diff --git a/apps/codecs.c b/apps/codecs.c index 73c3b20fc1..575497b16c 100644 --- a/apps/codecs.c +++ b/apps/codecs.c @@ -54,7 +54,7 @@ #define LOGF_ENABLE #include "logf.h" -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) +#if (CONFIG_PLATFORM & PLATFORM_SDL) #define PREFIX(_x_) sim_ ## _x_ #else #define PREFIX(_x_) _x_ diff --git a/apps/main.c b/apps/main.c index 6622094e13..70f4cb5b04 100644 --- a/apps/main.c +++ b/apps/main.c @@ -141,7 +141,7 @@ #endif #endif -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) +#if (CONFIG_PLATFORM & PLATFORM_SDL) #ifdef SIMULATOR #include "sim_tasks.h" #endif @@ -151,7 +151,7 @@ #if defined(WIN32) #undef main #endif -#endif /* SDL|MAEMO|PAMDORA */ +#endif /* SDL */ /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ diff --git a/apps/misc.c b/apps/misc.c index af0cbaf519..ea4bed923c 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -639,7 +639,7 @@ static void lo_unplug_change(bool inserted) long default_event_handler_ex(long event, void (*callback)(void *), void *parameter) { -#if CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO) +#if CONFIG_PLATFORM & (PLATFORM_ANDROID) static bool resume = false; #endif @@ -737,7 +737,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame lo_unplug_change(false); return SYS_LINEOUT_UNPLUGGED; #endif -#if CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO) +#if CONFIG_PLATFORM & (PLATFORM_ANDROID) /* stop playback if we receive a call */ case SYS_CALL_INCOMING: resume = audio_status() == AUDIO_STATUS_PLAY; diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index f322765ed1..0000000000 --- a/debian/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -rockbox 3.13.x for Maemo --------------------------- - -Rockbox for maemo technial preview release. - -Known issues: -- Application exit is only possible with CTRL+BACKSPACE diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ca04675a41..0000000000 --- a/debian/changelog +++ /dev/null @@ -1,113 +0,0 @@ -rockbox (2013-03-10maemo1) unstable; urgency=low - - * Update to rockbox 3.13 code base (v3.13-final) - - -- Thomas Jarosch Sun, 10 Mar 2013 19:00:00 +0100 - -rockbox (2012-12-26maemo1) unstable; urgency=low - - * Update to rockbox 3.12 code base (v3.12-final) - - -- Thomas Jarosch Wed, 26 Dec 2012 19:00:00 +0100 - -rockbox (2011-12-10maemo1) unstable; urgency=low - - * Update to rockbox 3.10 code base (r31165) - * Patch: Added software mixer performance fix on N900 - * Patch: Added pcm locking code on N900 - * Patch: Assembler optimized software mixing (FS #12421) - - -- Thomas Jarosch Sat, 10 Dec 2011 19:00:00 +0100 - -rockbox (2011-06-28maemo1) unstable; urgency=low - - * Update to rockbox 3.9 code base - - -- Thomas Jarosch Tue, 28 Jun 2011 19:00:00 +0100 - -rockbox (2011-04-16maemo1) unstable; urgency=low - - * Fix premature idle shutdown after last track finished playing - * Update to latest rockbox SVN code - - -- Thomas Jarosch Fri, 16 Apr 2011 19:15:00 +0100 - -rockbox (2011-03-18maemo0) unstable; urgency=low - - * Implemented RTC support (timestamps in last.FM scrobbler log) - * Working sleep timer - * Working idle poweroff - * Support for antialised fonts (not in use yet) - * Update to latest rockbox SVN code - - -- Thomas Jarosch Fri, 18 Mar 2011 22:00:00 +0100 - -rockbox (2011-02-27maemo0) unstable; urgency=low - - * Fix/enable assembler optimizations on public build - * Change play/pause button so that it shows - the click action and not the current state - - -- Thomas Jarosch Sun, 27 Feb 2011 19:00:00 +0100 - -rockbox (2011-02-25maemo0) unstable; urgency=low - - * Embedded album art support - * Fixed bookmark handling - * Prevent stuck up/down buttons on N900 with shared cursor keys - * Fixed Last.FM scrobbler log file - * New threading code uses less CPU - * Fix rare hang on shutdown - * Small fixes to the metadata parser - * Update to rockbox SVN code - - -- Thomas Jarosch Fri, 25 Feb 2011 18:10:00 +0100 - -rockbox (2011-01-26maemo0) unstable; urgency=low - - * Bluetooth headset support - * Ignore preinstalled sounds in /usr/share/sounds - - -- Thomas Jarosch Wed, 26 Jan 2011 22:50:00 +0100 - -rockbox (2011-01-12maemo0) unstable; urgency=low - - * Always show prev/next track button - * Bind enter key to rockbock's center button (all platforms) - * Bind more keys on n8xx (maemo4) - * Update to latest rockbox SVN code - - -- Thomas Jarosch Wed, 12 Jan 2011 19:42:00 +0100 - -rockbox (2011-01-04maemo0) unstable; urgency=low - - * Update to latest rockbox SVN code (regenerates the database) - * Test automatic garage build - * Fix x86 build targets - - -- Thomas Jarosch Tue, 04 Jan 2011 00:20:00 +0100 - - -rockbox (2011-01-02maemo0) unstable; urgency=low - - * New version number to indicate this build is work in progress - - -- Thomas Jarosch Sun, 02 Jan 2011 00:05:00 +0100 - - -rockbox (3.7.2maemo2) unstable; urgency=low - - * Fix duplicate database entries - * Initial rockbox plugin support: - - Small tools in the context menu - - mikmod (.mod, .s3m, .xm etc) support - - Credits screen - - -- Thomas Jarosch Sat, 01 Jan 2011 19:01:00 +0100 - - -rockbox (3.7.2maemo1) unstable; urgency=low - - * Initial release for Nokia N900 - - -- Thomas Jarosch Thu, 30 Dec 2010 16:18:05 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 42d64bf150..0000000000 --- a/debian/control +++ /dev/null @@ -1,82 +0,0 @@ -Source: rockbox -Section: user/multimedia -Priority: extra -Maintainer: Thomas Jarosch -Build-Depends: debhelper (>= 5), pkg-config, maemo-version-dev, - libosso-dev, libglib2.0-dev, libhal-dev, osso-af-settings, - libsdl1.2-dev, libxml2-dev, - libgstreamer0.10-dev | maemo-version-dev (<= 5), - libgstreamer-plugins-base0.10-dev | maemo-version-dev (<= 5), - libgstreamer-plugins-base0.10-dev | maemo-version-dev (<= 5), - libplayback-1-dev | maemo-version-dev (<= 5) -# Note: This is the -debian- standards version, not rockbox -Standards-Version: 3.7.2 - -Package: rockbox -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Rockbox open source high quality audio player -XB-Maemo-Display-Name: Rockbox audio player -XB-Maemo-Upgrade-Description: Update to rockbox 3.13 code base -XSBC-Bugtracker: http://www.rockbox.org/tracker/ -XB-Maemo-Icon-26: - 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 - rkJggg== - -Package: rockbox-doc -Architecture: all -Description: Documentation for rockbox - -Package: rockbox-dbg -Section: devel -Architecture: any -Depends: rockbox (= ${Source-Version}) -Description: Debug symbols for rockbox diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 381623dc88..0000000000 --- a/debian/copyright +++ /dev/null @@ -1,30 +0,0 @@ -This package was debianized by Thomas Jarosch on -Thu, 30 Dec 2010 16:18:05 -0500. - -It was downloaded from www.rockbox.org / svn://svn.rockbox.org/rockbox/trunk - -Upstream Author: The rockbox team - see docs/CREDITS for all the names - -Copyright: 2001-2013 - The rockbox team - -License: - - This package 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 package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2010, Thomas Jarosch and -is licensed under the GPL, see above. diff --git a/debian/maemo/rockbox.desktop b/debian/maemo/rockbox.desktop deleted file mode 100644 index 9539c2d21a..0000000000 --- a/debian/maemo/rockbox.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] - Encoding=UTF-8 - Version=3.7.1 - Type=Application - Name=Rockbox - Exec=/opt/rockbox/bin/rockbox - Icon=rockbox - X-HildonDesk-ShowInToolbar=true - X-Osso-Type=application/x-executable diff --git a/debian/maemo/rockbox.png b/debian/maemo/rockbox.png deleted file mode 100644 index 076f349c43..0000000000 Binary files a/debian/maemo/rockbox.png and /dev/null differ diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 85dc65d664..0000000000 --- a/debian/rules +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/make -f - -# We deduce the target based on the available version of the Maemo SDK -ifeq (1,$(shell pkg-config --atleast-version=5 maemo-version && echo 1)) -TARGET=nokian900 -else -TARGET=nokian8xx -endif - -CONFIGURE_OPTIONS := --target=$(TARGET) --ram=8 --rbdir=/.rockbox --type=N -DESKTOP_DIR := `pkg-config --variable=desktopentrydir osso-af-settings` - -export DH_VERBOSE=1 - -builddir: - test -d builddir || mkdir -p builddir - -builddir/Makefile: builddir - cd builddir && test -f Makefile || ../tools/configure $(CONFIGURE_OPTIONS) - -build: build-stamp - -build-stamp: builddir/Makefile - dh_testdir - cd builddir && $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -rf builddir - dh_clean -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd builddir && $(MAKE) PREFIX=$(CURDIR)/debian/rockbox/opt/rockbox fullinstall - - # Remove broken plugins (keymap missing) - # Note: Credits and f.e. mikmod are included and working - rm -f $(CURDIR)/debian/rockbox/opt/rockbox/lib/rockbox/rocks/apps/* - rm -f $(CURDIR)/debian/rockbox/opt/rockbox/lib/rockbox/rocks/demos/* - rm -f $(CURDIR)/debian/rockbox/opt/rockbox/lib/rockbox/rocks/games/* - - # Install icon and .desktop file - mkdir -p $(CURDIR)/debian/rockbox/usr/share/icons/hicolor/64x64/apps - cp -f debian/maemo/rockbox.png $(CURDIR)/debian/rockbox/usr/share/icons/hicolor/64x64/apps - mkdir -p $(CURDIR)/debian/rockbox$(DESKTOP_DIR) - cp -f debian/maemo/rockbox.desktop $(CURDIR)/debian/rockbox$(DESKTOP_DIR) - - # Ignore built in sounds - mkdir -p $(CURDIR)/debian/rockbox/usr/share/sounds - touch $(CURDIR)/debian/rockbox/usr/share/sounds/database.ignore - -# Build architecture-independent files here. -binary-indep: -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip --dbg-package=rockbox-dbg - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/firmware/SOURCES b/firmware/SOURCES index 840348a105..26be981cdd 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -240,11 +240,6 @@ target/hosted/samsungypr/ypr1/pmu-ypr1.c target/hosted/samsungypr/ypr1/wmcodec-ypr1.c #endif -/* Maemo specific files */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -target/hosted/maemo/maemo-thread.c -#endif - #if defined(RG_NANO) && !defined(SIMULATOR) target/hosted/sysfs.c target/hosted/power-linux.c @@ -572,15 +567,12 @@ drivers/audio/es9218.c #else /* PLATFORM_HOSTED */ #if defined(HAVE_SDL_AUDIO) || defined(SIMULATOR) drivers/audio/sdl.c -#if (CONFIG_PLATFORM & PLATFORM_MAEMO5) -target/hosted/maemo/pcm-gstreamer.c -#else target/hosted/sdl/pcm-sdl.c -#endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */ #elif defined(SAMSUNG_YPR0) && defined(HAVE_AS3514) drivers/audio/as3514.c #elif defined(SAMSUNG_YPR1) && defined(HAVE_WM8978) drivers/audio/wm8978.c +gets) #elif defined(CTRU) drivers/audio/ctru.c #endif diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 9f79a881b6..7019119306 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -225,7 +225,7 @@ struct sound_settings_info #include "es9218.h" #elif (CONFIG_PLATFORM & PLATFORM_ANDROID) #include "android_codec.h" -#elif ((CONFIG_PLATFORM & (PLATFORM_MAEMO | PLATFORM_PANDORA | PLATFORM_SDL | PLATFORM_CTRU)) | defined(RG_NANO)) +#elif ((CONFIG_PLATFORM & (PLATFORM_SDL | PLATFORM_CTRU)) | defined(RG_NANO)) #include "sdl_codec.h" #elif defined(DX50) #include "codec-dx50.h" diff --git a/firmware/export/config.h b/firmware/export/config.h index 6f27e8fceb..eb976c9fd4 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -95,11 +95,7 @@ #define PLATFORM_HOSTED (1<<1) #define PLATFORM_ANDROID (1<<2) #define PLATFORM_SDL (1<<3) -#define PLATFORM_MAEMO4 (1<<4) -#define PLATFORM_MAEMO5 (1<<5) -#define PLATFORM_MAEMO (PLATFORM_MAEMO4|PLATFORM_MAEMO5) -#define PLATFORM_PANDORA (1<<6) -#define PLATFORM_CTRU (1<<7) +#define PLATFORM_CTRU (1<<4) /* CONFIG_KEYPAD */ #define IRIVER_H100_PAD 4 @@ -538,12 +534,6 @@ Lyre prototype 1 */ #include "config/sdlapp.h" #elif defined(ANDROID) #include "config/android.h" -#elif defined(NOKIAN8XX) -#include "config/nokian8xx.h" -#elif defined(NOKIAN900) -#include "config/nokian900.h" -#elif defined(PANDORA) -#include "config/pandora.h" #elif defined(SAMSUNG_YPR0) #include "config/samsungypr0.h" #elif defined(CREATIVE_ZENXFI) @@ -1427,7 +1417,6 @@ Lyre prototype 1 */ #endif #if defined(HAVE_SDL_AUDIO) \ - && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \ && !defined(HAVE_SW_VOLUME_CONTROL) /* SW volume is needed for accurate control and no double buffering should be * required. If target uses SW volume, then its definitions are used instead diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h deleted file mode 100644 index 9fb9e81780..0000000000 --- a/firmware/export/config/nokian8xx.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This config file is for Rockbox as an application on the Nokia N8xx - */ - -/* We don't run on hardware directly */ -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 100 - -#define MODEL_NAME "Rockbox" - -#define USB_NONE - -#define HAVE_FPU - - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 800 -#define LCD_HEIGHT 480 -#define LCD_DEPTH 16 -#define LCD_PIXELFORMAT RGB565 - -/* define this to indicate your device's keypad */ -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_HOSTED - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE - - - - -/* Work around debug macro expansion of strncmp in scratchbox */ -#define _HAVE_STRING_ARCH_strncmp - -#define HAVE_MULTIMEDIA_KEYS -#define HAVE_SCROLLWHEEL -#define CONFIG_KEYPAD SDL_PAD - -/* Use SDL audio/pcm in a SDL app build */ -#define HAVE_SDL -#define HAVE_SDL_AUDIO - -#define HAVE_SW_TONE_CONTROLS - -/* can provide both remaining percentage and time information */ -#define CONFIG_BATTERY_MEASURE (PERCENTAGE_MEASURE|TIME_MEASURE) -#define NO_LOW_BATTERY_SHUTDOWN - -/* Define this to the CPU frequency */ -/* -#define CPU_FREQ 48000000 -*/ - -#define CONFIG_LCD LCD_COWOND2 - -/* Define this if a programmable hotkey is mapped */ -#define HAVE_HOTKEY - -#define BOOTDIR "/.rockbox" - -/* No special storage */ -#define CONFIG_STORAGE STORAGE_HOSTFS -#define HAVE_STORAGE_FLUSH diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h deleted file mode 100644 index a939ff0799..0000000000 --- a/firmware/export/config/nokian900.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This config file is for Rockbox as an application on the Nokia N900 - */ - -/* We don't run on hardware directly */ -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 100 - -#define MODEL_NAME "Rockbox" - -#define USB_NONE - -#define HAVE_FPU - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 800 -#define LCD_HEIGHT 480 -#define LCD_DEPTH 16 -#define LCD_PIXELFORMAT RGB565 - -/* define this to indicate your device's keypad */ -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_HOSTED - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE - - - - -/* Work around debug macro expansion of strncmp in scratchbox */ -#define _HAVE_STRING_ARCH_strncmp - -#define HAVE_MULTIMEDIA_KEYS -#define HAVE_SCROLLWHEEL -#define CONFIG_KEYPAD SDL_PAD - -/* Use SDL audio/pcm in a SDL app build */ -#define HAVE_SDL -#define HAVE_SDL_AUDIO - -#define HAVE_SW_TONE_CONTROLS - -/* can provide both remaining percentage and time information */ -#define CONFIG_BATTERY_MEASURE (PERCENTAGE_MEASURE|TIME_MEASURE) -#define NO_LOW_BATTERY_SHUTDOWN -/* -#define CPU_FREQ 48000000 -*/ - -#define CONFIG_LCD LCD_COWOND2 - -/* Define this if a programmable hotkey is mapped */ -#define HAVE_HOTKEY - -#define BOOTDIR "/.rockbox" - -/* No special storage */ -#define CONFIG_STORAGE STORAGE_HOSTFS -#define HAVE_STORAGE_FLUSH diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h deleted file mode 100644 index 841d7e2b4b..0000000000 --- a/firmware/export/config/pandora.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This config file is for Rockbox as an application on the Nokia N8xx - */ - -/* We don't run on hardware directly */ -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_PANDORA) - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 100 - -#define MODEL_NAME "Rockbox" - -#define USB_NONE - - - - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 800 -#define LCD_HEIGHT 480 -#define LCD_DEPTH 16 -#define LCD_PIXELFORMAT RGB565 - -/* define this to indicate your device's keypad */ -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_HOSTED - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE - - - - -/* Work around debug macro expansion of strncmp in scratchbox */ -#define _HAVE_STRING_ARCH_strncmp - -#define HAVE_SCROLLWHEEL -#define CONFIG_KEYPAD SDL_PAD - -/* Use SDL audio/pcm in a SDL app build */ -#define HAVE_SDL -#define HAVE_SDL_AUDIO - -#define HAVE_SW_TONE_CONTROLS - -/* Define current usage levels. */ -#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ -#define CURRENT_BACKLIGHT 30 /* TBD */ -#define CURRENT_RECORD 0 /* no recording yet */ - -/* Define this to the CPU frequency */ -/* -#define CPU_FREQ 48000000 -*/ - -#define CONFIG_LCD LCD_COWOND2 - -/* Define this if a programmable hotkey is mapped */ -#define HAVE_HOTKEY - -#define BOOTDIR "/.rockbox" - -/* No special storage */ -#define CONFIG_STORAGE STORAGE_HOSTFS -#define HAVE_STORAGE_FLUSH diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h index 4e164c0d10..6dcbb9e4d4 100644 --- a/firmware/export/pcm_mixer.h +++ b/firmware/export/pcm_mixer.h @@ -34,9 +34,7 @@ /* These MIPS32r1 targets have a very high interrupt latency, which unfortunately causes a lot of audio underruns under even moderate load */ #define MIX_FRAME_SAMPLES 2048 -#elif (CONFIG_PLATFORM & PLATFORM_MAEMO5) || defined(DX50) || defined(DX90) -/* Maemo 5 needs 2048 samples for decent performance. - Otherwise the locking overhead inside gstreamer costs too much */ +#elif defined(DX50) || defined(DX90) /* iBasso Devices: Match Rockbox PCM buffer size to ALSA PCM buffer size to minimize memory transfers. */ #define MIX_FRAME_SAMPLES 2048 diff --git a/firmware/export/sdl_codec.h b/firmware/export/sdl_codec.h index b5c1d81374..2adcd8bc5d 100644 --- a/firmware/export/sdl_codec.h +++ b/firmware/export/sdl_codec.h @@ -21,13 +21,7 @@ #ifndef _SDL_CODEC_H #define _SDL_CODEC_H -#if (defined(HAVE_SDL_AUDIO) \ - && !(CONFIG_PLATFORM & PLATFORM_MAEMO5)) \ - || (CONFIG_PLATFORM & PLATFORM_CTRU) +// This is pretty generic and probably needs adjusting AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -80, 0, 0) -#else -#define AUDIOHW_CAPS (MONO_VOL_CAP) -AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -99, 0, 0) -#endif /* CONFIG_PLATFORM & PLATFORM_SDL */ #endif /* _SDL_CODEC_H */ diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c index 7d59a174dc..6287762574 100644 --- a/firmware/target/hosted/filesystem-app.c +++ b/firmware/target/hosted/filesystem-app.c @@ -55,7 +55,7 @@ #if defined(HAVE_MULTIDRIVE) || defined(HAVE_SPECIAL_DIRS) #if (CONFIG_PLATFORM & PLATFORM_ANDROID) static const char rbhome[] = "/sdcard"; -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) \ +#elif (CONFIG_PLATFORM & PLATFORM_SDL) \ && !defined(__PCTOOL__) static const char *rbhome; #elif defined(PIVOT_ROOT) diff --git a/firmware/target/hosted/maemo/maemo-thread.c b/firmware/target/hosted/maemo/maemo-thread.c deleted file mode 100644 index 43d21c9ad4..0000000000 --- a/firmware/target/hosted/maemo/maemo-thread.c +++ /dev/null @@ -1,172 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 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 -#include -#include - -#include "config.h" -#include "system.h" -#include "kernel.h" -#include "thread.h" -#include "power.h" -#include "debug.h" -#include "button.h" - -/* Battery status information */ -#define BME_UDI "/org/freedesktop/Hal/devices/bme" -#define BATTERY_PERCENTAGE "battery.charge_level.percentage" -#define BATTER_REMAINING_TIME "battery.remaining_time" - -/* Bluetooth headset support */ -#define BT_HEADSET_UDI "/org/freedesktop/Hal/devices/computer_logicaldev_input_1" - -GMainLoop *maemo_main_loop = NULL; -osso_context_t *maemo_osso_ctx = NULL; - -volatile int maemo_display_on = 1; -volatile int maemo_battery_level = 0; -volatile int maemo_remaining_time_sec = 0; - -void display_status_callback(osso_display_state_t state, gpointer data) -{ - (void)data; - - if (state == OSSO_DISPLAY_OFF) - maemo_display_on = 0; - else - maemo_display_on = 1; -} - - -void get_battery_values(LibHalContext *ctx) -{ - /* Get initial battery percentage and remaining time */ - maemo_battery_level = libhal_device_get_property_int( - ctx, BME_UDI, - BATTERY_PERCENTAGE, NULL); - - maemo_remaining_time_sec = libhal_device_get_property_int( - ctx, BME_UDI, - BATTER_REMAINING_TIME, NULL); - - DEBUGF("[maemo] Battery percentage: %d, remaining_time_sec: %d\n", maemo_battery_level, maemo_remaining_time_sec); -} - -static void on_battery_changed (LibHalContext *ctx, - const char *udi, - const char *key, - dbus_bool_t is_removed, - dbus_bool_t is_added) -{ - (void)is_removed; - (void)is_added; - - if (!g_str_equal (udi, BME_UDI)) - return; - - if (!g_str_equal (key, BATTERY_PERCENTAGE) && !g_str_equal (key, BATTER_REMAINING_TIME)) - return; - - get_battery_values(ctx); -} - -static void on_bt_button_pressed(LibHalContext *ctx, - const char *udi, - const char *condition_name, - const char *condition_detail) -{ - (void)ctx; - - if (!g_str_equal (udi, BT_HEADSET_UDI) || !g_str_equal(condition_name, "ButtonPressed")) - return; - - sim_enter_irq_handler(); - - if (g_str_equal(condition_detail, "play-cd") || g_str_equal(condition_detail, "pause-cd")) - button_queue_post(BUTTON_MULTIMEDIA_PLAYPAUSE, 0); - else if (g_str_equal(condition_detail, "stop-cd")) - button_queue_post(BUTTON_MULTIMEDIA_STOP, 0); - else if (g_str_equal(condition_detail, "next-song")) - button_queue_post(BUTTON_MULTIMEDIA_NEXT, 0); - else if (g_str_equal(condition_detail, "previous-song")) - button_queue_post(BUTTON_MULTIMEDIA_PREV, 0); - else if (g_str_equal(condition_detail, "fast-forward")) - button_queue_post(BUTTON_MULTIMEDIA_FFWD, 0); - else if (g_str_equal(condition_detail, "rewind")) - button_queue_post(BUTTON_MULTIMEDIA_REW, 0); - - sim_exit_irq_handler(); -} - -int maemo_thread_func (void *wait_for_osso_startup) -{ - maemo_main_loop = g_main_loop_new (NULL, FALSE); - - /* Register display callback */ - maemo_osso_ctx = osso_initialize ("rockbox", "666", FALSE, NULL); - osso_hw_set_display_event_cb(maemo_osso_ctx, display_status_callback, NULL); - - /* Register battery status callback */ - LibHalContext *hal_ctx; - hal_ctx = libhal_ctx_new(); - - DBusConnection *system_bus = (DBusConnection*)osso_get_sys_dbus_connection(maemo_osso_ctx); - libhal_ctx_set_dbus_connection(hal_ctx, system_bus); - - libhal_ctx_init(hal_ctx, NULL); - libhal_ctx_set_device_property_modified (hal_ctx, on_battery_changed); - libhal_device_add_property_watch (hal_ctx, BME_UDI, NULL); - - /* Work around libhal API issue: We need to add a property watch - to get the condition change callback working */ - libhal_device_add_property_watch (hal_ctx, BT_HEADSET_UDI, NULL); - libhal_ctx_set_device_condition(hal_ctx, on_bt_button_pressed); - - get_battery_values(hal_ctx); - - /* let system_init proceed */ - SDL_SemPost((SDL_sem *)wait_for_osso_startup); - - g_main_loop_run (maemo_main_loop); - - /* Cleanup */ - osso_deinitialize (maemo_osso_ctx); - libhal_device_remove_property_watch (hal_ctx, BT_HEADSET_UDI, NULL); - libhal_device_remove_property_watch (hal_ctx, BME_UDI, NULL); - libhal_ctx_shutdown (hal_ctx, NULL); - libhal_ctx_free(hal_ctx); - - return 0; -} - -/* Returns battery level in percent */ -int _battery_level(void) -{ - return maemo_battery_level; -} - -/* Return remaining battery time in minutes */ -int _battery_time(void) -{ - return maemo_remaining_time_sec / 60; -} diff --git a/firmware/target/hosted/maemo/maemo-thread.h b/firmware/target/hosted/maemo/maemo-thread.h deleted file mode 100644 index a0996b4945..0000000000 --- a/firmware/target/hosted/maemo/maemo-thread.h +++ /dev/null @@ -1,36 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 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. - * - ****************************************************************************/ -#ifndef __MAEMO_THREAD_H__ -#define __MAEMO_THREAD_H__ - -#include -#include - -extern osso_context_t *maemo_osso_ctx; -extern GMainLoop *maemo_main_loop; - -extern volatile int maemo_display_on; -extern volatile int maemo_has_input_focus; - -int maemo_thread_func(void *unused); -void pcm_shutdown_gstreamer(void); - -#endif diff --git a/firmware/target/hosted/maemo/pcm-gstreamer.c b/firmware/target/hosted/maemo/pcm-gstreamer.c deleted file mode 100644 index 33fa6d343f..0000000000 --- a/firmware/target/hosted/maemo/pcm-gstreamer.c +++ /dev/null @@ -1,451 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 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 "autoconf.h" - -#include -#include "config.h" -#include "debug.h" -#include "sound.h" -#include "audiohw.h" -#include "system.h" -#include "settings.h" - -#include "playback.h" -#include "kernel.h" - -#include -#include -#include -#include -#include -#include - -/* Maemo5: N900 specific libplayback support */ -#include -#include -#include -#include "maemo-thread.h" - -#ifdef HAVE_RECORDING -#include "audiohw.h" -#ifdef HAVE_SPDIF_IN -#include "spdif.h" -#endif -#endif - -#include "pcm.h" -#include "pcm-internal.h" -#include "pcm_sampr.h" - -/*#define LOGF_ENABLE*/ -#include "logf.h" - -#ifdef DEBUG -#include -extern bool debug_audio; -#endif - -/* Declarations for libplayblack */ -pb_playback_t *playback = NULL; -void playback_state_req_handler(pb_playback_t *pb, - enum pb_state_e req_state, - pb_req_t *ext_req, - void *data); -void playback_state_req_callback(pb_playback_t *pb, - enum pb_state_e granted_state, - const char *reason, - pb_req_t *req, - void *data); -bool playback_granted = false; - -/* Gstreamer related vars */ -GstCaps *gst_audio_caps = NULL; -GstElement *gst_pipeline = NULL; -GstElement *gst_appsrc = NULL; -GstElement *gst_volume = NULL; -GstElement *gst_pulsesink = NULL; -GstBus *gst_bus = NULL; -static int bus_watch_id = 0; -GMainLoop *pcm_loop = NULL; - -static const void* pcm_data = NULL; -static size_t pcm_data_size = 0; - -static int audio_locked = 0; -static pthread_mutex_t audio_lock_mutex = PTHREAD_MUTEX_INITIALIZER; -static int inside_feed_data = 0; - -/* - * mutex lock/unlock wrappers neatness' sake - */ -static inline void lock_audio(void) -{ - pthread_mutex_lock(&audio_lock_mutex); -} - -static inline void unlock_audio(void) -{ - pthread_mutex_unlock(&audio_lock_mutex); -} - -void pcm_play_lock(void) -{ - if (++audio_locked == 1) - lock_audio(); -} - -void pcm_play_unlock(void) -{ - if (--audio_locked == 0) - unlock_audio(); -} - -void pcm_dma_apply_settings(void) -{ -} - -void pcm_play_dma_start(const void *addr, size_t size) -{ - pcm_data = addr; - pcm_data_size = size; - - if (playback_granted) - { - /* Start playing now */ - if (!inside_feed_data) - gst_element_set_state (GST_ELEMENT(gst_pipeline), GST_STATE_PLAYING); - else - DEBUGF("ERROR: dma_start called while inside feed_data\n"); - } else - { - /* N900: Request change to playing state */ - pb_playback_req_state (playback, - PB_STATE_PLAY, - playback_state_req_callback, - NULL); - } -} - -void pcm_play_dma_stop(void) -{ - if (inside_feed_data) - g_signal_emit_by_name (gst_appsrc, "end-of-stream", NULL); - else - gst_element_set_state (GST_ELEMENT(gst_pipeline), GST_STATE_NULL); -} - -static void feed_data(GstElement * appsrc, guint size_hint, void *unused) -{ - (void)size_hint; - (void)unused; - - lock_audio(); - - /* Make sure we don't trigger a gst_element_set_state() call - from inside gstreamer's stream thread as it will deadlock */ - inside_feed_data = 1; - - if (pcm_play_dma_complete_callback(PCM_DMAST_OK, &pcm_data, &pcm_data_size)) - { - GstBuffer *buffer = gst_buffer_new (); - GstFlowReturn ret; - - GST_BUFFER_DATA (buffer) = (__u8 *)pcm_data; - GST_BUFFER_SIZE (buffer) = pcm_data_size; - - g_signal_emit_by_name (appsrc, "push-buffer", buffer, &ret); - gst_buffer_unref (buffer); - - if (ret != 0) - DEBUGF("push-buffer error result: %d\n", ret); - - pcm_play_dma_status_callback(PCM_DMAST_STARTED); - } else - { - DEBUGF("feed_data: No Data.\n"); - g_signal_emit_by_name (appsrc, "end-of-stream", NULL); - } - - inside_feed_data = 0; - - unlock_audio(); -} - -static gboolean -gst_bus_message (GstBus * bus, GstMessage * message, void *unused) -{ - (void)bus; - (void)unused; - - DEBUGF(" [gst] got BUS message %s\n", - gst_message_type_get_name (GST_MESSAGE_TYPE (message))); - - switch (GST_MESSAGE_TYPE (message)) { - case GST_MESSAGE_ERROR: - { - GError *err; - gchar *debug; - gst_message_parse_error (message, &err, &debug); - - DEBUGF("[gst] Received error: Src: %s, msg: %s\n", GST_MESSAGE_SRC_NAME(message), err->message); - - g_error_free (err); - g_free (debug); - } - - g_main_loop_quit (pcm_loop); - break; - case GST_MESSAGE_EOS: - gst_element_set_state (GST_ELEMENT(gst_pipeline), GST_STATE_NULL); - break; - case GST_MESSAGE_STATE_CHANGED: - { - GstState old_state, new_state; - - gst_message_parse_state_changed (message, &old_state, &new_state, NULL); - DEBUGF("[gst] Element %s changed state from %s to %s.\n", - GST_MESSAGE_SRC_NAME(message), - gst_element_state_get_name (old_state), - gst_element_state_get_name (new_state)); - break; - } - default: - break; - } - - return TRUE; -} - -void maemo_configure_appsrc(void) -{ - /* Block push-buffer until there is enough room */ - g_object_set (G_OBJECT(gst_appsrc), "block", TRUE, NULL); - - g_object_set(G_OBJECT(gst_appsrc), "format", GST_FORMAT_BYTES, NULL); - - gst_audio_caps = gst_caps_new_simple("audio/x-raw-int", "width", G_TYPE_INT, (gint)16, "depth", G_TYPE_INT, (gint)16, "channels" ,G_TYPE_INT, (gint)2, - "signed",G_TYPE_BOOLEAN,1, - "rate",G_TYPE_INT,44100,"endianness",G_TYPE_INT,(gint)1234,NULL); - - g_object_set (G_OBJECT(gst_appsrc), "caps", gst_audio_caps, NULL); - - gst_app_src_set_stream_type(GST_APP_SRC(gst_appsrc), - GST_APP_STREAM_TYPE_STREAM); - - /* configure the appsrc, we will push data into the appsrc from the - * mainloop. */ - g_signal_connect (gst_appsrc, "need-data", G_CALLBACK (feed_data), NULL); -} - -/* Init libplayback: Grant access rights to - play audio while the phone is in silent mode */ -void maemo_init_libplayback(void) -{ - DBusConnection *session_bus_raw = (DBusConnection*)osso_get_dbus_connection(maemo_osso_ctx); - - playback = pb_playback_new_2(session_bus_raw, - PB_CLASS_MEDIA, - PB_FLAG_AUDIO, - PB_STATE_STOP, - playback_state_req_handler, - NULL); - - pb_playback_set_stream(playback, "Playback Stream"); -} - -/** - * Gets called by the policy framework if an important - * event arrives: Incoming calls etc. - */ -void maemo_tell_rockbox_to_stop_audio(void) -{ - sim_enter_irq_handler(); - queue_broadcast(SYS_CALL_INCOMING, 0); - sim_exit_irq_handler(); - - osso_system_note_infoprint(maemo_osso_ctx, "Stopping rockbox playback", NULL); -} - -void playback_state_req_handler(pb_playback_t *pb, - enum pb_state_e req_state, - pb_req_t *ext_req, - void *data) -{ - (void)pb; - (void)ext_req; - (void)data; - - DEBUGF("External state change request: state: %s, data: %p\n", - pb_state_to_string(req_state), data); - - if (req_state == PB_STATE_STOP && playback_granted) - { - DEBUGF("Stopping playback, might be an incoming call\n"); - - playback_granted = false; - maemo_tell_rockbox_to_stop_audio(); - } -} - -/** - * Callback for our own state change request. - */ -void playback_state_req_callback(pb_playback_t *pb, enum pb_state_e granted_state, const char *reason, pb_req_t *req, void *data) -{ - (void)data; - (void)reason; - - DEBUGF("State request callback: granted_state: %s, reason: %s\n", - pb_state_to_string(granted_state), reason); - - /* We are allowed to play audio */ - if (granted_state == PB_STATE_PLAY) - { - DEBUGF("Playback granted. Start playing...\n"); - playback_granted = true; - if (!inside_feed_data) - gst_element_set_state (GST_ELEMENT(gst_pipeline), GST_STATE_PLAYING); - } else - { - DEBUGF("Can't start playing. Throwing away play request\n"); - - playback_granted = false; - maemo_tell_rockbox_to_stop_audio(); - } - - pb_playback_req_completed(pb, req); -} - -void pcm_play_dma_init(void) -{ - maemo_init_libplayback(); - - GMainContext *ctx = g_main_loop_get_context(maemo_main_loop); - pcm_loop = g_main_loop_new (ctx, true); - - gst_init (NULL, NULL); - - gst_pipeline = gst_pipeline_new ("rockbox"); - - gst_appsrc = gst_element_factory_make ("appsrc", NULL); - gst_volume = gst_element_factory_make ("volume", NULL); - gst_pulsesink = gst_element_factory_make ("pulsesink", NULL); - - /* Connect elements */ - gst_bin_add_many (GST_BIN (gst_pipeline), - gst_appsrc, gst_volume, gst_pulsesink, NULL); - gst_element_link_many (gst_appsrc, gst_volume, gst_pulsesink, NULL); - - /* Connect to gstreamer bus of the pipeline */ - gst_bus = gst_pipeline_get_bus (GST_PIPELINE (gst_pipeline)); - bus_watch_id = gst_bus_add_watch (gst_bus, (GstBusFunc) gst_bus_message, NULL); - - maemo_configure_appsrc(); -} - -void pcm_shutdown_gstreamer(void) -{ - /* Try to stop playing */ - gst_element_set_state (GST_ELEMENT(gst_pipeline), GST_STATE_NULL); - - /* Make sure we are really stopped. This should return almost instantly, - so we wait up to ten seconds and just continue otherwise */ - gst_element_get_state (GST_ELEMENT(gst_pipeline), NULL, NULL, GST_SECOND * 10); - - g_source_remove (bus_watch_id); - g_object_unref(gst_bus); - gst_bus = NULL; - - gst_object_unref (gst_pipeline); - gst_pipeline = NULL; - - /* Shutdown libplayback and gstreamer */ - pb_playback_destroy (playback); - gst_deinit(); - - g_main_loop_quit(pcm_loop); - g_main_loop_unref (pcm_loop); - - pthread_mutex_destroy(&audio_lock_mutex); -} - -void pcm_play_dma_postinit(void) -{ -} - -void pcm_set_mixer_volume(int volume) -{ - /* gstreamer volume range is from 0.00 to 1.00 - * input is -990..0 */ - gdouble gst_vol = 1.0f - (gdouble)volume / -990.0f; - g_object_set (G_OBJECT(gst_volume), "volume", gst_vol, NULL); -} - - -#ifdef HAVE_RECORDING -void pcm_rec_lock(void) -{ -} - -void pcm_rec_unlock(void) -{ -} - -void pcm_rec_dma_init(void) -{ -} - -void pcm_rec_dma_close(void) -{ -} - -void pcm_rec_dma_start(void *start, size_t size) -{ - (void)start; - (void)size; -} - -void pcm_rec_dma_stop(void) -{ -} - -const void * pcm_rec_dma_get_peak_buffer(void) -{ - return NULL; -} - -void audiohw_set_recvol(int left, int right, int type) -{ - (void)left; - (void)right; - (void)type; -} - -#ifdef HAVE_SPDIF_IN -unsigned long spdif_measure_frequency(void) -{ - return 0; -} -#endif - -#endif /* HAVE_RECORDING */ diff --git a/firmware/target/hosted/sdl/app/button-application.c b/firmware/target/hosted/sdl/app/button-application.c index 8071df201a..1f908ebfc5 100644 --- a/firmware/target/hosted/sdl/app/button-application.c +++ b/firmware/target/hosted/sdl/app/button-application.c @@ -37,9 +37,6 @@ int key_to_button(int keyboard_key) int new_btn = BUTTON_NONE; switch (keyboard_key) { -#if (CONFIG_PLATFORM & PLATFORM_MAEMO4) - case SDLK_ESCAPE: -#endif case SDLK_KP_7: new_btn = BUTTON_TOPLEFT; break; @@ -47,36 +44,20 @@ int key_to_button(int keyboard_key) case SDLK_UP: new_btn = BUTTON_TOPMIDDLE; break; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO4) - case SDLK_F7: -#endif case SDLK_KP_9: new_btn = BUTTON_TOPRIGHT; break; -#if (CONFIG_PLATFORM & PLATFORM_PANDORA) - case SDLK_RSHIFT: -#endif case SDLK_KP_4: case SDLK_LEFT: new_btn = BUTTON_MIDLEFT; break; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO|PLATFORM_PANDORA) - case SDLK_RETURN: - case SDLK_KP_ENTER: -#endif case SDLK_KP_5: new_btn = BUTTON_CENTER; break; -#if (CONFIG_PLATFORM & PLATFORM_PANDORA) - case SDLK_RCTRL: -#endif case SDLK_KP_6: case SDLK_RIGHT: new_btn = BUTTON_MIDRIGHT; break; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO4) - case SDLK_F6: -#endif case SDLK_KP_1: new_btn = BUTTON_BOTTOMLEFT; break; @@ -84,9 +65,6 @@ int key_to_button(int keyboard_key) case SDLK_DOWN: new_btn = BUTTON_BOTTOMMIDDLE; break; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO4) - case SDLK_F8: -#endif case SDLK_KP_3: new_btn = BUTTON_BOTTOMRIGHT; break; diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index d8564e12f6..00b1016f2a 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c @@ -81,10 +81,6 @@ SDL_Cursor *sdl_arrow_cursor = NULL; int sdl_app_has_input_focus = 1; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -static int n900_updown_key_pressed = 0; -#endif - #ifdef HAS_BUTTON_HOLD bool hold_button_state = false; bool button_hold(void) { @@ -288,28 +284,6 @@ static bool event_handler(SDL_Event *event) case SDL_KEYDOWN: case SDL_KEYUP: ev_key = event->key.keysym.sym; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO5) - /* N900 with shared up/down cursor mapping. Seen on the German, - Finnish, Italian, French and Russian version. Probably more. */ - if (event->key.keysym.mod & KMOD_MODE || n900_updown_key_pressed) - { - /* Prevent stuck up/down keys: If you release the ALT key before the cursor key, - rockbox will see a KEYUP event for left/right instead of up/down and - the previously pressed up/down key would stay active. */ - if (ev_key == SDLK_LEFT || ev_key == SDLK_RIGHT) - { - if (event->type == SDL_KEYDOWN) - n900_updown_key_pressed = 1; - else - n900_updown_key_pressed = 0; - } - - if (ev_key == SDLK_LEFT) - ev_key = SDLK_UP; - else if (ev_key == SDLK_RIGHT) - ev_key = SDLK_DOWN; - } -#endif button_event(ev_key, event->type == SDL_KEYDOWN); break; @@ -463,9 +437,6 @@ static void show_sim_help(void) #ifdef HAVE_HOTSWAP HELPTXT(EXT_KEY, "toggle external drive"); #endif -#if (CONFIG_PLATFORM & PLATFORM_PANDORA) - HELPTXT(SDLK_LCTRL, "shutdown"); -#endif #ifdef HAS_BUTTON_HOLD HELPTXT(SDLK_h, "toggle hold button"); #endif @@ -586,12 +557,6 @@ static void button_event(int key, bool pressed) return; #endif #endif -#if (CONFIG_PLATFORM & PLATFORM_PANDORA) - case SDLK_LCTRL: - /* Will post SDL_USEREVENT in shutdown_hw() if successful. */ - sys_poweroff(); - break; -#endif #ifdef RG_NANO case SDLK_q: /* Use reboot to exit without shutting down */ diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c index c50d5fdb00..4f44506f3c 100644 --- a/firmware/target/hosted/sdl/lcd-bitmap.c +++ b/firmware/target/hosted/sdl/lcd-bitmap.c @@ -25,9 +25,6 @@ #include "button-sdl.h" #include "lcd-sdl.h" #include "screendump.h" -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -#include "maemo-thread.h" -#endif SDL_Surface* lcd_surface; @@ -125,16 +122,6 @@ void lcd_update(void) void lcd_update_rect(int x_start, int y_start, int width, int height) { -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) - /* Don't update display if not shown */ - if (!maemo_display_on) - return; - - /* Don't update if we don't have the input focus */ - if (!sdl_app_has_input_focus) - return; -#endif - sdl_update_rect(lcd_surface, x_start, y_start, width, height, LCD_WIDTH, LCD_HEIGHT, get_lcd_pixel); sdl_gui_update(lcd_surface, x_start, y_start, width, diff --git a/firmware/target/hosted/sdl/lcd-sdl.c b/firmware/target/hosted/sdl/lcd-sdl.c index 641fc3f1c3..a2c5cea647 100644 --- a/firmware/target/hosted/sdl/lcd-sdl.c +++ b/firmware/target/hosted/sdl/lcd-sdl.c @@ -151,15 +151,7 @@ void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end, int lcd_get_dpi(void) { -#if (CONFIG_PLATFORM & PLATFORM_MAEMO5) - return 267; -#elif (CONFIG_PLATFORM & PLATFORM_MAEMO4) - return 225; -#elif (CONFIG_PLATFORM & PLATFORM_PANDORA) - return 217; -#else /* TODO: find a way to query it from the OS, SDL doesn't support it * directly; for now assume the more or less standard 96 */ return 96; -#endif } diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index ec7ba8f36c..639f2baeef 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c @@ -44,12 +44,6 @@ #include "panic.h" #include "debug.h" -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -#include -#include -#include "maemo-thread.h" -#endif - #if defined(RG_NANO) && !defined(SIMULATOR) #include #include "instant_play.h" @@ -116,14 +110,6 @@ static int sdl_event_thread(void * param) #endif /* !HAVE_TOUCHSCREEN */ #endif /* !SIMULATOR */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) - /* start maemo thread: Listen to display on/off events and battery monitoring */ - SDL_sem *wait_for_maemo_startup = SDL_CreateSemaphore(0); /* 0-count so it blocks */ - SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, NULL, wait_for_maemo_startup); - SDL_SemWait(wait_for_maemo_startup); - SDL_DestroySemaphore(wait_for_maemo_startup); -#endif - #if SDL_MAJOR_VERSION == 1 SDL_InitSubSystem(SDL_INIT_VIDEO); @@ -151,19 +137,6 @@ static int sdl_event_thread(void * param) /* finally enter the button loop */ gui_message_loop(); -#if (CONFIG_PLATFORM & PLATFORM_MAEMO5) - pcm_shutdown_gstreamer(); -#endif -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) - g_main_loop_quit (maemo_main_loop); - g_main_loop_unref(maemo_main_loop); - SDL_WaitThread(maemo_thread, NULL); -#endif - -#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA)) - SDL_FreeCursor(hiddenCursor); -#endif - /* Order here is relevent to prevent deadlocks and use of destroyed sync primitives by kernel threads */ #ifdef HAVE_SDL_THREADS @@ -246,12 +219,6 @@ void system_init(void) /* fake stack, OS manages size (and growth) */ stackbegin = stackend = (uintptr_t*)&s; -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) - /* Make glib thread safe */ - g_thread_init(NULL); - g_type_init(); -#endif - #if defined(RG_NANO) && !defined(SIMULATOR) /* Set system volume to max with amixer */ system("amixer -q sset 'Headphone' 63 unmute"); diff --git a/firmware/target/hosted/sdl/window-sdl.c b/firmware/target/hosted/sdl/window-sdl.c index fce800d471..05e2772778 100644 --- a/firmware/target/hosted/sdl/window-sdl.c +++ b/firmware/target/hosted/sdl/window-sdl.c @@ -212,8 +212,8 @@ void sdl_window_setup(void) int depth = LCD_DEPTH < 8 ? 16 : LCD_DEPTH; Uint32 flags = SDL_WINDOW_ALLOW_HIGHDPI; -#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA)) - /* Fullscreen mode for maemo app */ +#if 0 + /* Fullscreen mode might be desired */ flags |= SDL_WINDOW_FULLSCREEN; #else if (display_zoom == 1) diff --git a/packaging/pandora/PXML.xml b/packaging/pandora/PXML.xml deleted file mode 100644 index 6b8653b67b..0000000000 --- a/packaging/pandora/PXML.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - Rockbox - - - - rockbox digital music player - - - - - - - - - - - Rockbox - - Rockbox - - - - - - - - - - - - - rockbox digital music player - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/pandora/pandora.make b/packaging/pandora/pandora.make deleted file mode 100644 index c0a0ef991d..0000000000 --- a/packaging/pandora/pandora.make +++ /dev/null @@ -1,31 +0,0 @@ -PANDORA_DIR=$(ROOTDIR)/packaging/pandora -PND_MAKE=/usr/local/angstrom/arm/scripts/pnd_make -PND_BUILD_DIR=pnddir - -pnddir: - mkdir $(PND_BUILD_DIR) - -pnd: pnddir $(PND_MAKE) $(DEPFILE) build - # Creating PND file - make PREFIX=$(PND_BUILD_DIR)/rockbox fullinstall - - # Install Pandora build files - cp $(PANDORA_DIR)/PXML.xml $(PND_BUILD_DIR) - cp $(PANDORA_DIR)/rockbox.png $(PND_BUILD_DIR) - cp $(PANDORA_DIR)/rockbox_preview.jpg $(PND_BUILD_DIR) - cp $(PANDORA_DIR)/run_rockbox.sh $(PND_BUILD_DIR) - - # Remove stuff that's broken because of missing keymapping. - # Otherwise the user will have a hard time to shut down rockbox - rm -f $(PND_BUILD_DIR)/rockbox/lib/rockbox/rocks/apps/* - rm -f $(PND_BUILD_DIR)/rockbox/lib/rockbox/rocks/demos/* - rm -f $(PND_BUILD_DIR)/rockbox/lib/rockbox/rocks/games/* - - # Add docs folder - cp -rf $(ROOTDIR)/docs $(PND_BUILD_DIR) - - # Fix up permissions - chmod -R a+r $(PND_BUILD_DIR) - - # Invoke pndmake - $(PND_MAKE) -p rockbox.pnd -d $(PND_BUILD_DIR) -x $(PND_BUILD_DIR)/PXML.xml -i $(PND_BUILD_DIR)/rockbox.png -c diff --git a/packaging/pandora/rockbox.png b/packaging/pandora/rockbox.png deleted file mode 100644 index 076f349c43..0000000000 Binary files a/packaging/pandora/rockbox.png and /dev/null differ diff --git a/packaging/pandora/rockbox_preview.jpg b/packaging/pandora/rockbox_preview.jpg deleted file mode 100644 index 12c91ad93b..0000000000 Binary files a/packaging/pandora/rockbox_preview.jpg and /dev/null differ diff --git a/packaging/pandora/run_rockbox.sh b/packaging/pandora/run_rockbox.sh deleted file mode 100755 index 8ac95a3930..0000000000 --- a/packaging/pandora/run_rockbox.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -CONFIG_DIR=.config/rockbox.org -mkdir --parents $CONFIG_DIR - -# Copy over a default config file or set default language -# cp --no-clobber config.cfg.default $CONFIG_DIR/config.cfg - -export HOME=$(pwd) -./rockbox/bin/rockbox diff --git a/tools/configure b/tools/configure index 7394ab81a9..6461825cc7 100755 --- a/tools/configure +++ b/tools/configure @@ -634,132 +634,6 @@ mipsr2elcc () { gccchoice="9.5.0" } -maemocc () { - # Scratchbox sets up "gcc" based on the active target - prefixtools "" - - GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib//` - GCCOPTS="$GCCOPTS -fno-builtin -g -I\$(SIMDIR)" - GCCOPTIMIZE='' - LDOPTS="-lm -ldl $LDOPTS" - GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" - SHARED_LDFLAGS="-shared" - SHARED_CFLAGS='' - endian="little" - thread_support="HAVE_SIGALTSTACK_THREADS" - - is_n900=0 - # Determine maemo version - if pkg-config --atleast-version=5 maemo-version; then - if [ "$1" == "4" ]; then - echo "ERROR: Maemo 4 SDK required." - exit 1 - fi - extradefines="$extradefines -DMAEMO5" - echo "Found N900 maemo version" - is_n900=1 - elif pkg-config --atleast-version=4 maemo-version; then - if [ "$1" == "5" ]; then - echo "ERROR: Maemo 5 SDK required." - exit 1 - fi - extradefines="$extradefines -DMAEMO4" - echo "Found N8xx maemo version" - else - echo "Unable to determine maemo version. Is the maemo-version-dev package installed?" - exit 1 - fi - - # SDL - if [ $is_n900 -eq 1 ]; then - GCCOPTS="$GCCOPTS `pkg-config --cflags sdl`" - LDOPTS="$LDOPTS `pkg-config --libs sdl`" - else - GCCOPTS="$GCCOPTS `${sdl_config} --cflags`" - LDOPTS="$LDOPTS `${sdl_config} --libs`" - fi - - # glib and libosso support - GCCOPTS="$GCCOPTS `pkg-config --cflags libosso glib-2.0 gthread-2.0`" - LDOPTS="$LDOPTS `pkg-config --libs libosso glib-2.0 gthread-2.0`" - - # libhal support: Battery monitoring - GCCOPTS="$GCCOPTS `pkg-config --cflags hal`" - LDOPTS="$LDOPTS `pkg-config --libs hal`" - - GCCOPTS="$GCCOPTS -O2 -fno-strict-aliasing" - if [ $is_n900 -eq 1 ]; then - # gstreamer support: Audio output. - GCCOPTS="$GCCOPTS `pkg-config --cflags gstreamer-base-0.10 gstreamer-plugins-base-0.10 gstreamer-app-0.10`" - LDOPTS="$LDOPTS `pkg-config --libs gstreamer-base-0.10 gstreamer-plugins-base-0.10 gstreamer-app-0.10`" - - # N900 specific: libplayback support - GCCOPTS="$GCCOPTS `pkg-config --cflags libplayback-1`" - LDOPTS="$LDOPTS `pkg-config --libs libplayback-1`" - - # N900 specific: Enable ARMv7 NEON support - if sb-conf show -A |grep -q -i arm; then - echo "Detected ARM target" - GCCOPTS="$GCCOPTS -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" - extradefines="$extradefines -DMAEMO_ARM_BUILD" - else - echo "Detected x86 target" - fi - else - # N8xx specific: Enable armv5te instructions - if sb-conf show -A |grep -q -i arm; then - echo "Detected ARM target" - GCCOPTS="$GCCOPTS -mcpu=arm1136jf-s -mfloat-abi=softfp -mfpu=vfp" - extradefines="$extradefines -DMAEMO_ARM_BUILD" - else - echo "Detected x86 target" - fi - fi -} - -pandoracc () { - # Note: The new "Ivanovic" pandora toolchain is not able to compile rockbox. - # You have to use the sebt3 toolchain: - # http://www.gp32x.com/board/index.php?/topic/58490-yactfeau/ - - PNDSDK="/usr/local/angstrom/arm" - if [ ! -x $PNDSDK/bin/arm-angstrom-linux-gnueabi-gcc ]; then - echo "Pandora SDK gcc not found in $PNDSDK/bin/arm-angstrom-linux-gnueabi-gcc" - exit - fi - - PATH=$PNDSDK/bin:$PATH:$PNDSDK/arm-angstrom-linux-gnueabi/usr/bin - PKG_CONFIG_PATH=$PNDSDK/arm-angstrom-linux-gnueabi/usr/lib/pkgconfig - LDOPTS="-L$PNDSDK/arm-angstrom-linux-gnueabi/usr/lib -Wl,-rpath,$PNDSDK/arm-angstrom-linux-gnueabi/usr/lib $LDOPTS" - PKG_CONFIG="pkg-config" - - GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib//` - GCCOPTS="$GCCOPTS -fno-builtin -g -I\$(SIMDIR)" - GCCOPTIMIZE='' - LDOPTS="-lm -ldl $LDOPTS" - GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" - SHARED_LDFLAGS="-shared" - SHARED_CFLAGS='' - endian="little" - thread_support="HAVE_SIGALTSTACK_THREADS" - - # Include path - GCCOPTS="$GCCOPTS -I$PNDSDK/arm-angstrom-linux-gnueabi/usr/include" - - # Set up compiler - gccchoice="4.3.3" - prefixtools "$PNDSDK/bin/arm-angstrom-linux-gnueabi-" - - # Detect SDL - GCCOPTS="$GCCOPTS `$PNDSDK/bin/${sdl_config} --cflags`" - LDOPTS="$LDOPTS `$PNDSDK/bin/${sdl_config} --libs`" - - # Compiler options - GCCOPTS="$GCCOPTS -O2 -fno-strict-aliasing" - GCCOPTS="$GCCOPTS -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" - GCCOPTS="$GCCOPTS -ffast-math -fsingle-precision-constant" -} - arm1176jzlinuxcc () { GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib//` # Although the ARM1176JZ-S supports unaligned accesses, those seems to disabled @@ -1848,10 +1722,10 @@ cat <