Skip to content

Commit 279925e

Browse files
mmahadevan108mmahadevan108
committed
KL27Z: Coding convention fixes
Signed-off-by: Mahadevan Mahesh <[email protected]>
1 parent 682df90 commit 279925e

File tree

6 files changed

+88
-44
lines changed

6 files changed

+88
-44
lines changed

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/device/TOOLCHAIN_ARM_STD/sys.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ extern "C" {
1414

1515
extern char Image$$RW_IRAM1$$ZI$$Limit[];
1616

17-
extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
17+
extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3)
18+
{
1819
uint32_t zi_limit = (uint32_t)Image$$RW_IRAM1$$ZI$$Limit;
1920
uint32_t sp_limit = __current_sp();
2021

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/device/cmsis_nvic.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@
3232

3333
extern void InstallIRQHandler(IRQn_Type irq, uint32_t irqHandler);
3434

35-
void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
35+
void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
36+
{
3637
InstallIRQHandler(IRQn, vector);
3738
}
3839

39-
uint32_t NVIC_GetVector(IRQn_Type IRQn) {
40+
uint32_t NVIC_GetVector(IRQn_Type IRQn)
41+
{
4042
uint32_t *vectors = (uint32_t*)SCB->VTOR;
4143
return vectors[IRQn + 16];
4244
}

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/pwmout_api.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ static float pwm_clock_mhz;
2727
/* Array of TPM peripheral base address. */
2828
static TPM_Type *const tpm_addrs[] = TPM_BASE_PTRS;
2929

30-
void pwmout_init(pwmout_t* obj, PinName pin) {
30+
void pwmout_init(pwmout_t* obj, PinName pin)
31+
{
3132
PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
3233
MBED_ASSERT(pwm != (PWMName)NC);
3334

@@ -72,11 +73,13 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
7273
pinmap_pinout(pin, PinMap_PWM);
7374
}
7475

75-
void pwmout_free(pwmout_t* obj) {
76+
void pwmout_free(pwmout_t* obj)
77+
{
7678
TPM_Deinit(tpm_addrs[obj->pwm_name >> TPM_SHIFT]);
7779
}
7880

79-
void pwmout_write(pwmout_t* obj, float value) {
81+
void pwmout_write(pwmout_t* obj, float value)
82+
{
8083
if (value < 0.0f) {
8184
value = 0.0f;
8285
} else if (value > 1.0f) {
@@ -91,7 +94,8 @@ void pwmout_write(pwmout_t* obj, float value) {
9194
base->CNT = 0;
9295
}
9396

94-
float pwmout_read(pwmout_t* obj) {
97+
float pwmout_read(pwmout_t* obj)
98+
{
9599
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
96100
uint16_t count = (base->CONTROLS[obj->pwm_name & 0xF].CnV) & TPM_CnV_VAL_MASK;
97101
uint16_t mod = base->MOD & TPM_MOD_MOD_MASK;
@@ -102,16 +106,19 @@ float pwmout_read(pwmout_t* obj) {
102106
return (v > 1.0f) ? (1.0f) : (v);
103107
}
104108

105-
void pwmout_period(pwmout_t* obj, float seconds) {
109+
void pwmout_period(pwmout_t* obj, float seconds)
110+
{
106111
pwmout_period_us(obj, seconds * 1000000.0f);
107112
}
108113

109-
void pwmout_period_ms(pwmout_t* obj, int ms) {
114+
void pwmout_period_ms(pwmout_t* obj, int ms)
115+
{
110116
pwmout_period_us(obj, ms * 1000);
111117
}
112118

113119
// Set the PWM period, keeping the duty cycle the same.
114-
void pwmout_period_us(pwmout_t* obj, int us) {
120+
void pwmout_period_us(pwmout_t* obj, int us)
121+
{
115122
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
116123
float dc = pwmout_read(obj);
117124

@@ -120,15 +127,18 @@ void pwmout_period_us(pwmout_t* obj, int us) {
120127
pwmout_write(obj, dc);
121128
}
122129

123-
void pwmout_pulsewidth(pwmout_t* obj, float seconds) {
130+
void pwmout_pulsewidth(pwmout_t* obj, float seconds)
131+
{
124132
pwmout_pulsewidth_us(obj, seconds * 1000000.0f);
125133
}
126134

127-
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) {
135+
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms)
136+
{
128137
pwmout_pulsewidth_us(obj, ms * 1000);
129138
}
130139

131-
void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
140+
void pwmout_pulsewidth_us(pwmout_t* obj, int us)
141+
{
132142
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
133143
uint32_t value = (uint32_t)(pwm_clock_mhz * (float)us);
134144

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/serial_api.c

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ static clock_name_t const uart_clocks[] = LPUART_CLOCK_FREQS;
4040
int stdio_uart_inited = 0;
4141
serial_t stdio_uart;
4242

43-
void serial_init(serial_t *obj, PinName tx, PinName rx) {
43+
void serial_init(serial_t *obj, PinName tx, PinName rx)
44+
{
4445
uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX);
4546
uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX);
4647
obj->index = pinmap_merge(uart_tx, uart_rx);
@@ -79,16 +80,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
7980
}
8081
}
8182

82-
void serial_free(serial_t *obj) {
83+
void serial_free(serial_t *obj)
84+
{
8385
LPUART_Deinit(uart_addrs[obj->index]);
8486
serial_irq_ids[obj->index] = 0;
8587
}
8688

87-
void serial_baud(serial_t *obj, int baudrate) {
89+
void serial_baud(serial_t *obj, int baudrate)
90+
{
8891
LPUART_SetBaudRate(uart_addrs[obj->index], (uint32_t)baudrate, CLOCK_GetFreq(uart_clocks[obj->index]));
8992
}
9093

91-
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
94+
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits)
95+
{
9296
LPUART_Type *base = uart_addrs[obj->index];
9397
uint8_t temp;
9498
/* Set bit count and parity mode. */
@@ -118,7 +122,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
118122
/******************************************************************************
119123
* INTERRUPTS HANDLING
120124
******************************************************************************/
121-
static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index) {
125+
static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index)
126+
{
122127
LPUART_Type *base = uart_addrs[index];
123128

124129
/* If RX overrun. */
@@ -138,22 +143,26 @@ static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint
138143
}
139144
}
140145

141-
void uart0_irq() {
146+
void uart0_irq()
147+
{
142148
uint32_t status_flags = LPUART0->STAT;
143149
uart_irq((status_flags & kLPUART_TxDataRegEmptyFlag), (status_flags & kLPUART_RxDataRegFullFlag), 0);
144150
}
145151

146-
void uart1_irq() {
152+
void uart1_irq()
153+
{
147154
uint32_t status_flags = LPUART1->STAT;
148155
uart_irq((status_flags & kLPUART_TxDataRegEmptyFlag), (status_flags & kLPUART_RxDataRegFullFlag), 1);
149156
}
150157

151-
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
158+
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
159+
{
152160
irq_handler = handler;
153161
serial_irq_ids[obj->index] = id;
154162
}
155163

156-
void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
164+
void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
165+
{
157166
IRQn_Type uart_irqs[] = LPUART_RX_TX_IRQS;
158167
uint32_t vector = 0;
159168

@@ -210,44 +219,52 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
210219
}
211220
}
212221

213-
int serial_getc(serial_t *obj) {
222+
int serial_getc(serial_t *obj)
223+
{
214224
uint8_t data;
215225

216226
LPUART_ReadBlocking(uart_addrs[obj->index], &data, 1);
217227
return data;
218228
}
219229

220-
void serial_putc(serial_t *obj, int c) {
230+
void serial_putc(serial_t *obj, int c)
231+
{
221232
while (!serial_writable(obj));
222233
LPUART_WriteByte(uart_addrs[obj->index], (uint8_t)c);
223234
}
224235

225-
int serial_readable(serial_t *obj) {
236+
int serial_readable(serial_t *obj)
237+
{
226238
uint32_t status_flags = LPUART_GetStatusFlags(uart_addrs[obj->index]);
227239
if (status_flags & kLPUART_RxOverrunFlag)
228240
LPUART_ClearStatusFlags(uart_addrs[obj->index], kLPUART_RxOverrunFlag);
229241
return (status_flags & kLPUART_RxDataRegFullFlag);
230242
}
231243

232-
int serial_writable(serial_t *obj) {
244+
int serial_writable(serial_t *obj)
245+
{
233246
uint32_t status_flags = LPUART_GetStatusFlags(uart_addrs[obj->index]);
234247
if (status_flags & kLPUART_RxOverrunFlag)
235248
LPUART_ClearStatusFlags(uart_addrs[obj->index], kLPUART_RxOverrunFlag);
236249
return (status_flags & kLPUART_TxDataRegEmptyFlag);
237250
}
238251

239-
void serial_clear(serial_t *obj) {
252+
void serial_clear(serial_t *obj)
253+
{
240254
}
241255

242-
void serial_pinout_tx(PinName tx) {
256+
void serial_pinout_tx(PinName tx)
257+
{
243258
pinmap_pinout(tx, PinMap_UART_TX);
244259
}
245260

246-
void serial_break_set(serial_t *obj) {
261+
void serial_break_set(serial_t *obj)
262+
{
247263
uart_addrs[obj->index]->CTRL |= LPUART_CTRL_SBK_MASK;
248264
}
249265

250-
void serial_break_clear(serial_t *obj) {
266+
void serial_break_clear(serial_t *obj)
267+
{
251268
uart_addrs[obj->index]->CTRL &= ~LPUART_CTRL_SBK_MASK;
252269
}
253270

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/spi_api.c

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ static SPI_Type *const spi_address[] = SPI_BASE_PTRS;
3232
/* Array of SPI bus clock frequencies */
3333
static clock_name_t const spi_clocks[] = SPI_CLOCK_FREQS;
3434

35-
void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel) {
35+
void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel)
36+
{
3637
// determine the SPI to use
3738
uint32_t spi_mosi = pinmap_peripheral(mosi, PinMap_SPI_MOSI);
3839
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
5354
}
5455
}
5556

56-
void spi_free(spi_t *obj) {
57+
void spi_free(spi_t *obj)
58+
{
5759
SPI_Deinit(spi_address[obj->instance]);
5860
}
5961

60-
void spi_format(spi_t *obj, int bits, int mode, int slave) {
62+
void spi_format(spi_t *obj, int bits, int mode, int slave)
63+
{
6164

6265
spi_master_config_t master_config;
6366
spi_slave_config_t slave_config;
@@ -87,15 +90,18 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
8790
}
8891
}
8992

90-
void spi_frequency(spi_t *obj, int hz) {
93+
void spi_frequency(spi_t *obj, int hz)
94+
{
9195
SPI_MasterSetBaudRate(spi_address[obj->instance], (uint32_t)hz, CLOCK_GetFreq(spi_clocks[obj->instance]));
9296
}
9397

94-
static inline int spi_readable(spi_t * obj) {
98+
static inline int spi_readable(spi_t * obj)
99+
{
95100
return (SPI_GetStatusFlags(spi_address[obj->instance]) & kSPI_RxBufferFullFlag);
96101
}
97102

98-
int spi_master_write(spi_t *obj, int value) {
103+
int spi_master_write(spi_t *obj, int value)
104+
{
99105
spi_transfer_t xfer = {0};
100106
uint32_t rx_data;
101107
SPI_Type *base = spi_address[obj->instance];
@@ -109,11 +115,13 @@ int spi_master_write(spi_t *obj, int value) {
109115
return rx_data & 0xffff;
110116
}
111117

112-
int spi_slave_receive(spi_t *obj) {
118+
int spi_slave_receive(spi_t *obj)
119+
{
113120
return spi_readable(obj);
114121
}
115122

116-
int spi_slave_read(spi_t *obj) {
123+
int spi_slave_read(spi_t *obj)
124+
{
117125
uint32_t rx_data;
118126

119127
while (!spi_readable(obj));
@@ -122,7 +130,8 @@ int spi_slave_read(spi_t *obj) {
122130
return rx_data & 0xffff;
123131
}
124132

125-
void spi_slave_write(spi_t *obj, int value) {
133+
void spi_slave_write(spi_t *obj, int value)
134+
{
126135
SPI_Type *base = spi_address[obj->instance];
127136
size_t size = ((base->C2 & SPI_C2_SPIMODE_MASK) >> SPI_C2_SPIMODE_SHIFT) + 1U;
128137
SPI_WriteBlocking(spi_address[obj->instance], (uint8_t *)&value, size);

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_KL27Z/us_ticker.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
static int us_ticker_inited = 0;
2424

25-
void us_ticker_init(void) {
25+
void us_ticker_init(void)
26+
{
2627
if (us_ticker_inited) {
2728
return;
2829
}
@@ -60,23 +61,27 @@ void us_ticker_init(void) {
6061
}
6162

6263

63-
uint32_t us_ticker_read() {
64+
uint32_t us_ticker_read()
65+
{
6466
if (!us_ticker_inited) {
6567
us_ticker_init();
6668
}
6769

6870
return ~(PIT_GetCurrentTimerCount(PIT, kPIT_Chnl_1));
6971
}
7072

71-
void us_ticker_disable_interrupt(void) {
73+
void us_ticker_disable_interrupt(void)
74+
{
7275
LPTMR_DisableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);
7376
}
7477

75-
void us_ticker_clear_interrupt(void) {
78+
void us_ticker_clear_interrupt(void)
79+
{
7680
LPTMR_ClearStatusFlags(LPTMR0, kLPTMR_TimerCompareFlag);
7781
}
7882

79-
void us_ticker_set_interrupt(timestamp_t timestamp) {
83+
void us_ticker_set_interrupt(timestamp_t timestamp)
84+
{
8085
int delta = (int)(timestamp - us_ticker_read());
8186
if (delta <= 0) {
8287
// This event was in the past.

0 commit comments

Comments
 (0)