author | kergoth <kergoth> | 2002-12-06 04:13:13 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-06 04:13:13 (UTC) |
commit | db466251a506d0af3f1eb5d0095ca151e887267d (patch) (unidiff) | |
tree | 4301cc07325e0b057a2b0115a35598f3bfb7bece /core | |
parent | 0e19980617d101f69d0540d62b89fe1894cfe0f2 (diff) | |
download | opie-db466251a506d0af3f1eb5d0095ca151e887267d.zip opie-db466251a506d0af3f1eb5d0095ca151e887267d.tar.gz opie-db466251a506d0af3f1eb5d0095ca151e887267d.tar.bz2 |
Attempt to open /dev/rtc if /dev/misc/rtc fails, so it works in the nondevfs case.
-rw-r--r-- | core/opiealarm/opiealarm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index 70e5415..bb2e684 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c | |||
@@ -231,26 +231,27 @@ int suspend ( int fix_rtc ) | |||
231 | 231 | ||
232 | fclose ( fp ); | 232 | fclose ( fp ); |
233 | 233 | ||
234 | alrt = atoi ( buf ); // get the alarm time | 234 | alrt = atoi ( buf ); // get the alarm time |
235 | if ( alrt == 0 ) | 235 | if ( alrt == 0 ) |
236 | break; // ( 0, "/etc/resumeat contains an invalid time description" ); | 236 | break; // ( 0, "/etc/resumeat contains an invalid time description" ); |
237 | alrt -= 5; // wake up 5 sec before the specified time | 237 | alrt -= 5; // wake up 5 sec before the specified time |
238 | alr = *gmtime ( &alrt ); | 238 | alr = *gmtime ( &alrt ); |
239 | 239 | ||
240 | time ( &syst );// get the UNIX system time | 240 | time ( &syst );// get the UNIX system time |
241 | sys = *localtime ( &syst ); | 241 | sys = *localtime ( &syst ); |
242 | 242 | ||
243 | if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) // open the RTC device | 243 | if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) |
244 | break; // ( 1, "/dev/misc/rtc" ); | 244 | if (( fd = open ( "/dev/rtc", O_RDWR )) < 0 ) |
245 | break; // ( 1, "rtc" ); | ||
245 | 246 | ||
246 | memset ( &rtc, 0, sizeof ( struct tm )); // get the RTC time | 247 | memset ( &rtc, 0, sizeof ( struct tm )); // get the RTC time |
247 | if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 ) | 248 | if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 ) |
248 | break; // ( 1, "ioctl RTC_RD_TIME" ); | 249 | break; // ( 1, "ioctl RTC_RD_TIME" ); |
249 | rtct = mktime ( &rtc ); | 250 | rtct = mktime ( &rtc ); |
250 | 251 | ||
251 | rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; // calculate the difference between system and hardware time | 252 | rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; // calculate the difference between system and hardware time |
252 | 253 | ||
253 | if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) { | 254 | if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) { |
254 | struct tm set; | 255 | struct tm set; |
255 | set = *gmtime ( &syst ); | 256 | set = *gmtime ( &syst ); |
256 | 257 | ||