diff options
-rw-r--r-- | firmware/drivers/i2c.c | 8 | ||||
-rw-r--r-- | firmware/drivers/serial.c | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/firmware/drivers/i2c.c b/firmware/drivers/i2c.c index ed12145da9..f44c0a9afd 100644 --- a/firmware/drivers/i2c.c +++ b/firmware/drivers/i2c.c | |||
@@ -23,6 +23,8 @@ | |||
23 | #include "debug.h" | 23 | #include "debug.h" |
24 | #include "system.h" | 24 | #include "system.h" |
25 | 25 | ||
26 | #if CONFIG_I2C != I2C_H100 /* FIX: not yet done */ | ||
27 | |||
26 | /* cute little functions, atomic read-modify-write */ | 28 | /* cute little functions, atomic read-modify-write */ |
27 | #if CONFIG_I2C == I2C_GMINI | 29 | #if CONFIG_I2C == I2C_GMINI |
28 | 30 | ||
@@ -279,3 +281,9 @@ int i2c_read(int address, unsigned char* buf, int count ) | |||
279 | i2c_stop(); | 281 | i2c_stop(); |
280 | return x; | 282 | return x; |
281 | } | 283 | } |
284 | #else /* not h100 i2c */ | ||
285 | void i2c_init(void) | ||
286 | { | ||
287 | /* a dummy */ | ||
288 | } | ||
289 | #endif /* h100 i2c */ | ||
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index 8a16cfb3b5..6ee5b4f81b 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <stdlib.h> | 19 | #include <stdlib.h> |
20 | #include "button.h" | 20 | #include "button.h" |
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "sh7034.h" | 22 | #include "cpu.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | 24 | #include "kernel.h" |
25 | #include "backlight.h" | 25 | #include "backlight.h" |
@@ -27,6 +27,7 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "serial.h" | 28 | #include "serial.h" |
29 | 29 | ||
30 | #if CONFIG_CPU != MCF5249 /* FIX: this is not compiled for coldfire */ | ||
30 | #ifndef HAVE_MMC /* MMC takes serial port 1, so don't mess with it */ | 31 | #ifndef HAVE_MMC /* MMC takes serial port 1, so don't mess with it */ |
31 | 32 | ||
32 | /* Received byte identifiers */ | 33 | /* Received byte identifiers */ |
@@ -137,3 +138,9 @@ int remote_control_rx(void) | |||
137 | } | 138 | } |
138 | 139 | ||
139 | #endif /* HAVE_MMC */ | 140 | #endif /* HAVE_MMC */ |
141 | #else | ||
142 | void serial_setup (void) | ||
143 | { | ||
144 | /* a dummy */ | ||
145 | } | ||
146 | #endif /* CONFIG_CPU != MCF5249 */ | ||