Attempt to open /dev/rtc if /dev/misc/rtc fails, so it works in the nondevfs case.

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
@@ -219,50 +219,51 @@ int suspend ( int fix_rtc )
         // 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