From 4a870d3682f3522b926fecb545cd13f91596df27 Mon Sep 17 00:00:00 2001 From: "Aron L. Phillips" Date: Mon, 4 Aug 2014 11:06:15 -0400 Subject: [PATCH] The following changes were based on the request by Martin Kojtal: Removed the pin definition comments from the xxx_api.c files; Added GHI_MBUINO to the build_travis.py target section. --- .../TARGET_NXP/TARGET_LPC11UXX/analogin_api.c | 12 -------- .../hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c | 10 ------- .../TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c | 28 ----------------- .../TARGET_NXP/TARGET_LPC11UXX/serial_api.c | 14 --------- .../hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c | 30 ------------------- workspace_tools/build_travis.py | 2 ++ 6 files changed, 2 insertions(+), 94 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c index faf4923097..0f2abfa6bf 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c @@ -29,18 +29,6 @@ static inline int div_round_up(int x, int y) { return (x + (y - 1)) / y; } -//static const PinMap PinMap_ADC[] = { -// {P0_11, ADC0_0, 0x02}, -// {P0_12, ADC0_1, 0x02}, -// {P0_13, ADC0_2, 0x02}, -// {P0_14, ADC0_3, 0x02}, -// {P0_15, ADC0_4, 0x02}, -// {P0_16, ADC0_5, 0x01}, -// {P0_22, ADC0_6, 0x01}, -// {P0_23, ADC0_7, 0x01}, -// {NC , NC , 0 } -//}; - #define LPC_IOCON0_BASE (LPC_IOCON_BASE) #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c index 7b5f7bebb5..b100dc439a 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c @@ -19,16 +19,6 @@ #include "pinmap.h" #include "PeripheralPins.h" // For the Peripheral to Pin Definitions found in the individual Target's Platform -//static const PinMap PinMap_I2C_SDA[] = { -// {P0_5, I2C_0, 1}, -// {NC , NC , 0} -//}; -// -//static const PinMap PinMap_I2C_SCL[] = { -// {P0_4, I2C_0, 1}, -// {NC , NC, 0} -//}; - #define I2C_CONSET(x) (x->i2c->CONSET) #define I2C_CONCLR(x) (x->i2c->CONCLR) #define I2C_STAT(x) (x->i2c->STAT) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c index 6c1f0c97e9..c008c75989 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c @@ -22,34 +22,6 @@ #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 -///* To have a PWM where we can change both the period and the duty cycle, -// * we need an entire timer. With the following conventions: -// * * MR3 is used for the PWM period -// * * MR0, MR1, MR2 are used for the duty cycle -// */ -//static const PinMap PinMap_PWM[] = { -// /* CT16B0 */ -// {P0_8 , PWM_1, 2}, {P1_13, PWM_1, 2}, /* MR0 */ -// {P0_9 , PWM_2, 2}, {P1_14, PWM_2, 2}, /* MR1 */ -// {P0_10, PWM_3, 3}, {P1_15, PWM_3, 2}, /* MR2 */ -// -// /* CT16B1 */ -// {P0_21, PWM_4, 1}, /* MR0 */ -// {P0_22, PWM_5, 2}, {P1_23, PWM_5, 1}, /* MR1 */ -// -// /* CT32B0 */ -// {P0_18, PWM_6, 2}, {P1_24, PWM_6, 1}, /* MR0 */ -// {P0_19, PWM_7, 2}, {P1_25, PWM_7, 1}, /* MR1 */ -// {P0_1 , PWM_8, 2}, {P1_26, PWM_8, 1}, /* MR2 */ -// -// /* CT32B1 */ -// {P0_13, PWM_9 , 3}, {P1_0, PWM_9 , 1}, /* MR0 */ -// {P0_14, PWM_10, 3}, {P1_1, PWM_10, 1}, /* MR1 */ -// {P0_15, PWM_11, 3}, {P1_2, PWM_11, 1}, /* MR2 */ -// -// {NC, NC, 0} -//}; - typedef struct { uint8_t timer; uint8_t mr; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c index dc273b69f7..98330f7a95 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c @@ -28,20 +28,6 @@ ******************************************************************************/ #define UART_NUM 1 -//static const PinMap PinMap_UART_TX[] = { -// {P0_19, UART_0, 1}, -// {P1_13, UART_0, 3}, -// {P1_27, UART_0, 2}, -// { NC , NC , 0} -//}; -// -//static const PinMap PinMap_UART_RX[] = { -// {P0_18, UART_0, 1}, -// {P1_14, UART_0, 3}, -// {P1_26, UART_0, 2}, -// {NC , NC , 0} -//}; - static uint32_t serial_irq_ids[UART_NUM] = {0}; static uart_irq_handler irq_handler; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c index 83822e2935..ce3c6f0cb2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c @@ -21,36 +21,6 @@ #include "error.h" #include "PeripheralPins.h" // For the Peripheral to Pin Definitions found in the individual Target's Platform -//static const PinMap PinMap_SPI_SCLK[] = { -// {P0_6 , SPI_0, 0x02}, -// {P0_10, SPI_0, 0x02}, -// {P1_29, SPI_0, 0x01}, -// {P1_15, SPI_1, 0x03}, -// {P1_20, SPI_1, 0x02}, -// {NC , NC , 0} -//}; -// -//static const PinMap PinMap_SPI_MOSI[] = { -// {P0_9 , SPI_0, 0x01}, -// {P0_21, SPI_1, 0x02}, -// {P1_22, SPI_1, 0x02}, -// {NC , NC , 0} -//}; -// -//static const PinMap PinMap_SPI_MISO[] = { -// {P0_8 , SPI_0, 0x01}, -// {P0_22, SPI_1, 0x03}, -// {P1_21, SPI_1, 0x02}, -// {NC , NC , 0} -//}; -// -//static const PinMap PinMap_SPI_SSEL[] = { -// {P0_2 , SPI_0, 0x01}, -// {P1_19, SPI_1, 0x02}, -// {P1_23, SPI_1, 0x02}, -// {NC , NC , 0} -//}; - static inline int ssp_disable(spi_t *obj); static inline int ssp_enable(spi_t *obj); diff --git a/workspace_tools/build_travis.py b/workspace_tools/build_travis.py index 7d7405b10f..8583aa3770 100644 --- a/workspace_tools/build_travis.py +++ b/workspace_tools/build_travis.py @@ -11,6 +11,8 @@ build_list = ( { "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb_host", "usb", "ublox"] }, { "target": "LPC2368", "toolchains": "GCC_ARM" }, { "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"]}, + { "target": "GHI_MBUINO", "toolchains": "GCC_ARM"}, + { "target": "LPC11U24_301", "toolchains": "GCC_ARM" }, { "target": "NUCLEO_F103RB", "toolchains": "GCC_ARM"},