diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-26 22:58:10 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-26 22:58:10 +0000 |
| commit | 4ae4e2307d114d422e46bdff319a85f2d22834b2 (patch) | |
| tree | 6092dfe232e5561f521bd09260a06c6033f86a75 | |
| parent | 73639e8e2e7d5fef3b9c6305f2de74c20a282d4b (diff) | |
| download | rockbox-4ae4e2307d114d422e46bdff319a85f2d22834b2.zip rockbox-4ae4e2307d114d422e46bdff319a85f2d22834b2.tar.gz rockbox-4ae4e2307d114d422e46bdff319a85f2d22834b2.tar.bz2 rockbox-4ae4e2307d114d422e46bdff319a85f2d22834b2.tar.xz | |
Ingenic Jz4740 RTC: actually write date to RTC
Touchscreen DAPs: add timescreen keymap
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20122 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/keymaps/keymap-ondavx747.c | 6 | ||||
| -rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 10 | ||||
| -rw-r--r-- | firmware/drivers/rtc/rtc_jz4740.c | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-ondavx747.c b/apps/keymaps/keymap-ondavx747.c index 336227f..492c671 100644 --- a/apps/keymaps/keymap-ondavx747.c +++ b/apps/keymaps/keymap-ondavx747.c @@ -118,6 +118,12 @@ static const struct button_mapping button_context_bmark[] = { }; /* button_context_bmark */ static const struct button_mapping button_context_time[] = { + { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, + { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_time */ diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 4b31ac6..37d36a2 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c @@ -166,6 +166,16 @@ static const struct button_mapping button_context_bmark[] = { }; /* button_context_bmark */ static const struct button_mapping button_context_time[] = { + { ACTION_SETTINGS_INC, BUTTON_TOPMIDDLE, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_MIDLEFT, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, + { ACTION_STD_CANCEL, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS_TIME), }; /* button_context_time */ diff --git a/firmware/drivers/rtc/rtc_jz4740.c b/firmware/drivers/rtc/rtc_jz4740.c index da39b3f..61ee0e0 100644 --- a/firmware/drivers/rtc/rtc_jz4740.c +++ b/firmware/drivers/rtc/rtc_jz4740.c @@ -162,7 +162,9 @@ int rtc_write_datetime(unsigned char* buf) lval = jz_mktime(year, rtc_tm->tm_mon, rtc_tm->tm_mday, rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec); + __cpm_start_rtc(); REG_RTC_RSR = lval; + __cpm_stop_rtc(); return 0; } |