diff options
author | Udo Schläpfer <rockbox-2014.10@desktopwarrior.net> | 2015-02-02 21:44:29 +0100 |
---|---|---|
committer | Udo Schläpfer <rockbox-2014.10@desktopwarrior.net> | 2015-02-02 21:57:55 +0100 |
commit | dbabd0d9c34a33bc0c51243ec37f230d117db955 (patch) | |
tree | 46de348929ce739702a230a2587fdb5539585753 /apps/keymaps/keymap-touchscreen.c | |
parent | cef17e3d59ad93f766e8ee23b1610540a33dfe5e (diff) | |
download | rockbox-dbabd0d9c34a33bc0c51243ec37f230d117db955.tar.gz rockbox-dbabd0d9c34a33bc0c51243ec37f230d117db955.zip |
iBasso DX50/DX90: Major code cleanup and reorganization.
Reorganization
- Separated iBasso devices from PLATFORM_ANDROID. These are now standlone
hosted targets. Most device specific code is in the
firmware/target/hosted/ibasso directory.
- No dependency on Android SDK, only the Android NDK is needed.
32 bit Android NDK and Android API Level 16.
- Separate implementation for each device where feasible.
Code cleanup
- Rewrite of existing code, from simple reformat to complete reimplementation.
- New backlight interface, seperating backlight from touchscreen.
- Rewrite of device button handler, removing unneeded code and fixing memory
leaks.
- New Debug messages interface logging to Android adb logcat (DEBUGF, panicf,
logf).
- Rewrite of lcd device handler, removing unneeded code and fixing memory leaks.
- Rewrite of audiohw device handler/pcm interface, removing unneeded code and
fixing memory leaks, enabling 44.1/48kHz pthreaded playback.
- Rewrite of power and powermng, proper shutdown, using batterylog results
(see http://gerrit.rockbox.org/r/#/c/1047/).
- Rewrite of configure (Android NDK) and device specific config.
- Rewrite of the Android NDK specific Makefile.
Misc
- All plugins/games/demos activated.
- Update tinyalsa to latest from https://github.com/tinyalsa/tinyalsa.
Includes
- http://gerrit.rockbox.org/r/#/c/993/
- http://gerrit.rockbox.org/r/#/c/1010/
- http://gerrit.rockbox.org/r/#/c/1035/
Does not include http://gerrit.rockbox.org/r/#/c/1007/ due to new backlight
interface and new option for hold switch, touchscreen, physical button
interaction.
Rockbox needs the iBasso DX50/DX90 loader for startup, see
http://gerrit.rockbox.org/r/#/c/1099/
The loader expects Rockbox to be installed in /mnt/sdcard/.rockbox/. If
/mnt/sdcard/ is accessed as USB mass storage device, Rockbox will exit
gracefully and the loader will restart Rockbox on USB disconnect.
Tested on iBasso DX50.
Compiled (not tested) for iBasso DX90.
Compiled (not tested) for PLATFORM_ANDROID.
Change-Id: I5f5e22e68f5b4cf29c28e2b40b2c265f2beb7ab7
Diffstat (limited to 'apps/keymaps/keymap-touchscreen.c')
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 9825c92e7d..6163cb054c 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -171,6 +171,13 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
172 | }; /* button_context_settingsgraphical */ | 172 | }; /* button_context_settingsgraphical */ |
173 | 173 | ||
174 | |||
175 | static const struct button_mapping button_context_mainmenu[] = | ||
176 | { | ||
177 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2 | CONTEXT_MAINMENU) | ||
178 | }; | ||
179 | |||
180 | |||
174 | static const struct button_mapping button_context_yesno[] = { | 181 | static const struct button_mapping button_context_yesno[] = { |
175 | { ACTION_YESNO_ACCEPT, BUTTON_TOPRIGHT, BUTTON_NONE }, | 182 | { ACTION_YESNO_ACCEPT, BUTTON_TOPRIGHT, BUTTON_NONE }, |
176 | { ACTION_YESNO_ACCEPT, BUTTON_BOTTOMLEFT, BUTTON_NONE }, | 183 | { ACTION_YESNO_ACCEPT, BUTTON_BOTTOMLEFT, BUTTON_NONE }, |
@@ -389,7 +396,12 @@ const struct button_mapping* get_context_mapping(int context) | |||
389 | 396 | ||
390 | case CONTEXT_LIST: | 397 | case CONTEXT_LIST: |
391 | return button_context_list; | 398 | return button_context_list; |
399 | |||
392 | case CONTEXT_MAINMENU: | 400 | case CONTEXT_MAINMENU: |
401 | { | ||
402 | return button_context_mainmenu; | ||
403 | } | ||
404 | |||
393 | case CONTEXT_TREE: | 405 | case CONTEXT_TREE: |
394 | if (global_settings.hold_lr_for_scroll_in_list) | 406 | if (global_settings.hold_lr_for_scroll_in_list) |
395 | return button_context_listtree_scroll_without_combo; | 407 | return button_context_listtree_scroll_without_combo; |