Rename some macros to account for the recently added M5 port. No code changes.

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

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 @@
 
 #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
 
-#define CONFIG_KEYPAD IAUDIO_X5_PAD
+#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
 
 #define AB_REPEAT_ENABLE 1
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
@@ -64,8 +64,7 @@
 #define CONFIG_LCD LCD_S1D15E06
 
 /* Define this for LCD backlight available */
-#define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */
-/* #define HAVE_BACKLIGHT_BRIGHTNESS TODO: not yet known */
+#define CONFIG_BACKLIGHT BL_M5 /* PCF50606 I2C */
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
@@ -108,7 +107,7 @@
 
 /* Type of mobile power */
 #define X5_BATT_CONFIG          2
-#define CONFIG_BATTERY          BATT_IAUDIO_X5
+#define CONFIG_BATTERY          BATT_IAUDIO_X5M5
 #define BATTERY_CAPACITY_MIN    950   /* min. capacity selectable */
 #define BATTERY_CAPACITY_MAX    2250  /* max. capacity selectable */
 #define BATTERY_CAPACITY_INC    50    /* capacity increment */
@@ -127,7 +126,7 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
-#define USB_X5STYLE
+#define USB_X5M5_STYLE
 
 /* Define this if you have adjustable CPU frequency */
 #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 @@
 
 #define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
 
-#define CONFIG_KEYPAD IAUDIO_X5_PAD
+#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
 
 #define AB_REPEAT_ENABLE 1
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
@@ -122,7 +122,7 @@
 
 /* Type of mobile power */
 #define X5_BATT_CONFIG          2
-#define CONFIG_BATTERY          BATT_IAUDIO_X5
+#define CONFIG_BATTERY          BATT_IAUDIO_X5M5
 #define BATTERY_CAPACITY_MIN    950   /* min. capacity selectable */
 #define BATTERY_CAPACITY_MAX    2250  /* max. capacity selectable */
 #define BATTERY_CAPACITY_INC    50    /* capacity increment */
@@ -141,7 +141,7 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
-#define USB_X5STYLE
+#define USB_X5M5_STYLE
 
 /* USB On-the-go */
 #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 @@
 #define ONDIO_PAD           3
 #define IRIVER_H100_PAD     4
 #define IRIVER_H300_PAD     5
-#define IAUDIO_X5_PAD       6
+#define IAUDIO_X5M5_PAD     6
 #define IPOD_4G_PAD         7
 #define IPOD_3G_PAD         8
 #define IRIVER_IFP7XX_PAD   9
@@ -69,15 +69,15 @@
 #define X5_REMOTE   3
 
 /* CONFIG_BATTERY */
-#define BATT_LIION2200  2200 /* FM/V2 recorder type */
-#define BATT_4AA_NIMH   1500
-#define BATT_3AAA       1000 /* Ondio */
-#define BATT_IAUDIO_X5   950
-#define BATT_LIPOL1300  1300 /* the type used in iRiver h1x0 models */
-#define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */
-#define BATT_BP009       820 /* iriver H10 5/6Gb - iriver BP009 */
-#define BATT_LIION830    830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
-#define BATT_1AA         333 /* iRiver iFP: Alkaline, NiHM */
+#define BATT_LIION2200   2200 /* FM/V2 recorder type */
+#define BATT_4AA_NIMH    1500
+#define BATT_3AAA        1000 /* Ondio */
+#define BATT_IAUDIO_X5M5  950
+#define BATT_LIPOL1300   1300 /* the type used in iRiver h1x0 models */
+#define BATT_LPCS355385  1550 /* iriver h10 20Gb - SKC LPCS355385 */
+#define BATT_BP009        820 /* iriver H10 5/6Gb - iriver BP009 */
+#define BATT_LIION830     830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
+#define BATT_1AA          333 /* iRiver iFP: Alkaline, NiHM */
 
 /* CONFIG_CHARGING */
 #define CHARGING_SIMPLE  1 /* Simple, hardware controlled charging */
@@ -128,6 +128,7 @@
 #define BL_X5            13 /* iAudio X5 PCF50606 I2C */
 #define BL_H10_5GB       14 /* iriver H10 5/6GB */
 #define BL_TPJ1022       15 /* Tatung Elio TPJ-1022 */
+#define BL_M5            16 /* iAudio M5 PCF50606 I2C */
 
 /* CONFIG_I2C */
 #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] =
     338
 #elif CONFIG_BATTERY == BATT_LIION830   /* Gigabeat F */
     345
-#elif CONFIG_BATTERY == BATT_IAUDIO_X5  /* iAudio X5 */
+#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5  /* iAudio X5 */
     354
 #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/
     376
@@ -213,7 +213,7 @@ static const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
     302
 #elif CONFIG_BATTERY == BATT_LIION830   /* Gigabeat F */
     340
-#elif CONFIG_BATTERY == BATT_IAUDIO_X5  /* iAudio X5 */
+#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5  /* iAudio X5 */
     350
 #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */
     365
@@ -237,7 +237,7 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
 #elif CONFIG_BATTERY == BATT_LIPOL1300
     /* Below 337 the backlight starts flickering during HD access */
      { 337, 365, 370, 374, 378, 382, 387, 393, 400, 408, 416 }
-#elif CONFIG_BATTERY == BATT_IAUDIO_X5
+#elif CONFIG_BATTERY == BATT_IAUDIO_X5M5
     /* iAudio x5 series  - still experimenting with best curve */
 // Lithium ion discharge curve
     { 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)
 #elif defined(USB_ISP1582)
     /* TODO: Implement USB_ISP1582 */
     (void) on;
-#elif defined(USB_X5STYLE)
+#elif defined(USB_X5M5_STYLE)
     /* TODO X5 */
 #elif defined(USB_GIGABEAT_STYLE)
     /* TODO gigabeat */