More iPod 3G work from Seven Le Mesle

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8835 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 35 insertions, 36 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index 3ae1d37..12eab9f 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -27,7 +27,8 @@
     (CONFIG_KEYPAD == IAUDIO_X5_PAD)
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
+      (CONFIG_KEYPAD == IPOD_3G_PAD)
 #define HAS_BUTTON_HOLD
 #endif
 extern struct event_queue button_queue;
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 9d55b6b..e809afa 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -82,10 +82,8 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
-#define USB_IPODSTYLE
+#define USB_NONE
 
-/* define this if the unit can be powered or charged via USB */
-#define HAVE_USB_POWER
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h
index 36bb3c9..3104fde 100644
--- a/firmware/export/pp5002.h
+++ b/firmware/export/pp5002.h
@@ -21,38 +21,38 @@
 
 /* All info gleaned and/or copied from the iPodLinux project. */
 
-#define GPIOA_ENABLE     (*(volatile unsigned long *)(0xcf000000))
-#define GPIOB_ENABLE     (*(volatile unsigned long *)(0xcf000004))
-#define GPIOC_ENABLE     (*(volatile unsigned long *)(0xcf000008))
-#define GPIOD_ENABLE     (*(volatile unsigned long *)(0xcf00000c))
-#define GPIOA_OUTPUT_EN  (*(volatile unsigned long *)(0xcf000010))
-#define GPIOB_OUTPUT_EN  (*(volatile unsigned long *)(0xcf000014))
-#define GPIOC_OUTPUT_EN  (*(volatile unsigned long *)(0xcf000018))
-#define GPIOD_OUTPUT_EN  (*(volatile unsigned long *)(0xcf00001c))
-#define GPIOA_OUTPUT_VAL (*(volatile unsigned long *)(0xcf000020))
-#define GPIOB_OUTPUT_VAL (*(volatile unsigned long *)(0xcf000024))
-#define GPIOC_OUTPUT_VAL (*(volatile unsigned long *)(0xcf000028))
-#define GPIOD_OUTPUT_VAL (*(volatile unsigned long *)(0xcf00002c))
-#define GPIOA_INPUT_VAL  (*(volatile unsigned long *)(0xcf000030))
-#define GPIOB_INPUT_VAL  (*(volatile unsigned long *)(0xcf000034))
-#define GPIOC_INPUT_VAL  (*(volatile unsigned long *)(0xcf000038))
-#define GPIOD_INPUT_VAL  (*(volatile unsigned long *)(0xcf00003c))
-#define GPIOA_INT_STAT   (*(volatile unsigned long *)(0xcf000040))
-#define GPIOB_INT_STAT   (*(volatile unsigned long *)(0xcf000044))
-#define GPIOC_INT_STAT   (*(volatile unsigned long *)(0xcf000048))
-#define GPIOD_INT_STAT   (*(volatile unsigned long *)(0xcf00004c))
-#define GPIOA_INT_EN     (*(volatile unsigned long *)(0xcf000050))
-#define GPIOB_INT_EN     (*(volatile unsigned long *)(0xcf000054))
-#define GPIOC_INT_EN     (*(volatile unsigned long *)(0xcf000058))
-#define GPIOD_INT_EN     (*(volatile unsigned long *)(0xcf00005c))
-#define GPIOA_INT_LEV    (*(volatile unsigned long *)(0xcf000060))
-#define GPIOB_INT_LEV    (*(volatile unsigned long *)(0xcf000064))
-#define GPIOC_INT_LEV    (*(volatile unsigned long *)(0xcf000068))
-#define GPIOD_INT_LEV    (*(volatile unsigned long *)(0xcf00006c))
-#define GPIOA_INT_CLR    (*(volatile unsigned long *)(0xcf000070))
-#define GPIOB_INT_CLR    (*(volatile unsigned long *)(0xcf000074))
-#define GPIOC_INT_CLR    (*(volatile unsigned long *)(0xcf000078))
-#define GPIOD_INT_CLR    (*(volatile unsigned long *)(0xcf00007c))
+#define GPIOA_ENABLE     (*(volatile unsigned char *)(0xcf000000))
+#define GPIOB_ENABLE     (*(volatile unsigned char *)(0xcf000004))
+#define GPIOC_ENABLE     (*(volatile unsigned char *)(0xcf000008))
+#define GPIOD_ENABLE     (*(volatile unsigned char *)(0xcf00000c))
+#define GPIOA_OUTPUT_EN  (*(volatile unsigned char *)(0xcf000010))
+#define GPIOB_OUTPUT_EN  (*(volatile unsigned char *)(0xcf000014))
+#define GPIOC_OUTPUT_EN  (*(volatile unsigned char *)(0xcf000018))
+#define GPIOD_OUTPUT_EN  (*(volatile unsigned char *)(0xcf00001c))
+#define GPIOA_OUTPUT_VAL (*(volatile unsigned char *)(0xcf000020))
+#define GPIOB_OUTPUT_VAL (*(volatile unsigned char *)(0xcf000024))
+#define GPIOC_OUTPUT_VAL (*(volatile unsigned char *)(0xcf000028))
+#define GPIOD_OUTPUT_VAL (*(volatile unsigned char *)(0xcf00002c))
+#define GPIOA_INPUT_VAL  (*(volatile unsigned char *)(0xcf000030))
+#define GPIOB_INPUT_VAL  (*(volatile unsigned char *)(0xcf000034))
+#define GPIOC_INPUT_VAL  (*(volatile unsigned char *)(0xcf000038))
+#define GPIOD_INPUT_VAL  (*(volatile unsigned char *)(0xcf00003c))
+#define GPIOA_INT_STAT   (*(volatile unsigned char *)(0xcf000040))
+#define GPIOB_INT_STAT   (*(volatile unsigned char *)(0xcf000044))
+#define GPIOC_INT_STAT   (*(volatile unsigned char *)(0xcf000048))
+#define GPIOD_INT_STAT   (*(volatile unsigned char *)(0xcf00004c))
+#define GPIOA_INT_EN     (*(volatile unsigned char *)(0xcf000050))
+#define GPIOB_INT_EN     (*(volatile unsigned char *)(0xcf000054))
+#define GPIOC_INT_EN     (*(volatile unsigned char *)(0xcf000058))
+#define GPIOD_INT_EN     (*(volatile unsigned char *)(0xcf00005c))
+#define GPIOA_INT_LEV    (*(volatile unsigned char *)(0xcf000060))
+#define GPIOB_INT_LEV    (*(volatile unsigned char *)(0xcf000064))
+#define GPIOC_INT_LEV    (*(volatile unsigned char *)(0xcf000068))
+#define GPIOD_INT_LEV    (*(volatile unsigned char *)(0xcf00006c))
+#define GPIOA_INT_CLR    (*(volatile unsigned char *)(0xcf000070))
+#define GPIOB_INT_CLR    (*(volatile unsigned char *)(0xcf000074))
+#define GPIOC_INT_CLR    (*(volatile unsigned char *)(0xcf000078))
+#define GPIOD_INT_CLR    (*(volatile unsigned char *)(0xcf00007c))
 
 #define DEV_RS (*(volatile unsigned long *)( 0xcf005030))
 #define DEV_EN (*(volatile unsigned long *)( 0xcf005000))