author | sandman <sandman> | 2002-06-26 17:42:48 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-26 17:42:48 (UTC) |
commit | 1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038 (patch) (unidiff) | |
tree | d34f5076bfd68ed6bdae0af1a475d9118fef3879 | |
parent | 18905bcc671622ab11b4e3d4447e4cd34f7308ee (diff) | |
download | opie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.zip opie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.tar.gz opie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.tar.bz2 |
The embedix arm-linux-strip does not accept -s but --strip-all (weird)
Fixed a RTC get time ioctl bug in opiealarm.
-rw-r--r-- | core/opiealarm/Makefile | 2 | ||||
-rw-r--r-- | core/opiealarm/opiealarm.c | 2 |
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 | |||
@@ -4,23 +4,23 @@ DESTDIR=../../bin | |||
4 | CROSS:=arm-linux- | 4 | CROSS:=arm-linux- |
5 | CC :=$(CROSS)gcc | 5 | CC :=$(CROSS)gcc |
6 | LD :=$(CROSS)gcc | 6 | LD :=$(CROSS)gcc |
7 | STRIP:=$(CROSS)strip | 7 | STRIP:=$(CROSS)strip |
8 | 8 | ||
9 | CFLAGS:=-O2 | 9 | CFLAGS:=-O2 |
10 | LDFLAGS:= | 10 | LDFLAGS:= |
11 | 11 | ||
12 | all: $(DESTDIR)/opiealarm $(DESTDIR)/opieatd | 12 | all: $(DESTDIR)/opiealarm $(DESTDIR)/opieatd |
13 | 13 | ||
14 | $(DESTDIR)/opiealarm: opiealarm.c | 14 | $(DESTDIR)/opiealarm: opiealarm.c |
15 | $(CC) $(CFLAGS) opiealarm.c -o $(DESTDIR)/opiealarm $(LDFLAGS) | 15 | $(CC) $(CFLAGS) opiealarm.c -o $(DESTDIR)/opiealarm $(LDFLAGS) |
16 | $(STRIP) -s $(DESTDIR)/opiealarm | 16 | $(STRIP) --strip-all $(DESTDIR)/opiealarm |
17 | chmod u+s $(DESTDIR)/opiealarm | 17 | chmod u+s $(DESTDIR)/opiealarm |
18 | chown root $(DESTDIR)/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n" | 18 | chown root $(DESTDIR)/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n" |
19 | 19 | ||
20 | $(DESTDIR)/opieatd: opieatd | 20 | $(DESTDIR)/opieatd: opieatd |
21 | cp opieatd $(DESTDIR)/opieatd | 21 | cp opieatd $(DESTDIR)/opieatd |
22 | chmod +x $(DESTDIR)/opieatd | 22 | chmod +x $(DESTDIR)/opieatd |
23 | 23 | ||
24 | clean: | 24 | clean: |
25 | -rm -f *~ core | 25 | -rm -f *~ core |
26 | 26 | ||
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 | |||
@@ -234,25 +234,25 @@ int suspend ( int fix_rtc ) | |||
234 | alr = *gmtime ( &alrt ); | 234 | alr = *gmtime ( &alrt ); |
235 | 235 | ||
236 | // get system time | 236 | // get system time |
237 | time ( &syst ); | 237 | time ( &syst ); |
238 | sys = *localtime ( &syst ); | 238 | sys = *localtime ( &syst ); |
239 | 239 | ||
240 | // Write alarm time to RTC | 240 | // Write alarm time to RTC |
241 | if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) | 241 | if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 ) |
242 | error_msg_and_die ( 1, "/dev/misc/rtc" ); | 242 | error_msg_and_die ( 1, "/dev/misc/rtc" ); |
243 | 243 | ||
244 | // get RTC time | 244 | // get RTC time |
245 | memset ( &rtc, 0, sizeof ( struct tm )); | 245 | memset ( &rtc, 0, sizeof ( struct tm )); |
246 | if ( ioctl ( fd, RTC_ALM_SET, &rtc ) < 0 ) | 246 | if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 ) |
247 | error_msg_and_die ( 1, "ioctl RTC_RD_TIME" ); | 247 | error_msg_and_die ( 1, "ioctl RTC_RD_TIME" ); |
248 | rtct = mktime ( &rtc ); | 248 | rtct = mktime ( &rtc ); |
249 | 249 | ||
250 | 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 ); | 250 | 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 ); |
251 | 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 ); | 251 | 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 ); |
252 | 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 ); | 252 | 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 ); |
253 | 253 | ||
254 | fprintf ( log, "System/RTC diff: %d seconds\n", ( syst - rtct ) - sys. tm_gmtoff ); | 254 | fprintf ( log, "System/RTC diff: %d seconds\n", ( syst - rtct ) - sys. tm_gmtoff ); |
255 | 255 | ||
256 | 256 | ||
257 | rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; | 257 | rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff; |
258 | 258 | ||