From 4e42cd712c6c4bb952efededefc4d6947b52f43b Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 8 Mar 2011 20:54:42 +0000 Subject: RaaA: Add RTC support git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29544 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 1 + firmware/export/config/android.h | 3 +++ firmware/export/config/nokian8xx.h | 3 +++ firmware/export/config/nokian900.h | 3 +++ firmware/export/config/pandora.h | 3 +++ firmware/export/config/sdlapp.h | 3 +++ firmware/target/hosted/rtc.c | 40 ++++++++++++++++++++++++++++++++++++++ uisimulator/common/stubs.c | 18 ----------------- 8 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 firmware/target/hosted/rtc.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 32d2a4edfe..21bb732798 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -7,6 +7,7 @@ load_code.c powermgmt.c #if (CONFIG_PLATFORM & PLATFORM_HOSTED) target/hosted/powermgmt.c +target/hosted/rtc.c #endif system.c usb.c diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index a2fe09247e..c9ae8ba191 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h @@ -59,6 +59,9 @@ /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h index 0d95a8a7c2..f11fa87021 100644 --- a/firmware/export/config/nokian8xx.h +++ b/firmware/export/config/nokian8xx.h @@ -49,6 +49,9 @@ /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h index 5cd41d50d0..a36aebf8db 100644 --- a/firmware/export/config/nokian900.h +++ b/firmware/export/config/nokian900.h @@ -49,6 +49,9 @@ /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h index 9835b26db5..a740208ac0 100644 --- a/firmware/export/config/pandora.h +++ b/firmware/export/config/pandora.h @@ -49,6 +49,9 @@ /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h index c02a188c4a..a55b7e3be3 100644 --- a/firmware/export/config/sdlapp.h +++ b/firmware/export/config/sdlapp.h @@ -57,6 +57,9 @@ /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/target/hosted/rtc.c b/firmware/target/hosted/rtc.c new file mode 100644 index 0000000000..179e7ea909 --- /dev/null +++ b/firmware/target/hosted/rtc.c @@ -0,0 +1,40 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Based upon code (C) 2002 by Björn Stenberg + * Copyright (C) 2011 by Thomas Jarosch + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include + +void rtc_init(void) +{ +} + +int rtc_read_datetime(struct tm *tm) +{ + time_t now = time(NULL); + *tm = *localtime(&now); + + return 0; +} + +int rtc_write_datetime(const struct tm *tm) +{ + (void)tm; + return 0; +} diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index 024afab14f..f8b8fdc912 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c @@ -234,10 +234,6 @@ void storage_spindown(int s) storage_spinning = false; } -void rtc_init(void) -{ -} - int rtc_read(int address) { return address ^ 0x55; @@ -250,20 +246,6 @@ int rtc_write(int address, int value) return 0; } -int rtc_read_datetime(struct tm *tm) -{ - time_t now = time(NULL); - *tm = *localtime(&now); - - return 0; -} - -int rtc_write_datetime(const struct tm *tm) -{ - (void)tm; - return 0; -} - #ifdef HAVE_RTC_ALARM void rtc_get_alarm(int *h, int *m) { -- cgit v1.2.3