From 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Wed, 7 Mar 2012 16:14:53 -0800 Subject: Revert "Update bionic kernel headers using update_all.py" This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made. --- libc/kernel/common/linux/rtc.h | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'libc/kernel/common/linux/rtc.h') diff --git a/libc/kernel/common/linux/rtc.h b/libc/kernel/common/linux/rtc.h index e4370600d..b51bc7194 100644 --- a/libc/kernel/common/linux/rtc.h +++ b/libc/kernel/common/linux/rtc.h @@ -7,77 +7,66 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef _LINUX_RTC_H_ #define _LINUX_RTC_H_ + struct rtc_time { int tm_sec; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int tm_min; int tm_hour; int tm_mday; int tm_mon; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int tm_year; int tm_wday; int tm_yday; int tm_isdst; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + struct rtc_wkalrm { unsigned char enabled; unsigned char pending; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct rtc_time time; }; + struct rtc_pll_info { int pll_ctrl; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int pll_value; int pll_max; int pll_min; int pll_posmult; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int pll_negmult; long pll_clock; }; + #define RTC_AIE_ON _IO('p', 0x01) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_AIE_OFF _IO('p', 0x02) #define RTC_UIE_ON _IO('p', 0x03) #define RTC_UIE_OFF _IO('p', 0x04) #define RTC_PIE_ON _IO('p', 0x05) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_PIE_OFF _IO('p', 0x06) #define RTC_WIE_ON _IO('p', 0x0f) #define RTC_WIE_OFF _IO('p', 0x10) + #define RTC_ALM_SET _IOW('p', 0x07, struct rtc_time) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_ALM_READ _IOR('p', 0x08, struct rtc_time) #define RTC_RD_TIME _IOR('p', 0x09, struct rtc_time) #define RTC_SET_TIME _IOW('p', 0x0a, struct rtc_time) #define RTC_IRQP_READ _IOR('p', 0x0b, unsigned long) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_IRQP_SET _IOW('p', 0x0c, unsigned long) #define RTC_EPOCH_READ _IOR('p', 0x0d, unsigned long) #define RTC_EPOCH_SET _IOW('p', 0x0e, unsigned long) + #define RTC_WKALM_SET _IOW('p', 0x0f, struct rtc_wkalrm) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_WKALM_RD _IOR('p', 0x10, struct rtc_wkalrm) + #define RTC_PLL_GET _IOR('p', 0x11, struct rtc_pll_info) #define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) + #define RTC_IRQF 0x80 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define RTC_PF 0x40 #define RTC_AF 0x20 #define RTC_UF 0x10 + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -- cgit v1.2.3