author | kergoth <kergoth> | 2002-12-06 04:13:13 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-06 04:13:13 (UTC) |
commit | db466251a506d0af3f1eb5d0095ca151e887267d (patch) (side-by-side diff) | |
tree | 4301cc07325e0b057a2b0115a35598f3bfb7bece | |
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 @@ -179,130 +179,131 @@ int main ( int argc, char **argv ) fprintf ( stderr, "You need root priviledges to run opiealarm." ); return 2; } if ( !mode ) usage ( ); parent_pid = getpid ( ); // kill running opiealarm opiealarm_was_running = kill_with_pidfile ( ); remove_pidfile ( ); switch ( mode ) { case 'r': opt = resume ( ac_resusp ); break; case 's': default : opt = suspend ( fix_rtc ); break; } parent_pid = 0; return opt; } int suspend ( int fix_rtc ) { FILE *fp; char buf [64]; time_t alrt, syst, rtct; struct tm alr, sys, rtc; int fd; int rtc_sys_diff; if ( !fork_with_pidfile ( )) return 3; // we are the child process from here on ... tzset ( ); // not sure if it is really needed -- it probably doesn't hurt ... do { // try/catch simulation // read the wakeup time from /etc/resumeat if (!( fp = fopen ( "/etc/resumeat", "r" ))) break; // ( 1, "/etc/resumeat" ); if ( !fgets ( buf, sizeof( buf ) - 1, fp )) break; // ( 1, "/etc/resumeat" ); fclose ( fp ); alrt = atoi ( buf ); // get the alarm time if ( alrt == 0 ) break; // ( 0, "/etc/resumeat contains an invalid time description" ); alrt -= 5; // wake up 5 sec before the specified time alr = *gmtime ( &alrt ); time ( &syst );// get the UNIX system time sys = *localtime ( &syst ); - if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) // open the RTC device - break; // ( 1, "/dev/misc/rtc" ); + if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) + if (( fd = open ( "/dev/rtc", O_RDWR )) < 0 ) + break; // ( 1, "rtc" ); memset ( &rtc, 0, sizeof ( struct tm )); // get the RTC time if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 ) break; // ( 1, "ioctl RTC_RD_TIME" ); rtct = mktime ( &rtc ); rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; // calculate the difference between system and hardware time if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) { struct tm set; set = *gmtime ( &syst ); // if the difference between system and hardware time is more than 3 seconds, // we have to set the RTC (hwclock --systohc), or alarms won't work reliably. if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 ) break; // ( 1, "ioctl RTC_SET_TIME" ); } if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 ) // set RTC alarm time break; // ( 1, "ioctl RTC_ALM_SET" ); if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 ) break; // ( 1, "ioctl RTC_AIE_ON" ); // enable RTC alarm irq // tell the parent it is safe to exit now .. we have set the RTC alarm kill ( parent_pid, SIGUSR1 ); if ( read ( fd, buf, sizeof( unsigned long )) < 0 ) // wait for the RTC alarm irq break; // ( 1, "read rtc alarm" ); // iPAQ woke up via RTC irq -- otherwise we would have received a SIGUSR2 // from the "resume instance" of opiealarm. if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 ) // disable RTC alarm irq break; // ( 1, "ioctl RTC_AIE_OFF" ); close ( fd ); remove_pidfile ( ); // normal exit return 0; } while ( 0 ); kill ( parent_pid, SIGUSR1 ); // parent is still running - it can exit now while ( 1 ) // pretend that we are waiting on RTC, so opiealarm -r can kill us sleep ( 1000 ); // if we don't do this, the "resuspend on AC" would be triggerd return 0; } int onac ( void ) { FILE *fp; int on = 0; // check the apm proc interface for AC status if (( fp = fopen ( APMFILE, "r" ))) { int ac = 0; if ( fscanf ( fp, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%*x 0x%*x %*d%% %*i %*c", &ac ) == 1 ) on = ( ac == 0x01 ) ? 1 : 0; |