summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-12-10 21:07:10 (UTC)
committer kergoth <kergoth>2002-12-10 21:07:10 (UTC)
commit51f44c6a22971d6f60f5e36523d9efbeaa8aec55 (patch) (unidiff)
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
@@ -217,57 +217,62 @@ int suspend ( int fix_rtc )
217 return 3; 217 return 3;
218 218
219 // we are the child process from here on ... 219 // we are the child process from here on ...
220 220
221 tzset ( ); // not sure if it is really needed -- it probably doesn't hurt ... 221 tzset ( ); // not sure if it is really needed -- it probably doesn't hurt ...
222 222
223 do { // try/catch simulation 223 time ( &syst );// get the UNIX system time
224 sys = *localtime ( &syst );
224 225
225 // read the wakeup time from /etc/resumeat 226 do {
226 if (!( fp = fopen ( "/etc/resumeat", "r" )))
227 break; // ( 1, "/etc/resumeat" );
228
229 if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
230 break; // ( 1, "/etc/resumeat" );
231
232 fclose ( fp );
233
234 alrt = atoi ( buf ); // get the alarm time
235 if ( alrt == 0 )
236 break; // ( 0, "/etc/resumeat contains an invalid time description" );
237 alrt -= 5; // wake up 5 sec before the specified time
238 alr = *gmtime ( &alrt );
239
240 time ( &syst );// get the UNIX system time
241 sys = *localtime ( &syst );
242 227
243 if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) 228 if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 )
244 if (( fd = open ( "/dev/rtc", O_RDWR )) < 0 ) 229 if (( fd = open ( "/dev/rtc", O_RDWR )) < 0 )
245 break; // ( 1, "rtc" ); 230 break; // ( 1, "rtc" );
246 231
247 memset ( &rtc, 0, sizeof ( struct tm )); // get the RTC time 232 memset ( &rtc, 0, sizeof ( struct tm )); // get the RTC time
233
248 if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 ) 234 if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 )
249 break; // ( 1, "ioctl RTC_RD_TIME" ); 235 break; // ( 1, "ioctl RTC_RD_TIME" );
236
250 rtct = mktime ( &rtc ); 237 rtct = mktime ( &rtc );
251 238
252 rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; // calculate the difference between system and hardware time 239 rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; // calculate the difference between system and hardware time
253 240
254 if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) { 241 if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) {
255 struct tm set; 242 struct tm set;
256 set = *gmtime ( &syst ); 243 set = *gmtime ( &syst );
257 244
258 // if the difference between system and hardware time is more than 3 seconds, 245 // if the difference between system and hardware time is more than 3 seconds,
259 // we have to set the RTC (hwclock --systohc), or alarms won't work reliably. 246 // we have to set the RTC (hwclock --systohc), or alarms won't work reliably.
260 247
261 if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 ) 248 if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 )
262 break; // ( 1, "ioctl RTC_SET_TIME" ); 249 break; // ( 1, "ioctl RTC_SET_TIME" );
263 } 250 }
264 251
252 // read the wakeup time from /etc/resumeat
253 if (!( fp = fopen ( "/etc/resumeat", "r" )))
254 break; // ( 1, "/etc/resumeat" );
255
256 if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
257 break; // ( 1, "/etc/resumeat" );
258
259 fclose ( fp );
260
261 alrt = atoi ( buf ); // get the alarm time
262
263 if ( alrt == 0 )
264 break; // ( 0, "/etc/resumeat contains an invalid time description" );
265 alrt -= 5; // wake up 5 sec before the specified time
266
267 alr = *gmtime ( &alrt );
268
265 if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 ) // set RTC alarm time 269 if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 ) // set RTC alarm time
266 break; // ( 1, "ioctl RTC_ALM_SET" ); 270 break; // ( 1, "ioctl RTC_ALM_SET" );
267 if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 ) 271
272 if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 )
268 break; // ( 1, "ioctl RTC_AIE_ON" ); // enable RTC alarm irq 273 break; // ( 1, "ioctl RTC_AIE_ON" ); // enable RTC alarm irq
269 274
270 // tell the parent it is safe to exit now .. we have set the RTC alarm 275 // tell the parent it is safe to exit now .. we have set the RTC alarm
271 kill ( parent_pid, SIGUSR1 ); 276 kill ( parent_pid, SIGUSR1 );
272 277
273 if ( read ( fd, buf, sizeof( unsigned long )) < 0 ) // wait for the RTC alarm irq 278 if ( read ( fd, buf, sizeof( unsigned long )) < 0 ) // wait for the RTC alarm irq
@@ -275,28 +280,34 @@ int suspend ( int fix_rtc )
275 280
276 // iPAQ woke up via RTC irq -- otherwise we would have received a SIGUSR2 281 // iPAQ woke up via RTC irq -- otherwise we would have received a SIGUSR2
277 // from the "resume instance" of opiealarm. 282 // from the "resume instance" of opiealarm.
278 283
279 if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 ) // disable RTC alarm irq 284 if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 ) // disable RTC alarm irq
280 break; // ( 1, "ioctl RTC_AIE_OFF" ); 285 break; // ( 1, "ioctl RTC_AIE_OFF" );
281 286
282 close ( fd ); 287 close ( fd );
283
284 remove_pidfile ( ); // normal exit
285 return 0;
286 288
287 } while ( 0 ); 289 remove_pidfile ( );
290
291 return 0;
292
293 } while ( 0 )
294
295 if ( fp != NULL )
296 fclose ( fp );
288 297
289 kill ( parent_pid, SIGUSR1 ); // parent is still running - it can exit now 298 if ( fd != -1 )
299 close ( fd );
300
301 kill ( parent_pid, SIGUSR1 );
290 302
291 while ( 1 ) // pretend that we are waiting on RTC, so opiealarm -r can kill us 303 while ( 1 ) // pretend that we are waiting on RTC, so opiealarm -r can kill us
292 sleep ( 1000 ); // if we don't do this, the "resuspend on AC" would be triggerd 304 sleep ( 1000 ); // if we don't do this, the "resuspend on AC" would be triggerd
293 return 0; 305 return 0;
294} 306}
295 307
296
297int onac ( void ) 308int onac ( void )
298{ 309{
299 FILE *fp; 310 FILE *fp;
300 int on = 0; 311 int on = 0;
301 312
302 // check the apm proc interface for AC status 313 // check the apm proc interface for AC status