summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorAndrew Rossignol <aarossig@google.com>2016-07-12 17:07:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 17:07:05 +0000
commitd4926feb1381b9e03437371d2b7e79774c3a9135 (patch)
treefdb02a77732b0e6261f85187c20bae2f8f86763b /firmware
parentdde6059b35031bd7d1a980cc59be1d764f1d097c (diff)
parent7788602f701f937bf49b918fc2b433c14546aa70 (diff)
downloadcontexthub-d4926feb1381b9e03437371d2b7e79774c3a9135.tar.gz
Merge \\"sensors: allow MAX_REGISTERED_SENSORS to be overridden\\" into nyc-mr1-dev am: 6499d19eab
am: 7788602f70 Change-Id: I7616f319e7ccd17209c616456edd3b276b5f7132
Diffstat (limited to 'firmware')
-rw-r--r--firmware/inc/sensors.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/firmware/inc/sensors.h b/firmware/inc/sensors.h
index 3049c092..8ff9bf8d 100644
--- a/firmware/inc/sensors.h
+++ b/firmware/inc/sensors.h
@@ -21,13 +21,19 @@
extern "C" {
#endif
#include <plat/inc/taggedPtr.h>
+#include <variant/inc/variant.h>
#include <eventnums.h>
#include <sensType.h>
#include <stdbool.h>
#include <stdint.h>
#include "toolchain.h"
-#define MAX_REGISTERED_SENSORS 32 /* this may need to be revisted later */
+// Specify the maximum number of sensors that can be registered. Allow it to be
+// overriden on a per-device basis.
+#ifndef MAX_REGISTERED_SENSORS
+#define MAX_REGISTERED_SENSORS 32
+#endif // MAX_REGISTERED_SENSORS
+
#define MAX_MIN_SAMPLES 3000
enum NumAxis {