summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorRobert Kukla <roolku@rockbox.org>2008-01-11 21:48:01 +0000
committerRobert Kukla <roolku@rockbox.org>2008-01-11 21:48:01 +0000
commit7d961d390a39669cd9e00a0a221edbc94808cdb5 (patch)
tree810b38658db39de4eae9e0e6421206b17660ae5f /firmware/target/arm
parentc4ebcbeaf496c3b50be01da9a2a9ce6eefef9c2c (diff)
downloadrockbox-7d961d390a39669cd9e00a0a221edbc94808cdb5.tar.gz
rockbox-7d961d390a39669cd9e00a0a221edbc94808cdb5.zip
m:robe 100:
- adjust lcd_grey_phase_blit() parameter to recent change - detection of external power - compilation of plugins - need to be enabled individually in SOURCES/SUBDIRS (use autostart.rock as test plugin with limited interaction via BUTTON_POWER) also - move autostart.rock to apps dir where it is expected - set missing svn:keywords for various files git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16056 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-mr100.c7
-rw-r--r--firmware/target/arm/olympus/mrobe-100/power-mr100.c6
2 files changed, 7 insertions, 6 deletions
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,
/* Performance function that works with an external buffer
note that by and bheight are in 4-pixel units! */
-void lcd_grey_phase_blit(const struct grey_data *data, int x, int by,
- int width, int bheight, int stride)
+void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases,
+ int x, int by, int width, int bheight, int stride)
{
/* TODO: Implement lcd_grey_phase_blit() */
- (void)data;
+ (void)values;
+ (void)phases;
(void)x;
(void)by;
(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)
bool charger_inserted(void)
{
- return false;
+ return (GPIOB_INPUT_VAL & 0x02) ? false : true ;
}
void ide_power_enable(bool on)
{
(void)on;
- /* We do nothing on the iPod */
+ /* We do nothing */
}
bool ide_powered(void)
{
- /* pretend we are always powered - we don't turn it off on the ipod */
+ /* pretend we are always powered - we don't turn it off */
return true;
}