diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-mrobe100.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/lcd-mr100.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/power-mr100.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 3e0093446e..f0c82a5c48 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h | |||
@@ -7,6 +7,8 @@ | |||
7 | /* until voltages are sorted out */ | 7 | /* until voltages are sorted out */ |
8 | #define NO_LOW_BATTERY_SHUTDOWN | 8 | #define NO_LOW_BATTERY_SHUTDOWN |
9 | 9 | ||
10 | #define OLYMPUS_MROBE_100 1 | ||
11 | |||
10 | /* For Rolo and boot loader */ | 12 | /* For Rolo and boot loader */ |
11 | #define MODEL_NUMBER 23 | 13 | #define MODEL_NUMBER 23 |
12 | #define MODEL_NAME "Olympus m:robe MR-100" | 14 | #define MODEL_NAME "Olympus m:robe MR-100" |
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c index bf751f47a9..c7977e63fc 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c | |||
@@ -132,11 +132,12 @@ void lcd_blit(const unsigned char* data, int x, int by, int width, | |||
132 | 132 | ||
133 | /* Performance function that works with an external buffer | 133 | /* Performance function that works with an external buffer |
134 | note that by and bheight are in 4-pixel units! */ | 134 | note that by and bheight are in 4-pixel units! */ |
135 | void lcd_grey_phase_blit(const struct grey_data *data, int x, int by, | 135 | void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases, |
136 | int width, int bheight, int stride) | 136 | int x, int by, int width, int bheight, int stride) |
137 | { | 137 | { |
138 | /* TODO: Implement lcd_grey_phase_blit() */ | 138 | /* TODO: Implement lcd_grey_phase_blit() */ |
139 | (void)data; | 139 | (void)values; |
140 | (void)phases; | ||
140 | (void)x; | 141 | (void)x; |
141 | (void)by; | 142 | (void)by; |
142 | (void)width; | 143 | (void)width; |
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c index 1fb2ecb958..54b7030646 100644 --- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c | |||
@@ -37,19 +37,19 @@ void power_init(void) | |||
37 | 37 | ||
38 | bool charger_inserted(void) | 38 | bool charger_inserted(void) |
39 | { | 39 | { |
40 | return false; | 40 | return (GPIOB_INPUT_VAL & 0x02) ? false : true ; |
41 | } | 41 | } |
42 | 42 | ||
43 | void ide_power_enable(bool on) | 43 | void ide_power_enable(bool on) |
44 | { | 44 | { |
45 | (void)on; | 45 | (void)on; |
46 | /* We do nothing on the iPod */ | 46 | /* We do nothing */ |
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | ||
50 | bool ide_powered(void) | 50 | bool ide_powered(void) |
51 | { | 51 | { |
52 | /* pretend we are always powered - we don't turn it off on the ipod */ | 52 | /* pretend we are always powered - we don't turn it off */ |
53 | return true; | 53 | return true; |
54 | } | 54 | } |
55 | 55 | ||