diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-09-18 12:41:12 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-09-18 12:41:12 +0000 |
commit | fa9dee01bc70a56cb602f66776a43939c8293f6f (patch) | |
tree | cde60a608aa0f16f51c28099f784d85b832dc862 /apps/keymaps/keymap-h1x0_h3x0.c | |
parent | 7ef47ed87614d6100b491b2c0eb9f75d1fdc1f01 (diff) | |
download | rockbox-fa9dee01bc70a56cb602f66776a43939c8293f6f.tar.gz rockbox-fa9dee01bc70a56cb602f66776a43939c8293f6f.zip |
Reverted the recording timer commit, as it has at least 2 major problems. (1) It uses the user timer, which interferes e.g. with backlight fading on H1x0 (and potentially other targets). Using the user timer here is a waste, as the required timing lies in the range of seconds to days. A tick task would be sufficient. (2) It draws to the LCD from within an ISR. This must not be done unless there's a mechanism to ensure it doesn't interfere with the main thread's drawing, otherwise garbage might be displayed and LCD updates might stop working.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10991 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-h1x0_h3x0.c')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 4ac671ff3c..0c0b61d201 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -415,10 +415,6 @@ const struct button_mapping button_context_settings_h100remote[] = { | |||
415 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 415 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
416 | { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE }, | 416 | { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE }, |
417 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 417 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
418 | { ACTION_STD_PREV, BUTTON_RC_SOURCE, BUTTON_NONE }, | ||
419 | { ACTION_STD_PREVREPEAT, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, | ||
420 | { ACTION_STD_NEXT, BUTTON_RC_BITRATE, BUTTON_NONE }, | ||
421 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | ||
422 | /* { ACTION_NONE, BUTTON_RC_ON, BUTTON_NONE }, | 418 | /* { ACTION_NONE, BUTTON_RC_ON, BUTTON_NONE }, |
423 | { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, | 419 | { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, |
424 | { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, | 420 | { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, |
@@ -431,11 +427,8 @@ const struct button_mapping button_context_settings_h300lcdremote[] = { | |||
431 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 427 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
432 | { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 428 | { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
433 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 429 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
434 | { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, | 430 | { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, |
435 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 431 | { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, |
436 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, | ||
437 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
438 | { ACTION_SETTINGS_RESET, BUTTON_RC_ON, BUTTON_NONE }, | ||
439 | 432 | ||
440 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 433 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
441 | }; /* button_context_settings */ | 434 | }; /* button_context_settings */ |