diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-06-25 08:48:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:13 -0400 |
commit | 655066c3835e7b51794c4d56f042eb78b5a79f53 (patch) | |
tree | 25d2a104d5c77c58994f3c96aa08bf83bd1f8116 /include/linux | |
parent | 1abb0dc92d706e8c73c7a62ca813738fe2259a7f (diff) |
[PATCH] RTC: rtc-dev UIE emulation
Import genrtc's RTC UIE emulation (CONFIG_GEN_RTC_X) to rtc-dev driver with
slight adjustments/refinements. This makes UIE-less rtc drivers work
better with programs doing read/poll on /dev/rtc, such as hwclock. This
emulation should not harm rtc drivers with UIE support, since
rtc_dev_ioctl() calls underlaying rtc driver's ioctl() first.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/rtc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index ab61cd1199f2..43310760fe73 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
@@ -155,6 +155,16 @@ struct rtc_device | |||
155 | struct rtc_task *irq_task; | 155 | struct rtc_task *irq_task; |
156 | spinlock_t irq_task_lock; | 156 | spinlock_t irq_task_lock; |
157 | int irq_freq; | 157 | int irq_freq; |
158 | #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL | ||
159 | struct work_struct uie_task; | ||
160 | struct timer_list uie_timer; | ||
161 | /* Those fields are protected by rtc->irq_lock */ | ||
162 | unsigned int oldsecs; | ||
163 | unsigned int irq_active:1; | ||
164 | unsigned int stop_uie_polling:1; | ||
165 | unsigned int uie_task_active:1; | ||
166 | unsigned int uie_timer_active:1; | ||
167 | #endif | ||
158 | }; | 168 | }; |
159 | #define to_rtc_device(d) container_of(d, struct rtc_device, class_dev) | 169 | #define to_rtc_device(d) container_of(d, struct rtc_device, class_dev) |
160 | 170 | ||