diff options
| author | Eric Tashakkor <w36098@motorola.com> | 2014-04-02 09:38:23 -0500 |
|---|---|---|
| committer | Eric Tashakkor <w36098@motorola.com> | 2014-04-02 09:38:23 -0500 |
| commit | 95ccb340360c3baf61af491dc9d56906b226176e (patch) | |
| tree | 68b1e0ac20f8e9e29768433be5047719fcdc1c87 /include/uapi/linux/input.h | |
| parent | 0035f53710a67a53f1c9863c688ac96a302f86da (diff) | |
| download | olio-linux-3.10-95ccb340360c3baf61af491dc9d56906b226176e.tar.xz olio-linux-3.10-95ccb340360c3baf61af491dc9d56906b226176e.zip | |
IKXCLOCK-569 Update M4 Pedometer Driver with Sysfs and IIO Reporting
Added IIO and sysfs functionality.
Removed input.h changes associated with this driver.
Backported fixes/updates to heartrate sensor.
Fixed error in ALS sensor that would unregister the wrong interrupt.
Change-Id: I0983c1119efb7f268f968e0a7fe9dc96192cdc42
Signed-off-by: Eric Tashakkor <w36098@motorola.com>
Diffstat (limited to 'include/uapi/linux/input.h')
| -rw-r--r-- | include/uapi/linux/input.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index e830392451f..b3618eb001e 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -891,18 +891,10 @@ struct input_keymap_entry { #define MSC_GESTURE_VALUE1 0x0c #define MSC_GESTURE_VALUE2 0x0d #define MSC_GESTURE_VALUE3 0x0e -#define MSC_STEPCOUNT 0x0f -#define MSC_DISTANCE 0x10 -#define MSC_SPEED 0x11 -#define MSC_ACTIVITY_TYPE 0x12 -#define MSC_METS 0x13 -#define MSC_CALORIES 0x14 -#define MSC_METSACTIVITY 0x15 -#define MSC_FLOORSCLIMBED 0x16 -#define MSC_PASSIVE_STEPS 0x17 -#define MSC_PASSIVE_METS 0x18 -#define MSC_PASSIVE_TIMESTAMP 0x19 -#define MSC_PASSIVE_FLOORSCLIMBED 0x1a +#define MSC_PASSIVE_STEPS 0x0f +#define MSC_PASSIVE_METS 0x10 +#define MSC_PASSIVE_TIMESTAMP 0x11 +#define MSC_PASSIVE_FLOORSCLIMBED 0x12 #define MSC_MAX 0x1f #define MSC_CNT (MSC_MAX+1) |