summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-04-09 17:47:32 +0000
committerJens Arnold <amiconn@rockbox.org>2007-04-09 17:47:32 +0000
commit87ac614ccd18f8481aae7fa7baf855b5b01ee48b (patch)
tree31366265cabd301cbf336d8ea94c3c6ca0fa6146
parent61e798ff27edc6a491f76c567ec20f8adab38217 (diff)
downloadrockbox-87ac614ccd18f8481aae7fa7baf855b5b01ee48b.zip
rockbox-87ac614ccd18f8481aae7fa7baf855b5b01ee48b.tar.gz
rockbox-87ac614ccd18f8481aae7fa7baf855b5b01ee48b.tar.bz2
rockbox-87ac614ccd18f8481aae7fa7baf855b5b01ee48b.tar.xz
Enable rockboy for M5.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13084 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/SUBDIRS5
-rw-r--r--apps/plugins/rockboy/sys_rockbox.c5
-rw-r--r--manual/plugins/main.tex4
3 files changed, 6 insertions, 8 deletions
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 34e83f0..5ac85a3 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -3,9 +3,8 @@
/* For all targets */
/* For various targets... */
-#if (CONFIG_KEYPAD == RECORDER_PAD) || \
- (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
- defined(HAVE_LCD_COLOR)
+#if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \
+ || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5)
rockboy
#endif
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 40f6868..783accd 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -76,7 +76,7 @@ void ev_poll(void)
released = ~newbuttonstate & oldbuttonstate;
pressed = newbuttonstate & ~oldbuttonstate;
oldbuttonstate = newbuttonstate;
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
if (rb->button_hold()&~holdbutton)
fb.mode=(fb.mode+1)%4;
holdbutton=rb->button_hold();
@@ -161,8 +161,7 @@ void ev_poll(void)
#else
if(pressed & options.MENU) {
#endif
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
- defined(HAVE_LCD_COLOR)
+#if (CONFIG_KEYPAD != RECORDER_PAD)
#ifdef HAVE_WHEEL_POSITION
rb->wheel_send_events(true);
#endif
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index f5fc7a3..9d27144 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -15,7 +15,7 @@ text files, chip8 games), or from the \setting{Open with} option on the
\section{Games}
\opt{HAVE_LCD_BITMAP}
{See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
- \opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodvideo,sansa}
+ \opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}
{and Rockboy in \reference{ref:Rockboy}}.}
\opt{HAVE_LCD_BITMAP}{\input{plugins/blackjack.tex}}
@@ -107,7 +107,7 @@ the associated file. Viewers are stored in the
\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
-\opt{recorder,recorderv2fm,h1xx,h300,h10,h10_5gb,ipodcolor,ipodvideo,ipodnano,x5,sansa}{\input{plugins/rockboy.tex}}
+\opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}{\input{plugins/rockboy.tex}}
{\input{plugins/search.tex}}