Skip to content

Commit e1af24c

Browse files
0xc01700xc0170
committed
Spaces correction
1 parent 3c0775f commit e1af24c

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/i2c_api.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
8484

8585
pinmap_pinout(sda, PinMap_I2C_SDA);
8686
pinmap_pinout(scl, PinMap_I2C_SCL);
87-
87+
8888
first_read = 1;
8989
}
9090

@@ -117,12 +117,12 @@ int i2c_stop(i2c_t *obj) {
117117

118118
static int timeout_status_poll(i2c_t *obj, uint32_t mask) {
119119
uint32_t i, timeout = 1000;
120-
120+
121121
for (i = 0; i < timeout; i++) {
122122
if (obj->i2c->S & mask)
123123
return 0;
124124
}
125-
125+
126126
return 1;
127127
}
128128

@@ -131,14 +131,14 @@ static int timeout_status_poll(i2c_t *obj, uint32_t mask) {
131131
// 1: OK ack not received
132132
// 2: failure
133133
static int i2c_wait_end_tx_transfer(i2c_t *obj) {
134-
134+
135135
// wait for the interrupt flag
136136
if (timeout_status_poll(obj, I2C_S_IICIF_MASK)) {
137137
return 2;
138138
}
139-
139+
140140
obj->i2c->S |= I2C_S_IICIF_MASK;
141-
141+
142142
// wait transfer complete
143143
if (timeout_status_poll(obj, I2C_S_TCF_MASK)) {
144144
return 2;
@@ -156,9 +156,9 @@ static int i2c_wait_end_rx_transfer(i2c_t *obj) {
156156
if (timeout_status_poll(obj, I2C_S_IICIF_MASK)) {
157157
return 1;
158158
}
159-
159+
160160
obj->i2c->S |= I2C_S_IICIF_MASK;
161-
161+
162162
return 0;
163163
}
164164

@@ -293,33 +293,33 @@ void i2c_reset(i2c_t *obj) {
293293

294294
int i2c_byte_read(i2c_t *obj, int last) {
295295
char data;
296-
296+
297297
// set rx mode
298298
obj->i2c->C1 &= ~I2C_C1_TX_MASK;
299-
299+
300300
if(first_read) {
301301
// first dummy read
302302
i2c_do_read(obj, &data, 0);
303303
first_read = 0;
304304
}
305-
305+
306306
if (last) {
307307
// set tx mode
308308
obj->i2c->C1 |= I2C_C1_TX_MASK;
309309
return obj->i2c->D;
310310
}
311-
311+
312312
i2c_do_read(obj, &data, last);
313-
313+
314314
return data;
315315
}
316316

317317
int i2c_byte_write(i2c_t *obj, int data) {
318318
first_read = 1;
319-
319+
320320
// set tx mode
321321
obj->i2c->C1 |= I2C_C1_TX_MASK;
322-
322+
323323
return !i2c_do_write(obj, (data & 0xFF));
324324
}
325325

@@ -340,33 +340,33 @@ int i2c_slave_receive(i2c_t *obj) {
340340
switch(obj->i2c->S) {
341341
// read addressed
342342
case 0xE6: return 1;
343-
343+
344344
// write addressed
345345
case 0xE2: return 3;
346-
346+
347347
default: return 0;
348348
}
349349
}
350350

351351
int i2c_slave_read(i2c_t *obj, char *data, int length) {
352352
uint8_t dummy_read, count;
353353
uint8_t * ptr;
354-
354+
355355
// set rx mode
356356
obj->i2c->C1 &= ~I2C_C1_TX_MASK;
357-
357+
358358
// first dummy read
359359
dummy_read = obj->i2c->D;
360360
if(i2c_wait_end_rx_transfer(obj)) {
361361
return 0;
362362
}
363-
363+
364364
// read address
365365
dummy_read = obj->i2c->D;
366366
if(i2c_wait_end_rx_transfer(obj)) {
367367
return 0;
368368
}
369-
369+
370370
// read (length - 1) bytes
371371
for (count = 0; count < (length - 1); count++) {
372372
data[count] = obj->i2c->D;
@@ -378,32 +378,32 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) {
378378
// read last byte
379379
ptr = (length == 0) ? &dummy_read : (uint8_t *)&data[count];
380380
*ptr = obj->i2c->D;
381-
381+
382382
return (length) ? (count + 1) : 0;
383383
}
384384

385385
int i2c_slave_write(i2c_t *obj, const char *data, int length) {
386386
uint32_t i, count = 0;
387-
387+
388388
// set tx mode
389389
obj->i2c->C1 |= I2C_C1_TX_MASK;
390-
390+
391391
for (i = 0; i < length; i++) {
392392
if(i2c_do_write(obj, data[count++]) == 2) {
393393
return i;
394394
}
395395
}
396-
396+
397397
// set rx mode
398398
obj->i2c->C1 &= ~I2C_C1_TX_MASK;
399-
399+
400400
// dummy rx transfer needed
401401
// otherwise the master cannot generate a stop bit
402402
obj->i2c->D;
403403
if(i2c_wait_end_rx_transfer(obj) == 2) {
404404
return count;
405405
}
406-
406+
407407
return count;
408408
}
409409

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/serial_api.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
7777
}
7878
// Disable UART before changing registers
7979
obj->uart->C2 &= ~(UART_C2_RE_MASK | UART_C2_TE_MASK);
80-
80+
8181
switch (uart) {
8282
case UART_0: obj->index = 0; break;
8383
case UART_1: obj->index = 1; break;
@@ -122,13 +122,13 @@ void serial_free(serial_t *obj) {
122122
// DivAddVal < MulVal
123123
//
124124
void serial_baud(serial_t *obj, int baudrate) {
125-
125+
126126
// save C2 state
127127
uint8_t c2_state = (obj->uart->C2 & (UART_C2_RE_MASK | UART_C2_TE_MASK));
128-
128+
129129
// Disable UART before changing registers
130130
obj->uart->C2 &= ~(UART_C2_RE_MASK | UART_C2_TE_MASK);
131-
131+
132132
// [TODO] not hardcode this value
133133
uint32_t PCLK = (obj->uart == UART0) ? 48000000u : 24000000u;
134134

@@ -143,20 +143,20 @@ void serial_baud(serial_t *obj, int baudrate) {
143143
// set BDH and BDL
144144
obj->uart->BDH = (obj->uart->BDH & ~(0x1f)) | ((DL >> 8) & 0x1f);
145145
obj->uart->BDL = (obj->uart->BDL & ~(0xff)) | ((DL >> 0) & 0xff);
146-
146+
147147
// restore C2 state
148148
obj->uart->C2 |= c2_state;
149149
}
150150

151151
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
152152
uint8_t m10 = 0;
153-
153+
154154
// save C2 state
155155
uint8_t c2_state = (obj->uart->C2 & (UART_C2_RE_MASK | UART_C2_TE_MASK));
156-
156+
157157
// Disable UART before changing registers
158158
obj->uart->C2 &= ~(UART_C2_RE_MASK | UART_C2_TE_MASK);
159-
159+
160160
// 8 data bits = 0 ... 9 data bits = 1
161161
if ((data_bits < 8) || (data_bits > 9)) {
162162
error("Invalid number of bits (%d) in serial format, should be 8..9\r\n", data_bits);
@@ -178,7 +178,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
178178
error("Invalid stop bits specified\r\n");
179179
}
180180
stop_bits -= 1;
181-
181+
182182
// 9 data bits + parity
183183
if (data_bits == 2) {
184184
// only uart0 supports 10 bit communication
@@ -193,17 +193,17 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
193193
obj->uart->C1 = ((data_bits << 4)
194194
| (parity_enable << 1)
195195
| (parity_select << 0));
196-
196+
197197
// enable 10bit mode if needed
198198
if (obj->index == 0) {
199199
obj->uart->C4 &= ~UARTLP_C4_M10_MASK;
200200
obj->uart->C4 |= (m10 << UARTLP_C4_M10_SHIFT);
201201
}
202-
202+
203203
// stop bits
204204
obj->uart->BDH &= ~UART_BDH_SBNS_MASK;
205205
obj->uart->BDH |= (stop_bits << UART_BDH_SBNS_SHIFT);
206-
206+
207207
// restore C2 state
208208
obj->uart->C2 |= c2_state;
209209
}
@@ -304,7 +304,7 @@ void serial_pinout_tx(PinName tx) {
304304
}
305305

306306
void serial_break_set(serial_t *obj) {
307-
obj->uart->C2 |= UART_C2_SBK_MASK;
307+
obj->uart->C2 |= UART_C2_SBK_MASK;
308308
}
309309

310310
void serial_break_clear(serial_t *obj) {

0 commit comments

Comments
 (0)