From 8fd6d658a1caeddc0a84dd69ffe45739bd466e74 Mon Sep 17 00:00:00 2001 From: Thom Johansen Date: Wed, 28 Feb 2007 21:55:11 +0000 Subject: Add wake on alarm support for Ipods. Rename HAVE_ALARM_MOD to HAVE_ALARM_RTC since it's not always a mod. Make Ipod PCF driver keep other flags in OOCC1 that have been set instead of overwriting them. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12522 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/pcf50605.c | 10 ++-- firmware/drivers/rtc/rtc_ds1339_ds3231.c | 6 +- firmware/drivers/rtc/rtc_m41st84w.c | 8 +-- firmware/drivers/rtc/rtc_pcf50605.c | 94 ++++++++++++++++++++++++++++++-- 4 files changed, 102 insertions(+), 16 deletions(-) (limited to 'firmware/drivers') diff --git a/firmware/drivers/pcf50605.c b/firmware/drivers/pcf50605.c index 0610f41aec..cf4ea9fecb 100644 --- a/firmware/drivers/pcf50605.c +++ b/firmware/drivers/pcf50605.c @@ -89,10 +89,9 @@ int pcf50605_write(int address, unsigned char val) int pcf50605_write_multiple(int address, const unsigned char* buf, int count) { - /* TODO */ - (void)address; - (void)buf; - (void)count; + int i; + for (i = 0; i < count; i++) + pp_i2c_send(0x8, address + i, buf[i]); return 0; } @@ -102,7 +101,8 @@ int pcf50605_write_multiple(int address, const unsigned char* buf, int count) power on your iPod again. */ void pcf50605_standby_mode(void) { - pcf50605_write(OOCC1, GOSTDBY | CHGWAK | EXTONWAK); + const char mask = pcf50605_read(OOCC1) | GOSTDBY | CHGWAK | EXTONWAK; + pcf50605_write(OOCC1, mask); } void pcf50605_init(void) diff --git a/firmware/drivers/rtc/rtc_ds1339_ds3231.c b/firmware/drivers/rtc/rtc_ds1339_ds3231.c index df67fed735..7396c2e0a1 100644 --- a/firmware/drivers/rtc/rtc_ds1339_ds3231.c +++ b/firmware/drivers/rtc/rtc_ds1339_ds3231.c @@ -33,14 +33,14 @@ void rtc_init(void) /* read one byte from RTC; 0 on success */ rtc_detected = !sw_i2c_read(RTC_ADDR, 0, &byte, 1); -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM /* Check + save alarm bit first, before the power thread starts watching */ rtc_check_alarm_started(false); #endif } -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM /* check whether the unit has been started by the RTC alarm function */ /* (check for A2F, which => started using wakeup alarm) */ @@ -117,7 +117,7 @@ bool rtc_enable_alarm(bool enable) return false; /* all ok */ } -#endif /* HAVE_ALARM_MOD */ +#endif /* HAVE_RTC_ALARM */ int rtc_read_datetime(unsigned char* buf) { diff --git a/firmware/drivers/rtc/rtc_m41st84w.c b/firmware/drivers/rtc/rtc_m41st84w.c index 1d76867e13..4e861692d8 100644 --- a/firmware/drivers/rtc/rtc_m41st84w.c +++ b/firmware/drivers/rtc/rtc_m41st84w.c @@ -31,7 +31,7 @@ void rtc_init(void) { unsigned char data; -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM /* Check + save alarm bit first, before the power thread starts watching */ rtc_check_alarm_started(false); #endif @@ -52,7 +52,7 @@ void rtc_init(void) rtc_write(0x0c,data); } -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM /* Clear Trec bit, write-protecting the RTC for 200ms when shutting off */ /* without this, the alarm won't work! */ @@ -71,7 +71,7 @@ void rtc_init(void) #endif } -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM /* check whether the unit has been started by the RTC alarm function */ /* (check for AF, which => started using wakeup alarm) */ @@ -168,7 +168,7 @@ bool rtc_enable_alarm(bool enable) return false; /* all ok */ } -#endif /* HAVE_ALARM_MOD */ +#endif /* HAVE_RTC_ALARM */ int rtc_write(unsigned char address, unsigned char value) { diff --git a/firmware/drivers/rtc/rtc_pcf50605.c b/firmware/drivers/rtc/rtc_pcf50605.c index 1bc40146ff..fedcdd3cdf 100644 --- a/firmware/drivers/rtc/rtc_pcf50605.c +++ b/firmware/drivers/rtc/rtc_pcf50605.c @@ -24,8 +24,12 @@ #include "pcf50605.h" #include +/* Values which each disable one alarm time register */ +static char alarm_disable[] = { 0x7f, 0x7f, 0x3f, 0x07, 0x3f, 0x1f, 0xff }; + void rtc_init(void) { + rtc_check_alarm_started(false); } int rtc_read_datetime(unsigned char* buf) @@ -35,11 +39,93 @@ int rtc_read_datetime(unsigned char* buf) int rtc_write_datetime(unsigned char* buf) { - int i; + pcf50605_write_multiple(0x0a, buf, 7); + return 1; +} + +/** + * Checks the PCF interrupt 1 register bit 7 to see if an alarm interrupt has + * triggered since last we checked. + */ +bool rtc_check_alarm_flag(void) +{ + return pcf50605_read(0x02) & 0x80; +} - for (i=0;i<7;i++) { - pcf50605_write(0x0a+i, buf[i]); +/** + * Enables or disables the alarm. + * The Ipod bootloader clears all PCF interrupt registers and always enables + * the "wake on RTC" bit on OOCC1, so we have to rely on other means to find + * out if we just woke from an alarm. + * Return value is always false for us. + */ +bool rtc_enable_alarm(bool enable) +{ + if (enable) { + /* Tell the PCF to ignore everything but second, minute and hour, so + * that an alarm will trigger the next time the alarm time occurs. + */ + pcf50605_write_multiple(0x14, alarm_disable + 3, 4); + /* Unmask the alarm interrupt (might be unneeded) */ + pcf50605_write(0x5, pcf50605_read(0x5) & ~0x80); + /* Make sure wake on RTC is set */ + pcf50605_write(0x8, pcf50605_read(0x8) | 0x10); + } else { + /* We use this year to indicate a disabled alarm. If you happen to live + * around this time and are annoyed by this, feel free to seek out my + * grave and do something nasty to it. + */ + pcf50605_write(0x17, 0x99); } + return false; +} - return 1; +/** + * Check if alarm caused unit to start. + */ +bool rtc_check_alarm_started(bool release_alarm) +{ + static bool run_before = false, alarm_state; + bool rc; + + if (run_before) { + rc = alarm_state; + alarm_state &= ~release_alarm; + } else { + char rt[3], at[3]; + /* The Ipod bootloader seems to read (and thus clear) the PCF interrupt + * registers, so we need to find some other way to detect if an alarm + * just happened + */ + pcf50605_read_multiple(0x0a, rt, 3); + pcf50605_read_multiple(0x11, at, 3); + + /* If alarm time and real time match within 10 seconds of each other, we + * assume an alarm just triggered + */ + rc = alarm_state = rt[1] == at[1] && rt[2] == at[2] + && (rt[0] - at[0]) <= 10; + run_before = true; + } + return rc; +} + +void rtc_set_alarm(int h, int m) +{ + /* Set us to wake at the first second of the specified time */ + pcf50605_write(0x11, 0); + /* Convert to BCD */ + pcf50605_write(0x12, ((m/10) << 4) | m%10); + pcf50605_write(0x13, ((h/10) << 4) | h%10); } + +void rtc_get_alarm(int *h, int *m) +{ + char buf[2]; + + pcf50605_read_multiple(0x12, buf, 2); + /* Convert from BCD */ + *m = ((buf[0] >> 4) & 0x7)*10 + (buf[0] & 0x0f); + *h = ((buf[1] >> 4) & 0x3)*10 + (buf[1] & 0x0f); +} + -- cgit v1.2.3