summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/opiealarm/Makefile2
-rw-r--r--core/opiealarm/opiealarm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/opiealarm/Makefile b/core/opiealarm/Makefile
index e988abf..f20d451 100644
--- a/core/opiealarm/Makefile
+++ b/core/opiealarm/Makefile
@@ -1,26 +1,26 @@
DESTDIR=../../bin
CROSS:=arm-linux-
CC :=$(CROSS)gcc
LD :=$(CROSS)gcc
STRIP:=$(CROSS)strip
CFLAGS:=-O2
LDFLAGS:=
all: $(DESTDIR)/opiealarm $(DESTDIR)/opieatd
$(DESTDIR)/opiealarm: opiealarm.c
$(CC) $(CFLAGS) opiealarm.c -o $(DESTDIR)/opiealarm $(LDFLAGS)
- $(STRIP) -s $(DESTDIR)/opiealarm
+ $(STRIP) --strip-all $(DESTDIR)/opiealarm
chmod u+s $(DESTDIR)/opiealarm
chown root $(DESTDIR)/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n"
$(DESTDIR)/opieatd: opieatd
cp opieatd $(DESTDIR)/opieatd
chmod +x $(DESTDIR)/opieatd
clean:
-rm -f *~ core
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 71367b3..ce0103e 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -222,49 +222,49 @@ int suspend ( int fix_rtc )
if ( alrt == 0 )
error_msg_and_die ( 0, "/etc/resumeat contains an invalid time description" );
/* subtract 5 sec from event time... */
alrt -= 5;
if ( log )
fprintf ( log, "Setting RTC alarm to %d\n", alrt );
tzset ( );
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
memset ( &rtc, 0, sizeof ( struct tm ));
- if ( ioctl ( fd, RTC_ALM_SET, &rtc ) < 0 )
+ if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 )
error_msg_and_die ( 1, "ioctl RTC_RD_TIME" );
rtct = mktime ( &rtc );
fprintf ( log, "System time: %02d.%02d.%04d %02d:%02d:%02d DST: %d (TZ: %s, offset: %d)\n", sys. tm_mday, sys. tm_mon + 1, sys. tm_year + 1900, sys. tm_hour, sys. tm_min, sys. tm_sec, sys. tm_isdst, sys. tm_zone, sys. tm_gmtoff );
fprintf ( log, "RTC time: %02d.%02d.%04d %02d:%02d:%02d DST: %d (TZ: %s, offset: %d)\n", rtc. tm_mday, rtc. tm_mon + 1, rtc. tm_year + 1900, rtc. tm_hour, rtc. tm_min, rtc. tm_sec, rtc. tm_isdst, rtc. tm_zone, rtc. tm_gmtoff );
fprintf ( log, "Wakeup time: %02d.%02d.%04d %02d:%02d:%02d DST: %d (TZ: %s, offset: %d)\n", alr. tm_mday, alr. tm_mon + 1, alr. tm_year + 1900, alr. tm_hour, alr. tm_min, alr. tm_sec, alr. tm_isdst, alr. tm_zone, alr. tm_gmtoff );
fprintf ( log, "System/RTC diff: %d seconds\n", ( syst - rtct ) - sys. tm_gmtoff );
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