diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/TOOLCHAIN_ARM_STD/sys.cpp index b129b2c2a5..8062f9334f 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/TOOLCHAIN_ARM_STD/sys.cpp +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/TOOLCHAIN_ARM_STD/sys.cpp @@ -14,7 +14,8 @@ extern "C" { extern char Image$$RW_IRAM1$$ZI$$Limit[]; -extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) { +extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) +{ uint32_t zi_limit = (uint32_t)Image$$RW_IRAM1$$ZI$$Limit; uint32_t sp_limit = __current_sp(); diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/cmsis_nvic.c b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/cmsis_nvic.c index 59b37502b2..e2ce6f1532 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/cmsis_nvic.c +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/device/cmsis_nvic.c @@ -32,11 +32,13 @@ extern void InstallIRQHandler(IRQn_Type irq, uint32_t irqHandler); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) { +void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) +{ InstallIRQHandler(IRQn, vector); } -uint32_t NVIC_GetVector(IRQn_Type IRQn) { +uint32_t NVIC_GetVector(IRQn_Type IRQn) +{ uint32_t *vectors = (uint32_t*)SCB->VTOR; return vectors[IRQn + 16]; } diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/pwmout_api.c b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/pwmout_api.c index a2a90e8b8b..405446e694 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/pwmout_api.c +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/pwmout_api.c @@ -27,7 +27,8 @@ static float pwm_clock_mhz; /* Array of TPM peripheral base address. */ static TPM_Type *const tpm_addrs[] = TPM_BASE_PTRS; -void pwmout_init(pwmout_t* obj, PinName pin) { +void pwmout_init(pwmout_t* obj, PinName pin) +{ PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); MBED_ASSERT(pwm != (PWMName)NC); @@ -72,11 +73,13 @@ void pwmout_init(pwmout_t* obj, PinName pin) { pinmap_pinout(pin, PinMap_PWM); } -void pwmout_free(pwmout_t* obj) { +void pwmout_free(pwmout_t* obj) +{ TPM_Deinit(tpm_addrs[obj->pwm_name >> TPM_SHIFT]); } -void pwmout_write(pwmout_t* obj, float value) { +void pwmout_write(pwmout_t* obj, float value) +{ if (value < 0.0f) { value = 0.0f; } else if (value > 1.0f) { @@ -91,7 +94,8 @@ void pwmout_write(pwmout_t* obj, float value) { base->CNT = 0; } -float pwmout_read(pwmout_t* obj) { +float pwmout_read(pwmout_t* obj) +{ TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT]; uint16_t count = (base->CONTROLS[obj->pwm_name & 0xF].CnV) & TPM_CnV_VAL_MASK; uint16_t mod = base->MOD & TPM_MOD_MOD_MASK; @@ -102,16 +106,19 @@ float pwmout_read(pwmout_t* obj) { return (v > 1.0f) ? (1.0f) : (v); } -void pwmout_period(pwmout_t* obj, float seconds) { +void pwmout_period(pwmout_t* obj, float seconds) +{ pwmout_period_us(obj, seconds * 1000000.0f); } -void pwmout_period_ms(pwmout_t* obj, int ms) { +void pwmout_period_ms(pwmout_t* obj, int ms) +{ pwmout_period_us(obj, ms * 1000); } // Set the PWM period, keeping the duty cycle the same. -void pwmout_period_us(pwmout_t* obj, int us) { +void pwmout_period_us(pwmout_t* obj, int us) +{ TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT]; float dc = pwmout_read(obj); @@ -120,15 +127,18 @@ void pwmout_period_us(pwmout_t* obj, int us) { pwmout_write(obj, dc); } -void pwmout_pulsewidth(pwmout_t* obj, float seconds) { +void pwmout_pulsewidth(pwmout_t* obj, float seconds) +{ pwmout_pulsewidth_us(obj, seconds * 1000000.0f); } -void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) { +void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) +{ pwmout_pulsewidth_us(obj, ms * 1000); } -void pwmout_pulsewidth_us(pwmout_t* obj, int us) { +void pwmout_pulsewidth_us(pwmout_t* obj, int us) +{ TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT]; uint32_t value = (uint32_t)(pwm_clock_mhz * (float)us); diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/serial_api.c b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/serial_api.c index 5f2c3bc992..b18e91b3e0 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/serial_api.c +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/serial_api.c @@ -40,7 +40,8 @@ static clock_name_t const uart_clocks[] = LPUART_CLOCK_FREQS; int stdio_uart_inited = 0; serial_t stdio_uart; -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) +{ uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX); uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX); obj->index = pinmap_merge(uart_tx, uart_rx); @@ -79,16 +80,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { } } -void serial_free(serial_t *obj) { +void serial_free(serial_t *obj) +{ LPUART_Deinit(uart_addrs[obj->index]); serial_irq_ids[obj->index] = 0; } -void serial_baud(serial_t *obj, int baudrate) { +void serial_baud(serial_t *obj, int baudrate) +{ LPUART_SetBaudRate(uart_addrs[obj->index], (uint32_t)baudrate, CLOCK_GetFreq(uart_clocks[obj->index])); } -void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { +void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) +{ LPUART_Type *base = uart_addrs[obj->index]; uint8_t temp; /* Set bit count and parity mode. */ @@ -118,7 +122,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b /****************************************************************************** * INTERRUPTS HANDLING ******************************************************************************/ -static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index) { +static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index) +{ LPUART_Type *base = uart_addrs[index]; /* If RX overrun. */ @@ -138,22 +143,26 @@ static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint } } -void uart0_irq() { +void uart0_irq() +{ uint32_t status_flags = LPUART0->STAT; uart_irq((status_flags & kLPUART_TxDataRegEmptyFlag), (status_flags & kLPUART_RxDataRegFullFlag), 0); } -void uart1_irq() { +void uart1_irq() +{ uint32_t status_flags = LPUART1->STAT; uart_irq((status_flags & kLPUART_TxDataRegEmptyFlag), (status_flags & kLPUART_RxDataRegFullFlag), 1); } -void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) { +void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) +{ irq_handler = handler; serial_irq_ids[obj->index] = id; } -void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { +void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) +{ IRQn_Type uart_irqs[] = LPUART_RX_TX_IRQS; uint32_t vector = 0; @@ -210,44 +219,52 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } } -int serial_getc(serial_t *obj) { +int serial_getc(serial_t *obj) +{ uint8_t data; LPUART_ReadBlocking(uart_addrs[obj->index], &data, 1); return data; } -void serial_putc(serial_t *obj, int c) { +void serial_putc(serial_t *obj, int c) +{ while (!serial_writable(obj)); LPUART_WriteByte(uart_addrs[obj->index], (uint8_t)c); } -int serial_readable(serial_t *obj) { +int serial_readable(serial_t *obj) +{ uint32_t status_flags = LPUART_GetStatusFlags(uart_addrs[obj->index]); if (status_flags & kLPUART_RxOverrunFlag) LPUART_ClearStatusFlags(uart_addrs[obj->index], kLPUART_RxOverrunFlag); return (status_flags & kLPUART_RxDataRegFullFlag); } -int serial_writable(serial_t *obj) { +int serial_writable(serial_t *obj) +{ uint32_t status_flags = LPUART_GetStatusFlags(uart_addrs[obj->index]); if (status_flags & kLPUART_RxOverrunFlag) LPUART_ClearStatusFlags(uart_addrs[obj->index], kLPUART_RxOverrunFlag); return (status_flags & kLPUART_TxDataRegEmptyFlag); } -void serial_clear(serial_t *obj) { +void serial_clear(serial_t *obj) +{ } -void serial_pinout_tx(PinName tx) { +void serial_pinout_tx(PinName tx) +{ pinmap_pinout(tx, PinMap_UART_TX); } -void serial_break_set(serial_t *obj) { +void serial_break_set(serial_t *obj) +{ uart_addrs[obj->index]->CTRL |= LPUART_CTRL_SBK_MASK; } -void serial_break_clear(serial_t *obj) { +void serial_break_clear(serial_t *obj) +{ uart_addrs[obj->index]->CTRL &= ~LPUART_CTRL_SBK_MASK; } diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/spi_api.c b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/spi_api.c index 19404ced60..34affdc05e 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/spi_api.c +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/spi_api.c @@ -32,7 +32,8 @@ static SPI_Type *const spi_address[] = SPI_BASE_PTRS; /* Array of SPI bus clock frequencies */ static clock_name_t const spi_clocks[] = SPI_CLOCK_FREQS; -void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel) { +void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel) +{ // determine the SPI to use uint32_t spi_mosi = pinmap_peripheral(mosi, PinMap_SPI_MOSI); uint32_t spi_miso = pinmap_peripheral(miso, PinMap_SPI_MISO); @@ -53,11 +54,13 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel } } -void spi_free(spi_t *obj) { +void spi_free(spi_t *obj) +{ SPI_Deinit(spi_address[obj->instance]); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) +{ spi_master_config_t master_config; spi_slave_config_t slave_config; @@ -87,15 +90,18 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } } -void spi_frequency(spi_t *obj, int hz) { +void spi_frequency(spi_t *obj, int hz) +{ SPI_MasterSetBaudRate(spi_address[obj->instance], (uint32_t)hz, CLOCK_GetFreq(spi_clocks[obj->instance])); } -static inline int spi_readable(spi_t * obj) { +static inline int spi_readable(spi_t * obj) +{ return (SPI_GetStatusFlags(spi_address[obj->instance]) & kSPI_RxBufferFullFlag); } -int spi_master_write(spi_t *obj, int value) { +int spi_master_write(spi_t *obj, int value) +{ spi_transfer_t xfer = {0}; uint32_t rx_data; SPI_Type *base = spi_address[obj->instance]; @@ -109,11 +115,13 @@ int spi_master_write(spi_t *obj, int value) { return rx_data & 0xffff; } -int spi_slave_receive(spi_t *obj) { +int spi_slave_receive(spi_t *obj) +{ return spi_readable(obj); } -int spi_slave_read(spi_t *obj) { +int spi_slave_read(spi_t *obj) +{ uint32_t rx_data; while (!spi_readable(obj)); @@ -122,7 +130,8 @@ int spi_slave_read(spi_t *obj) { return rx_data & 0xffff; } -void spi_slave_write(spi_t *obj, int value) { +void spi_slave_write(spi_t *obj, int value) +{ SPI_Type *base = spi_address[obj->instance]; size_t size = ((base->C2 & SPI_C2_SPIMODE_MASK) >> SPI_C2_SPIMODE_SHIFT) + 1U; SPI_WriteBlocking(spi_address[obj->instance], (uint8_t *)&value, size); diff --git a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/us_ticker.c b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/us_ticker.c index 2a2138041c..728ea8f448 100644 --- a/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/us_ticker.c +++ b/targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL43Z/us_ticker.c @@ -22,7 +22,8 @@ static int us_ticker_inited = 0; -void us_ticker_init(void) { +void us_ticker_init(void) +{ if (us_ticker_inited) { return; } @@ -60,7 +61,8 @@ void us_ticker_init(void) { } -uint32_t us_ticker_read() { +uint32_t us_ticker_read() +{ if (!us_ticker_inited) { us_ticker_init(); } @@ -68,15 +70,18 @@ uint32_t us_ticker_read() { return ~(PIT_GetCurrentTimerCount(PIT, kPIT_Chnl_1)); } -void us_ticker_disable_interrupt(void) { +void us_ticker_disable_interrupt(void) +{ LPTMR_DisableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable); } -void us_ticker_clear_interrupt(void) { +void us_ticker_clear_interrupt(void) +{ LPTMR_ClearStatusFlags(LPTMR0, kLPTMR_TimerCompareFlag); } -void us_ticker_set_interrupt(timestamp_t timestamp) { +void us_ticker_set_interrupt(timestamp_t timestamp) +{ int delta = (int)(timestamp - us_ticker_read()); if (delta <= 0) { // This event was in the past.