summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-12-10 21:07:10 (UTC)
committer kergoth <kergoth>2002-12-10 21:07:10 (UTC)
commit51f44c6a22971d6f60f5e36523d9efbeaa8aec55 (patch) (side-by-side diff)
tree3c299e1564146f4c10f90dae3f8ab97477752971
parentd7ade26d9b84c5347b39891f97fbf12f440d86f0 (diff)
downloadopie-51f44c6a22971d6f60f5e36523d9efbeaa8aec55.zip
opie-51f44c6a22971d6f60f5e36523d9efbeaa8aec55.tar.gz
opie-51f44c6a22971d6f60f5e36523d9efbeaa8aec55.tar.bz2
slight bit of rearranging to ensure that the rtc time gets set if using -s regardless of whether resumeat contains a valid alarm
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opiealarm/opiealarm.c73
1 files changed, 42 insertions, 31 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index bb2e684..5ea24b7 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -221,31 +221,18 @@ int suspend ( int fix_rtc )
tzset ( ); // not sure if it is really needed -- it probably doesn't hurt ...
- do { // try/catch simulation
+ time ( &syst );// get the UNIX system time
+ sys = *localtime ( &syst );
- // 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 );
+ do {
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 );
@@ -255,15 +242,33 @@ int suspend ( int fix_rtc )
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_SET_TIME, &set ) < 0 )
+ break; // ( 1, "ioctl RTC_SET_TIME" );
}
+ // 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 );
+
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 )
+
+ if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 )
break; // ( 1, "ioctl RTC_AIE_ON" ); // enable RTC alarm irq
@@ -279,13 +284,20 @@ int suspend ( int fix_rtc )
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 );
+ remove_pidfile ( );
+
+ return 0;
+
+ } while ( 0 )
+
+ if ( fp != NULL )
+ fclose ( fp );
- kill ( parent_pid, SIGUSR1 ); // parent is still running - it can exit now
+ if ( fd != -1 )
+ close ( fd );
+
+ kill ( parent_pid, SIGUSR1 );
while ( 1 ) // pretend that we are waiting on RTC, so opiealarm -r can kill us
@@ -294,5 +306,4 @@ int suspend ( int fix_rtc )
}
-
int onac ( void )
{