From 987879b958f87a9af7ef9edcf6ae417fe56db788 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 5 Feb 2006 17:34:49 +0000 Subject: Further iPod 3G work from Seven Le Mesle git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8583 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/usb.c') diff --git a/firmware/usb.c b/firmware/usb.c index 80a8c98d8c..32e98ef6ce 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -68,7 +68,7 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */ #elif CONFIG_KEYPAD == ONDIO_PAD #define USBPOWER_BUTTON BUTTON_MENU #define USBPOWER_BTN_IGNORE BUTTON_OFF -#elif CONFIG_KEYPAD == IPOD_4G_PAD +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define USBPOWER_BUTTON BUTTON_MENU #define USBPOWER_BTN_IGNORE BUTTON_PLAY #elif CONFIG_KEYPAD == IRIVER_H300_PAD @@ -172,7 +172,7 @@ void usb_enable(bool on) if (on) { /* The following code is copied from ipodlinux */ -#ifdef APPLE_IPODCOLOR +#if defined (APPLE_IPODCOLOR) || defined(APPLE_IPOD3G) unsigned char* storage_ptr = (unsigned char *)0x40017F00; #elif defined(APPLE_IPODNANO) || defined(APPLE_IPODVIDEO) unsigned char* storage_ptr = (unsigned char *)0x4001FF00; -- cgit v1.2.3