Skip to content

Commit d1a4f2e

Browse files
ArdaFuArdaFu
committed
Merge pull request #1 from RT-Thread/master
pull rt-thread master
2 parents f74d7f1 + 0eb3594 commit d1a4f2e

File tree

54 files changed

+666
-617
lines changed

Some content is hidden

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

54 files changed

+666
-617
lines changed

Diff for: ‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ env:
5151
- RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'
5252
# - RTT_BSP='upd70f3454' # iar
5353
# - RTT_BSP='x86' # x86
54-
- RTT_BSP='xplorer4330/m4' RTT_TOOL_CHAIN='sourcery-arm'
54+
- RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
55+
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
5556
- RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
5657
- RTT_BSP='beaglebone' RTT_TOOL_CHAIN='sourcery-arm'
5758
- RTT_BSP='zynq7000' RTT_TOOL_CHAIN='sourcery-arm'

Diff for: ‎bsp/at91sam9260/applications/application.c

-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ void rt_init_thread_entry(void* parameter)
138138
/* register ethernetif device */
139139
eth_system_device_init();
140140
rt_hw_macb_init();
141-
/* re-init device driver */
142-
rt_device_init_all();
143141
/* init lwip system */
144142
lwip_sys_init();
145143
}

Diff for: ‎bsp/at91sam9260/drivers/usart.c

+10-14
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void rt_at91_usart_handler(int vector, void *param)
9595
return;
9696
}
9797
rt_interrupt_enter();
98-
rt_hw_serial_isr(dev);
98+
rt_hw_serial_isr((struct rt_serial_device *)dev, RT_SERIAL_EVENT_RX_IND);
9999
rt_interrupt_leave();
100100
}
101101

@@ -231,7 +231,6 @@ static const struct rt_uart_ops at91_usart_ops =
231231

232232
#if defined(RT_USING_DBGU)
233233
static struct rt_serial_device serial_dbgu;
234-
static struct serial_ringbuffer dbgu_int_rx;
235234
struct at91_uart dbgu = {
236235
DBGU,
237236
AT91_ID_SYS
@@ -241,7 +240,6 @@ struct at91_uart dbgu = {
241240

242241
#if defined(RT_USING_UART0)
243242
static struct rt_serial_device serial0;
244-
static struct serial_ringbuffer uart0_int_rx;
245243
struct at91_uart uart0 = {
246244
UART0,
247245
AT91SAM9260_ID_US0
@@ -250,7 +248,6 @@ struct at91_uart uart0 = {
250248

251249
#if defined(RT_USING_UART1)
252250
static struct rt_serial_device serial1;
253-
static struct serial_ringbuffer uart1_int_rx;
254251
struct at91_uart uart1 = {
255252
UART1,
256253
AT91SAM9260_ID_US1
@@ -259,7 +256,6 @@ struct at91_uart uart1 = {
259256

260257
#if defined(RT_USING_UART2)
261258
static struct rt_serial_device serial2;
262-
static struct serial_ringbuffer uart2_int_rx;
263259
struct at91_uart uart2 = {
264260
UART2,
265261
AT91SAM9260_ID_US2
@@ -268,7 +264,6 @@ struct at91_uart uart2 = {
268264

269265
#if defined(RT_USING_UART3)
270266
static struct rt_serial_device serial3;
271-
static struct serial_ringbuffer uart3_int_rx;
272267
struct at91_uart uart3 = {
273268
UART3,
274269
AT91SAM9260_ID_US3
@@ -337,29 +332,29 @@ void rt_hw_uart_init(void)
337332

338333
#if defined(RT_USING_DBGU)
339334
serial_dbgu.ops = &at91_usart_ops;
340-
serial_dbgu.int_rx = &dbgu_int_rx;
341335
serial_dbgu.config.baud_rate = BAUD_RATE_115200;
342336
serial_dbgu.config.bit_order = BIT_ORDER_LSB;
343337
serial_dbgu.config.data_bits = DATA_BITS_8;
344338
serial_dbgu.config.parity = PARITY_NONE;
345339
serial_dbgu.config.stop_bits = STOP_BITS_1;
346340
serial_dbgu.config.invert = NRZ_NORMAL;
341+
serial_dbgu.config.bufsz = RT_SERIAL_RB_BUFSZ;
347342

348343
/* register vcom device */
349344
rt_hw_serial_register(&serial_dbgu, "dbgu",
350-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
345+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
351346
&dbgu);
352347
#endif
353348

354349
#if defined(RT_USING_UART0)
355350
serial0.ops = &at91_usart_ops;
356-
serial0.int_rx = &uart0_int_rx;
357351
serial0.config.baud_rate = BAUD_RATE_115200;
358352
serial0.config.bit_order = BIT_ORDER_LSB;
359353
serial0.config.data_bits = DATA_BITS_8;
360354
serial0.config.parity = PARITY_NONE;
361355
serial0.config.stop_bits = STOP_BITS_1;
362356
serial0.config.invert = NRZ_NORMAL;
357+
serial0.config.bufsz = RT_SERIAL_RB_BUFSZ;
363358

364359
/* register vcom device */
365360
rt_hw_serial_register(&serial0, "uart0",
@@ -379,10 +374,11 @@ void rt_hw_uart_init(void)
379374
serial1.config.parity = PARITY_NONE;
380375
serial1.config.stop_bits = STOP_BITS_1;
381376
serial1.config.invert = NRZ_NORMAL;
377+
serial1.config.bufsz = RT_SERIAL_RB_BUFSZ;
382378

383379
/* register vcom device */
384380
rt_hw_serial_register(&serial1, "uart1",
385-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
381+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
386382
&uart1);
387383
rt_hw_interrupt_install(uart1.irq, rt_at91_usart_handler,
388384
(void *)&(serial1.parent), "UART1");
@@ -391,17 +387,17 @@ void rt_hw_uart_init(void)
391387

392388
#if defined(RT_USING_UART2)
393389
serial2.ops = &at91_usart_ops;
394-
serial2.int_rx = &uart2_int_rx;
395390
serial2.config.baud_rate = BAUD_RATE_115200;
396391
serial2.config.bit_order = BIT_ORDER_LSB;
397392
serial2.config.data_bits = DATA_BITS_8;
398393
serial2.config.parity = PARITY_NONE;
399394
serial2.config.stop_bits = STOP_BITS_1;
400395
serial2.config.invert = NRZ_NORMAL;
396+
serial2.config.bufsz = RT_SERIAL_RB_BUFSZ;
401397

402398
/* register vcom device */
403399
rt_hw_serial_register(&serial2, "uart2",
404-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
400+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
405401
&uart2);
406402
rt_hw_interrupt_install(uart2.irq, rt_at91_usart_handler,
407403
(void *)&(serial2.parent), "UART2");
@@ -410,17 +406,17 @@ void rt_hw_uart_init(void)
410406

411407
#if defined(RT_USING_UART3)
412408
serial3.ops = &at91_usart_ops;
413-
serial3.int_rx = &uart3_int_rx;
414409
serial3.config.baud_rate = BAUD_RATE_115200;
415410
serial3.config.bit_order = BIT_ORDER_LSB;
416411
serial3.config.data_bits = DATA_BITS_8;
417412
serial3.config.parity = PARITY_NONE;
418413
serial3.config.stop_bits = STOP_BITS_1;
419414
serial3.config.invert = NRZ_NORMAL;
415+
serial3.config.bufsz = RT_SERIAL_RB_BUFSZ;
420416

421417
/* register vcom device */
422418
rt_hw_serial_register(&serial3, "uart3",
423-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
419+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
424420
&uart3);
425421
rt_hw_interrupt_install(uart3.irq, rt_at91_usart_handler,
426422
(void *)&(serial3.parent), "UART3");

Diff for: ‎bsp/avr32uc3b0/startup.c

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ int main(void)
3939
#endif
4040

4141
rt_system_scheduler_init();
42-
rt_device_init_all();
4342
rt_application_init();
4443

4544
#ifdef RT_USING_FINSH

Diff for: ‎bsp/beaglebone/drivers/serial.c

+17-19
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static void am33xx_uart_isr(int irqno, void* param)
4141

4242
if ((iir & (0x02 << 1)) || (iir & (0x6 << 1)))
4343
{
44-
rt_hw_serial_isr(serial);
44+
rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_IND);
4545
}
4646
}
4747

@@ -165,7 +165,6 @@ static const struct rt_uart_ops am33xx_uart_ops =
165165

166166
/* UART device driver structure */
167167
#ifdef RT_USING_UART0
168-
struct serial_ringbuffer uart0_int_rx;
169168
struct am33xx_uart uart0 =
170169
{
171170
UART0_BASE,
@@ -175,7 +174,6 @@ struct rt_serial_device serial0;
175174
#endif
176175

177176
#ifdef RT_USING_UART1
178-
struct serial_ringbuffer uart1_int_rx;
179177
struct am33xx_uart uart1 =
180178
{
181179
UART1_BASE,
@@ -185,7 +183,6 @@ struct rt_serial_device serial1;
185183
#endif
186184

187185
#ifdef RT_USING_UART2
188-
struct serial_ringbuffer uart2_int_rx;
189186
struct am33xx_uart uart2 =
190187
{
191188
UART2_BASE,
@@ -195,7 +192,6 @@ struct rt_serial_device serial2;
195192
#endif
196193

197194
#ifdef RT_USING_UART3
198-
struct serial_ringbuffer uart3_int_rx;
199195
struct am33xx_uart uart3 =
200196
{
201197
UART3_BASE,
@@ -205,7 +201,6 @@ struct rt_serial_device serial3;
205201
#endif
206202

207203
#ifdef RT_USING_UART4
208-
struct serial_ringbuffer uart4_int_rx;
209204
struct am33xx_uart uart4 =
210205
{
211206
UART4_BASE,
@@ -215,7 +210,6 @@ struct rt_serial_device serial4;
215210
#endif
216211

217212
#ifdef RT_USING_UART5
218-
struct serial_ringbuffer uart5_int_rx;
219213
struct am33xx_uart uart5 =
220214
{
221215
UART5_BASE,
@@ -359,8 +353,9 @@ int rt_hw_serial_init(void)
359353
config.parity = PARITY_NONE;
360354
config.stop_bits = STOP_BITS_1;
361355
config.invert = NRZ_NORMAL;
356+
config.bufsz = RT_SERIAL_RB_BUFSZ;
357+
362358
serial0.ops = &am33xx_uart_ops;
363-
serial0.int_rx = &uart0_int_rx;
364359
serial0.config = config;
365360
/* enable RX interrupt */
366361
UART_IER_REG(uart0.base) = 0x01;
@@ -370,7 +365,7 @@ int rt_hw_serial_init(void)
370365
rt_hw_interrupt_mask(uart0.irq);
371366
/* register UART0 device */
372367
rt_hw_serial_register(&serial0, "uart0",
373-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
368+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
374369
&uart0);
375370
#endif
376371

@@ -381,8 +376,9 @@ int rt_hw_serial_init(void)
381376
config.parity = PARITY_NONE;
382377
config.stop_bits = STOP_BITS_1;
383378
config.invert = NRZ_NORMAL;
379+
config.bufsz = RT_SERIAL_RB_BUFSZ;
380+
384381
serial1.ops = &am33xx_uart_ops;
385-
serial1.int_rx = &uart1_int_rx;
386382
serial1.config = config;
387383
/* enable RX interrupt */
388384
UART_IER_REG(uart1.base) = 0x01;
@@ -392,7 +388,7 @@ int rt_hw_serial_init(void)
392388
rt_hw_interrupt_mask(uart1.irq);
393389
/* register UART0 device */
394390
rt_hw_serial_register(&serial1, "uart1",
395-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
391+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
396392
&uart1);
397393
#endif
398394

@@ -403,8 +399,9 @@ int rt_hw_serial_init(void)
403399
config.parity = PARITY_NONE;
404400
config.stop_bits = STOP_BITS_1;
405401
config.invert = NRZ_NORMAL;
402+
config.bufsz = RT_SERIAL_RB_BUFSZ;
403+
406404
serial2.ops = &am33xx_uart_ops;
407-
serial2.int_rx = &uart2_int_rx;
408405
serial2.config = config;
409406
/* enable RX interrupt */
410407
UART_IER_REG(uart2.base) = 0x01;
@@ -414,7 +411,7 @@ int rt_hw_serial_init(void)
414411
rt_hw_interrupt_mask(uart2.irq);
415412
/* register UART2 device */
416413
rt_hw_serial_register(&serial2, "uart2",
417-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
414+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
418415
&uart2);
419416
#endif
420417

@@ -425,8 +422,9 @@ int rt_hw_serial_init(void)
425422
config.parity = PARITY_NONE;
426423
config.stop_bits = STOP_BITS_1;
427424
config.invert = NRZ_NORMAL;
425+
config.bufsz = RT_SERIAL_RB_BUFSZ;
426+
428427
serial3.ops = &am33xx_uart_ops;
429-
serial3.int_rx = &uart_3_int_rx;
430428
serial3.config = config;
431429
/* enable RX interrupt */
432430
UART_IER_REG(uart3.base) = 0x01;
@@ -436,7 +434,7 @@ int rt_hw_serial_init(void)
436434
rt_hw_interrupt_mask(uart3.irq);
437435
/* register UART3 device */
438436
rt_hw_serial_register(&serial3, "uart3",
439-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
437+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
440438
&uart3);
441439
#endif
442440

@@ -447,9 +445,9 @@ int rt_hw_serial_init(void)
447445
config.parity = PARITY_NONE;
448446
config.stop_bits = STOP_BITS_1;
449447
config.invert = NRZ_NORMAL;
448+
config.bufsz = RT_SERIAL_RB_BUFSZ;
450449

451450
serial4.ops = &am33xx_uart_ops;
452-
serial4.int_rx = &uart4_int_rx;
453451
serial4.config = config;
454452
/* enable RX interrupt */
455453
UART_IER_REG(uart4.base) = 0x01;
@@ -459,7 +457,7 @@ int rt_hw_serial_init(void)
459457
rt_hw_interrupt_mask(uart4.irq);
460458
/* register UART4 device */
461459
rt_hw_serial_register(&serial4, "uart4",
462-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
460+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
463461
&uart4);
464462
#endif
465463

@@ -470,9 +468,9 @@ int rt_hw_serial_init(void)
470468
config.parity = PARITY_NONE;
471469
config.stop_bits = STOP_BITS_1;
472470
config.invert = NRZ_NORMAL;
471+
config.bufsz = RT_SERIAL_RB_BUFSZ;
473472

474473
serial5.ops = &am33xx_uart_ops;
475-
serial5.int_rx = &uart5_int_rx;
476474
serial5.config = config;
477475
/* enable RX interrupt */
478476
UART_IER_REG(uart5.base) = 0x01;
@@ -482,7 +480,7 @@ int rt_hw_serial_init(void)
482480
rt_hw_interrupt_mask(uart5.irq);
483481
/* register UART4 device */
484482
rt_hw_serial_register(&serial5, "uart5",
485-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
483+
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
486484
&uart5);
487485
#endif
488486

Diff for: ‎bsp/bf533/startup.c

-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ void rtthread_startup(void)
6262
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
6363
&uart0);
6464

65-
/* init all device */
66-
rt_device_init_all();
67-
6865
rt_console_set_device("uart0");
6966
#endif
7067

Diff for: ‎bsp/efm32/startup.c

-3
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ void rtthread_startup(void)
114114
/* init scheduler system */
115115
rt_system_scheduler_init();
116116

117-
/* init all devices */
118-
rt_device_init_all();
119-
120117
/* init finsh */
121118
#ifdef RT_USING_FINSH
122119
finsh_system_init();

Diff for: ‎bsp/frdm-k64f/board/drv_uart.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "drv_uart.h"
1717

1818
static struct rt_serial_device _k64_serial; //abstracted serial for RTT
19-
static struct serial_ringbuffer _k64_int_rx; //UART send buffer area
2019

2120
struct k64_serial_device
2221
{
@@ -231,7 +230,7 @@ static const struct rt_uart_ops _k64_ops =
231230
void UART0_RX_TX_IRQHandler(void)
232231
{
233232
rt_interrupt_enter();
234-
rt_hw_serial_isr((struct rt_serial_device*)&_k64_serial);
233+
rt_hw_serial_isr((struct rt_serial_device*)&_k64_serial, RT_SERIAL_EVENT_RX_IND);
235234
rt_interrupt_leave();
236235
}
237236

@@ -247,9 +246,9 @@ void rt_hw_uart_init(void)
247246
config.parity = PARITY_NONE;
248247
config.stop_bits = STOP_BITS_1;
249248
config.invert = NRZ_NORMAL;
249+
config.bufsz = RT_SERIAL_RB_BUFSZ;
250250

251251
_k64_serial.ops = &_k64_ops;
252-
_k64_serial.int_rx = &_k64_int_rx;
253252
_k64_serial.config = config;
254253

255254
rt_hw_serial_register(&_k64_serial, "uart0",

Diff for: ‎bsp/lm3s8962/applications/startup.c

-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ void rtthread_startup(void)
118118
/* init sd card device */
119119
rt_hw_sdcard_init();
120120
#endif
121-
/* init all device */
122-
rt_device_init_all();
123121

124122
/* init application */
125123
rt_application_init();

0 commit comments

Comments
 (0)