summaryrefslogtreecommitdiff
path: root/bsp
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2013-09-03 05:46:20 -0700
committerBernard Xiong <[email protected]>2013-09-03 05:46:20 -0700
commitb4166e0b2585eecea8a46f72c50f75724d2feec1 (patch)
treec5fa3fd7dc182b76d48fb9855098ca6ce8380554 /bsp
parent49e28c2629ca941f20066790e195b274d206a88a (diff)
parentd70761222c4924aac9105ddbbe62089c1118c712 (diff)
Merge pull request #153 from grissiom/stm32f10x
stm32f10x: fix the rtgui initialization
Diffstat (limited to 'bsp')
-rw-r--r--bsp/stm32f10x/applications/application.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bsp/stm32f10x/applications/application.c b/bsp/stm32f10x/applications/application.c
index 7031711460..d57bb4e4c0 100644
--- a/bsp/stm32f10x/applications/application.c
+++ b/bsp/stm32f10x/applications/application.c
@@ -111,7 +111,6 @@ void rt_init_thread_entry(void* parameter)
#ifdef RT_USING_RTGUI
{
- extern void rtgui_system_server_init(void);
extern void rt_hw_lcd_init();
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 */
rtgui_graphic_set_device(lcd);
+#ifndef RT_USING_COMPONENTS_INIT
/* init rtgui system server */
rtgui_system_server_init();
+#endif
calibration_set_restore(cali_setup);
calibration_set_after(cali_store);