diff options
-rw-r--r-- | firmware/debug.c | 6 | ||||
-rw-r--r-- | firmware/mpeg.c | 5 |
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]; | |||
32 | #include "kernel.h" | 32 | #include "kernel.h" |
33 | #include "system.h" | 33 | #include "system.h" |
34 | 34 | ||
35 | #ifdef DEBUG | ||
36 | #if CONFIG_CPU == SH7034 /* these are still very SH-oriented */ | ||
35 | void debug_init(void) | 37 | void debug_init(void) |
36 | { | 38 | { |
37 | #if CONFIG_CPU == SH7034 | ||
38 | /* Clear it all! */ | 39 | /* Clear it all! */ |
39 | SSR1 &= ~(SCI_RDRF | SCI_ORER | SCI_PER | SCI_FER); | 40 | SSR1 &= ~(SCI_RDRF | SCI_ORER | SCI_PER | SCI_FER); |
40 | 41 | ||
@@ -43,11 +44,8 @@ void debug_init(void) | |||
43 | SCR1 |= 0x40; | 44 | SCR1 |= 0x40; |
44 | SCR1 &= ~0x80; | 45 | SCR1 &= ~0x80; |
45 | IPRE |= 0xf000; /* Set to highest priority */ | 46 | IPRE |= 0xf000; /* Set to highest priority */ |
46 | #endif | ||
47 | } | 47 | } |
48 | 48 | ||
49 | #ifdef DEBUG | ||
50 | #if CONFIG_CPU == SH7034 /* these are still very SH-oriented */ | ||
51 | static int debug_tx_ready(void) | 49 | static int debug_tx_ready(void) |
52 | { | 50 | { |
53 | return (SSR1 & SCI_TDRE); | 51 | 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) | |||
557 | ); | 557 | ); |
558 | } | 558 | } |
559 | 559 | ||
560 | #endif /* #if CONFIG_HWCODEC == MAS3587F */ | ||
561 | |||
562 | void rec_tick (void) __attribute__ ((section (".icode"))); | 560 | void rec_tick (void) __attribute__ ((section (".icode"))); |
563 | void rec_tick(void) | 561 | void rec_tick(void) |
564 | { | 562 | { |
565 | #if CONFIG_HWCODEC == MAS3587F | ||
566 | int i; | 563 | int i; |
567 | int num_bytes; | 564 | int num_bytes; |
568 | if(is_recording && (PBDR & 0x4000)) | 565 | if(is_recording && (PBDR & 0x4000)) |
@@ -667,8 +664,8 @@ void rec_tick(void) | |||
667 | } | 664 | } |
668 | } | 665 | } |
669 | } | 666 | } |
670 | #endif /* #if CONFIG_HWCODEC == MAS3587F */ | ||
671 | } | 667 | } |
668 | #endif /* #if CONFIG_HWCODEC == MAS3587F */ | ||
672 | 669 | ||
673 | void playback_tick(void) | 670 | void playback_tick(void) |
674 | { | 671 | { |