equal
deleted
inserted
replaced
40 uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP); |
40 uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP); |
41 spin_unlock_irqrestore(&rtc_lock, flags); |
41 spin_unlock_irqrestore(&rtc_lock, flags); |
42 return uip; |
42 return uip; |
43 } |
43 } |
44 |
44 |
45 static inline unsigned int get_rtc_time(struct rtc_time *time) |
45 static inline unsigned int __get_rtc_time(struct rtc_time *time) |
46 { |
46 { |
47 unsigned char ctrl; |
47 unsigned char ctrl; |
48 unsigned long flags; |
48 unsigned long flags; |
49 |
49 |
50 #ifdef CONFIG_MACH_DECSTATION |
50 #ifdef CONFIG_MACH_DECSTATION |
106 time->tm_mon--; |
106 time->tm_mon--; |
107 |
107 |
108 return RTC_24H; |
108 return RTC_24H; |
109 } |
109 } |
110 |
110 |
|
111 #ifndef get_rtc_time |
|
112 #define get_rtc_time __get_rtc_time |
|
113 #endif |
|
114 |
111 /* Set the current date and time in the real time clock. */ |
115 /* Set the current date and time in the real time clock. */ |
112 static inline int set_rtc_time(struct rtc_time *time) |
116 static inline int __set_rtc_time(struct rtc_time *time) |
113 { |
117 { |
114 unsigned long flags; |
118 unsigned long flags; |
115 unsigned char mon, day, hrs, min, sec; |
119 unsigned char mon, day, hrs, min, sec; |
116 unsigned char save_control, save_freq_select; |
120 unsigned char save_control, save_freq_select; |
117 unsigned int yrs; |
121 unsigned int yrs; |
188 spin_unlock_irqrestore(&rtc_lock, flags); |
192 spin_unlock_irqrestore(&rtc_lock, flags); |
189 |
193 |
190 return 0; |
194 return 0; |
191 } |
195 } |
192 |
196 |
|
197 #ifndef set_rtc_time |
|
198 #define set_rtc_time __set_rtc_time |
|
199 #endif |
|
200 |
193 static inline unsigned int get_rtc_ss(void) |
201 static inline unsigned int get_rtc_ss(void) |
194 { |
202 { |
195 struct rtc_time h; |
203 struct rtc_time h; |
196 |
204 |
197 get_rtc_time(&h); |
205 __get_rtc_time(&h); |
198 return h.tm_sec; |
206 return h.tm_sec; |
199 } |
207 } |
200 |
208 |
201 static inline int get_rtc_pll(struct rtc_pll_info *pll) |
209 static inline int get_rtc_pll(struct rtc_pll_info *pll) |
202 { |
210 { |