From 87ac614ccd18f8481aae7fa7baf855b5b01ee48b Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 9 Apr 2007 17:47:32 +0000 Subject: Enable rockboy for M5. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13084 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/SUBDIRS | 5 ++--- apps/plugins/rockboy/sys_rockbox.c | 5 ++--- manual/plugins/main.tex | 4 ++-- 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 @@ /* 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 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) 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 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 \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}} -- cgit v1.2.3