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.tar.gz
rockbox-87ac614ccd18f8481aae7fa7baf855b5b01ee48b.zip
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 34e83f0195..5ac85a3115 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -3,9 +3,8 @@
3/* For all targets */ 3/* For all targets */
4 4
5/* For various targets... */ 5/* For various targets... */
6#if (CONFIG_KEYPAD == RECORDER_PAD) || \ 6#if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \
7 (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ 7 || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5)
8 defined(HAVE_LCD_COLOR)
9rockboy 8rockboy
10#endif 9#endif
11 10
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 40f68681d8..783accd01b 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -76,7 +76,7 @@ void ev_poll(void)
76 released = ~newbuttonstate & oldbuttonstate; 76 released = ~newbuttonstate & oldbuttonstate;
77 pressed = newbuttonstate & ~oldbuttonstate; 77 pressed = newbuttonstate & ~oldbuttonstate;
78 oldbuttonstate = newbuttonstate; 78 oldbuttonstate = newbuttonstate;
79#if CONFIG_KEYPAD == IRIVER_H100_PAD 79#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
80 if (rb->button_hold()&~holdbutton) 80 if (rb->button_hold()&~holdbutton)
81 fb.mode=(fb.mode+1)%4; 81 fb.mode=(fb.mode+1)%4;
82 holdbutton=rb->button_hold(); 82 holdbutton=rb->button_hold();
@@ -161,8 +161,7 @@ void ev_poll(void)
161#else 161#else
162 if(pressed & options.MENU) { 162 if(pressed & options.MENU) {
163#endif 163#endif
164#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ 164#if (CONFIG_KEYPAD != RECORDER_PAD)
165 defined(HAVE_LCD_COLOR)
166#ifdef HAVE_WHEEL_POSITION 165#ifdef HAVE_WHEEL_POSITION
167 rb->wheel_send_events(true); 166 rb->wheel_send_events(true);
168#endif 167#endif
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index f5fc7a3db3..9d2714436e 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
15\section{Games} 15\section{Games}
16\opt{HAVE_LCD_BITMAP} 16\opt{HAVE_LCD_BITMAP}
17 {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator} 17 {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
18 \opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodvideo,sansa} 18 \opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}
19 {and Rockboy in \reference{ref:Rockboy}}.} 19 {and Rockboy in \reference{ref:Rockboy}}.}
20 20
21\opt{HAVE_LCD_BITMAP}{\input{plugins/blackjack.tex}} 21\opt{HAVE_LCD_BITMAP}{\input{plugins/blackjack.tex}}
@@ -107,7 +107,7 @@ the associated file. Viewers are stored in the
107 107
108\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}} 108\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
109 109
110\opt{recorder,recorderv2fm,h1xx,h300,h10,h10_5gb,ipodcolor,ipodvideo,ipodnano,x5,sansa}{\input{plugins/rockboy.tex}} 110\opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}{\input{plugins/rockboy.tex}}
111 111
112{\input{plugins/search.tex}} 112{\input{plugins/search.tex}}
113 113