提交 412d548f 编写于 作者: B bernard

[BSP] Remove rt_device_init_all() function invoking.

上级 54326fcb
...@@ -35,27 +35,7 @@ ...@@ -35,27 +35,7 @@
void rt_init_thread_entry(void* parameter) void rt_init_thread_entry(void* parameter)
{ {
/* LwIP Initialization */ /* nothing */
#ifdef RT_USING_LWIP
{
extern void lwip_sys_init(void);
/* register ethernetif device */
eth_system_device_init();
rt_hw_stm32_eth_init();
/* re-init device driver */
rt_device_init_all();
/* init lwip system */
lwip_sys_init();
rt_kprintf("TCP/IP initialized!\n");
}
#endif
//FS
//GUI
} }
float f_var1; float f_var1;
...@@ -70,7 +50,7 @@ static void rt_thread_entry_led1(void* parameter) ...@@ -70,7 +50,7 @@ static void rt_thread_entry_led1(void* parameter)
{ {
int n = 0; int n = 0;
rt_hw_led_init(); rt_hw_led_init();
while (1) while (1)
{ {
//rt_kprintf("LED\t%d\tis shining\r\n",n); //rt_kprintf("LED\t%d\tis shining\r\n",n);
...@@ -92,16 +72,9 @@ int rt_application_init() ...@@ -92,16 +72,9 @@ int rt_application_init()
{ {
rt_thread_t init_thread; rt_thread_t init_thread;
#if (RT_THREAD_PRIORITY_MAX == 32)
init_thread = rt_thread_create("init", init_thread = rt_thread_create("init",
rt_init_thread_entry, RT_NULL, rt_init_thread_entry, RT_NULL,
2048, 8, 20); 2048, RT_THREAD_PRIORITY_MAX/3, 20);
#else
init_thread = rt_thread_create("init",
rt_init_thread_entry, RT_NULL,
2048, 80, 20);
#endif
if (init_thread != RT_NULL) if (init_thread != RT_NULL)
rt_thread_startup(init_thread); rt_thread_startup(init_thread);
......
...@@ -85,9 +85,6 @@ void rtthread_startup(void) ...@@ -85,9 +85,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
/* init all device */
rt_device_init_all();
/* init application */ /* init application */
rt_application_init(); rt_application_init();
...@@ -112,7 +109,7 @@ void rtthread_startup(void) ...@@ -112,7 +109,7 @@ void rtthread_startup(void)
int main(void) int main(void)
{ {
/* disable interrupt first */ /* disable interrupt first */
rt_hw_interrupt_disable(); rt_hw_interrupt_disable();
......
...@@ -138,8 +138,6 @@ void rt_init_thread_entry(void* parameter) ...@@ -138,8 +138,6 @@ void rt_init_thread_entry(void* parameter)
/* register ethernetif device */ /* register ethernetif device */
eth_system_device_init(); eth_system_device_init();
rt_hw_macb_init(); rt_hw_macb_init();
/* re-init device driver */
rt_device_init_all();
/* init lwip system */ /* init lwip system */
lwip_sys_init(); lwip_sys_init();
} }
...@@ -176,7 +174,7 @@ void rt_led_thread_entry(void* parameter) ...@@ -176,7 +174,7 @@ void rt_led_thread_entry(void* parameter)
led_on(3); led_on(3);
else else
led_off(3); led_off(3);
} }
} }
#endif #endif
...@@ -197,7 +195,7 @@ int rt_application_init() ...@@ -197,7 +195,7 @@ int rt_application_init()
rt_led_thread_entry, RT_NULL, rt_led_thread_entry, RT_NULL,
512, 20, 20); 512, 20, 20);
#endif #endif
#else #else
init_thread = rt_thread_create("init", init_thread = rt_thread_create("init",
rt_init_thread_entry, RT_NULL, rt_init_thread_entry, RT_NULL,
...@@ -207,7 +205,7 @@ int rt_application_init() ...@@ -207,7 +205,7 @@ int rt_application_init()
rt_led_thread_entry, RT_NULL, rt_led_thread_entry, RT_NULL,
512, 200, 20); 512, 200, 20);
#endif #endif
#endif #endif
if (init_thread != RT_NULL) if (init_thread != RT_NULL)
......
...@@ -39,7 +39,6 @@ int main(void) ...@@ -39,7 +39,6 @@ int main(void)
#endif #endif
rt_system_scheduler_init(); rt_system_scheduler_init();
rt_device_init_all();
rt_application_init(); rt_application_init();
#ifdef RT_USING_FINSH #ifdef RT_USING_FINSH
......
...@@ -62,9 +62,6 @@ void rtthread_startup(void) ...@@ -62,9 +62,6 @@ void rtthread_startup(void)
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
&uart0); &uart0);
/* init all device */
rt_device_init_all();
rt_console_set_device("uart0"); rt_console_set_device("uart0");
#endif #endif
......
...@@ -65,11 +65,6 @@ void rtthread_startup(void) ...@@ -65,11 +65,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
...@@ -55,11 +55,6 @@ void rtthread_startup(void) ...@@ -55,11 +55,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
...@@ -76,11 +76,6 @@ void rtthread_startup(void) ...@@ -76,11 +76,6 @@ void rtthread_startup(void)
rt_thread_idle_sethook(rt_hw_led_flash); rt_thread_idle_sethook(rt_hw_led_flash);
#endif #endif
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
...@@ -109,7 +104,7 @@ int main (void) ...@@ -109,7 +104,7 @@ int main (void)
/* invoke rtthread_startup */ /* invoke rtthread_startup */
rtthread_startup(); rtthread_startup();
return 0; return 0;
} }
......
...@@ -76,11 +76,6 @@ void rtthread_startup(void) ...@@ -76,11 +76,6 @@ void rtthread_startup(void)
rt_thread_idle_sethook(rt_hw_led_flash); rt_thread_idle_sethook(rt_hw_led_flash);
#endif #endif
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
...@@ -109,7 +104,7 @@ int main (void) ...@@ -109,7 +104,7 @@ int main (void)
/* invoke rtthread_startup */ /* invoke rtthread_startup */
rtthread_startup(); rtthread_startup();
return 0; return 0;
} }
......
...@@ -100,9 +100,6 @@ void rtthread_startup(void) ...@@ -100,9 +100,6 @@ void rtthread_startup(void)
/* init hardware serial device */ /* init hardware serial device */
rt_hw_serial_init(); rt_hw_serial_init();
/*init all registed devices*/
rt_device_init_all();
#endif #endif
/* init application */ /* init application */
......
...@@ -33,14 +33,11 @@ void rt_init_thread_entry(void *parameter) ...@@ -33,14 +33,11 @@ void rt_init_thread_entry(void *parameter)
/* init Display Controller */ /* init Display Controller */
rt_hw_dc_init(); rt_hw_dc_init();
/* re-init device driver */
rt_device_init_all();
/* find Display Controller device */ /* find Display Controller device */
dc = rt_device_find("dc"); dc = rt_device_find("dc");
/* set Display Controller device as rtgui graphic driver */ /* set Display Controller device as rtgui graphic driver */
rtgui_graphic_set_device(dc); rtgui_graphic_set_device(dc);
} }
#endif #endif
...@@ -59,7 +56,7 @@ int rt_application_init(void) ...@@ -59,7 +56,7 @@ int rt_application_init(void)
tid = rt_thread_create("init", tid = rt_thread_create("init",
rt_init_thread_entry, RT_NULL, rt_init_thread_entry, RT_NULL,
4096, 8, 20); 4096, 8, 20);
if (tid != RT_NULL) if (tid != RT_NULL)
rt_thread_startup(tid); rt_thread_startup(tid);
return 0; return 0;
......
...@@ -64,11 +64,6 @@ void rtthread_startup(void) ...@@ -64,11 +64,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
...@@ -42,7 +42,7 @@ void rtthread_startup(void) ...@@ -42,7 +42,7 @@ void rtthread_startup(void)
{ {
/* init hardware interrupt */ /* init hardware interrupt */
rt_hw_interrupt_init(); rt_hw_interrupt_init();
/* init board */ /* init board */
rt_hw_board_init(); rt_hw_board_init();
...@@ -51,13 +51,13 @@ void rtthread_startup(void) ...@@ -51,13 +51,13 @@ void rtthread_startup(void)
/* init tick */ /* init tick */
rt_system_tick_init(); rt_system_tick_init();
/* init kernel object */ /* init kernel object */
rt_system_object_init(); rt_system_object_init();
/* init timer system */ /* init timer system */
rt_system_timer_init(); rt_system_timer_init();
#ifdef RT_USING_HEAP #ifdef RT_USING_HEAP
#ifdef __ICCM16C__ #ifdef __ICCM16C__
rt_system_heap_init(__segment_begin("DATA16_HEAP"), __segment_end("DATA16_HEAP")); rt_system_heap_init(__segment_begin("DATA16_HEAP"), __segment_end("DATA16_HEAP"));
...@@ -68,11 +68,6 @@ void rtthread_startup(void) ...@@ -68,11 +68,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
...@@ -88,10 +83,10 @@ void rtthread_startup(void) ...@@ -88,10 +83,10 @@ void rtthread_startup(void)
/* init idle thread */ /* init idle thread */
rt_thread_idle_init(); rt_thread_idle_init();
/* start scheduler */ /* start scheduler */
rt_system_scheduler_start(); rt_system_scheduler_start();
/* never reach here */ /* never reach here */
return ; return ;
} }
...@@ -103,7 +98,7 @@ int main(void) ...@@ -103,7 +98,7 @@ int main(void)
/* init system setting */ /* init system setting */
system_init(); system_init();
/* startup RT-Thread RTOS */ /* startup RT-Thread RTOS */
rtthread_startup(); rtthread_startup();
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/** /**
* @addtogroup FM3 * @addtogroup FM3
*/ */
/*@{*/ /*@{*/
#include <rtthread.h> #include <rtthread.h>
...@@ -37,48 +37,45 @@ static char msg_pool[2048]; ...@@ -37,48 +37,45 @@ static char msg_pool[2048];
void rt_init_thread_entry(void *parameter) void rt_init_thread_entry(void *parameter)
{ {
rt_device_t lcd; rt_device_t lcd;
rt_hw_led_init(); rt_hw_led_init();
rt_hw_key_init(); rt_hw_key_init();
rt_hw_adc_init(); rt_hw_adc_init();
rt_hw_lcd_init(); rt_hw_lcd_init();
rt_hw_cpu_init(); rt_hw_cpu_init();
/* re-init device driver */
rt_device_init_all();
#ifdef RT_USING_RTGUI #ifdef RT_USING_RTGUI
extern void rtgui_system_server_init(void); extern void rtgui_system_server_init(void);
/* find lcd device */ /* find lcd device */
lcd = rt_device_find("lcd"); lcd = rt_device_find("lcd");
/* set lcd device as rtgui graphic driver */ /* set lcd device as rtgui graphic driver */
rtgui_graphic_set_device(lcd); rtgui_graphic_set_device(lcd);
/* init rtgui system server */ /* init rtgui system server */
rtgui_system_server_init(); rtgui_system_server_init();
/* startup rtgui */ /* startup rtgui */
rtgui_startup(); rtgui_startup();
#else #else
{ {
char buf[20] = {'\0'}; char buf[20] = {'\0'};
struct lcd_msg msg; struct lcd_msg msg;
rt_device_t device; rt_device_t device;
device = rt_device_find("lcd"); device = rt_device_find("lcd");
rt_device_control(device, RT_DEVICE_CTRL_LCD_CLEAR_SCR, RT_NULL); rt_device_control(device, RT_DEVICE_CTRL_LCD_CLEAR_SCR, RT_NULL);
x = 1; x = 1;
y = 1; y = 1;
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "ADC"); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "ADC");
x = 1; x = 1;
y = 20; y = 20;
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "CPU"); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "CPU");
x = 1; x = 1;
y = 40; y = 40;
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "KEY"); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, "KEY");
while(1) while(1)
{ {
if (rt_mq_recv(&mq, &msg, sizeof(msg), RT_WAITING_FOREVER) == RT_EOK) if (rt_mq_recv(&mq, &msg, sizeof(msg), RT_WAITING_FOREVER) == RT_EOK)
...@@ -90,14 +87,14 @@ void rt_init_thread_entry(void *parameter) ...@@ -90,14 +87,14 @@ void rt_init_thread_entry(void *parameter)
y = 1; y = 1;
rt_memset(buf, 0, sizeof(buf)); rt_memset(buf, 0, sizeof(buf));
rt_sprintf(buf, "%04d", msg.adc_value); rt_sprintf(buf, "%04d", msg.adc_value);
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf);
break; break;
case CPU_MSG: case CPU_MSG:
x = 40; x = 40;
y = 20; y = 20;
rt_memset(buf, 0, sizeof(buf)); rt_memset(buf, 0, sizeof(buf));
rt_sprintf(buf, "%03d %03d", msg.major, msg.minor); rt_sprintf(buf, "%03d %03d", msg.major, msg.minor);
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf);
break; break;
case KEY_MSG: case KEY_MSG:
x = 40; x = 40;
...@@ -110,22 +107,22 @@ void rt_init_thread_entry(void *parameter) ...@@ -110,22 +107,22 @@ void rt_init_thread_entry(void *parameter)
break; break;
case KEY_UP: case KEY_UP:
rt_sprintf(buf, "UP KEY "); rt_sprintf(buf, "UP KEY ");
break; break;
case KEY_RIGHT: case KEY_RIGHT:
rt_sprintf(buf, "RIGHT KEY"); rt_sprintf(buf, "RIGHT KEY");
break; break;
case KEY_LEFT: case KEY_LEFT:
rt_sprintf(buf, "LEFT KEY "); rt_sprintf(buf, "LEFT KEY ");
break; break;
case KEY_ENTER: case KEY_ENTER:
rt_sprintf(buf, "ENTER KEY"); rt_sprintf(buf, "ENTER KEY");
break; break;
default: default:
rt_sprintf(buf, "NO KEY "); rt_sprintf(buf, "NO KEY ");
break; break;
} }
rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf); rt_device_control(device, RT_DEVICE_CTRL_LCD_PUT_STRING, buf);
break; break;
} }
} }
} }
...@@ -138,11 +135,11 @@ int rt_application_init(void) ...@@ -138,11 +135,11 @@ int rt_application_init(void)
rt_thread_t init_thread; rt_thread_t init_thread;
rt_mq_init(&mq, "mqt", &msg_pool[0], 128 - sizeof(void*), sizeof(msg_pool), RT_IPC_FLAG_FIFO); rt_mq_init(&mq, "mqt", &msg_pool[0], 128 - sizeof(void*), sizeof(msg_pool), RT_IPC_FLAG_FIFO);
init_thread = rt_thread_create("init", rt_init_thread_entry, RT_NULL, 1024, 21, 20); init_thread = rt_thread_create("init", rt_init_thread_entry, RT_NULL, 1024, 21, 20);
if(init_thread != RT_NULL) if(init_thread != RT_NULL)
rt_thread_startup(init_thread); rt_thread_startup(init_thread);
return 0; return 0;
} }
......
...@@ -52,7 +52,7 @@ void rtthread_startup(void) ...@@ -52,7 +52,7 @@ void rtthread_startup(void)
/* init board */ /* init board */
rt_hw_board_init(); rt_hw_board_init();
rt_show_version(); rt_show_version();
/* init tick */ /* init tick */
...@@ -86,8 +86,6 @@ void rtthread_startup(void) ...@@ -86,8 +86,6 @@ void rtthread_startup(void)
#ifdef RT_USING_DEVICE #ifdef RT_USING_DEVICE
/* init hardware serial device */ /* init hardware serial device */
rt_hw_serial_init(); rt_hw_serial_init();
/* init all device */
rt_device_init_all();
#endif #endif
/* init application */ /* init application */
...@@ -113,7 +111,7 @@ int main (void) ...@@ -113,7 +111,7 @@ int main (void)
{ {
/* invoke rtthread_startup */ /* invoke rtthread_startup */
rtthread_startup(); rtthread_startup();
return 0; return 0;
} }
......
...@@ -71,11 +71,6 @@ void rtthread_startup(void) ...@@ -71,11 +71,6 @@ void rtthread_startup(void)
rt_thread_idle_sethook(rt_hw_led_flash); rt_thread_idle_sethook(rt_hw_led_flash);
#endif #endif
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
...@@ -78,20 +78,6 @@ void rtthread_startup() ...@@ -78,20 +78,6 @@ void rtthread_startup()
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
#ifdef RT_USING_DFS
/* Not implemented */
#endif
#ifdef RT_USING_LWIP
/* Not implemented */
#endif
/*init all registed devices */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
...@@ -52,10 +52,10 @@ void rtthread_startup(void) ...@@ -52,10 +52,10 @@ void rtthread_startup(void)
/* init tick */ /* init tick */
rt_system_tick_init(); rt_system_tick_init();
/* init kernel object */ /* init kernel object */
rt_system_object_init(); rt_system_object_init();
/* init timer system */ /* init timer system */
rt_system_timer_init(); rt_system_timer_init();
...@@ -68,11 +68,6 @@ void rtthread_startup(void) ...@@ -68,11 +68,6 @@ void rtthread_startup(void)
/* init scheduler system */ /* init scheduler system */
rt_system_scheduler_init(); rt_system_scheduler_init();
#ifdef RT_USING_DEVICE
/* init all device */
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
...@@ -102,7 +97,7 @@ int main(void) ...@@ -102,7 +97,7 @@ int main(void)
/* init system setting */ /* init system setting */
TAB0_Start(); TAB0_Start();
/* startup RT-Thread RTOS */ /* startup RT-Thread RTOS */
rtthread_startup(); rtthread_startup();
......
...@@ -84,10 +84,6 @@ void rtthread_startup(void) ...@@ -84,10 +84,6 @@ void rtthread_startup(void)
rt_thread_idle_sethook(rt_hw_led_flash); rt_thread_idle_sethook(rt_hw_led_flash);
#endif #endif
#ifdef RT_USING_DEVICE
rt_device_init_all();
#endif
/* init application */ /* init application */
rt_application_init(); rt_application_init();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册