summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-04-08 09:08:38 +0000
committerJens Arnold <amiconn@rockbox.org>2006-04-08 09:08:38 +0000
commit4ac150e8d3549eb9c06fba71aca88337b59bf7eb (patch)
tree047d2991af1660aaf90b3f830dfbfb7e82db1a57 /apps
parent37e386f3d81ebe7ad4f32e919d529391f8f4ced0 (diff)
downloadrockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.zip
rockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.tar.gz
rockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.tar.bz2
rockbox-4ac150e8d3549eb9c06fba71aca88337b59bf7eb.tar.xz
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.c2
-rw-r--r--apps/plugins/pacbox/pacbox.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 008e0a2..9ad1c5f 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1353,7 +1353,7 @@ bool view_battery(void)
lcd_puts(0, 6, buf);
lcd_puts(0, 7, power_message);
#else /* !HAVE_CHARGE_CTRL */
-#if defined APPLE_IPODNANO || defined APPLE_IPODVIDEO
+#if defined IPOD_NANO || defined IPOD_VIDEO
int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false;
int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true;
int dock = (GPIOA_INPUT_VAL & 0x10)?true:false;
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index c852608..8712448 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -106,7 +106,7 @@
/* How many video frames (out of a possible 60) we display each second.
NOTE: pacbox.c assumes this is an integer divisor of 60
*/
-#ifdef APPLE_IPOD_NANO
+#ifdef IPOD_NANO
/* The Nano can manage full-speed at 30fps (1 in 2 frames) */
#define FPS 30
#else