Skip to content

Commit 5f1f6c7

Browse files
committed
[LPC1549] put PINASSIGN0-15 to PINASSIGN[] on LPC15xx.h
and fixed typo on system_LPC15xx.c
1 parent 741bfc2 commit 5f1f6c7

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/LPC15xx.h

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* from CMSIS SVD File 'H2_v0.3.svd' Version 0.3,
1313
*
1414
* modified by Keil
15+
* modified by ytsuboi
1516
*******************************************************************************************************/
1617

1718

@@ -1029,25 +1030,30 @@ typedef struct { /*!< WWDT Structure
10291030
*/
10301031

10311032
typedef struct { /*!< SWM Structure */
1032-
__IO uint32_t PINASSIGN0; /*!< Pin assign register 0. Assign movable functions U0_TXD, U0_RXD,
1033-
U0_RTS, U0_CTS. */
1034-
__IO uint32_t PINASSIGN1; /*!< Pin assign register 1. Assign movable functions U0_SCLK, U1_TXD,
1035-
U1_RXD, U1_RTS. */
1036-
__IO uint32_t PINASSIGN2; /*!< Pin assign register 2. Assign movable functions U1_CTS, U1_SCLK,
1037-
U2_TXD, U2_RXD. */
1038-
__IO uint32_t PINASSIGN3; /*!< Pin assign register 3. Assign movable function . */
1039-
__IO uint32_t PINASSIGN4; /*!< Pin assign register 4. Assign movable functions */
1040-
__IO uint32_t PINASSIGN5; /*!< Pin assign register 5. Assign movable functions */
1041-
__IO uint32_t PINASSIGN6; /*!< Pin assign register 6. Assign movable functions */
1042-
__IO uint32_t PINASSIGN7; /*!< Pin assign register 7. Assign movable functions */
1043-
__IO uint32_t PINASSIGN8; /*!< Pin assign register 8. Assign movable functions */
1044-
__IO uint32_t PINASSIGN9; /*!< Pin assign register 9. Assign movable functions */
1045-
__IO uint32_t PINASSIGN10; /*!< Pin assign register 10. Assign movable functions */
1046-
__IO uint32_t PINASSIGN11; /*!< Pin assign register 11. Assign movable functions */
1047-
__IO uint32_t PINASSIGN12; /*!< Pin assign register 12. Assign movable functions */
1048-
__IO uint32_t PINASSIGN13; /*!< Pin assign register 13. Assign movable functions */
1049-
__IO uint32_t PINASSIGN14; /*!< Pin assign register 14. Assign movable functions */
1050-
__IO uint32_t PINASSIGN15; /*!< Pin assign register 15. Assign movable functions */
1033+
union {
1034+
__IO uint32_t PINASSIGN[16];
1035+
struct {
1036+
__IO uint32_t PINASSIGN0; /*!< Pin assign register 0. Assign movable functions U0_TXD, U0_RXD,
1037+
U0_RTS, U0_CTS. */
1038+
__IO uint32_t PINASSIGN1; /*!< Pin assign register 1. Assign movable functions U0_SCLK, U1_TXD,
1039+
U1_RXD, U1_RTS. */
1040+
__IO uint32_t PINASSIGN2; /*!< Pin assign register 2. Assign movable functions U1_CTS, U1_SCLK,
1041+
U2_TXD, U2_RXD. */
1042+
__IO uint32_t PINASSIGN3; /*!< Pin assign register 3. Assign movable function . */
1043+
__IO uint32_t PINASSIGN4; /*!< Pin assign register 4. Assign movable functions */
1044+
__IO uint32_t PINASSIGN5; /*!< Pin assign register 5. Assign movable functions */
1045+
__IO uint32_t PINASSIGN6; /*!< Pin assign register 6. Assign movable functions */
1046+
__IO uint32_t PINASSIGN7; /*!< Pin assign register 7. Assign movable functions */
1047+
__IO uint32_t PINASSIGN8; /*!< Pin assign register 8. Assign movable functions */
1048+
__IO uint32_t PINASSIGN9; /*!< Pin assign register 9. Assign movable functions */
1049+
__IO uint32_t PINASSIGN10; /*!< Pin assign register 10. Assign movable functions */
1050+
__IO uint32_t PINASSIGN11; /*!< Pin assign register 11. Assign movable functions */
1051+
__IO uint32_t PINASSIGN12; /*!< Pin assign register 12. Assign movable functions */
1052+
__IO uint32_t PINASSIGN13; /*!< Pin assign register 13. Assign movable functions */
1053+
__IO uint32_t PINASSIGN14; /*!< Pin assign register 14. Assign movable functions */
1054+
__IO uint32_t PINASSIGN15; /*!< Pin assign register 15. Assign movable functions */
1055+
};
1056+
};
10511057
__I uint32_t RESERVED0[96];
10521058
__IO uint32_t PINENABLE0; /*!< Pin enable register 0. Enables fixed-pin functions */
10531059
__IO uint32_t PINENABLE1; /*!< Pin enable register 0. Enables fixed-pin functions */

libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/system_LPC15xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
// </e>
142142
//
143143
// <e> SCT Clock Configuration
144-
#define SCT_CLOCK_SETUP 0
144+
#define SCT_CLOCK_SETUP 1
145145
// <h> SCT PLL Control (SCTPLLCTRL)
146146
// <i> F_clkout = M * F_clkin = F_CCO / (2 * P)
147147
// <i> F_clkin must be in the range of 10 MHz to 25 MHz
@@ -503,7 +503,7 @@ void SystemInit (void) {
503503
LPC_SYSCON->PDRUNCFG &= ~(1 << 24); /* Power-up SCT PLL */
504504
LPC_SYSCON->SCTPLLCLKSEL = SCTPLLCLKSEL_Val; /* Select PLL Input */
505505

506-
LPC_SYSCON->USBPLLCTRL = SCTPLLCTRL_Val;
506+
LPC_SYSCON->SCTPLLCTRL = SCTPLLCTRL_Val;
507507
while (!(LPC_SYSCON->SCTPLLSTAT & 0x01)); /* Wait Until PLL Locked */
508508
#else /* SCT clock is not used */
509509
LPC_SYSCON->PDRUNCFG |= (1 << 24); /* Power-down SCT PLL */

0 commit comments

Comments
 (0)