More dead code...

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6430 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 8 deletions

diff --git a/firmware/debug.c b/firmware/debug.c
index e3be2de168..33b55a5c41 100644
--- a/firmware/debug.c
+++ b/firmware/debug.c
@@ -32,9 +32,10 @@ static char debugbuf[200];
 #include "kernel.h"
 #include "system.h"
 
+#ifdef DEBUG
+#if CONFIG_CPU == SH7034 /* these are still very SH-oriented */
 void debug_init(void)
 {
-#if CONFIG_CPU == SH7034
     /* Clear it all! */
     SSR1 &= ~(SCI_RDRF | SCI_ORER | SCI_PER | SCI_FER);
 
@@ -43,11 +44,8 @@ void debug_init(void)
     SCR1 |= 0x40;
     SCR1 &= ~0x80;
     IPRE |= 0xf000; /* Set to highest priority */
-#endif
 }
 
-#ifdef DEBUG
-#if CONFIG_CPU == SH7034 /* these are still very SH-oriented */
 static int debug_tx_ready(void)
 {
     return (SSR1 & SCI_TDRE);
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 64b1165c23..115d590f65 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -557,12 +557,9 @@ static void drain_dma_buffer(void)
     );
 }
 
-#endif /* #if CONFIG_HWCODEC == MAS3587F */
-
 void rec_tick (void) __attribute__ ((section (".icode")));
 void rec_tick(void)
 {
-#if CONFIG_HWCODEC == MAS3587F
     int i;
     int num_bytes;
     if(is_recording && (PBDR & 0x4000))
@@ -667,8 +664,8 @@ void rec_tick(void)
             }
         }
     }
-#endif /* #if CONFIG_HWCODEC == MAS3587F */
 }
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 void playback_tick(void)
 {