Browse Source

stm32f10x: fix the rtgui initialization

The rtgui_system_server_init prototype is wrong. And if we use
RT_USING_COMPONENTS_INIT, there is no need to call
rtgui_system_server_init again.
Grissiom 12 years ago
parent
commit
d70761222c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      bsp/stm32f10x/applications/application.c

+ 2 - 1
bsp/stm32f10x/applications/application.c

@@ -111,7 +111,6 @@ void rt_init_thread_entry(void* parameter)
 
 
 #ifdef RT_USING_RTGUI
 #ifdef RT_USING_RTGUI
     {
     {
-        extern void rtgui_system_server_init(void);
         extern void rt_hw_lcd_init();
         extern void rt_hw_lcd_init();
         extern void rtgui_touch_hw_init(void);
         extern void rtgui_touch_hw_init(void);
 
 
@@ -132,8 +131,10 @@ void rt_init_thread_entry(void* parameter)
         /* set lcd device as rtgui graphic driver */
         /* set lcd device as rtgui graphic driver */
         rtgui_graphic_set_device(lcd);
         rtgui_graphic_set_device(lcd);
 
 
+#ifndef RT_USING_COMPONENTS_INIT
         /* init rtgui system server */
         /* init rtgui system server */
         rtgui_system_server_init();
         rtgui_system_server_init();
+#endif
 
 
         calibration_set_restore(cali_setup);
         calibration_set_restore(cali_setup);
         calibration_set_after(cali_store);
         calibration_set_after(cali_store);