Skip to content

Commit b78e552

Browse files
mmahadevan108mmahadevan108
committed
Kinetis SDK: Coding convention fixes
Signed-off-by: Mahadevan Mahesh <[email protected]>
1 parent 93aca0b commit b78e552

File tree

10 files changed

+131
-59
lines changed

10 files changed

+131
-59
lines changed

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/analogin_api.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ static ADC_Type *const adc_addrs[] = ADC_BASE_PTRS;
2929

3030
#define MAX_FADC 6000000
3131

32-
void analogin_init(analogin_t *obj, PinName pin) {
32+
void analogin_init(analogin_t *obj, PinName pin)
33+
{
3334
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
3435
MBED_ASSERT(obj->adc != (ADCName)NC);
3536

@@ -57,7 +58,8 @@ void analogin_init(analogin_t *obj, PinName pin) {
5758
pinmap_pinout(pin, PinMap_ADC);
5859
}
5960

60-
uint16_t analogin_read_u16(analogin_t *obj) {
61+
uint16_t analogin_read_u16(analogin_t *obj)
62+
{
6163
uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT;
6264
adc16_channel_config_t adc16_channel_config;
6365

@@ -83,7 +85,8 @@ uint16_t analogin_read_u16(analogin_t *obj) {
8385
return ADC16_GetChannelConversionValue(adc_addrs[instance], 0);
8486
}
8587

86-
float analogin_read(analogin_t *obj) {
88+
float analogin_read(analogin_t *obj)
89+
{
8790
uint16_t value = analogin_read_u16(obj);
8891
return (float)value * (1.0f / (float)0xFFFF);
8992
}

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/analogout_api.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ static DAC_Type *const dac_bases[] = DAC_BASE_PTRS;
2828

2929
#define RANGE_12BIT 0xFFF
3030

31-
void analogout_init(dac_t *obj, PinName pin) {
31+
void analogout_init(dac_t *obj, PinName pin)
32+
{
3233
dac_config_t dac_config;
3334
obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);
3435
if (obj->dac == (DACName)NC) {
@@ -41,17 +42,22 @@ void analogout_init(dac_t *obj, PinName pin) {
4142
DAC_SetBufferValue(dac_bases[obj->dac], 0, 0);
4243
}
4344

44-
void analogout_free(dac_t *obj) {}
45+
void analogout_free(dac_t *obj)
46+
{
47+
}
4548

46-
static inline void dac_write(dac_t *obj, int value) {
49+
static inline void dac_write(dac_t *obj, int value)
50+
{
4751
DAC_SetBufferValue(dac_bases[obj->dac], 0, (uint16_t)value);
4852
}
4953

50-
static inline int dac_read(dac_t *obj) {
54+
static inline int dac_read(dac_t *obj)
55+
{
5156
return ((DAC0->DAT[obj->dac].DATH << 8) | DAC0->DAT[obj->dac].DATL);
5257
}
5358

54-
void analogout_write(dac_t *obj, float value) {
59+
void analogout_write(dac_t *obj, float value)
60+
{
5561
if (value < 0.0f) {
5662
dac_write(obj, 0);
5763
} else if (value > 1.0f) {
@@ -61,16 +67,19 @@ void analogout_write(dac_t *obj, float value) {
6167
}
6268
}
6369

64-
void analogout_write_u16(dac_t *obj, uint16_t value) {
70+
void analogout_write_u16(dac_t *obj, uint16_t value)
71+
{
6572
dac_write(obj, value >> 4); // 12-bit
6673
}
6774

68-
float analogout_read(dac_t *obj) {
75+
float analogout_read(dac_t *obj)
76+
{
6977
uint32_t value = dac_read(obj);
7078
return (float)value * (1.0f / (float)RANGE_12BIT);
7179
}
7280

73-
uint16_t analogout_read_u16(dac_t *obj) {
81+
uint16_t analogout_read_u16(dac_t *obj)
82+
{
7483
uint32_t value = dac_read(obj); // 12-bit
7584
return (value << 4) | ((value >> 8) & 0x003F);
7685
}

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/gpio_api.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,31 @@
2121

2222
static GPIO_Type * const gpio_addrs[] = GPIO_BASE_PTRS;
2323

24-
uint32_t gpio_set(PinName pin) {
24+
uint32_t gpio_set(PinName pin)
25+
{
2526
MBED_ASSERT(pin != (PinName)NC);
2627
uint32_t pin_num = pin & 0xFF;
2728

2829
pin_function(pin, (int)kPORT_MuxAsGpio);
2930
return 1 << pin_num;
3031
}
3132

32-
void gpio_init(gpio_t *obj, PinName pin) {
33+
void gpio_init(gpio_t *obj, PinName pin)
34+
{
3335
obj->pin = pin;
3436
if (pin == (PinName)NC)
3537
return;
3638

3739
pin_function(pin, (int)kPORT_MuxAsGpio);
3840
}
3941

40-
void gpio_mode(gpio_t *obj, PinMode mode) {
42+
void gpio_mode(gpio_t *obj, PinMode mode)
43+
{
4144
pin_mode(obj->pin, mode);
4245
}
4346

44-
void gpio_dir(gpio_t *obj, PinDirection direction) {
47+
void gpio_dir(gpio_t *obj, PinDirection direction)
48+
{
4549
MBED_ASSERT(obj->pin != (PinName)NC);
4650
uint32_t port = obj->pin >> GPIO_PORT_SHIFT;
4751
uint32_t pin_num = obj->pin & 0xFF;
@@ -57,15 +61,17 @@ void gpio_dir(gpio_t *obj, PinDirection direction) {
5761
}
5862
}
5963

60-
void gpio_write(gpio_t *obj, int value) {
64+
void gpio_write(gpio_t *obj, int value)
65+
{
6166
MBED_ASSERT(obj->pin != (PinName)NC);
6267
uint32_t port = obj->pin >> GPIO_PORT_SHIFT;
6368
uint32_t pin = obj->pin & 0xFF;
6469

6570
GPIO_WritePinOutput(gpio_addrs[port], pin, value);
6671
}
6772

68-
int gpio_read(gpio_t *obj) {
73+
int gpio_read(gpio_t *obj)
74+
{
6975
MBED_ASSERT(obj->pin != (PinName)NC);
7076
uint32_t port = obj->pin >> GPIO_PORT_SHIFT;
7177
uint32_t pin = obj->pin & 0xFF;

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/gpio_irq_api.c

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ static const IRQn_Type port_irqs[] = PORT_IRQS;
4040
#define IRQ_FALLING_EDGE (10)
4141
#define IRQ_EITHER_EDGE (11)
4242

43-
static void handle_interrupt_in(PortName port, int ch_base) {
43+
static void handle_interrupt_in(PortName port, int ch_base)
44+
{
4445
uint32_t i;
4546
uint32_t interrupt_flags;
4647
PORT_Type *port_base = port_addrs[port];
@@ -79,13 +80,33 @@ static void handle_interrupt_in(PortName port, int ch_base) {
7980
PORT_ClearPinsInterruptFlags(port_base, interrupt_flags);
8081
}
8182

82-
void gpio_irqA(void) {handle_interrupt_in(PortA, 0);}
83-
void gpio_irqB(void) {handle_interrupt_in(PortB, 32);}
84-
void gpio_irqC(void) {handle_interrupt_in(PortC, 64);}
85-
void gpio_irqD(void) {handle_interrupt_in(PortD, 96);}
86-
void gpio_irqE(void) {handle_interrupt_in(PortE, 128);}
83+
void gpio_irqA(void)
84+
{
85+
handle_interrupt_in(PortA, 0);
86+
}
87+
88+
void gpio_irqB(void)
89+
{
90+
handle_interrupt_in(PortB, 32);
91+
}
92+
93+
void gpio_irqC(void)
94+
{
95+
handle_interrupt_in(PortC, 64);
96+
}
97+
98+
void gpio_irqD(void)
99+
{
100+
handle_interrupt_in(PortD, 96);
101+
}
102+
103+
void gpio_irqE(void)
104+
{
105+
handle_interrupt_in(PortE, 128);
106+
}
87107

88-
int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id) {
108+
int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id)
109+
{
89110
if (pin == NC) {
90111
return -1;
91112
}
@@ -131,11 +152,13 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
131152
return 0;
132153
}
133154

134-
void gpio_irq_free(gpio_irq_t *obj) {
155+
void gpio_irq_free(gpio_irq_t *obj)
156+
{
135157
channel_ids[obj->ch] = 0;
136158
}
137159

138-
void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
160+
void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
161+
{
139162
PORT_Type *base = port_addrs[obj->port];
140163
port_interrupt_t irq_settings = kPORT_InterruptOrDMADisabled;
141164

@@ -176,11 +199,13 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
176199
base->PCR[obj->pin] |= PORT_PCR_ISF_MASK;
177200
}
178201

179-
void gpio_irq_enable(gpio_irq_t *obj) {
202+
void gpio_irq_enable(gpio_irq_t *obj)
203+
{
180204
NVIC_EnableIRQ(port_irqs[obj->port]);
181205
}
182206

183-
void gpio_irq_disable(gpio_irq_t *obj) {
207+
void gpio_irq_disable(gpio_irq_t *obj)
208+
{
184209
NVIC_DisableIRQ(port_irqs[obj->port]);
185210
}
186211

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/gpio_object.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ typedef struct {
2424
PinName pin;
2525
} gpio_t;
2626

27-
static inline int gpio_is_connected(const gpio_t *obj) {
27+
static inline int gpio_is_connected(const gpio_t *obj)
28+
{
2829
return obj->pin != (PinName)NC;
2930
}
3031

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/i2c_api.c

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ static I2C_Type *const i2c_addrs[] = I2C_BASE_PTRS;
3232
/* Array of I2C bus clock frequencies */
3333
static clock_name_t const i2c_clocks[] = I2C_CLOCK_FREQS;
3434

35-
void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
35+
void i2c_init(i2c_t *obj, PinName sda, PinName scl)
36+
{
3637
uint32_t i2c_sda = pinmap_peripheral(sda, PinMap_I2C_SDA);
3738
uint32_t i2c_scl = pinmap_peripheral(scl, PinMap_I2C_SCL);
3839
obj->instance = pinmap_merge(i2c_sda, i2c_scl);
@@ -57,7 +58,8 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
5758
#endif
5859
}
5960

60-
int i2c_start(i2c_t *obj) {
61+
int i2c_start(i2c_t *obj)
62+
{
6163
I2C_Type *base = i2c_addrs[obj->instance];
6264
uint32_t statusFlags = I2C_MasterGetStatusFlags(base);
6365

@@ -77,7 +79,8 @@ int i2c_start(i2c_t *obj) {
7779
return 0;
7880
}
7981

80-
int i2c_stop(i2c_t *obj) {
82+
int i2c_stop(i2c_t *obj)
83+
{
8184
if (I2C_MasterStop(i2c_addrs[obj->instance]) != kStatus_Success) {
8285
obj->next_repeated_start = 0;
8386
return 1;
@@ -86,14 +89,16 @@ int i2c_stop(i2c_t *obj) {
8689
return 0;
8790
}
8891

89-
void i2c_frequency(i2c_t *obj, int hz) {
92+
void i2c_frequency(i2c_t *obj, int hz)
93+
{
9094
uint32_t busClock;
9195

9296
busClock = CLOCK_GetFreq(i2c_clocks[obj->instance]);
9397
I2C_MasterSetBaudRate(i2c_addrs[obj->instance], hz, busClock);
9498
}
9599

96-
int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
100+
int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
101+
{
97102
I2C_Type *base = i2c_addrs[obj->instance];
98103
i2c_master_transfer_t master_xfer;
99104

@@ -121,7 +126,8 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
121126
return length;
122127
}
123128

124-
int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
129+
int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop)
130+
{
125131
I2C_Type *base = i2c_addrs[obj->instance];
126132
i2c_master_transfer_t master_xfer;
127133

@@ -145,11 +151,13 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
145151
return length;
146152
}
147153

148-
void i2c_reset(i2c_t *obj) {
154+
void i2c_reset(i2c_t *obj)
155+
{
149156
i2c_stop(obj);
150157
}
151158

152-
int i2c_byte_read(i2c_t *obj, int last) {
159+
int i2c_byte_read(i2c_t *obj, int last)
160+
{
153161
uint8_t data;
154162
I2C_Type *base = i2c_addrs[obj->instance];
155163
i2c_master_transfer_t master_xfer;
@@ -169,7 +177,8 @@ int i2c_byte_read(i2c_t *obj, int last) {
169177
return data;
170178
}
171179

172-
int i2c_byte_write(i2c_t *obj, int data) {
180+
int i2c_byte_write(i2c_t *obj, int data)
181+
{
173182
#if FSL_I2C_DRIVER_VERSION > MAKE_VERSION(2, 0, 1)
174183
if (I2C_MasterWriteBlocking(i2c_addrs[obj->instance], (uint8_t *)(&data), 1, kI2C_TransferNoStopFlag) == kStatus_Success) {
175184
return 1;
@@ -184,7 +193,8 @@ int i2c_byte_write(i2c_t *obj, int data) {
184193

185194

186195
#if DEVICE_I2CSLAVE
187-
void i2c_slave_mode(i2c_t *obj, int enable_slave) {
196+
void i2c_slave_mode(i2c_t *obj, int enable_slave)
197+
{
188198
i2c_slave_config_t slave_config;
189199
I2C_SlaveGetDefaultConfig(&slave_config);
190200
slave_config.slaveAddress = 0;
@@ -196,7 +206,8 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) {
196206
#endif
197207
}
198208

199-
int i2c_slave_receive(i2c_t *obj) {
209+
int i2c_slave_receive(i2c_t *obj)
210+
{
200211
uint32_t status_flags = I2C_SlaveGetStatusFlags(i2c_addrs[obj->instance]);
201212

202213
if (status_flags & kI2C_AddressMatchFlag) {
@@ -213,7 +224,8 @@ int i2c_slave_receive(i2c_t *obj) {
213224
}
214225
}
215226

216-
int i2c_slave_read(i2c_t *obj, char *data, int length) {
227+
int i2c_slave_read(i2c_t *obj, char *data, int length)
228+
{
217229
I2C_Type *base = i2c_addrs[obj->instance];
218230

219231
if (base->S & kI2C_AddressMatchFlag) {
@@ -228,7 +240,8 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) {
228240
return length;
229241
}
230242

231-
int i2c_slave_write(i2c_t *obj, const char *data, int length) {
243+
int i2c_slave_write(i2c_t *obj, const char *data, int length)
244+
{
232245
I2C_Type *base = i2c_addrs[obj->instance];
233246

234247
I2C_SlaveWriteBlocking(base, (uint8_t *)data, length);
@@ -241,7 +254,8 @@ int i2c_slave_write(i2c_t *obj, const char *data, int length) {
241254
return length;
242255
}
243256

244-
void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
257+
void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask)
258+
{
245259
i2c_addrs[obj->instance]->A1 = address & 0xfe;
246260
}
247261
#endif

‎targets/TARGET_Freescale/TARGET_KSDK2_MCUS/api/pinmap.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
/* Array of PORT peripheral base address. */
2222
static PORT_Type *const port_addrs[] = PORT_BASE_PTRS;
2323

24-
void pin_function(PinName pin, int function) {
24+
void pin_function(PinName pin, int function)
25+
{
2526
MBED_ASSERT(pin != (PinName)NC);
2627
clock_ip_name_t port_clocks[] = PORT_CLOCKS;
2728

@@ -30,7 +31,8 @@ void pin_function(PinName pin, int function) {
3031
PORT_SetPinMux(port_addrs[pin >> GPIO_PORT_SHIFT], pin & 0xFF, (port_mux_t)function);
3132
}
3233

33-
void pin_mode(PinName pin, PinMode mode) {
34+
void pin_mode(PinName pin, PinMode mode)
35+
{
3436
MBED_ASSERT(pin != (PinName)NC);
3537
uint32_t instance = pin >> GPIO_PORT_SHIFT;
3638
uint32_t pinName = pin & 0xFF;

0 commit comments

Comments
 (0)