Skip to content

Commit 905a173

Browse files
0xc01700xc0170
authored
Merge pull request #3268 from NXPmicro/Coding_Convention_Changes
Coding convention changes
2 parents 9fdf7f7 + b78e552 commit 905a173

File tree

59 files changed

+869
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+869
-432
lines changed

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K66F/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_K66F/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_K66F/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 FTM peripheral base address. */
2828
static FTM_Type *const ftm_addrs[] = FTM_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
FTM_Deinit(ftm_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) {
@@ -93,7 +96,8 @@ void pwmout_write(pwmout_t* obj, float value) {
9396
FTM_SetSoftwareTrigger(base, true);
9497
}
9598

96-
float pwmout_read(pwmout_t* obj) {
99+
float pwmout_read(pwmout_t* obj)
100+
{
97101
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
98102
uint16_t count = (base->CONTROLS[obj->pwm_name & 0xF].CnV) & FTM_CnV_VAL_MASK;
99103
uint16_t mod = base->MOD & FTM_MOD_MOD_MASK;
@@ -104,16 +108,19 @@ float pwmout_read(pwmout_t* obj) {
104108
return (v > 1.0f) ? (1.0f) : (v);
105109
}
106110

107-
void pwmout_period(pwmout_t* obj, float seconds) {
111+
void pwmout_period(pwmout_t* obj, float seconds)
112+
{
108113
pwmout_period_us(obj, seconds * 1000000.0f);
109114
}
110115

111-
void pwmout_period_ms(pwmout_t* obj, int ms) {
116+
void pwmout_period_ms(pwmout_t* obj, int ms)
117+
{
112118
pwmout_period_us(obj, ms * 1000);
113119
}
114120

115121
// Set the PWM period, keeping the duty cycle the same.
116-
void pwmout_period_us(pwmout_t* obj, int us) {
122+
void pwmout_period_us(pwmout_t* obj, int us)
123+
{
117124
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
118125
float dc = pwmout_read(obj);
119126

@@ -122,15 +129,18 @@ void pwmout_period_us(pwmout_t* obj, int us) {
122129
pwmout_write(obj, dc);
123130
}
124131

125-
void pwmout_pulsewidth(pwmout_t* obj, float seconds) {
132+
void pwmout_pulsewidth(pwmout_t* obj, float seconds)
133+
{
126134
pwmout_pulsewidth_us(obj, seconds * 1000000.0f);
127135
}
128136

129-
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) {
137+
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms)
138+
{
130139
pwmout_pulsewidth_us(obj, ms * 1000);
131140
}
132141

133-
void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
142+
void pwmout_pulsewidth_us(pwmout_t* obj, int us)
143+
{
134144
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
135145
uint32_t value = (uint32_t)(pwm_clock_mhz * (float)us);
136146

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

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

44-
void serial_init(serial_t *obj, PinName tx, PinName rx) {
44+
void serial_init(serial_t *obj, PinName tx, PinName rx)
45+
{
4546
uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX);
4647
uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX);
4748
obj->index = pinmap_merge(uart_tx, uart_rx);
@@ -74,16 +75,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
7475
}
7576
}
7677

77-
void serial_free(serial_t *obj) {
78+
void serial_free(serial_t *obj)
79+
{
7880
UART_Deinit(uart_addrs[obj->index]);
7981
serial_irq_ids[obj->index] = 0;
8082
}
8183

82-
void serial_baud(serial_t *obj, int baudrate) {
84+
void serial_baud(serial_t *obj, int baudrate)
85+
{
8386
UART_SetBaudRate(uart_addrs[obj->index], (uint32_t)baudrate, CLOCK_GetFreq(uart_clocks[obj->index]));
8487
}
8588

86-
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
89+
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits)
90+
{
8791
UART_Type *base = uart_addrs[obj->index];
8892
uint8_t temp;
8993
/* Set bit count and parity mode. */
@@ -111,7 +115,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
111115
/******************************************************************************
112116
* INTERRUPTS HANDLING
113117
******************************************************************************/
114-
static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index) {
118+
static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint32_t index)
119+
{
115120
UART_Type *base = uart_addrs[index];
116121

117122
/* If RX overrun. */
@@ -130,36 +135,43 @@ static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_full, uint
130135
}
131136
}
132137

133-
void uart0_irq() {
138+
void uart0_irq()
139+
{
134140
uint32_t status_flags = UART0->S1;
135141
uart_irq((status_flags & kUART_TxDataRegEmptyFlag), (status_flags & kUART_RxDataRegFullFlag), 0);
136142
}
137143

138-
void uart1_irq() {
144+
void uart1_irq()
145+
{
139146
uint32_t status_flags = UART1->S1;
140147
uart_irq((status_flags & UART_S1_TDRE_MASK), (status_flags & UART_S1_RDRF_MASK), 1);
141148
}
142149

143-
void uart2_irq() {
150+
void uart2_irq()
151+
{
144152
uint32_t status_flags = UART2->S1;
145153
uart_irq((status_flags & UART_S1_TDRE_MASK), (status_flags & UART_S1_RDRF_MASK), 2);
146154
}
147155

148-
void uart3_irq() {
156+
void uart3_irq()
157+
{
149158
uint32_t status_flags = UART3->S1;
150159
uart_irq((status_flags & UART_S1_TDRE_MASK), (status_flags & UART_S1_RDRF_MASK), 3);
151160
}
152161

153-
void uart4_irq() {
162+
void uart4_irq()
163+
{
154164
uint32_t status_flags = UART4->S1;
155165
uart_irq((status_flags & UART_S1_TDRE_MASK), (status_flags & UART_S1_RDRF_MASK), 4);
156166
}
157-
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
167+
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
168+
{
158169
irq_handler = handler;
159170
serial_irq_ids[obj->index] = id;
160171
}
161172

162-
void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
173+
void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
174+
{
163175
IRQn_Type uart_irqs[] = UART_RX_TX_IRQS;
164176
uint32_t vector = 0;
165177

@@ -225,45 +237,53 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
225237
}
226238
}
227239

228-
int serial_getc(serial_t *obj) {
240+
int serial_getc(serial_t *obj)
241+
{
229242
while (!serial_readable(obj));
230243
uint8_t data;
231244
data = UART_ReadByte(uart_addrs[obj->index]);
232245

233246
return data;
234247
}
235248

236-
void serial_putc(serial_t *obj, int c) {
249+
void serial_putc(serial_t *obj, int c)
250+
{
237251
while (!serial_writable(obj));
238252
UART_WriteByte(uart_addrs[obj->index], (uint8_t)c);
239253
}
240254

241-
int serial_readable(serial_t *obj) {
255+
int serial_readable(serial_t *obj)
256+
{
242257
uint32_t status_flags = UART_GetStatusFlags(uart_addrs[obj->index]);
243258
if (status_flags & kUART_RxOverrunFlag)
244259
UART_ClearStatusFlags(uart_addrs[obj->index], kUART_RxOverrunFlag);
245260
return (status_flags & kUART_RxDataRegFullFlag);
246261
}
247262

248-
int serial_writable(serial_t *obj) {
263+
int serial_writable(serial_t *obj)
264+
{
249265
uint32_t status_flags = UART_GetStatusFlags(uart_addrs[obj->index]);
250266
if (status_flags & kUART_RxOverrunFlag)
251267
UART_ClearStatusFlags(uart_addrs[obj->index], kUART_RxOverrunFlag);
252268
return (status_flags & kUART_TxDataRegEmptyFlag);
253269
}
254270

255-
void serial_clear(serial_t *obj) {
271+
void serial_clear(serial_t *obj)
272+
{
256273
}
257274

258-
void serial_pinout_tx(PinName tx) {
275+
void serial_pinout_tx(PinName tx)
276+
{
259277
pinmap_pinout(tx, PinMap_UART_TX);
260278
}
261279

262-
void serial_break_set(serial_t *obj) {
280+
void serial_break_set(serial_t *obj)
281+
{
263282
uart_addrs[obj->index]->C2 |= UART_C2_SBK_MASK;
264283
}
265284

266-
void serial_break_clear(serial_t *obj) {
285+
void serial_break_clear(serial_t *obj)
286+
{
267287
uart_addrs[obj->index]->C2 &= ~UART_C2_SBK_MASK;
268288
}
269289

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K66F/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
DSPI_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
dspi_master_config_t master_config;
6366
dspi_slave_config_t slave_config;
@@ -84,18 +87,21 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
8487
}
8588
}
8689

87-
void spi_frequency(spi_t *obj, int hz) {
90+
void spi_frequency(spi_t *obj, int hz)
91+
{
8892
uint32_t busClock = CLOCK_GetFreq(spi_clocks[obj->instance]);
8993
DSPI_MasterSetBaudRate(spi_address[obj->instance], kDSPI_Ctar0, (uint32_t)hz, busClock);
9094
//Half clock period delay after SPI transfer
9195
DSPI_MasterSetDelayTimes(spi_address[obj->instance], kDSPI_Ctar0, kDSPI_LastSckToPcs, busClock, 500000000 / hz);
9296
}
9397

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

98-
int spi_master_write(spi_t *obj, int value) {
103+
int spi_master_write(spi_t *obj, int value)
104+
{
99105
dspi_command_data_config_t command;
100106
uint32_t rx_data;
101107
DSPI_GetDefaultDataCommandConfig(&command);
@@ -112,11 +118,13 @@ int spi_master_write(spi_t *obj, int value) {
112118
return rx_data & 0xffff;
113119
}
114120

115-
int spi_slave_receive(spi_t *obj) {
121+
int spi_slave_receive(spi_t *obj)
122+
{
116123
return spi_readable(obj);
117124
}
118125

119-
int spi_slave_read(spi_t *obj) {
126+
int spi_slave_read(spi_t *obj)
127+
{
120128
uint32_t rx_data;
121129

122130
while (!spi_readable(obj));
@@ -125,7 +133,8 @@ int spi_slave_read(spi_t *obj) {
125133
return rx_data & 0xffff;
126134
}
127135

128-
void spi_slave_write(spi_t *obj, int value) {
136+
void spi_slave_write(spi_t *obj, int value)
137+
{
129138
DSPI_SlaveWriteDataBlocking(spi_address[obj->instance], (uint32_t)value);
130139
}
131140

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

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

2222
static int us_ticker_inited = 0;
2323

24-
void us_ticker_init(void) {
24+
void us_ticker_init(void)
25+
{
2526
if (us_ticker_inited) {
2627
return;
2728
}
@@ -51,23 +52,27 @@ void us_ticker_init(void) {
5152
}
5253

5354

54-
uint32_t us_ticker_read() {
55+
uint32_t us_ticker_read()
56+
{
5557
if (!us_ticker_inited) {
5658
us_ticker_init();
5759
}
5860

5961
return ~(PIT_GetCurrentTimerCount(PIT, kPIT_Chnl_1));
6062
}
6163

62-
void us_ticker_disable_interrupt(void) {
64+
void us_ticker_disable_interrupt(void)
65+
{
6366
PIT_DisableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
6467
}
6568

66-
void us_ticker_clear_interrupt(void) {
69+
void us_ticker_clear_interrupt(void)
70+
{
6771
PIT_ClearStatusFlags(PIT, kPIT_Chnl_3, PIT_TFLG_TIF_MASK);
6872
}
6973

70-
void us_ticker_set_interrupt(timestamp_t timestamp) {
74+
void us_ticker_set_interrupt(timestamp_t timestamp)
75+
{
7176
int delta = (int)(timestamp - us_ticker_read());
7277
if (delta <= 0) {
7378
// This event was in the past.

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K82F/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

0 commit comments

Comments
 (0)