Diff: targets/cmsis/TARGET_NXP/TARGET_LPC43XX/LPC43xx.h

Revision:

294:78f9587bb26d

Parent:

258:2a0bf79294ef

--- a/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/LPC43xx.h	Thu Aug 21 10:45:06 2014 +0100
+++ b/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/LPC43xx.h	Thu Aug 21 11:00:08 2014 +0100
@@ -1204,10 +1204,10 @@
 /*
  * Audio or USB PLL selection
  */
-typedef enum CHIP_CGU_USB_AUDIO_PLL {
+typedef enum CGU_USB_AUDIO_PLL {
     CGU_USB_PLL,
     CGU_AUDIO_PLL
-} CHIP_CGU_USB_AUDIO_PLL_T;
+} CGU_USB_AUDIO_PLL_T;
 
 /*
  * PLL register block
@@ -1264,7 +1264,7 @@
  */
 #define LPC_RGU_BASE              0x40053000
 
-typedef enum CHIP_RGU_RST {
+typedef enum RGU_RST {
     RGU_CORE_RST,
     RGU_PERIPH_RST,
     RGU_MASTER_RST,
@@ -1313,7 +1313,7 @@
     RGU_SPI_RST,
 #endif
     RGU_LAST_RST = 63,
-} CHIP_RGU_RST_T;
+} RGU_RST_T;
 
 typedef struct {                        /* RGU Structure          */
     __I  uint32_t  RESERVED0[64];
@@ -1498,7 +1498,7 @@
 #define SCU_PINIO_PULLNONE         (SCU_MODE_INACT | SCU_MODE_INBUFF_EN)
 
 /* Calculate SCU offset and register address from group and pin number */
-#define SCU_OFF(group, num)        ((0x80 * group) + (0x04 * num))
+#define SCU_OFF(group, num)        ((group << 7) + (num << 2))
 #define SCU_REG(group, num)        ((__IO uint32_t *)(LPC_SCU_BASE + SCU_OFF(group, num)))
 
 /**