From 645260a1c91cc669ad5ee2e4cf7ef649f6e8b135 Mon Sep 17 00:00:00 2001 From: "dzzxzz@gmail.com" Date: Tue, 3 Jan 2012 09:08:47 +0000 Subject: [PATCH] fixed a compiling error while not defined RT_USING_FINSH git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1906 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/mini4020/startup.c | 2 ++ bsp/stm32f10x/enc28j60.c | 2 ++ bsp/stm32f10x/stm3210c_eval_lcd.c | 2 ++ bsp/stm32f10x/touch.c | 3 ++- libcpu/arm/s3c24x0/rtc.c | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bsp/mini4020/startup.c b/bsp/mini4020/startup.c index c75eb3b2aa..7b21ec4fc3 100644 --- a/bsp/mini4020/startup.c +++ b/bsp/mini4020/startup.c @@ -4,7 +4,9 @@ #include #include #include +#ifdef RT_USING_FINSH #include +#endif #ifdef RT_USING_LWIP #include diff --git a/bsp/stm32f10x/enc28j60.c b/bsp/stm32f10x/enc28j60.c index f3d5fddd97..2d442ba7a1 100644 --- a/bsp/stm32f10x/enc28j60.c +++ b/bsp/stm32f10x/enc28j60.c @@ -769,9 +769,11 @@ void rt_hw_enc28j60_init() eth_device_init(&(enc28j60_dev->parent), "e0"); } +#ifdef RT_USING_FINSH #include void show_reg(void) { // } FINSH_FUNCTION_EXPORT(show_reg,show en28j60 regs) +#endif diff --git a/bsp/stm32f10x/stm3210c_eval_lcd.c b/bsp/stm32f10x/stm3210c_eval_lcd.c index 72a7a0702c..ede01fbffa 100644 --- a/bsp/stm32f10x/stm3210c_eval_lcd.c +++ b/bsp/stm32f10x/stm3210c_eval_lcd.c @@ -541,6 +541,7 @@ void stm3210c_rtgui_init() today_init(); } +#ifdef RT_USING_FINSH #include void hline(rt_base_t x1, rt_base_t x2, rt_base_t y, rt_uint32_t pixel) @@ -563,3 +564,4 @@ void cls(rt_uint32_t c) rt_hw_lcd_draw_hline(&c, 0, 320, index); } FINSH_FUNCTION_EXPORT(cls, clear screen); +#endif diff --git a/bsp/stm32f10x/touch.c b/bsp/stm32f10x/touch.c index ccb3c3dad4..2b556ea75a 100644 --- a/bsp/stm32f10x/touch.c +++ b/bsp/stm32f10x/touch.c @@ -471,6 +471,7 @@ void rtgui_touch_hw_init(void) rt_device_register(&(touch->parent), "touch", RT_DEVICE_FLAG_RDWR); } +#ifdef RT_USING_FINSH #include void touch_t( rt_uint16_t x , rt_uint16_t y ) @@ -490,5 +491,5 @@ void touch_t( rt_uint16_t x , rt_uint16_t y ) rtgui_server_post_event(&emouse.parent, sizeof(struct rtgui_event_mouse)); } - FINSH_FUNCTION_EXPORT(touch_t, x & y ) ; +#endif diff --git a/libcpu/arm/s3c24x0/rtc.c b/libcpu/arm/s3c24x0/rtc.c index 27275c4812..5d1193586f 100644 --- a/libcpu/arm/s3c24x0/rtc.c +++ b/libcpu/arm/s3c24x0/rtc.c @@ -170,6 +170,7 @@ void rt_hw_rtc_init(void) rt_device_register(&rtc, "rtc", RT_DEVICE_FLAG_RDWR); } +#ifdef RT_USING_FINSH #include void list_date() { @@ -185,3 +186,4 @@ void list_date() } } FINSH_FUNCTION_EXPORT(list_date, list date); +#endif