Skip to content

Commit 5fc32bf

Browse files
wzyy2wzyy2
committed
Merge pull request #1 from RT-Thread/master
sync
2 parents 0c8335d + a8fadf1 commit 5fc32bf

File tree

722 files changed

+469349
-50431
lines changed

Some content is hidden

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

722 files changed

+469349
-50431
lines changed

Diff for: ‎.travis.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ env:
2424
- RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'
2525
- RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'
2626
# - RTT_BSP='bf533' # no scons
27-
- RTT_BSP='dev3210' RTT_TOOL_CHAIN='sourcery-mips'
2827
- RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'
29-
- RTT_BSP='jz47xx' RTT_TOOL_CHAIN='sourcery-mips'
3028
- RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'
3129
- RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'
3230
- RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'
33-
# - RTT_BSP='lpc1114' # no scons
34-
# - RTT_BSP='lpc122x' # no scons
31+
- RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'
3532
- RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'
3633
- RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm'
3734
- RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm'
@@ -40,13 +37,12 @@ env:
4037
# - RTT_BSP='m16c62p' # m32c
4138
- RTT_BSP='mb9bf500r' RTT_TOOL_CHAIN='sourcery-arm'
4239
- RTT_BSP='mb9bf506r' RTT_TOOL_CHAIN='sourcery-arm'
40+
- RTT_BSP='mb9bf618s' RTT_TOOL_CHAIN='sourcery-arm'
4341
# - RTT_BSP='microblaze' # no scons
4442
- RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm'
4543
# - RTT_BSP='mini4020' # no scons
4644
# - RTT_BSP='nios_ii' # no scons
47-
# - RTT_BSP='nuc140' # no scons
4845
# - RTT_BSP='pic32ethernet' # no scons
49-
# - RTT_BSP='sam7s' # no scons
5046
- RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm'
5147
# - RTT_BSP='simulator' # x86
5248
- RTT_BSP='stm32f0x' RTT_TOOL_CHAIN='sourcery-arm'
@@ -56,8 +52,10 @@ env:
5652
- RTT_BSP='stm32f40x' RTT_TOOL_CHAIN='sourcery-arm'
5753
- RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'
5854
# - RTT_BSP='upd70f3454' # iar
59-
# - RTT_BSP='wh44b0' # no scons
6055
# - RTT_BSP='x86' # x86
61-
- RTT_BSP='xplorer4330/m4' RTT_TOOL_CHAIN='sourcery-arm'
56+
- RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
57+
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
6258
- RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
6359
- RTT_BSP='beaglebone' RTT_TOOL_CHAIN='sourcery-arm'
60+
- RTT_BSP='zynq7000' RTT_TOOL_CHAIN='sourcery-arm'
61+
- RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'

Diff for: ‎ChangeLog_CN.md

+1,454
Large diffs are not rendered by default.

Diff for: ‎bsp/K60Fxxxx/drivers/led.c

-55
This file was deleted.

Diff for: ‎bsp/K60Fxxxx/drivers/system_MK60F12.c

-366
This file was deleted.

Diff for: ‎bsp/K60Fxxxx/readme.txt

-8
This file was deleted.

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

0 commit comments

Comments
 (0)