summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2006-11-27 09:44:56 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2006-11-27 09:44:56 +0000
commita45e632495a0b662474771737197658ef22d73f0 (patch)
treefaa6588b0e55cba4ea7ff8a58813d75581c563e1
parent860e387758bbebef04a6fde206decb7f31e45654 (diff)
downloadrockbox-a45e632495a0b662474771737197658ef22d73f0.tar.gz
rockbox-a45e632495a0b662474771737197658ef22d73f0.zip
move rtc functions to seperate files
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11614 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES15
-rw-r--r--firmware/drivers/rtc/rtc_e8564.c64
-rw-r--r--firmware/drivers/rtc/rtc_m41st84w.c (renamed from firmware/drivers/rtc.c)95
-rw-r--r--firmware/drivers/rtc/rtc_pcf50605.c45
-rw-r--r--firmware/drivers/rtc/rtc_pcf50606.c51
5 files changed, 169 insertions, 101 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 6bc9df231b..beb51bef42 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -127,14 +127,17 @@ eeprom_settings.c
#endif /* HAVE_EEPROM */
/* RTC */
-#if (CONFIG_RTC == RTC_M41ST84W) \
- || (CONFIG_RTC == RTC_PCF50606) \
- || (CONFIG_RTC == RTC_PCF50605) \
- || (CONFIG_RTC == RTC_E8564)
#ifndef SIMULATOR
-drivers/rtc.c
+#if (CONFIG_RTC == RTC_M41ST84W)
+drivers/rtc/rtc_m41st84w.c
+#elif (CONFIG_RTC == RTC_PCF50606)
+drivers/rtc/rtc_pcf50606.c
+#elif (CONFIG_RTC == RTC_PCF50605)
+drivers/rtc/rtc_pcf50605.c
+#elif (CONFIG_RTC == RTC_E8564)
+drivers/rtc/rtc_e8564.c
+#endif /* (CONFIG_RTC == RTC_) */
#endif /* SIMULATOR */
-#endif /* (CONFIG_RTC == RTC_*)
/* Tuner */
#ifdef CONFIG_TUNER
diff --git a/firmware/drivers/rtc/rtc_e8564.c b/firmware/drivers/rtc/rtc_e8564.c
new file mode 100644
index 0000000000..233168c303
--- /dev/null
+++ b/firmware/drivers/rtc/rtc_e8564.c
@@ -0,0 +1,64 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "i2c.h"
+#include "rtc.h"
+#include "kernel.h"
+#include "system.h"
+#include "i2c-pp5020.h"
+#include <stdbool.h>
+
+void rtc_init(void)
+{
+}
+
+int rtc_read_datetime(unsigned char* buf)
+{
+ unsigned char tmp;
+ int read;
+
+ /*RTC_E8564's slave address is 0x51*/
+ read = i2c_readbytes(0x51,0x02,7,buf);
+
+ /* swap wday and mday to be compatible with
+ * get_time() from firmware/common/timefuncs.c */
+ tmp=buf[3];
+ buf[3]=buf[4];
+ buf[4]=tmp;
+
+ return read;
+}
+
+int rtc_write_datetime(unsigned char* buf)
+{
+ int i;
+ unsigned char tmp;
+
+ /* swap wday and mday to be compatible with
+ * set_time() in firmware/common/timefuncs.c */
+ tmp=buf[3];
+ buf[3]=buf[4];
+ buf[4]=tmp;
+
+ for (i=0;i<7;i++){
+ pp_i2c_send(0x51, 0x02+i,buf[i]);
+ }
+ return 1;
+}
+
diff --git a/firmware/drivers/rtc.c b/firmware/drivers/rtc/rtc_m41st84w.c
index 4f30539904..1d76867e13 100644
--- a/firmware/drivers/rtc.c
+++ b/firmware/drivers/rtc/rtc_m41st84w.c
@@ -17,108 +17,16 @@
*
****************************************************************************/
#include "config.h"
-#ifdef CONFIG_RTC
#include "i2c.h"
#include "rtc.h"
#include "kernel.h"
#include "system.h"
-#include "pcf50606.h"
-#include "pcf50605.h"
-#if CONFIG_RTC == RTC_E8564
-#include "i2c-pp5020.h"
-#endif /*CONFIG_RTC == RTC_E8564*/
#include <stdbool.h>
#define RTC_ADR 0xd0
#define RTC_DEV_WRITE (RTC_ADR | 0x00)
#define RTC_DEV_READ (RTC_ADR | 0x01)
-#if CONFIG_RTC == RTC_E8564
-void rtc_init(void)
-{
-}
-
-int rtc_read_datetime(unsigned char* buf)
-{
- unsigned char tmp;
- int read;
-
- /*RTC_E8564's slave address is 0x51*/
- read = i2c_readbytes(0x51,0x02,7,buf);
-
- /* swap wday and mday to be compatible with
- * get_time() from firmware/common/timefuncs.c */
- tmp=buf[3];
- buf[3]=buf[4];
- buf[4]=tmp;
-
- return read;
-}
-
-int rtc_write_datetime(unsigned char* buf)
-{
- int i;
- unsigned char tmp;
-
- /* swap wday and mday to be compatible with
- * set_time() in firmware/common/timefuncs.c */
- tmp=buf[3];
- buf[3]=buf[4];
- buf[4]=tmp;
-
- for (i=0;i<7;i++){
- pp_i2c_send(0x51, 0x02+i,buf[i]);
- }
- return 1;
-}
-
-#elif CONFIG_RTC == RTC_PCF50605
-void rtc_init(void)
-{
-}
-
-int rtc_read_datetime(unsigned char* buf)
-{
- return pcf50605_read_multiple(0x0a, buf, 7);
-}
-
-int rtc_write_datetime(unsigned char* buf)
-{
- int i;
-
- for (i=0;i<7;i++) {
- pcf50605_write(0x0a+i, buf[i]);
- }
-
- return 1;
-}
-#elif CONFIG_RTC == RTC_PCF50606
-void rtc_init(void)
-{
-}
-
-int rtc_read_datetime(unsigned char* buf) {
- int rc;
- int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
-
- rc = pcf50606_read_multiple(0x0a, buf, 7);
-
- set_irq_level(oldlevel);
- return rc;
-}
-
-int rtc_write_datetime(unsigned char* buf) {
- int rc;
- int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
-
- rc = pcf50606_write_multiple(0x0a, buf, 7);
-
- set_irq_level(oldlevel);
-
- return rc;
-}
-
-#else
void rtc_init(void)
{
unsigned char data;
@@ -370,6 +278,3 @@ int rtc_write_datetime(unsigned char* buf) {
return rc;
}
-#endif /* CONFIG_RTC == RTC_PCF50606 */
-
-#endif /* CONFIG_RTC */
diff --git a/firmware/drivers/rtc/rtc_pcf50605.c b/firmware/drivers/rtc/rtc_pcf50605.c
new file mode 100644
index 0000000000..1bc40146ff
--- /dev/null
+++ b/firmware/drivers/rtc/rtc_pcf50605.c
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "i2c.h"
+#include "rtc.h"
+#include "kernel.h"
+#include "system.h"
+#include "pcf50605.h"
+#include <stdbool.h>
+
+void rtc_init(void)
+{
+}
+
+int rtc_read_datetime(unsigned char* buf)
+{
+ return pcf50605_read_multiple(0x0a, buf, 7);
+}
+
+int rtc_write_datetime(unsigned char* buf)
+{
+ int i;
+
+ for (i=0;i<7;i++) {
+ pcf50605_write(0x0a+i, buf[i]);
+ }
+
+ return 1;
+}
diff --git a/firmware/drivers/rtc/rtc_pcf50606.c b/firmware/drivers/rtc/rtc_pcf50606.c
new file mode 100644
index 0000000000..25b0c704c0
--- /dev/null
+++ b/firmware/drivers/rtc/rtc_pcf50606.c
@@ -0,0 +1,51 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "i2c.h"
+#include "rtc.h"
+#include "kernel.h"
+#include "system.h"
+#include "pcf50606.h"
+#include <stdbool.h>
+
+void rtc_init(void)
+{
+}
+
+int rtc_read_datetime(unsigned char* buf) {
+ int rc;
+ int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
+
+ rc = pcf50606_read_multiple(0x0a, buf, 7);
+
+ set_irq_level(oldlevel);
+ return rc;
+}
+
+int rtc_write_datetime(unsigned char* buf) {
+ int rc;
+ int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
+
+ rc = pcf50606_write_multiple(0x0a, buf, 7);
+
+ set_irq_level(oldlevel);
+
+ return rc;
+}
+