summaryrefslogtreecommitdiff
path: root/firmware/export/config.h
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-08-02 20:34:47 +0000
committerThomas Martitz <kugel@rockbox.org>2010-08-02 20:34:47 +0000
commit240923a801382c86545d10be167a15892a556fb6 (patch)
tree3c0e07ec3abf0c493a0b24b0b57e8bbd0200f7f6 /firmware/export/config.h
parent850efead04f10488b478a0f255a2464a01156a7f (diff)
downloadrockbox-240923a801382c86545d10be167a15892a556fb6.tar.gz
rockbox-240923a801382c86545d10be167a15892a556fb6.zip
Rockbox as an application: Commit current Android port progress.
General state is: Rockbox is usable (plays music, saves configuration, touchscreen works too). Problems: - Playing music in the background (i.e. when switching to another app) doesn't work reliably, but I'm working on that now. - no cabbiev2 (only some preliminary files for it), no other default theme. - screen flickers sometimes if the updates are too frequent - no multi screen apk/package - strange behavior when a phone call comes in The java files (and the eclipse project) resides in android/, which is also supposed to be the build folder. I've put a small README in there for instructions. There are some steps needed after the make part, which are described there, and which eclipse mostly handles. But there ought to be some script/makefile rules which do that instead in the future. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27668 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r--firmware/export/config.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 1b8a782f39..3b59004549 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -78,8 +78,10 @@
78 * bit fields to allow PLATFORM_HOSTED to be OR'ed e.g. with a 78 * bit fields to allow PLATFORM_HOSTED to be OR'ed e.g. with a
79 * possible future PLATFORM_ANDROID (some OSes might need totally different 79 * possible future PLATFORM_ANDROID (some OSes might need totally different
80 * handling to run on them than a stand-alone application) */ 80 * handling to run on them than a stand-alone application) */
81#define PLATFORM_NATIVE (1<<0) 81#define PLATFORM_NATIVE (1<<0)
82#define PLATFORM_HOSTED (1<<1) 82#define PLATFORM_HOSTED (1<<1)
83#define PLATFORM_ANDROID (1<<2)
84#define PLATFORM_SDL (1<<3)
83 85
84/* CONFIG_KEYPAD */ 86/* CONFIG_KEYPAD */
85#define PLAYER_PAD 1 87#define PLAYER_PAD 1
@@ -427,6 +429,8 @@ Lyre prototype 1 */
427 429
428#elif defined(APPLICATION) 430#elif defined(APPLICATION)
429#include "config/application.h" 431#include "config/application.h"
432#define CONFIG_CPU 0
433#define CONFIG_STORAGE 0
430#else 434#else
431/* no known platform */ 435/* no known platform */
432#endif 436#endif
@@ -689,11 +693,17 @@ Lyre prototype 1 */
689#define HAVE_EXTENDED_MESSAGING_AND_NAME 693#define HAVE_EXTENDED_MESSAGING_AND_NAME
690#define HAVE_WAKEUP_EXT_CB 694#define HAVE_WAKEUP_EXT_CB
691 695
696
697#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
698#define HAVE_PRIORITY_SCHEDULING
699#endif
700
692#if (CONFIG_PLATFORM & PLATFORM_NATIVE) 701#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
693#define HAVE_PRIORITY_SCHEDULING 702#define HAVE_PRIORITY_SCHEDULING
694#define HAVE_SCHEDULER_BOOSTCTRL 703#define HAVE_SCHEDULER_BOOSTCTRL
695#endif /* PLATFORM_NATIVE */ 704#endif /* PLATFORM_NATIVE */
696 705
706
697#define HAVE_SEMAPHORE_OBJECTS 707#define HAVE_SEMAPHORE_OBJECTS
698 708
699#if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC 709#if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC