diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-iaudiom5.h | 9 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 6 | ||||
-rw-r--r-- | firmware/export/config.h | 21 | ||||
-rw-r--r-- | firmware/powermgmt.c | 6 | ||||
-rw-r--r-- | firmware/usb.c | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index 66c54bfdd9..d714736035 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED | 48 | #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED |
49 | 49 | ||
50 | #define CONFIG_KEYPAD IAUDIO_X5_PAD | 50 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD |
51 | 51 | ||
52 | #define AB_REPEAT_ENABLE 1 | 52 | #define AB_REPEAT_ENABLE 1 |
53 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 53 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
@@ -64,8 +64,7 @@ | |||
64 | #define CONFIG_LCD LCD_S1D15E06 | 64 | #define CONFIG_LCD LCD_S1D15E06 |
65 | 65 | ||
66 | /* Define this for LCD backlight available */ | 66 | /* Define this for LCD backlight available */ |
67 | #define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */ | 67 | #define CONFIG_BACKLIGHT BL_M5 /* PCF50606 I2C */ |
68 | /* #define HAVE_BACKLIGHT_BRIGHTNESS TODO: not yet known */ | ||
69 | 68 | ||
70 | /* Define this if you have a software controlled poweroff */ | 69 | /* Define this if you have a software controlled poweroff */ |
71 | #define HAVE_SW_POWEROFF | 70 | #define HAVE_SW_POWEROFF |
@@ -108,7 +107,7 @@ | |||
108 | 107 | ||
109 | /* Type of mobile power */ | 108 | /* Type of mobile power */ |
110 | #define X5_BATT_CONFIG 2 | 109 | #define X5_BATT_CONFIG 2 |
111 | #define CONFIG_BATTERY BATT_IAUDIO_X5 | 110 | #define CONFIG_BATTERY BATT_IAUDIO_X5M5 |
112 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ | 111 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ |
113 | #define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ | 112 | #define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ |
114 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 113 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
@@ -127,7 +126,7 @@ | |||
127 | /* Offset ( in the firmware file's header ) to the real data */ | 126 | /* Offset ( in the firmware file's header ) to the real data */ |
128 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 127 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
129 | 128 | ||
130 | #define USB_X5STYLE | 129 | #define USB_X5M5_STYLE |
131 | 130 | ||
132 | /* Define this if you have adjustable CPU frequency */ | 131 | /* Define this if you have adjustable CPU frequency */ |
133 | #define HAVE_ADJUSTABLE_CPU_FREQ | 132 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index bf33e1c093..90959db345 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED | 50 | #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED |
51 | 51 | ||
52 | #define CONFIG_KEYPAD IAUDIO_X5_PAD | 52 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD |
53 | 53 | ||
54 | #define AB_REPEAT_ENABLE 1 | 54 | #define AB_REPEAT_ENABLE 1 |
55 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 55 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
@@ -122,7 +122,7 @@ | |||
122 | 122 | ||
123 | /* Type of mobile power */ | 123 | /* Type of mobile power */ |
124 | #define X5_BATT_CONFIG 2 | 124 | #define X5_BATT_CONFIG 2 |
125 | #define CONFIG_BATTERY BATT_IAUDIO_X5 | 125 | #define CONFIG_BATTERY BATT_IAUDIO_X5M5 |
126 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ | 126 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ |
127 | #define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ | 127 | #define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ |
128 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 128 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
@@ -141,7 +141,7 @@ | |||
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_X5STYLE | 144 | #define USB_X5M5_STYLE |
145 | 145 | ||
146 | /* USB On-the-go */ | 146 | /* USB On-the-go */ |
147 | #define CONFIG_USBOTG USBOTG_M5636 | 147 | #define CONFIG_USBOTG USBOTG_M5636 |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 13fb77661d..ae1ce5b283 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -53,7 +53,7 @@ | |||
53 | #define ONDIO_PAD 3 | 53 | #define ONDIO_PAD 3 |
54 | #define IRIVER_H100_PAD 4 | 54 | #define IRIVER_H100_PAD 4 |
55 | #define IRIVER_H300_PAD 5 | 55 | #define IRIVER_H300_PAD 5 |
56 | #define IAUDIO_X5_PAD 6 | 56 | #define IAUDIO_X5M5_PAD 6 |
57 | #define IPOD_4G_PAD 7 | 57 | #define IPOD_4G_PAD 7 |
58 | #define IPOD_3G_PAD 8 | 58 | #define IPOD_3G_PAD 8 |
59 | #define IRIVER_IFP7XX_PAD 9 | 59 | #define IRIVER_IFP7XX_PAD 9 |
@@ -69,15 +69,15 @@ | |||
69 | #define X5_REMOTE 3 | 69 | #define X5_REMOTE 3 |
70 | 70 | ||
71 | /* CONFIG_BATTERY */ | 71 | /* CONFIG_BATTERY */ |
72 | #define BATT_LIION2200 2200 /* FM/V2 recorder type */ | 72 | #define BATT_LIION2200 2200 /* FM/V2 recorder type */ |
73 | #define BATT_4AA_NIMH 1500 | 73 | #define BATT_4AA_NIMH 1500 |
74 | #define BATT_3AAA 1000 /* Ondio */ | 74 | #define BATT_3AAA 1000 /* Ondio */ |
75 | #define BATT_IAUDIO_X5 950 | 75 | #define BATT_IAUDIO_X5M5 950 |
76 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ | 76 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ |
77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ | 77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ |
78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ | 78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ |
79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ | 79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ |
80 | #define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */ | 80 | #define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */ |
81 | 81 | ||
82 | /* CONFIG_CHARGING */ | 82 | /* CONFIG_CHARGING */ |
83 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ | 83 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ |
@@ -128,6 +128,7 @@ | |||
128 | #define BL_X5 13 /* iAudio X5 PCF50606 I2C */ | 128 | #define BL_X5 13 /* iAudio X5 PCF50606 I2C */ |
129 | #define BL_H10_5GB 14 /* iriver H10 5/6GB */ | 129 | #define BL_H10_5GB 14 /* iriver H10 5/6GB */ |
130 | #define BL_TPJ1022 15 /* Tatung Elio TPJ-1022 */ | 130 | #define BL_TPJ1022 15 /* Tatung Elio TPJ-1022 */ |
131 | #define BL_M5 16 /* iAudio M5 PCF50606 I2C */ | ||
131 | 132 | ||
132 | /* CONFIG_I2C */ | 133 | /* CONFIG_I2C */ |
133 | #define I2C_PLAYREC 1 /* Archos Player/Recorder style */ | 134 | #define I2C_PLAYREC 1 /* Archos Player/Recorder style */ |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index bbb98144fb..eced1a21a6 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -192,7 +192,7 @@ static const unsigned int battery_level_dangerous[BATTERY_TYPES_COUNT] = | |||
192 | 338 | 192 | 338 |
193 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | 193 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ |
194 | 345 | 194 | 345 |
195 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ | 195 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ |
196 | 354 | 196 | 354 |
197 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/ | 197 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/ |
198 | 376 | 198 | 376 |
@@ -213,7 +213,7 @@ static const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | |||
213 | 302 | 213 | 302 |
214 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | 214 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ |
215 | 340 | 215 | 340 |
216 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ | 216 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ |
217 | 350 | 217 | 350 |
218 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */ | 218 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */ |
219 | 365 | 219 | 365 |
@@ -237,7 +237,7 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | |||
237 | #elif CONFIG_BATTERY == BATT_LIPOL1300 | 237 | #elif CONFIG_BATTERY == BATT_LIPOL1300 |
238 | /* Below 337 the backlight starts flickering during HD access */ | 238 | /* Below 337 the backlight starts flickering during HD access */ |
239 | { 337, 365, 370, 374, 378, 382, 387, 393, 400, 408, 416 } | 239 | { 337, 365, 370, 374, 378, 382, 387, 393, 400, 408, 416 } |
240 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 | 240 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 |
241 | /* iAudio x5 series - still experimenting with best curve */ | 241 | /* iAudio x5 series - still experimenting with best curve */ |
242 | // Lithium ion discharge curve | 242 | // Lithium ion discharge curve |
243 | { 355, 356, 357, 359, 362, 365, 369, 374, 380, 387, 395 } | 243 | { 355, 356, 357, 359, 362, 365, 369, 374, 380, 387, 395 } |
diff --git a/firmware/usb.c b/firmware/usb.c index cf4641950e..264c53284d 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -141,7 +141,7 @@ void usb_enable(bool on) | |||
141 | #elif defined(USB_ISP1582) | 141 | #elif defined(USB_ISP1582) |
142 | /* TODO: Implement USB_ISP1582 */ | 142 | /* TODO: Implement USB_ISP1582 */ |
143 | (void) on; | 143 | (void) on; |
144 | #elif defined(USB_X5STYLE) | 144 | #elif defined(USB_X5M5_STYLE) |
145 | /* TODO X5 */ | 145 | /* TODO X5 */ |
146 | #elif defined(USB_GIGABEAT_STYLE) | 146 | #elif defined(USB_GIGABEAT_STYLE) |
147 | /* TODO gigabeat */ | 147 | /* TODO gigabeat */ |