summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-02-23 11:33:19 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2017-09-05 21:42:12 +0200
commit1d121e8c082fe67757cf0d4df7b9e6ca1e26f755 (patch)
tree1c93842d99bb8e4a5f3ed5bca38c05e7f17894fa /apps
parent142f80f07d96305f1618c99c28c13319b1b279e6 (diff)
downloadrockbox-1d121e8c082fe67757cf0d4df7b9e6ca1e26f755.tar.gz
rockbox-1d121e8c082fe67757cf0d4df7b9e6ca1e26f755.tar.bz2
rockbox-1d121e8c082fe67757cf0d4df7b9e6ca1e26f755.zip
Initial commit for the Sony NWZ linux port
SUPPORTED SERIES: - NWZ-E450 - NWZ-E460 - NWZ-E470 - NWZ-E580 - NWZ-A10 NOTES: - bootloader makefile convert an extra font to be installed alongside the bootloader since sysfont is way too small - the toolsicon bitmap comes from the Oxygen iconset - touchscreen driver is untested TODO: - implement audio routing driver (pcm is handled by pcm-alsa) - fix playback: it crashes on illegal instruction in DEBUG builds - find out why the browser starts at / instead of /contents - implement radio support - implement return to OF for usb handling - calibrate battery curve (NB: of can report a battery level on a 0-5 scale but probabl don't want to use that ?) - implement simulator build (we need a nice image of the player) - figure out if we can detect jack removal POTENTIAL TODOS: - try to build a usb serial gadget and gdbserver Change-Id: Ic77d71e0651355d47cc4e423a40fb64a60c69a80
Diffstat (limited to 'apps')
-rw-r--r--apps/bitmaps/bitmaps.make3
-rw-r--r--apps/bitmaps/native/SOURCES6
-rw-r--r--apps/bitmaps/native/rockboxicon.130x130x16.bmpbin0 -> 51014 bytes
-rw-r--r--apps/bitmaps/native/toolsicon.130x130x16.bmpbin0 -> 51014 bytes
-rw-r--r--apps/debug_menu.c2
-rw-r--r--apps/keymaps/keymap-nwz.c1
6 files changed, 10 insertions, 2 deletions
diff --git a/apps/bitmaps/bitmaps.make b/apps/bitmaps/bitmaps.make
index a8165b9409..d39531a8b8 100644
--- a/apps/bitmaps/bitmaps.make
+++ b/apps/bitmaps/bitmaps.make
@@ -29,7 +29,8 @@ BMPOBJ = $(call full_path_subst,$(ROOTDIR)/%.bmp,$(BUILDDIR)/%.o,$(BMP))
BMPHFILES = $(BMPINCDIR)/usblogo.h $(BMPINCDIR)/remote_usblogo.h \
$(BMPINCDIR)/default_icons.h $(BMPINCDIR)/remote_default_icons.h \
- $(BMPINCDIR)/rockboxlogo.h $(BMPINCDIR)/remote_rockboxlogo.h
+ $(BMPINCDIR)/rockboxlogo.h $(BMPINCDIR)/remote_rockboxlogo.h \
+ $(BMPINCDIR)/rockboxicon.h $(BMPINCDIR)/toolsicon.h
$(BMPHFILES): $(BMPOBJ)
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index 88a571bdbd..dbd0f577ed 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -39,6 +39,12 @@ rockboxlogo.480x149x16.bmp
rockboxlogo.640x198x16.bmp
#endif
+/* The Sony NWZ linux bootloader needs icons to display a menu */
+#if defined(BOOTLOADER) && defined(SONY_NWZ_LINUX)
+rockboxicon.130x130x16.bmp
+toolsicon.130x130x16.bmp
+#endif
+
#ifndef BOOTLOADER /* We don't need these for the bootloader */
/* USB logo */
diff --git a/apps/bitmaps/native/rockboxicon.130x130x16.bmp b/apps/bitmaps/native/rockboxicon.130x130x16.bmp
new file mode 100644
index 0000000000..69e6792e7b
--- /dev/null
+++ b/apps/bitmaps/native/rockboxicon.130x130x16.bmp
Binary files differ
diff --git a/apps/bitmaps/native/toolsicon.130x130x16.bmp b/apps/bitmaps/native/toolsicon.130x130x16.bmp
new file mode 100644
index 0000000000..f9fccf0306
--- /dev/null
+++ b/apps/bitmaps/native/toolsicon.130x130x16.bmp
Binary files differ
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 08fc6e0da4..55454e0b94 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2594,7 +2594,7 @@ static const struct {
#endif
{ "Skin Engine RAM usage", dbg_skin_engine },
#endif
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX)
{ "View HW info", dbg_hw_info },
#endif
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c
index 210841ba44..90a26e54f8 100644
--- a/apps/keymaps/keymap-nwz.c
+++ b/apps/keymaps/keymap-nwz.c
@@ -210,6 +210,7 @@ static const struct button_mapping button_context_colorchooser[] = {
}; /* button_context_colorchooser */
static const struct button_mapping button_context_eq[] = {
+ { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),