Skip to content

Commit 49a1162

Browse files
author
Wayne Ren
committed
board: iotdk: code format
format the code with the rules in .astyle\embarc_astyle through astyle formatter Signed-off-by: Wayne Ren <[email protected]>
1 parent 0efd377 commit 49a1162

File tree

22 files changed

+353
-219
lines changed

22 files changed

+353
-219
lines changed

board/iotdk/drivers/ip/designware/i2s/dw_i2s_obj.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,18 +238,22 @@ DEV_I2S_PTR i2s_get_dev(int32_t i2s_id)
238238

239239
switch (i2s_id) {
240240
#if (USE_DW_I2S_0)
241+
241242
case DW_I2S_0_ID:
242243
return &dw_i2s_0;
243244
break;
244245
#endif
245246
#if (USE_DW_I2S_1)
247+
246248
case DW_I2S_1_ID:
247249
return &dw_i2s_1;
248250
break;
249251
#endif
252+
250253
default:
251254
break;
252255
}
256+
253257
return NULL;
254258
}
255259

board/iotdk/drivers/ip/designware/sdio/dw_sdio_obj.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static DW_SDIO_CTRL dw_sdio_0_ctrl;
4141
static DEV_SDIO dw_sdio_0;
4242

4343

44-
static void dw_sdio_0_isr(void * ptr)
44+
static void dw_sdio_0_isr(void *ptr)
4545
{
4646
dw_sdio_isr(&dw_sdio_0, ptr);
4747
}
@@ -119,13 +119,16 @@ DEV_SDIO_PTR sdio_get_dev(uint32_t sdio_id)
119119

120120
switch (sdio_id) {
121121
#if (USE_DW_SDIO_0)
122+
122123
case DW_SDIO_0_ID:
123124
return &dw_sdio_0;
124125
break;
125126
#endif
127+
126128
default:
127129
break;
128130
}
131+
129132
return NULL;
130133
}
131134

board/iotdk/drivers/ip/subsystem/gpio/dfss_gpio_obj.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,29 +484,38 @@ DEV_GPIO_PTR gpio_get_dev(int32_t gpio_id)
484484

485485
switch (gpio_id) {
486486
#if (USE_DFSS_GPIO_8B0)
487+
487488
case DFSS_GPIO_8B0_ID: return &gpio_0;
488489
#endif
489490
#if (USE_DFSS_GPIO_8B1)
491+
490492
case DFSS_GPIO_8B1_ID: return &gpio_1;
491493
#endif
492494
#if (USE_DFSS_GPIO_8B2)
495+
493496
case DFSS_GPIO_8B2_ID: return &gpio_2;
494497
#endif
495498
#if (USE_DFSS_GPIO_8B3)
499+
496500
case DFSS_GPIO_8B3_ID: return &gpio_3;
497501
#endif
498502
#if (USE_DFSS_GPIO_4B0)
503+
499504
case DFSS_GPIO_4B0_ID: return &gpio_4;
500505
#endif
501506
#if (USE_DFSS_GPIO_4B1)
507+
502508
case DFSS_GPIO_4B1_ID: return &gpio_5;
503509
#endif
504510
#if (USE_DFSS_GPIO_4B2)
511+
505512
case DFSS_GPIO_4B2_ID: return &gpio_6;
506513
#endif
514+
507515
default:
508516
break;
509517
}
518+
510519
return NULL;
511520
}
512521

board/iotdk/drivers/ip/subsystem/iic/dfss_iic_obj.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,22 @@ DEV_IIC_PTR iic_get_dev(int32_t iic_id)
220220

221221
switch (iic_id) {
222222
#if USE_DFSS_IIC_0
223+
223224
case DFSS_IIC_0_ID:
224225
return &dfss_iic_0;
225226
break;
226227
#endif
227228
#if USE_DFSS_IIC_1
229+
228230
case DFSS_IIC_1_ID:
229231
return &dfss_iic_1;
230232
break;
231233
#endif
234+
232235
default:
233236
break;
234237
}
238+
235239
return NULL;
236240
}
237241

board/iotdk/drivers/ip/subsystem/spi/dfss_spi_obj.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,19 +229,23 @@ DEV_SPI_PTR spi_get_dev(int32_t spi_id)
229229

230230
switch (spi_id) {
231231
#if (USE_DFSS_SPI_0)
232+
232233
case DFSS_SPI_0_ID:
233234
return &dfss_spi_0;
234235
break;
235236
#endif
236237

237238
#if (USE_DFSS_SPI_1)
239+
238240
case DFSS_SPI_1_ID:
239241
return &dfss_spi_1;
240242
break;
241243
#endif
244+
242245
default:
243246
break;
244247
}
248+
245249
return NULL;
246250
}
247251

board/iotdk/drivers/ip/subsystem/uart/dfss_uart_obj.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,28 +379,34 @@ DEV_UART_PTR uart_get_dev(int32_t uart_id)
379379

380380
switch (uart_id) {
381381
#if USE_DFSS_UART_0
382+
382383
case DFSS_UART_0_ID:
383384
return &dfss_uart_0;
384385
break;
385386
#endif
386387
#if USE_DFSS_UART_1
388+
387389
case DFSS_UART_1_ID:
388390
return &dfss_uart_1;
389391
break;
390392
#endif
391393
#if USE_DFSS_UART_2
394+
392395
case DFSS_UART_2_ID:
393396
return &dfss_uart_2;
394397
break;
395398
#endif
396399
#if USE_DFSS_UART_3
400+
397401
case DFSS_UART_3_ID:
398402
return &dfss_uart_3;
399403
break;
400404
#endif
405+
401406
default:
402407
break;
403408
}
409+
404410
return NULL;
405411
}
406412

board/iotdk/drivers/ntshell/ntshell_io.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,26 @@
3333
#include "ntshell_io.h"
3434

3535
/** get ntshell interface by index */
36-
NTSHELL_IO* get_ntshell_io(uint32_t id)
36+
NTSHELL_IO *get_ntshell_io(uint32_t id)
3737
{
3838
switch (id) {
3939
#if (USE_IOTDK_NTSHELL_UART_1)
40+
4041
case IOTDK_NTSHELL_0_ID:
4142
return &ntshell_uart_1;
4243
break;
4344
#endif
4445
#if (USE_IOTDK_NTSHELL_NETCONN_0)
46+
4547
case IOTDK_NTSHELL_1_ID:
4648
return &ntshell_netconn_0;
4749
break;
4850
#endif
51+
4952
default:
5053
break;
5154
}
55+
5256
return NULL;
5357
}
5458

board/iotdk/drivers/ntshell/ntshell_io_netconn.c

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ static void ntshell_netconn_thread(void *arg)
128128
netconn_listen(nt_netconn->local_conn);
129129

130130
nt_netconn->conn_status = CONN_NOTCONNECT;
131+
131132
while (1) {
132133
ercd = netconn_accept(nt_netconn->local_conn, &temp_conn);
133134
nt_netconn->conn_status = CONN_NOTCONNECT;
135+
134136
if (ercd == ERR_OK) {
135137
if (nt_netconn->remote_conn != NULL) { /* kill previous connection */
136138
sys_mbox_trypost(&nt_netconn->remote_conn->recvmbox, NULL);
@@ -139,6 +141,7 @@ static void ntshell_netconn_thread(void *arg)
139141
netconn_delete(nt_netconn->remote_conn);
140142
DBG("Delete old connection\n");
141143
}
144+
142145
DBG("New connection connected\n");
143146
nt_netconn->remote_conn = temp_conn;
144147
nt_netconn->conn_status = CONN_SUCCESS;
@@ -160,13 +163,15 @@ static int32_t ntshell_netconn_nt_ioinit(NTSHELL_IO_NETCONN *nt_netconn)
160163
if (nt_netconn->conn_thread->thread_arg == NULL) {
161164
nt_netconn->conn_thread->thread_arg = (void *)nt_netconn;
162165
}
166+
163167
sys_thread_new(nt_netconn->conn_thread->thread_name, nt_netconn->conn_thread->thread, \
164-
nt_netconn->conn_thread->thread_arg, nt_netconn->conn_thread->thread_stksz, \
165-
nt_netconn->conn_thread->thread_prio);
168+
nt_netconn->conn_thread->thread_arg, nt_netconn->conn_thread->thread_stksz, \
169+
nt_netconn->conn_thread->thread_prio);
166170

167171
while (nt_netconn->conn_status != CONN_SUCCESS) {
168172
sys_msleep(100);
169173
}
174+
170175
ercd = E_OK;
171176
error_exit:
172177
return ercd;
@@ -176,12 +181,15 @@ static int32_t netconn_nt_read_chr_raw(NTSHELL_IO_NETCONN *nt_netconn)
176181
{
177182
int8_t rcv_chr;
178183
int ercd;
184+
179185
if (nt_netconn->conn_status == CONN_SUCCESS) {
180186
if (nt_netconn->rcv_ofs >= nt_netconn->rcv_len) {
181187
if (nt_netconn->pbuf_rcv != NULL) { /* free it when valid */
182188
pbuf_free(nt_netconn->pbuf_rcv);
183189
}
190+
184191
ercd = netconn_recv_tcp_pbuf(nt_netconn->remote_conn, &nt_netconn->pbuf_rcv);
192+
185193
if (ercd == ERR_OK) {
186194
nt_netconn->rcv_ofs = 0;
187195
nt_netconn->rcv_len = nt_netconn->pbuf_rcv->tot_len;
@@ -190,17 +198,21 @@ static int32_t netconn_nt_read_chr_raw(NTSHELL_IO_NETCONN *nt_netconn)
190198
return E_OBJ;
191199
}
192200
}
201+
193202
if (nt_netconn->pbuf_rcv == NULL) {
194203
return E_OBJ;
195204
}
205+
196206
pbuf_copy_partial(nt_netconn->pbuf_rcv, &rcv_chr, 1, nt_netconn->rcv_ofs);
197207
nt_netconn->rcv_ofs ++;
198208
return ((int32_t)rcv_chr) & 0xff;
199209
}
210+
200211
/** error handling */
201212
if (nt_netconn->pbuf_rcv != NULL) { /* free it when valid */
202213
pbuf_free(nt_netconn->pbuf_rcv);
203214
}
215+
204216
nt_netconn->rcv_ofs = 0;
205217
nt_netconn->rcv_len = 0;
206218
return E_OBJ;
@@ -210,27 +222,32 @@ static int32_t netconn_nt_read_chr(NTSHELL_IO_NETCONN *nt_netconn)
210222
int32_t ch, req;
211223

212224
while ( (ch = netconn_nt_read_chr_raw(nt_netconn)) == TELNET_OPT_IAC \
213-
|| ch == '\0' && ch != E_OBJ) {
225+
|| ch == '\0' && ch != E_OBJ) {
214226
if (ch != '\0') {
215227
switch (ch = netconn_nt_read_chr_raw(nt_netconn)) {
216228
case TELNET_OPT_WILL:
217229
case TELNET_OPT_WONT:
218230
case TELNET_OPT_DO:
219231
case TELNET_OPT_DONT:
220232
req = netconn_nt_read_chr_raw(nt_netconn);
233+
221234
if (req != E_OBJ) {
222235
DBG("Telnet Request:%x\n\r", req);
223236
} else {
224237
return req;
225238
}
239+
226240
break;
241+
227242
case TELNET_OPT_SB:
228243
while ((ch = netconn_nt_read_chr_raw(nt_netconn)) != E_OBJ && ch != TELNET_OPT_IAC) {
229244
if ((ch = netconn_nt_read_chr_raw(nt_netconn)) == E_OBJ || ch == TELNET_OPT_SE) {
230245
break;
231246
}
232247
}
248+
233249
break;
250+
234251
default:
235252
break;
236253
}
@@ -251,6 +268,7 @@ static int32_t ntshell_netconn_nt_read(NTSHELL_IO_NETCONN *nt_netconn, void *buf
251268

252269
while (reacnt < cnt) {
253270
ercd = netconn_nt_read_chr(nt_netconn);
271+
254272
if (ercd == E_OBJ) {
255273
sys_msleep(10); /* yield for other process to run */
256274
break;
@@ -285,16 +303,20 @@ static int32_t ntshell_netconn_nt_write(NTSHELL_IO_NETCONN *nt_netconn, const vo
285303
while (wricnt < cnt) {
286304
crlf_snd_save = crlf_snd;
287305
sndchr = p_charbuf[wricnt];
306+
288307
if (crlf_snd && sndchr == '\n' && nt_netconn->conn_ctrl & CONN_CTRL_CRLF) {
289308
crlf_snd = 0;
290309
sndchr = '\r';
291310
} else {
292311
crlf_snd = 1;
293312
}
313+
294314
netconn_nt_write_chr(nt_netconn, sndchr);
315+
295316
if (nt_netconn->conn_status != CONN_SUCCESS) {
296317
break;
297318
}
319+
298320
wricnt += crlf_snd;
299321
}
300322

board/iotdk/drivers/ntshell/ntshell_io_uart.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ static int32_t ntshell_uart_nt_read(NTSHELL_IO *nt_io, void *buf, uint32_t cnt)
9393
IOTDK_NTSHELL_UART_CHECK_EXP(uart_dev!=NULL, E_PAR);
9494

9595
ercd = cnt;
96+
9697
do {
9798
uart_dev->uart_control(UART_CMD_GET_RXAVAIL, (void *)(&rd_avail));
99+
98100
if (rd_avail > 0) {
99101
rd_avail = (rd_avail > cnt) ? cnt : rd_avail;
100102
uart_dev->uart_read(buf, rd_avail);

0 commit comments

Comments
 (0)