From 2d722a17ec1d7b99c4e23d97784f77abbfb128e3 Mon Sep 17 00:00:00 2001 From: Robert Kukla Date: Mon, 7 Dec 2009 16:12:49 +0000 Subject: make tpj1022 bootloader compile again git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23892 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/blackjack.c | 2 +- apps/plugins/invadrox.c | 2 +- bootloader/SOURCES | 2 +- firmware/SOURCES | 4 ++-- firmware/export/config.h | 4 ++-- firmware/export/config/tatungtpj1022.h | 2 +- firmware/kernel.c | 2 +- firmware/target/arm/system-pp502x.c | 2 +- firmware/target/arm/usb-fw-pp502x.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 9e15d82822..93bd2396cb 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -279,7 +279,7 @@ enum { #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT -#elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD +#elif CONFIG_KEYPAD == TATUNG_TPJ1022_PAD #define BJACK_SELECT_NAME "MAIN" #define BJACK_STAY_NAME "MENU" #define BJACK_RESUME_NAME ">>|" diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index a1182c2c75..1bd80f0c36 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -139,7 +139,7 @@ PLUGIN_HEADER #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT -#elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD +#elif CONFIG_KEYPAD == TATUNG_TPJ1022_PAD /* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */ #define QUIT BUTTON_AB diff --git a/bootloader/SOURCES b/bootloader/SOURCES index de902e2a4b..f3f751d374 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES @@ -25,7 +25,7 @@ main-c250wipe.c show_logo.c main-pp.c #endif -#elif defined(ELIO_TPJ1022) +#elif defined(TATUNG_TPJ1022) tpj1022.c #elif defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(IAUDIO_M3) iaudio_coldfire.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 1a078ada29..36f4c2762c 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -946,7 +946,7 @@ target/arm/usb-fw-pp502x.c #endif /* SIMULATOR */ #endif /* MROBE_100 */ -#ifdef ELIO_TPJ1022 +#ifdef TATUNG_TPJ1022 #ifndef SIMULATOR target/arm/ata-as-arm.S target/arm/ata-pp5020.c @@ -960,7 +960,7 @@ target/arm/tatung/tpj1022/power-tpj1022.c target/arm/tatung/tpj1022/powermgmt-tpj1022.c target/arm/usb-fw-pp502x.c #endif /* SIMULATOR */ -#endif /* ELIO_TPJ1022 */ +#endif /* TATUNG_TPJ1022 */ #ifdef IPOD_4G #ifndef SIMULATOR diff --git a/firmware/export/config.h b/firmware/export/config.h index 438d98116f..303e5645df 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -87,7 +87,7 @@ #define IRIVER_H10_PAD 12 #define SANSA_E200_PAD 13 #define SANSA_C200_PAD 14 -#define ELIO_TPJ1022_PAD 15 +#define TATUNG_TPJ1022_PAD 15 #define ARCHOS_AV300_PAD 16 #define MROBE100_PAD 17 #define MROBE500_PAD 18 @@ -337,7 +337,7 @@ Lyre prototype 1 */ #include "config/sansac200.h" #elif defined(SANSA_M200) #include "config/sansam200.h" -#elif defined(ELIO_TPJ1022) +#elif defined(TATUNG_TPJ1022) #include "config/tatungtpj1022.h" #elif defined(MROBE_100) #include "config/mrobe100.h" diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h index 89e3d6dff1..079be73c86 100644 --- a/firmware/export/config/tatungtpj1022.h +++ b/firmware/export/config/tatungtpj1022.h @@ -43,7 +43,7 @@ /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ -#define CONFIG_KEYPAD ELIO_TPJ1022_PAD +#define CONFIG_KEYPAD TATUNG_TPJ1022_PAD /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/kernel.c b/firmware/kernel.c index d076d6defc..fbc5a2905c 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c @@ -272,7 +272,7 @@ void sleep(int ticks) void yield(void) { -#if ((defined(ELIO_TPJ1022)) && defined(BOOTLOADER)) +#if ((defined(TATUNG_TPJ1022)) && defined(BOOTLOADER)) /* Some targets don't like yielding in the bootloader */ #else switch_thread(); diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c index 6ce45a12f3..61d4d7cb59 100644 --- a/firmware/target/arm/system-pp502x.c +++ b/firmware/target/arm/system-pp502x.c @@ -459,7 +459,7 @@ void system_init(void) /* to be done */ #elif defined (MROBE_100) /* to be done */ -#elif defined (ELIO_TPJ1022) +#elif defined (TATUNG_TPJ1022) /* to be done */ #endif diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 0dbb965eaa..e234e61031 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c @@ -82,7 +82,7 @@ #define USB_GPIO_MASK 0x10 #define USB_GPIO_VAL 0x10 -#elif defined(ELIO_TPJ1022) +#elif defined(TATUNG_TPJ1022) /* GPIO ? bit ? is usb detect (dummy value)*/ #define USB_GPIO GPIOD #define USB_GPIO_MASK 0x10 -- cgit v1.2.3