diff options
| author | Michael Trimarchi <trimarchi@gandalf.sssup.it> | 2009-01-29 14:27:58 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-29 14:27:58 +0000 |
| commit | a3ce07e6730d25b688399159f7448eb7260b055c (patch) | |
| tree | 310cee381ae1566822ec0fd67c26583f598a08a0 | |
| parent | 605a4a1c31827759a22da53294d0f81c6330848a (diff) | |
Update old android_alarm.h file
Updata old android_alarm.h file with the new one
Signed-off-by: Michael Trimarchi <michael@panicking.kicks-ass.org>
| -rw-r--r-- | include/linux/android_alarm.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/include/linux/android_alarm.h b/include/linux/android_alarm.h index c1a1450e992..d0cafd63719 100644 --- a/include/linux/android_alarm.h +++ b/include/linux/android_alarm.h @@ -16,10 +16,10 @@ #ifndef _LINUX_ANDROID_ALARM_H #define _LINUX_ANDROID_ALARM_H -#include <asm/ioctl.h> +#include <linux/ioctl.h> #include <linux/time.h> -typedef enum { +enum android_alarm_type { /* return code bit numbers or set alarm arg */ ANDROID_ALARM_RTC_WAKEUP, ANDROID_ALARM_RTC, @@ -28,19 +28,21 @@ typedef enum { ANDROID_ALARM_SYSTEMTIME, ANDROID_ALARM_TYPE_COUNT, - + /* return code bit numbers */ /* ANDROID_ALARM_TIME_CHANGE = 16 */ -} android_alarm_type_t; +}; -typedef enum { +enum android_alarm_return_flags { ANDROID_ALARM_RTC_WAKEUP_MASK = 1U << ANDROID_ALARM_RTC_WAKEUP, ANDROID_ALARM_RTC_MASK = 1U << ANDROID_ALARM_RTC, - ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP, - ANDROID_ALARM_ELAPSED_REALTIME_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME, + ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK = + 1U << ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP, + ANDROID_ALARM_ELAPSED_REALTIME_MASK = + 1U << ANDROID_ALARM_ELAPSED_REALTIME, ANDROID_ALARM_SYSTEMTIME_MASK = 1U << ANDROID_ALARM_SYSTEMTIME, ANDROID_ALARM_TIME_CHANGE_MASK = 1U << 16 -} android_alarm_return_flags_t; +}; /* Disable alarm */ #define ANDROID_ALARM_CLEAR(type) _IO('a', 0 | ((type) << 4)) @@ -48,12 +50,13 @@ typedef enum { /* Ack last alarm and wait for next */ #define ANDROID_ALARM_WAIT _IO('a', 1) +#define ALARM_IOW(c, type, size) _IOW('a', (c) | ((type) << 4), size) /* Set alarm */ -#define ANDROID_ALARM_SET(type) _IOW('a', 2 | ((type) << 4), struct timespec) -#define ANDROID_ALARM_SET_AND_WAIT(type) _IOW('a', 3 | ((type) << 4), struct timespec) -#define ANDROID_ALARM_GET_TIME(type) _IOW('a', 4 | ((type) << 4), struct timespec) +#define ANDROID_ALARM_SET(type) ALARM_IOW(2, type, struct timespec) +#define ANDROID_ALARM_SET_AND_WAIT(type) ALARM_IOW(3, type, struct timespec) +#define ANDROID_ALARM_GET_TIME(type) ALARM_IOW(4, type, struct timespec) #define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) -#define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) -#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) +#define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) +#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) #endif |