OSDN Git Service

am bb2c87ea: am 1511e20f: improved comments and added a minDelay attribute to sensor_t
authorMathias Agopian <mathias@google.com>
Fri, 30 Jul 2010 01:20:40 +0000 (18:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jul 2010 01:20:40 +0000 (18:20 -0700)
Merge commit 'bb2c87ea03c6bff09ea05dc6ba69796efe31ebdb'

* commit 'bb2c87ea03c6bff09ea05dc6ba69796efe31ebdb':
  improved comments and added a minDelay attribute to sensor_t

include/hardware/sensors_deprecated.h
tests/nusensors/nusensors.cpp

index 7974788..ee667d6 100644 (file)
@@ -29,6 +29,7 @@ typedef struct {
         float           temperature;
         float           distance;
         float           light;
+        float           pressure;
     };
     int64_t         time;
     uint32_t        reserved;
index 731fa09..29e2069 100644 (file)
@@ -15,6 +15,7 @@
  */
 
 #include <stdint.h>
+#include <string.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>