diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-11 21:26:58 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-11 21:26:58 +0000 |
commit | d6e822cab9b4f1294a8789632c737d0d8f71ef58 (patch) | |
tree | dc6b6888ac54ff0a3f1974b87b18dfaa81e65ea4 /firmware | |
parent | 81cf65e496b94e12d962bbaf59b166244737bb3a (diff) | |
download | rockbox-d6e822cab9b4f1294a8789632c737d0d8f71ef58.tar.gz rockbox-d6e822cab9b4f1294a8789632c737d0d8f71ef58.zip |
Get rid of some old archos debug cruft (USB polarity, PR polarity and ATA address are all derived from the hw mask, and master/slave isn't displayed on other targets either). * Get rid of all the USB*STYLE macros (except USB_IPODSTYLE).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13112 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-fmrecorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-gigabeat.h | 2 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 2 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 2 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 2 | ||||
-rw-r--r-- | firmware/export/config-iaudiom5.h | 4 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 6 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 6 | ||||
-rw-r--r-- | firmware/export/config-player.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 3 | ||||
-rw-r--r-- | firmware/target/sh/archos/ata-archos.c | 7 | ||||
-rw-r--r-- | firmware/target/sh/archos/ata-target.h | 1 |
14 files changed, 1 insertions, 45 deletions
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index d40fd01198..e753808897 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -99,9 +99,6 @@ | |||
99 | /* FM recorders can wake up from RTC alarm */ | 99 | /* FM recorders can wake up from RTC alarm */ |
100 | #define HAVE_RTC_ALARM | 100 | #define HAVE_RTC_ALARM |
101 | 101 | ||
102 | /* How to detect USB */ | ||
103 | #define USB_FMRECORDERSTYLE 1 | ||
104 | |||
105 | /* Hardware controlled charging with monitoring */ | 102 | /* Hardware controlled charging with monitoring */ |
106 | #define CONFIG_CHARGING CHARGING_MONITOR | 103 | #define CONFIG_CHARGING CHARGING_MONITOR |
107 | 104 | ||
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index 588c92df6d..9b56a1a616 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h | |||
@@ -124,8 +124,6 @@ | |||
124 | /* Offset ( in the firmware file's header ) to the real data */ | 124 | /* Offset ( in the firmware file's header ) to the real data */ |
125 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 125 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
126 | 126 | ||
127 | #define USB_GIGABEAT_STYLE | ||
128 | |||
129 | #define HAVE_HEADPHONE_DETECTION | 127 | #define HAVE_HEADPHONE_DETECTION |
130 | 128 | ||
131 | /* Define this if you have adjustable CPU frequency */ | 129 | /* Define this if you have adjustable CPU frequency */ |
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 84ca26ba53..dbb499f3af 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -135,8 +135,6 @@ | |||
135 | /* Offset ( in the firmware file's header ) to the real data */ | 135 | /* Offset ( in the firmware file's header ) to the real data */ |
136 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 136 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
137 | 137 | ||
138 | #define USB_IRIVERSTYLE | ||
139 | |||
140 | #define HAVE_ATA_LED_CTRL | 138 | #define HAVE_ATA_LED_CTRL |
141 | 139 | ||
142 | /* Define this if you have adjustable CPU frequency */ | 140 | /* Define this if you have adjustable CPU frequency */ |
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index ebde63f260..f957f450d0 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -128,8 +128,6 @@ | |||
128 | /* Offset ( in the firmware file's header ) to the real data */ | 128 | /* Offset ( in the firmware file's header ) to the real data */ |
129 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 129 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
130 | 130 | ||
131 | #define USB_IRIVERSTYLE | ||
132 | |||
133 | #define HAVE_ATA_LED_CTRL | 131 | #define HAVE_ATA_LED_CTRL |
134 | 132 | ||
135 | /* Define this if you have adjustable CPU frequency */ | 133 | /* Define this if you have adjustable CPU frequency */ |
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 173b99e432..ad80191885 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -127,8 +127,6 @@ | |||
127 | /* Offset ( in the firmware file's header ) to the real data */ | 127 | /* Offset ( in the firmware file's header ) to the real data */ |
128 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 128 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
129 | 129 | ||
130 | #define USB_IRIVERSTYLE | ||
131 | |||
132 | /* USB On-the-go */ | 130 | /* USB On-the-go */ |
133 | #define CONFIG_USBOTG USBOTG_ISP1362 | 131 | #define CONFIG_USBOTG USBOTG_ISP1362 |
134 | 132 | ||
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index d6e4195216..bce3c47e5c 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h | |||
@@ -126,14 +126,12 @@ | |||
126 | /* Offset ( in the firmware file's header ) to the real data */ | 126 | /* Offset ( in the firmware file's header ) to the real data */ |
127 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 127 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
128 | 128 | ||
129 | #define USB_X5M5_STYLE | ||
130 | |||
131 | /* Define this if you have adjustable CPU frequency */ | 129 | /* Define this if you have adjustable CPU frequency */ |
132 | #define HAVE_ADJUSTABLE_CPU_FREQ | 130 | #define HAVE_ADJUSTABLE_CPU_FREQ |
133 | 131 | ||
134 | #define BOOTFILE_EXT "iaudio" | 132 | #define BOOTFILE_EXT "iaudio" |
135 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 133 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
136 | #define BOOTDIR "/.rockbox" | 134 | #define BOOTDIR "/.rockbox" |
137 | 135 | ||
138 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 136 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
139 | #define FLASH_ENTRYPOINT 0x00001000 | 137 | #define FLASH_ENTRYPOINT 0x00001000 |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index adcbfee551..57f8a68134 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -141,8 +141,6 @@ | |||
141 | /* Offset ( in the firmware file's header ) to the real data */ | 141 | /* Offset ( in the firmware file's header ) to the real data */ |
142 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 142 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
143 | 143 | ||
144 | #define USB_X5M5_STYLE | ||
145 | |||
146 | /* USB On-the-go */ | 144 | /* USB On-the-go */ |
147 | #define CONFIG_USBOTG USBOTG_M5636 | 145 | #define CONFIG_USBOTG USBOTG_M5636 |
148 | 146 | ||
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index fbc0c0e098..0e691b70e3 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -78,12 +78,6 @@ | |||
78 | /* Define this if the tuner is switched on by software */ | 78 | /* Define this if the tuner is switched on by software */ |
79 | #define HAVE_TUNER_PWR_CTRL | 79 | #define HAVE_TUNER_PWR_CTRL |
80 | 80 | ||
81 | /* How to detect USB */ | ||
82 | #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */ | ||
83 | |||
84 | /* How to enable USB */ | ||
85 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ | ||
86 | |||
87 | /* The start address index for ROM builds */ | 81 | /* The start address index for ROM builds */ |
88 | /* #define ROM_START 0x16010 for behind original Archos */ | 82 | /* #define ROM_START 0x16010 for behind original Archos */ |
89 | #define ROM_START 0x7010 /* for behind BootBox */ | 83 | #define ROM_START 0x7010 /* for behind BootBox */ |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index cefbbc3666..da723413ec 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -65,12 +65,6 @@ | |||
65 | /* Offset ( in the firmware file's header ) to the real data */ | 65 | /* Offset ( in the firmware file's header ) to the real data */ |
66 | #define FIRMWARE_OFFSET_FILE_DATA 24 | 66 | #define FIRMWARE_OFFSET_FILE_DATA 24 |
67 | 67 | ||
68 | /* How to detect USB */ | ||
69 | #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */ | ||
70 | |||
71 | /* How to enable USB */ | ||
72 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ | ||
73 | |||
74 | /* The start address index for ROM builds */ | 68 | /* The start address index for ROM builds */ |
75 | /* #define ROM_START 0x12010 for behind original Archos */ | 69 | /* #define ROM_START 0x12010 for behind original Archos */ |
76 | #define ROM_START 0x7010 /* for behind BootBox */ | 70 | #define ROM_START 0x7010 /* for behind BootBox */ |
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index c461402eb1..580831c861 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -74,9 +74,6 @@ | |||
74 | /* Offset ( in the firmware file's header ) to the real data */ | 74 | /* Offset ( in the firmware file's header ) to the real data */ |
75 | #define FIRMWARE_OFFSET_FILE_DATA 6 | 75 | #define FIRMWARE_OFFSET_FILE_DATA 6 |
76 | 76 | ||
77 | /* How to detect USB */ | ||
78 | #define USB_PLAYERSTYLE 1 | ||
79 | |||
80 | /* Hardware controlled charging */ | 77 | /* Hardware controlled charging */ |
81 | #define CONFIG_CHARGING CHARGING_SIMPLE | 78 | #define CONFIG_CHARGING CHARGING_SIMPLE |
82 | 79 | ||
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 3c53055886..d8bd0bed2f 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -86,9 +86,6 @@ | |||
86 | /* Offset ( in the firmware file's header ) to the real data */ | 86 | /* Offset ( in the firmware file's header ) to the real data */ |
87 | #define FIRMWARE_OFFSET_FILE_DATA 6 | 87 | #define FIRMWARE_OFFSET_FILE_DATA 6 |
88 | 88 | ||
89 | /* How to detect USB */ | ||
90 | #define USB_RECORDERSTYLE 1 | ||
91 | |||
92 | /* Software controlled charging */ | 89 | /* Software controlled charging */ |
93 | #define CONFIG_CHARGING CHARGING_CONTROL | 90 | #define CONFIG_CHARGING CHARGING_CONTROL |
94 | 91 | ||
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 1d64f586ac..0e6e00c167 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -99,9 +99,6 @@ | |||
99 | /* Define this if you have an FM Radio */ | 99 | /* Define this if you have an FM Radio */ |
100 | #define CONFIG_TUNER S1A0903X01 | 100 | #define CONFIG_TUNER S1A0903X01 |
101 | 101 | ||
102 | /* How to detect USB */ | ||
103 | #define USB_FMRECORDERSTYLE 1 | ||
104 | |||
105 | /* Hardware controlled charging with monitoring */ | 102 | /* Hardware controlled charging with monitoring */ |
106 | #define CONFIG_CHARGING CHARGING_MONITOR | 103 | #define CONFIG_CHARGING CHARGING_MONITOR |
107 | 104 | ||
diff --git a/firmware/target/sh/archos/ata-archos.c b/firmware/target/sh/archos/ata-archos.c index c685700fa3..5ad30d6891 100644 --- a/firmware/target/sh/archos/ata-archos.c +++ b/firmware/target/sh/archos/ata-archos.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #define ATA_CONTROL2 ((volatile unsigned char*)0x06200306) | 29 | #define ATA_CONTROL2 ((volatile unsigned char*)0x06200306) |
30 | 30 | ||
31 | volatile unsigned char* ata_control; | 31 | volatile unsigned char* ata_control; |
32 | int ata_io_address; /* 0x300 or 0x200 */ | ||
33 | 32 | ||
34 | void ata_reset(void) | 33 | void ata_reset(void) |
35 | { | 34 | { |
@@ -59,15 +58,9 @@ void ata_device_init(void) | |||
59 | PACR2 &= 0xBFFF; /* GPIO function for PA7 (IDE enable) */ | 58 | PACR2 &= 0xBFFF; /* GPIO function for PA7 (IDE enable) */ |
60 | 59 | ||
61 | if (read_hw_mask() & ATA_ADDRESS_200) | 60 | if (read_hw_mask() & ATA_ADDRESS_200) |
62 | { | ||
63 | ata_io_address = 0x200; /* For debug purposes only */ | ||
64 | ata_control = ATA_CONTROL1; | 61 | ata_control = ATA_CONTROL1; |
65 | } | ||
66 | else | 62 | else |
67 | { | ||
68 | ata_io_address = 0x300; /* For debug purposes only */ | ||
69 | ata_control = ATA_CONTROL2; | 63 | ata_control = ATA_CONTROL2; |
70 | } | ||
71 | } | 64 | } |
72 | 65 | ||
73 | bool ata_is_coldstart(void) | 66 | bool ata_is_coldstart(void) |
diff --git a/firmware/target/sh/archos/ata-target.h b/firmware/target/sh/archos/ata-target.h index 77f1f9d232..91585626c6 100644 --- a/firmware/target/sh/archos/ata-target.h +++ b/firmware/target/sh/archos/ata-target.h | |||
@@ -64,7 +64,6 @@ | |||
64 | #define SET_16BITREG(reg,val) reg = (val) | 64 | #define SET_16BITREG(reg,val) reg = (val) |
65 | 65 | ||
66 | extern volatile unsigned char* ata_control; | 66 | extern volatile unsigned char* ata_control; |
67 | extern int ata_io_address; | ||
68 | 67 | ||
69 | void ata_reset(void); | 68 | void ata_reset(void); |
70 | void ata_enable(bool on); | 69 | void ata_enable(bool on); |