From 2d875f83e6d5c14a0faf4474d17e8740406c7649 Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Mon, 20 Sep 2004 22:15:35 +0000
Subject: [PATCH] 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
---
 apps/main.c               | 5 ++++-
 firmware/drivers/button.c | 2 ++
 firmware/drivers/serial.c | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/main.c b/apps/main.c
index 70dc9e2fed..1a163ebd72 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -127,7 +127,10 @@ 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 263dce4d16..1fb1905862 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 a66f3b1fa4..bf2b26b866 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 */