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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/debug_menu.c | 2 | ||||
| -rw-r--r-- | apps/plugins/pacbox/pacbox.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 008e0a2518..9ad1c5f94c 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
| @@ -1353,7 +1353,7 @@ bool view_battery(void) | |||
| 1353 | lcd_puts(0, 6, buf); | 1353 | lcd_puts(0, 6, buf); |
| 1354 | lcd_puts(0, 7, power_message); | 1354 | lcd_puts(0, 7, power_message); |
| 1355 | #else /* !HAVE_CHARGE_CTRL */ | 1355 | #else /* !HAVE_CHARGE_CTRL */ |
| 1356 | #if defined APPLE_IPODNANO || defined APPLE_IPODVIDEO | 1356 | #if defined IPOD_NANO || defined IPOD_VIDEO |
| 1357 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; | 1357 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; |
| 1358 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; | 1358 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; |
| 1359 | int dock = (GPIOA_INPUT_VAL & 0x10)?true:false; | 1359 | int dock = (GPIOA_INPUT_VAL & 0x10)?true:false; |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index c852608680..8712448b5b 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
| @@ -106,7 +106,7 @@ | |||
| 106 | /* How many video frames (out of a possible 60) we display each second. | 106 | /* How many video frames (out of a possible 60) we display each second. |
| 107 | NOTE: pacbox.c assumes this is an integer divisor of 60 | 107 | NOTE: pacbox.c assumes this is an integer divisor of 60 |
| 108 | */ | 108 | */ |
| 109 | #ifdef APPLE_IPOD_NANO | 109 | #ifdef IPOD_NANO |
| 110 | /* The Nano can manage full-speed at 30fps (1 in 2 frames) */ | 110 | /* The Nano can manage full-speed at 30fps (1 in 2 frames) */ |
| 111 | #define FPS 30 | 111 | #define FPS 30 |
| 112 | #else | 112 | #else |