diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2004-09-20 22:15:35 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2004-09-20 22:15:35 +0000 |
| commit | 2d875f83e6d5c14a0faf4474d17e8740406c7649 (patch) | |
| tree | 7dbdfa3f33c18ffad4672c77f75938cf889e472a | |
| parent | 57945b125d7f467d222796920fb1b6cf4e90f802 (diff) | |
| download | rockbox-2d875f83e6d5c14a0faf4474d17e8740406c7649.zip rockbox-2d875f83e6d5c14a0faf4474d17e8740406c7649.tar.gz rockbox-2d875f83e6d5c14a0faf4474d17e8740406c7649.tar.bz2 rockbox-2d875f83e6d5c14a0faf4474d17e8740406c7649.tar.xz | |
Disabled all code for the serial remote on Ondio, since the serial port is needed for MMC access.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5097 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/main.c | 5 | ||||
| -rw-r--r-- | firmware/drivers/button.c | 2 | ||||
| -rw-r--r-- | firmware/drivers/serial.c | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c index 70dc9e2..1a163eb 100644 --- a/apps/main.c +++ b/apps/main.c @@ -127,8 +127,11 @@ void init(void) #ifdef DEBUG debug_init(); #else +#ifndef HAVE_MMC /* FIXME: This is also necessary for debug builds + * (do debug builds on the Ondio make sense?) */ serial_setup(); #endif +#endif i2c_init(); @@ -174,7 +177,7 @@ void init(void) #endif panicf("ata: %d", rc); } - + usb_start_monitoring(); /* temporary hack for Ondio, which can't browse without disk I/O */ diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 263dce4..1fb1905 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -67,12 +67,14 @@ static void button_tick(void) int diff; int btn; +#ifndef HAVE_MMC /* Post events for the remote control */ btn = remote_control_rx(); if(btn) { queue_post(&button_queue, btn, NULL); } +#endif /* only poll every X ticks */ if ( ++tick >= POLL_FREQUENCY ) diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index a66f3b1..bf2b26b 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c @@ -27,6 +27,8 @@ #include "lcd.h" #include "serial.h" +#ifndef HAVE_MMC /* MMC takes serial port 1, so don't mess with it */ + /* Received byte identifiers */ #define PLAY 0xC1 #define STOP 0xC2 @@ -133,3 +135,5 @@ int remote_control_rx(void) return ret; } + +#endif /* HAVE_MMC */ |