diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-04 00:01:15 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-04 00:01:15 +0000 |
commit | 760fea9ac7b52aa83d88371fac7bf0027cf7fd43 (patch) | |
tree | 9d5baa901da2c01b231252ef646457eec459a6f1 | |
parent | 44a5c827b7f6576b180043f8edd1837c611033e1 (diff) | |
download | rockbox-760fea9ac7b52aa83d88371fac7bf0027cf7fd43.tar.gz rockbox-760fea9ac7b52aa83d88371fac7bf0027cf7fd43.zip |
iAudio X5: various fixes to make the bootloader compile
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8560 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/boot.lds | 6 | ||||
-rw-r--r-- | firmware/crt0.S | 2 | ||||
-rw-r--r-- | firmware/drivers/serial.c | 2 | ||||
-rw-r--r-- | firmware/export/button.h | 3 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 14 | ||||
-rw-r--r-- | firmware/pcm_playback.c | 3 | ||||
-rw-r--r-- | firmware/powermgmt.c | 4 | ||||
-rw-r--r-- | firmware/sound.c | 2 | ||||
-rw-r--r-- | firmware/usb.c | 2 |
9 files changed, 31 insertions, 7 deletions
diff --git a/firmware/boot.lds b/firmware/boot.lds index 9f7e57cac4..1c300e5468 100644 --- a/firmware/boot.lds +++ b/firmware/boot.lds | |||
@@ -26,6 +26,12 @@ INPUT(crt0.o) | |||
26 | #define IRAMSIZE 0x18000 | 26 | #define IRAMSIZE 0x18000 |
27 | #define FLASHORIG 0x003f0000 | 27 | #define FLASHORIG 0x003f0000 |
28 | #define FLASHSIZE 4M | 28 | #define FLASHSIZE 4M |
29 | #elif defined(IAUDIO_X5) | ||
30 | #define DRAMORIG 0x31000000 | ||
31 | #define IRAMORIG 0x10000000 | ||
32 | #define IRAMSIZE 0x20000 | ||
33 | #define FLASHORIG 0x00100000 | ||
34 | #define FLASHSIZE 4M | ||
29 | #elif CONFIG_CPU == PP5020 | 35 | #elif CONFIG_CPU == PP5020 |
30 | #define DRAMORIG 0x10000000 | 36 | #define DRAMORIG 0x10000000 |
31 | #define IRAMORIG 0x40000000 | 37 | #define IRAMORIG 0x40000000 |
diff --git a/firmware/crt0.S b/firmware/crt0.S index 985fba9246..b0e85875bb 100644 --- a/firmware/crt0.S +++ b/firmware/crt0.S | |||
@@ -452,7 +452,7 @@ irq_handler: | |||
452 | pop r1, r0 | 452 | pop r1, r0 |
453 | ret_irq | 453 | ret_irq |
454 | 454 | ||
455 | #elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | 455 | #elif defined(CPU_COLDFIRE) |
456 | move.w #0x2700,%sr | 456 | move.w #0x2700,%sr |
457 | 457 | ||
458 | move.l #vectors,%d0 | 458 | move.l #vectors,%d0 |
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index 27061c299b..b491b13abb 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "serial.h" | 28 | #include "serial.h" |
29 | 29 | ||
30 | #if (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) && (CONFIG_CPU != PP5020) && (CONFIG_CPU != PNX0101) | 30 | #if (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) && (CONFIG_CPU != PP5020) && (CONFIG_CPU != PNX0101) && (CONFIG_CPU != MCF5250) |
31 | /* FIX: this doesn't work on iRiver or Gmini or iPod yet */ | 31 | /* FIX: this doesn't work on iRiver or Gmini or iPod yet */ |
32 | /* iFP7xx has no remote */ | 32 | /* iFP7xx has no remote */ |
33 | 33 | ||
diff --git a/firmware/export/button.h b/firmware/export/button.h index c251f11890..158cf41a84 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -182,6 +182,9 @@ bool button_hold(void); | |||
182 | #define BUTTON_UP 0x0008 | 182 | #define BUTTON_UP 0x0008 |
183 | #define BUTTON_DOWN 0x0010 | 183 | #define BUTTON_DOWN 0x0010 |
184 | #define BUTTON_MENU 0x0020 | 184 | #define BUTTON_MENU 0x0020 |
185 | #define BUTTON_OFF 0x0040 /* DOES NOT EXIST!!! */ | ||
186 | |||
187 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) | ||
185 | 188 | ||
186 | #endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */ | 189 | #endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */ |
187 | 190 | ||
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index fd9a8874a7..246b00c963 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -2,6 +2,9 @@ | |||
2 | * This config file is for iAudio X5 | 2 | * This config file is for iAudio X5 |
3 | */ | 3 | */ |
4 | 4 | ||
5 | /* For Rolo and boot loader */ | ||
6 | #define MODEL_NUMBER 1 | ||
7 | |||
5 | /* define this if you have recording possibility */ | 8 | /* define this if you have recording possibility */ |
6 | /*#define HAVE_RECORDING 1*/ | 9 | /*#define HAVE_RECORDING 1*/ |
7 | 10 | ||
@@ -59,12 +62,17 @@ | |||
59 | /* define this if the hardware can be powered off while charging */ | 62 | /* define this if the hardware can be powered off while charging */ |
60 | #define HAVE_POWEROFF_WHILE_CHARGING | 63 | #define HAVE_POWEROFF_WHILE_CHARGING |
61 | 64 | ||
62 | /* The start address index for ROM builds */ | 65 | /* The size of the flash ROM */ |
63 | #define ROM_START 0x11010 | 66 | #define FLASH_SIZE 0x400000 |
64 | 67 | ||
65 | /* Define this to the CPU frequency */ | 68 | /* Define this to the CPU frequency */ |
66 | #define CPU_FREQ 11289600 | 69 | #define CPU_FREQ 11289600 |
67 | 70 | ||
71 | /* Type of mobile power */ | ||
72 | #define CONFIG_BATTERY BATT_LIPOL1300 | ||
73 | |||
74 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | ||
75 | |||
68 | /* Define this if you have ATA power-off control */ | 76 | /* Define this if you have ATA power-off control */ |
69 | #define HAVE_ATA_POWER_OFF | 77 | #define HAVE_ATA_POWER_OFF |
70 | 78 | ||
@@ -74,6 +82,8 @@ | |||
74 | /* Offset ( in the firmware file's header ) to the real data */ | 82 | /* Offset ( in the firmware file's header ) to the real data */ |
75 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 83 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
76 | 84 | ||
85 | #define USB_X5STYLE | ||
86 | |||
77 | /* Define this if you have adjustable CPU frequency */ | 87 | /* Define this if you have adjustable CPU frequency */ |
78 | #define HAVE_ADJUSTABLE_CPU_FREQ | 88 | #define HAVE_ADJUSTABLE_CPU_FREQ |
79 | 89 | ||
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index a9e1e1ff99..980f077b5e 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
@@ -530,6 +530,9 @@ void pcm_calculate_peaks(int *left, int *right) | |||
530 | #elif defined(HAVE_WM8975) | 530 | #elif defined(HAVE_WM8975) |
531 | long samples = size / 4; | 531 | long samples = size / 4; |
532 | short *addr = p; | 532 | short *addr = p; |
533 | #elif defined(HAVE_TLV320) | ||
534 | long samples = 4; /* TODO X5 */ | ||
535 | short *addr = NULL; | ||
533 | #endif | 536 | #endif |
534 | 537 | ||
535 | if (samples > PEAK_SAMPLES) | 538 | if (samples > PEAK_SAMPLES) |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 2a987e3cf0..b61aed7366 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #endif | 43 | #endif |
44 | #ifdef HAVE_UDA1380 | 44 | #ifdef HAVE_UDA1380 |
45 | #include "uda1380.h" | 45 | #include "uda1380.h" |
46 | #elif HAVE_TLV320 | 46 | #elif defined(HAVE_TLV320) |
47 | #include "tlv320.h" | 47 | #include "tlv320.h" |
48 | #endif | 48 | #endif |
49 | #ifdef HAVE_LCD_BITMAP | 49 | #ifdef HAVE_LCD_BITMAP |
@@ -939,7 +939,7 @@ void shutdown_hw(void) | |||
939 | mp3_shutdown(); | 939 | mp3_shutdown(); |
940 | #ifdef HAVE_UDA1380 | 940 | #ifdef HAVE_UDA1380 |
941 | uda1380_close(); | 941 | uda1380_close(); |
942 | #elif HAVE_TLV320 | 942 | #elif defined(HAVE_TLV320) |
943 | tlv320_close(); | 943 | tlv320_close(); |
944 | #endif | 944 | #endif |
945 | backlight_off(); | 945 | backlight_off(); |
diff --git a/firmware/sound.c b/firmware/sound.c index 7c961afc97..cee8c06294 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "uda1380.h" | 28 | #include "uda1380.h" |
29 | #elif defined(HAVE_WM8975) | 29 | #elif defined(HAVE_WM8975) |
30 | #include "wm8975.h" | 30 | #include "wm8975.h" |
31 | #elif HAVE_TLV320 | 31 | #elif defined(HAVE_TLV320) |
32 | #include "tlv320.h" | 32 | #include "tlv320.h" |
33 | #endif | 33 | #endif |
34 | #include "dac.h" | 34 | #include "dac.h" |
diff --git a/firmware/usb.c b/firmware/usb.c index 94175a4b68..80a8c98d8c 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -183,6 +183,8 @@ void usb_enable(bool on) | |||
183 | #elif defined(USB_ISP1582) | 183 | #elif defined(USB_ISP1582) |
184 | /* TODO: Implement USB_ISP1582 */ | 184 | /* TODO: Implement USB_ISP1582 */ |
185 | (void) on; | 185 | (void) on; |
186 | #elif defined(USB_X5STYLE) | ||
187 | /* TODO X5 */ | ||
186 | #else | 188 | #else |
187 | #ifdef HAVE_LCD_BITMAP | 189 | #ifdef HAVE_LCD_BITMAP |
188 | if(read_hw_mask() & USB_ACTIVE_HIGH) | 190 | if(read_hw_mask() & USB_ACTIVE_HIGH) |