| -rw-r--r-- | core/opiealarm/opiealarm.c | 57 | ||||
| -rwxr-xr-x | root/etc/suspend-scripts/S46opiealarm | 2 |
2 files changed, 44 insertions, 15 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index ac98832..128929e 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c @@ -26,17 +26,17 @@ #define PIDFILE "/var/run/opiealarm.pid" #define APMFILE "/proc/apm" FILE *log; // debug only int resume ( int resuspend ); -int suspend ( void ); +int suspend ( int fix_rtc ); int main ( int argc, char **argv ); int fork_with_pidfile ( void ); int kill_with_pidfile ( void ); void remove_pidfile ( void ); void usage ( void ); void sig_handler ( int sig ); void error_msg_and_die ( int perr, const char *msg ); int onac ( void ); @@ -68,18 +68,19 @@ void sig_handler ( int sig ) log_msg ( "GOT SIGNAL -> EXITING\n" ); fclose ( log ); remove_pidfile ( ); exit ( 0 ); } void usage ( void ) { - fprintf ( stderr, "Usage: opiealarm -r|-s [-a]\n\n" ); + fprintf ( stderr, "Usage: opiealarm -s [-f] | -r [-a]\n\n" ); fprintf ( stderr, "\t-s\tSuspend mode: set RTC alarm\n" ); + fprintf ( stderr, "\t-f \tFix RTC, if RTC and system have more than 5sec difference (suspend mode)\n" ); fprintf ( stderr, "\t-r\tResume mode: kill running opiealarm\n" ); fprintf ( stderr, "\t-a <x>\tResuspend in <x> seconds (resume mode)\n\n" ); exit ( 1 ); } int fork_with_pidfile ( void ) { FILE *fp; @@ -138,34 +139,38 @@ void remove_pidfile ( void ) signal ( SIGINT, SIG_DFL ); } int main ( int argc, char **argv ) { int mode = 0; int ac_resusp = 0; + int fix_rtc = 0; int opt; - while (( opt = getopt ( argc, argv, "a:rs" )) != EOF ) { + while (( opt = getopt ( argc, argv, "a:frs" )) != EOF ) { switch ( opt ) { case 's': mode = 's'; break; case 'r': mode = 'r'; break; case 'a': ac_resusp = atoi ( optarg ); if ( ac_resusp < 30 ) { ac_resusp = 120; fprintf ( stderr, "Warning: resuspend timeout must be >= 30 sec. -- now set to 120 sec\n" ); } break; + case 'f': + fix_rtc = 1; + break; default: usage ( ); } } if ( geteuid ( ) != 0 ) { fprintf ( stderr, "You need root priviledges to run opiealarm." ); return 2; @@ -176,30 +181,31 @@ int main ( int argc, char **argv ) // kill running opiealarm opiealarm_was_running = kill_with_pidfile ( ); remove_pidfile ( ); switch ( mode ) { case 'r': return resume ( ac_resusp ); case 's': - default : return suspend ( ); + default : return suspend ( fix_rtc ); } return 0; } -int suspend ( void ) +int suspend ( int fix_rtc ) { FILE *fp; char buf [64]; - time_t t; - struct tm *tm; + time_t alrt, syst, rtct; + struct tm alr, sys, rtc; int fd; - + int rtc_sys_diff; + if ( !fork_with_pidfile ( )) return 3; log = fopen ( "/tmp/opiealarm.log", "w" ); log_msg ( "STARTING\n" ); @@ -207,34 +213,57 @@ int suspend ( void ) if (!( fp = fopen ( "/etc/resumeat", "r" ))) error_msg_and_die ( 1, "/etc/resumeat" ); if ( !fgets ( buf, sizeof( buf ) - 1, fp )) error_msg_and_die ( 1, "/etc/resumeat" ); fclose ( fp ); - t = atoi ( buf ); + alrt = atoi ( buf ); - if ( t == 0 ) + if ( alrt == 0 ) error_msg_and_die ( 0, "/etc/resumeat contains an invalid time description" ); /* subtract 5 sec from event time... */ - t -= 5; + alrt -= 5; if ( log ) - fprintf ( log, "Setting RTC alarm to %d\n", t ); + fprintf ( log, "Setting RTC alarm to %d\n", alrt ); - tm = gmtime ( &t ); + alr = *gmtime ( &alrt ); + // get system time + time ( &syst ); + sys = *localtime ( &syst ); + // Write alarm time to RTC if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) error_msg_and_die ( 1, "/dev/misc/rtc" ); + + // get RTC time + if ( ioctl ( fd, RTC_ALM_SET, &rtc ) < 0 ) + error_msg_and_die ( 1, "ioctl RTC_RD_TIME" ); + rtct = mktime ( &rtc ); + + rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; + + if ( fix_rtc && (( rtc_sys_diff < -4 ) || ( rtc_sys_diff > 4 ))) { + struct tm set; + + set = *gmtime ( &syst ); + + fprintf ( log, "Correcting RTC: %d seconds\n", rtc_sys_diff ); + + if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 ) + error_msg_and_die ( 1, "ioctl RTC_SET_TIME" ); + } + // set alarm time - if ( ioctl ( fd, RTC_ALM_SET, tm ) < 0 ) + if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 ) error_msg_and_die ( 1, "ioctl RTC_ALM_SET" ); // enable alarm irq if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 ) error_msg_and_die ( 1, "ioctl RTC_AIE_ON" ); log_msg ( "SLEEPING\n" ); // wait for alarm irq diff --git a/root/etc/suspend-scripts/S46opiealarm b/root/etc/suspend-scripts/S46opiealarm index 9b936e4..a41dae5 100755 --- a/root/etc/suspend-scripts/S46opiealarm +++ b/root/etc/suspend-scripts/S46opiealarm @@ -1,5 +1,5 @@ #!/bin/sh # Starts opiealarm, which only runs while the iPaq sleeps # and wakes it up when the RTC alarm goes off. -/opt/QtPalmtop/bin/opiealarm -s +/opt/QtPalmtop/bin/opiealarm -s -f |