diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-04-08 09:08:38 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-04-08 09:08:38 +0000 |
commit | 4ac150e8d3549eb9c06fba71aca88337b59bf7eb (patch) | |
tree | 047d2991af1660aaf90b3f830dfbfb7e82db1a57 /firmware/drivers/power.c | |
parent | 37e386f3d81ebe7ad4f32e919d529391f8f4ced0 (diff) | |
download | rockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.tar.gz rockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.zip |
Get rid of the redundant APPLE_* macros. * Fix wrong comments in lcd-ipod.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9561 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/power.c')
-rw-r--r-- | firmware/drivers/power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index cf90e0fc8c..9cc751e41e 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -123,7 +123,7 @@ bool charger_inserted(void) | |||
123 | return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF); | 123 | return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF); |
124 | #elif defined(TOSHIBA_GIGABEAT_F) | 124 | #elif defined(TOSHIBA_GIGABEAT_F) |
125 | return false; | 125 | return false; |
126 | #elif defined(APPLE_IPODVIDEO) | 126 | #elif defined(IPOD_VIDEO) |
127 | return (GPIOL_INPUT_VAL & 0x08)?false:true; | 127 | return (GPIOL_INPUT_VAL & 0x08)?false:true; |
128 | #elif defined(IPOD_ARCH) | 128 | #elif defined(IPOD_ARCH) |
129 | /* This needs filling in for other ipods. */ | 129 | /* This needs filling in for other ipods. */ |
@@ -158,7 +158,7 @@ bool charging_state(void) { | |||
158 | return charger_inserted(); | 158 | return charger_inserted(); |
159 | #elif defined(IRIVER_H300_SERIES) | 159 | #elif defined(IRIVER_H300_SERIES) |
160 | return (GPIO_READ & 0x00800000)?true:false; | 160 | return (GPIO_READ & 0x00800000)?true:false; |
161 | #elif defined(APPLE_IPODVIDEO) | 161 | #elif defined(IPOD_VIDEO) |
162 | return (GPIOB_INPUT_VAL & 0x01)?false:true; | 162 | return (GPIOB_INPUT_VAL & 0x01)?false:true; |
163 | #endif | 163 | #endif |
164 | } | 164 | } |