From 7d341d4e6ecf54f7b4cfb25466a8a13ec024037f Mon Sep 17 00:00:00 2001 From: SchumyHao Date: Thu, 16 Apr 2015 21:06:54 +0800 Subject: [PATCH 1/7] add w25q80 support to spi flash --- components/drivers/spi/spi_flash_w25qxx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/drivers/spi/spi_flash_w25qxx.c b/components/drivers/spi/spi_flash_w25qxx.c index bdcdbd83c1..2de71e3498 100644 --- a/components/drivers/spi/spi_flash_w25qxx.c +++ b/components/drivers/spi/spi_flash_w25qxx.c @@ -31,6 +31,7 @@ /* JEDEC Manufacturer¡¯s ID */ #define MF_ID (0xEF) /* JEDEC Device ID: Memory type and Capacity */ +#define MTC_W25Q80_BV (0x4014) /* W25Q80BV */ #define MTC_W25Q16_BV_CL_CV (0x4015) /* W25Q16BV W25Q16CL W25Q16CV */ #define MTC_W25Q16_DW (0x6015) /* W25Q16DW */ #define MTC_W25Q32_BV (0x4016) /* W25Q32BV */ @@ -345,6 +346,11 @@ rt_err_t w25qxx_init(const char * flash_device_name, const char * spi_device_nam { FLASH_TRACE("W25Q16DW detection\r\n"); spi_flash_device.geometry.sector_count = 512; + } + else if(memory_type_capacity == MTC_W25Q80_BV) + { + FLASH_TRACE("W25Q80BV detection\r\n"); + spi_flash_device.geometry.sector_count = 256; } else { From 88936f08364612822ac02901f5bd2bf4a752f582 Mon Sep 17 00:00:00 2001 From: SchumyHao Date: Thu, 16 Apr 2015 21:08:07 +0800 Subject: [PATCH 2/7] format --- components/drivers/spi/spi_flash_w25qxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/drivers/spi/spi_flash_w25qxx.c b/components/drivers/spi/spi_flash_w25qxx.c index 2de71e3498..2ff0d57c9f 100644 --- a/components/drivers/spi/spi_flash_w25qxx.c +++ b/components/drivers/spi/spi_flash_w25qxx.c @@ -347,7 +347,7 @@ rt_err_t w25qxx_init(const char * flash_device_name, const char * spi_device_nam FLASH_TRACE("W25Q16DW detection\r\n"); spi_flash_device.geometry.sector_count = 512; } - else if(memory_type_capacity == MTC_W25Q80_BV) + else if(memory_type_capacity == MTC_W25Q80_BV) { FLASH_TRACE("W25Q80BV detection\r\n"); spi_flash_device.geometry.sector_count = 256; From 62a2a49c41735324ddc7b2b44920b4d79e20675b Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Wed, 19 Aug 2015 09:51:14 +0800 Subject: [PATCH 3/7] [BSP] Update project files for stm32f0x --- bsp/stm32f0x/project.uvopt | 717 ++++++++++++++++++++++++++--------- bsp/stm32f0x/project.uvproj | 405 ++++++-------------- bsp/stm32f0x/project.uvprojx | 539 +++++++++++++------------- 3 files changed, 936 insertions(+), 725 deletions(-) diff --git a/bsp/stm32f0x/project.uvopt b/bsp/stm32f0x/project.uvopt index 25161a3a8c..6abc948d0a 100644 --- a/bsp/stm32f0x/project.uvopt +++ b/bsp/stm32f0x/project.uvopt @@ -27,7 +27,7 @@ 8000000 - 1 + 0 1 1 0 @@ -103,6 +103,7 @@ 1 0 1 + 0 0 0 13 @@ -118,38 +119,19 @@ STLink\ST-LINKIII-KEIL_SWO.dll - - - 0 - DLGTARM - (1010=75,103,441,526,0)(1007=105,136,282,346,0)(1008=90,120,456,345,0) - - - 0 - ARMDBGFLAGS - - - - 0 - DLGUARM - (105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0) - - - 0 - ST-LINKIII-KEIL_SWO - -U-O206 -O206 -S3 -C0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO3 -FD20000000 -FC800 -FN1 -FF0STM32F05x_64 -FS08000000 -FL010000 - - + + 0 + 0 0 - 1 + 0 0 0 0 0 - 1 + 0 0 0 0 @@ -172,84 +154,15 @@ - - Applications - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 49 - 0 - 2 - 4 - 0 - applications\application.c - application.c - - - 1 - 2 - 1 - 0 - 0 - 0 - 0 - 97 - 115 - 0 - applications\startup.c - startup.c - - - - - Drivers - 0 - 0 - 0 - - 2 - 3 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - drivers\board.c - board.c - - - 2 - 4 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - drivers\stm32f0xx_it.c - stm32f0xx_it.c - - - STM32_StdPeriph 0 0 0 + 0 - 3 - 5 + 1 + 1 1 0 0 @@ -260,10 +173,12 @@ 0 Libraries\CMSIS\ST\STM32F0xx\Source\Templates\system_stm32f0xx.c system_stm32f0xx.c + 0 + 0 - 3 - 6 + 1 + 2 1 0 0 @@ -274,10 +189,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_adc.c stm32f0xx_adc.c + 0 + 0 - 3 - 7 + 1 + 3 1 0 0 @@ -288,10 +205,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_cec.c stm32f0xx_cec.c + 0 + 0 - 3 - 8 + 1 + 4 1 0 0 @@ -302,10 +221,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_comp.c stm32f0xx_comp.c + 0 + 0 - 3 - 9 + 1 + 5 1 0 0 @@ -316,10 +237,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_crc.c stm32f0xx_crc.c + 0 + 0 - 3 - 10 + 1 + 6 1 0 0 @@ -330,10 +253,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dac.c stm32f0xx_dac.c + 0 + 0 - 3 - 11 + 1 + 7 1 0 0 @@ -344,10 +269,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dbgmcu.c stm32f0xx_dbgmcu.c + 0 + 0 - 3 - 12 + 1 + 8 1 0 0 @@ -358,10 +285,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dma.c stm32f0xx_dma.c + 0 + 0 - 3 - 13 + 1 + 9 1 0 0 @@ -372,10 +301,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_exti.c stm32f0xx_exti.c + 0 + 0 - 3 - 14 + 1 + 10 1 0 0 @@ -386,10 +317,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_flash.c stm32f0xx_flash.c + 0 + 0 - 3 - 15 + 1 + 11 1 0 0 @@ -400,10 +333,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_gpio.c stm32f0xx_gpio.c + 0 + 0 - 3 - 16 + 1 + 12 1 0 0 @@ -414,10 +349,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_i2c.c stm32f0xx_i2c.c + 0 + 0 - 3 - 17 + 1 + 13 1 0 0 @@ -428,10 +365,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_iwdg.c stm32f0xx_iwdg.c + 0 + 0 - 3 - 18 + 1 + 14 1 0 0 @@ -442,10 +381,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_misc.c stm32f0xx_misc.c + 0 + 0 - 3 - 19 + 1 + 15 1 0 0 @@ -456,10 +397,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_pwr.c stm32f0xx_pwr.c + 0 + 0 - 3 - 20 + 1 + 16 1 0 0 @@ -470,10 +413,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rcc.c stm32f0xx_rcc.c + 0 + 0 - 3 - 21 + 1 + 17 1 0 0 @@ -484,10 +429,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rtc.c stm32f0xx_rtc.c + 0 + 0 - 3 - 22 + 1 + 18 1 0 0 @@ -498,10 +445,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_spi.c stm32f0xx_spi.c + 0 + 0 - 3 - 23 + 1 + 19 1 0 0 @@ -512,10 +461,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_syscfg.c stm32f0xx_syscfg.c + 0 + 0 - 3 - 24 + 1 + 20 1 0 0 @@ -526,10 +477,12 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_tim.c stm32f0xx_tim.c + 0 + 0 - 3 - 25 + 1 + 21 1 0 0 @@ -540,7 +493,89 @@ 0 Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_usart.c stm32f0xx_usart.c + 0 + 0 + + 1 + 22 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_wwdg.c + stm32f0xx_wwdg.c + 0 + 0 + + + 1 + 23 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Libraries\CMSIS\ST\STM32F0xx\Source\Templates\arm\startup_stm32f0xx.s + startup_stm32f0xx.s + 0 + 0 + + + + + Applications + 0 + 0 + 0 + 0 + + 2 + 24 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + applications\application.c + application.c + 0 + 0 + + + 2 + 25 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + applications\startup.c + startup.c + 0 + 0 + + + + + Drivers + 0 + 0 + 0 + 0 3 26 @@ -552,13 +587,15 @@ 0 0 0 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_wwdg.c - stm32f0xx_wwdg.c + drivers\board.c + board.c + 0 + 0 3 27 - 2 + 1 0 0 0 @@ -566,18 +603,13 @@ 0 0 0 - Libraries\CMSIS\ST\STM32F0xx\Source\Templates\arm\startup_stm32f0xx.s - startup_stm32f0xx.s + drivers\led.c + led.c + 0 + 0 - - - - Kernel - 0 - 0 - 0 - 4 + 3 28 1 0 @@ -587,11 +619,13 @@ 0 0 0 - ..\..\src\clock.c - clock.c + drivers\stm32f0xx_it.c + stm32f0xx_it.c + 0 + 0 - 4 + 3 29 1 0 @@ -601,9 +635,19 @@ 0 0 0 - ..\..\src\idle.c - idle.c + drivers\usart.c + usart.c + 0 + 0 + + + + Kernel + 0 + 0 + 0 + 0 4 30 @@ -615,8 +659,10 @@ 0 0 0 - ..\..\src\ipc.c - ipc.c + ..\..\src\clock.c + clock.c + 0 + 0 4 @@ -629,8 +675,10 @@ 0 0 0 - ..\..\src\irq.c - irq.c + ..\..\src\components.c + components.c + 0 + 0 4 @@ -640,11 +688,13 @@ 0 0 0 - 1 - 1 + 0 + 0 0 - ..\..\src\kservice.c - kservice.c + ..\..\src\device.c + device.c + 0 + 0 4 @@ -652,13 +702,15 @@ 1 0 0 - 16 + 0 0 - 1 - 16 + 0 + 0 0 - ..\..\src\object.c - object.c + ..\..\src\idle.c + idle.c + 0 + 0 4 @@ -671,8 +723,10 @@ 0 0 0 - ..\..\src\scheduler.c - scheduler.c + ..\..\src\ipc.c + ipc.c + 0 + 0 4 @@ -685,8 +739,10 @@ 0 0 0 - ..\..\src\thread.c - thread.c + ..\..\src\irq.c + irq.c + 0 + 0 4 @@ -694,13 +750,95 @@ 1 0 0 - 20 + 0 0 - 31 - 36 + 0 + 0 + 0 + ..\..\src\kservice.c + kservice.c + 0 + 0 + + + 4 + 37 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\src\mem.c + mem.c + 0 + 0 + + + 4 + 38 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\src\object.c + object.c + 0 + 0 + + + 4 + 39 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\src\scheduler.c + scheduler.c + 0 + 0 + + + 4 + 40 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\src\thread.c + thread.c + 0 + 0 + + + 4 + 41 + 1 + 0 + 0 + 0 + 0 + 0 + 0 0 ..\..\src\timer.c timer.c + 0 + 0 @@ -709,9 +847,10 @@ 0 0 0 + 0 5 - 37 + 42 1 0 0 @@ -722,10 +861,12 @@ 0 ..\..\libcpu\arm\cortex-m0\cpuport.c cpuport.c + 0 + 0 5 - 38 + 43 2 0 0 @@ -736,10 +877,12 @@ 0 ..\..\libcpu\arm\cortex-m0\context_rvds.S context_rvds.S + 0 + 0 5 - 39 + 44 1 0 0 @@ -750,10 +893,12 @@ 0 ..\..\libcpu\arm\common\backtrace.c backtrace.c + 0 + 0 5 - 40 + 45 1 0 0 @@ -764,10 +909,12 @@ 0 ..\..\libcpu\arm\common\div0.c div0.c + 0 + 0 5 - 41 + 46 1 0 0 @@ -778,6 +925,216 @@ 0 ..\..\libcpu\arm\common\showmem.c showmem.c + 0 + 0 + + + + + DeviceDrivers + 0 + 0 + 0 + 0 + + 6 + 47 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\serial\serial.c + serial.c + 0 + 0 + + + 6 + 48 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\completion.c + completion.c + 0 + 0 + + + 6 + 49 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\dataqueue.c + dataqueue.c + 0 + 0 + + + 6 + 50 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\pipe.c + pipe.c + 0 + 0 + + + 6 + 51 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\portal.c + portal.c + 0 + 0 + + + 6 + 52 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\ringbuffer.c + ringbuffer.c + 0 + 0 + + + 6 + 53 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\drivers\src\workqueue.c + workqueue.c + 0 + 0 + + + + + finsh + 0 + 0 + 0 + 0 + + 7 + 54 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\finsh\shell.c + shell.c + 0 + 0 + + + 7 + 55 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\finsh\symbol.c + symbol.c + 0 + 0 + + + 7 + 56 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\finsh\cmd.c + cmd.c + 0 + 0 + + + 7 + 57 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\finsh\msh_cmd.c + msh_cmd.c + 0 + 0 + + + 7 + 58 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\finsh\msh.c + msh.c + 0 + 0 diff --git a/bsp/stm32f0x/project.uvproj b/bsp/stm32f0x/project.uvproj index f2d0040daf..0b72a4f31d 100644 --- a/bsp/stm32f0x/project.uvproj +++ b/bsp/stm32f0x/project.uvproj @@ -1,7 +1,10 @@ + 1.1 +
### uVision Project, (C) Keil Software
+ rt-thread @@ -12,25 +15,25 @@ STM32F051R8 STMicroelectronics IRAM(0x20000000-0x20001FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0") - + "Startup\ST\STM32F0xx\startup_stm32f0xx.s" ("STM32F0xx Startup Code") UL2CM3(-O207 -S0 -C0 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F05x_64 -FS08000000 -FL010000) 6188 stm32f0xx.h - - - - - - - - - + + + + + + + + + SFD\ST\STM32F0xx\STM32F051xx.sfr 0 - - - + + + ST\STM32F0xx\ ST\STM32F0xx\ @@ -54,8 +57,8 @@ 0 0 - - + + 0 0 0 @@ -64,21 +67,21 @@ 0 0 - - + + 0 0 0 0 - - + + 0 0 0 - + 0 @@ -92,16 +95,16 @@ 0 0 3 - - + + SARMCM3.DLL - + DARMCM1.DLL -pCM0 SARMCM3.DLL - + TARMCM1.DLL -pCM0 @@ -133,22 +136,23 @@ 1 0 1 + 0 0 13 - - - - - + + + + + - - - - - + + + + + STLink\ST-LINKIII-KEIL_SWO.dll @@ -161,9 +165,10 @@ 1 4104 + 0 STLink\ST-LINKIII-KEIL_SWO.dll "" () - + @@ -195,7 +200,7 @@ 0 0 "Cortex-M0" - + 0 0 0 @@ -326,7 +331,7 @@ 0x0 - + 1 @@ -341,11 +346,12 @@ 0 0 0 + 0 - - RT_USING_ARM_LIBC, USE_STDPERIPH_DRIVER - - Libraries/STM32F0xx_StdPeriph_Driver/inc;Libraries/CMSIS/ST/STM32F0xx/Include;Libraries/CMSIS/Include;applications;.;drivers;../../include;../../libcpu/arm/cortex-m0;../../libcpu/arm/common;../../components/libc/armlibc;../../components/drivers/include;../../components/drivers/include;../../components/finsh + + USE_STDPERIPH_DRIVER + + Libraries\STM32F0xx_StdPeriph_Driver\inc;Libraries\CMSIS\ST\STM32F0xx\Include;Libraries\CMSIS\Include;applications;.;drivers;..\..\include;..\..\libcpu\arm\cortex-m0;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh @@ -356,11 +362,12 @@ 0 0 0 + 0 - - - - + + + + @@ -372,12 +379,12 @@ 0 0x08000000 0x20000000 - - - - --keep *.o(.rti_fn.*) --keep *.o(FSymTab) --keep *.o(VSymTab) - - + + + + --keep *.o(.rti_fn.*) --keep *.o(FSymTab) + + @@ -388,161 +395,117 @@ system_stm32f0xx.c 1 - Libraries/CMSIS/ST/STM32F0xx/Source/Templates/system_stm32f0xx.c + Libraries\CMSIS\ST\STM32F0xx\Source\Templates\system_stm32f0xx.c - - stm32f0xx_adc.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_adc.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_adc.c - - stm32f0xx_cec.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_cec.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_cec.c - - stm32f0xx_comp.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_comp.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_comp.c - - stm32f0xx_crc.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_crc.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_crc.c - - stm32f0xx_dac.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dac.c - - stm32f0xx_dbgmcu.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dbgmcu.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dbgmcu.c - - stm32f0xx_dma.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dma.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dma.c - - stm32f0xx_exti.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_exti.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_exti.c - - stm32f0xx_flash.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_flash.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_flash.c - - stm32f0xx_gpio.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_gpio.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_gpio.c - - stm32f0xx_i2c.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_i2c.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_i2c.c - - stm32f0xx_iwdg.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_iwdg.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_iwdg.c - - stm32f0xx_misc.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_misc.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_misc.c - - stm32f0xx_pwr.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_pwr.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_pwr.c - - stm32f0xx_rcc.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rcc.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rcc.c - - stm32f0xx_rtc.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rtc.c - - stm32f0xx_spi.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_spi.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_spi.c - - stm32f0xx_syscfg.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_syscfg.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_syscfg.c - - stm32f0xx_tim.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_tim.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_tim.c - - stm32f0xx_usart.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_usart.c - - stm32f0xx_wwdg.c 1 - Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_wwdg.c + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_wwdg.c - - startup_stm32f0xx.s 2 - Libraries/CMSIS/ST/STM32F0xx/Source/Templates/arm/startup_stm32f0xx.s + Libraries\CMSIS\ST\STM32F0xx\Source\Templates\arm\startup_stm32f0xx.s @@ -552,14 +515,12 @@ application.c 1 - applications/application.c + applications\application.c - - startup.c 1 - applications/startup.c + applications\startup.c @@ -569,28 +530,22 @@ board.c 1 - drivers/board.c + drivers\board.c - - led.c 1 - drivers/led.c + drivers\led.c - - stm32f0xx_it.c 1 - drivers/stm32f0xx_it.c + drivers\stm32f0xx_it.c - - usart.c 1 - drivers/usart.c + drivers\usart.c @@ -600,84 +555,62 @@ clock.c 1 - ../../src/clock.c + ..\..\src\clock.c - - components.c 1 - ../../src/components.c + ..\..\src\components.c - - device.c 1 - ../../src/device.c + ..\..\src\device.c - - idle.c 1 - ../../src/idle.c + ..\..\src\idle.c - - ipc.c 1 - ../../src/ipc.c + ..\..\src\ipc.c - - irq.c 1 - ../../src/irq.c + ..\..\src\irq.c - - kservice.c 1 - ../../src/kservice.c + ..\..\src\kservice.c - - mem.c 1 - ../../src/mem.c + ..\..\src\mem.c - - object.c 1 - ../../src/object.c + ..\..\src\object.c - - scheduler.c 1 - ../../src/scheduler.c + ..\..\src\scheduler.c - - thread.c 1 - ../../src/thread.c + ..\..\src\thread.c - - timer.c 1 - ../../src/timer.c + ..\..\src\timer.c @@ -687,52 +620,27 @@ cpuport.c 1 - ../../libcpu/arm/cortex-m0/cpuport.c + ..\..\libcpu\arm\cortex-m0\cpuport.c - - context_rvds.S 2 - ../../libcpu/arm/cortex-m0/context_rvds.S + ..\..\libcpu\arm\cortex-m0\context_rvds.S - - backtrace.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c - - div0.c 1 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c - - showmem.c 1 - ../../libcpu/arm/common/showmem.c - - - - - libc - - - mem_std.c - 1 - ../../components/libc/armlibc/mem_std.c - - - - - stubs.c - 1 - ../../components/libc/armlibc/stubs.c + ..\..\libcpu\arm\common\showmem.c @@ -742,49 +650,37 @@ serial.c 1 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c - - completion.c 1 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c - - dataqueue.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c - - pipe.c 1 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c - - portal.c 1 - ../../components/drivers/src/portal.c + ..\..\components\drivers\src\portal.c - - ringbuffer.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c - - workqueue.c 1 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c @@ -794,95 +690,32 @@ shell.c 1 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c - - symbol.c 1 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c - - cmd.c 1 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c - - - finsh_compiler.c + msh_cmd.c 1 - ../../components/finsh/finsh_compiler.c + ..\..\components\finsh\msh_cmd.c - - - finsh_error.c + msh.c 1 - ../../components/finsh/finsh_error.c - - - - - finsh_heap.c - 1 - ../../components/finsh/finsh_heap.c - - - - - finsh_init.c - 1 - ../../components/finsh/finsh_init.c - - - - - finsh_node.c - 1 - ../../components/finsh/finsh_node.c - - - - - finsh_ops.c - 1 - ../../components/finsh/finsh_ops.c - - - - - finsh_parser.c - 1 - ../../components/finsh/finsh_parser.c - - - - - finsh_var.c - 1 - ../../components/finsh/finsh_var.c - - - - - finsh_vm.c - 1 - ../../components/finsh/finsh_vm.c - - - - - finsh_token.c - 1 - ../../components/finsh/finsh_token.c + ..\..\components\finsh\msh.c + diff --git a/bsp/stm32f0x/project.uvprojx b/bsp/stm32f0x/project.uvprojx index 543bdd6922..d07f696dd3 100644 --- a/bsp/stm32f0x/project.uvprojx +++ b/bsp/stm32f0x/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt-thread @@ -17,26 +14,26 @@ Keil.STM32F0xx_DFP.1.2.0 http://www.keil.com/pack/ IROM(0x08000000,0x10000) IRAM(0x20000000,0x2000) CPUTYPE("Cortex-M0") CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F0xx_64 -FS08000000 -FL010000 -FP0($$Device:STM32F051R8$Flash\STM32F0xx_64.FLM)) 0 $$Device:STM32F051R8$Device\Include\stm32f0xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32F051R8$SVD\STM32F0xx.svd 0 0 - - - + + + ST\STM32F0xx\ ST\STM32F0xx\ @@ -60,8 +57,8 @@ 0 0 - - + + 0 0 0 @@ -70,23 +67,21 @@ 0 0 - - + + 0 0 - 0 - 0 0 0 - - + + 0 0 0 - + 0 @@ -100,17 +95,16 @@ 0 0 3 - - - 1 + + SARMCM3.DLL - + DARMCM1.DLL -pCM0 SARMCM3.DLL - + TARMCM1.DLL -pCM0 @@ -132,7 +126,6 @@ 1 1 0 - 1 1 @@ -143,24 +136,22 @@ 1 0 1 - 0 - 1 0 - 11 + 13 - - - - - + + + + + - - - - - + + + + + STLink\ST-LINKIII-KEIL_SWO.dll @@ -173,14 +164,9 @@ 1 4104 - 1 STLink\ST-LINKIII-KEIL_SWO.dll "" () - - - - - 0 + @@ -212,7 +198,7 @@ 0 0 "Cortex-M0" - + 0 0 0 @@ -343,7 +329,7 @@ 0x0 - + 1 @@ -358,14 +344,11 @@ 0 0 0 - 0 - 0 - 0 - - RT_USING_ARM_LIBC, USE_STDPERIPH_DRIVER - - .;..\..\components\drivers\include;..\..\components\finsh;..\..\components\init;..\..\components\libc\armlibc;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;Libraries\CMSIS\Include;Libraries\CMSIS\ST\STM32F0xx\Include;Libraries\STM32F0xx_StdPeriph_Driver\inc;applications;drivers + + USE_STDPERIPH_DRIVER + + .;..\..\components\drivers\include;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;Libraries\CMSIS\Include;Libraries\CMSIS\ST\STM32F0xx\Include;Libraries\STM32F0xx_StdPeriph_Driver\inc;applications;drivers @@ -376,13 +359,11 @@ 0 0 0 - 0 - 0 - - - - + + + + @@ -394,17 +375,180 @@ 0 0x08000000 0x20000000 - - - - - --keep __fsym_* --keep __vsym_* --keep __rt_init* - - + + + + --keep *.o(.rti_fn.*) --keep *.o(FSymTab) + + + + STM32_StdPeriph + + + system_stm32f0xx.c + 1 + Libraries\CMSIS\ST\STM32F0xx\Source\Templates\system_stm32f0xx.c + + + + + stm32f0xx_adc.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_adc.c + + + + + stm32f0xx_cec.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_cec.c + + + + + stm32f0xx_comp.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_comp.c + + + + + stm32f0xx_crc.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_crc.c + + + + + stm32f0xx_dac.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dac.c + + + + + stm32f0xx_dbgmcu.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dbgmcu.c + + + + + stm32f0xx_dma.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dma.c + + + + + stm32f0xx_exti.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_exti.c + + + + + stm32f0xx_flash.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_flash.c + + + + + stm32f0xx_gpio.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_gpio.c + + + + + stm32f0xx_i2c.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_i2c.c + + + + + stm32f0xx_iwdg.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_iwdg.c + + + + + stm32f0xx_misc.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_misc.c + + + + + stm32f0xx_pwr.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_pwr.c + + + + + stm32f0xx_rcc.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rcc.c + + + + + stm32f0xx_rtc.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rtc.c + + + + + stm32f0xx_spi.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_spi.c + + + + + stm32f0xx_syscfg.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_syscfg.c + + + + + stm32f0xx_tim.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_tim.c + + + + + stm32f0xx_usart.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_usart.c + + + + + stm32f0xx_wwdg.c + 1 + Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_wwdg.c + + + + + startup_stm32f0xx.s + 2 + Libraries\CMSIS\ST\STM32F0xx\Source\Templates\arm\startup_stm32f0xx.s + + + Applications @@ -413,6 +557,8 @@ 1 applications\application.c + + startup.c 1 @@ -428,16 +574,22 @@ 1 drivers\board.c + + led.c 1 drivers\led.c + + stm32f0xx_it.c 1 drivers\stm32f0xx_it.c + + usart.c 1 @@ -445,126 +597,6 @@ - - STM32_StdPeriph - - - system_stm32f0xx.c - 1 - Libraries\CMSIS\ST\STM32F0xx\Source\Templates\system_stm32f0xx.c - - - stm32f0xx_adc.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_adc.c - - - stm32f0xx_cec.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_cec.c - - - stm32f0xx_comp.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_comp.c - - - stm32f0xx_crc.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_crc.c - - - stm32f0xx_dac.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dac.c - - - stm32f0xx_dbgmcu.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dbgmcu.c - - - stm32f0xx_dma.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_dma.c - - - stm32f0xx_exti.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_exti.c - - - stm32f0xx_flash.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_flash.c - - - stm32f0xx_gpio.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_gpio.c - - - stm32f0xx_i2c.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_i2c.c - - - stm32f0xx_iwdg.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_iwdg.c - - - stm32f0xx_misc.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_misc.c - - - stm32f0xx_pwr.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_pwr.c - - - stm32f0xx_rcc.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rcc.c - - - stm32f0xx_rtc.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_rtc.c - - - stm32f0xx_spi.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_spi.c - - - stm32f0xx_syscfg.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_syscfg.c - - - stm32f0xx_tim.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_tim.c - - - stm32f0xx_usart.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_usart.c - - - stm32f0xx_wwdg.c - 1 - Libraries\STM32F0xx_StdPeriph_Driver\src\stm32f0xx_wwdg.c - - - startup_stm32f0xx.s - 2 - Libraries\CMSIS\ST\STM32F0xx\Source\Templates\arm\startup_stm32f0xx.s - - - Kernel @@ -573,51 +605,78 @@ 1 ..\..\src\clock.c + + + + components.c + 1 + ..\..\src\components.c + + + device.c 1 ..\..\src\device.c + + idle.c 1 ..\..\src\idle.c + + ipc.c 1 ..\..\src\ipc.c + + irq.c 1 ..\..\src\irq.c + + kservice.c 1 ..\..\src\kservice.c + + mem.c 1 ..\..\src\mem.c + + object.c 1 ..\..\src\object.c + + scheduler.c 1 ..\..\src\scheduler.c + + thread.c 1 ..\..\src\thread.c + + timer.c 1 @@ -633,21 +692,29 @@ 1 ..\..\libcpu\arm\cortex-m0\cpuport.c + + context_rvds.S 2 ..\..\libcpu\arm\cortex-m0\context_rvds.S + + backtrace.c 1 ..\..\libcpu\arm\common\backtrace.c + + div0.c 1 ..\..\libcpu\arm\common\div0.c + + showmem.c 1 @@ -663,31 +730,43 @@ 1 ..\..\components\drivers\serial\serial.c + + completion.c 1 ..\..\components\drivers\src\completion.c + + dataqueue.c 1 ..\..\components\drivers\src\dataqueue.c + + pipe.c 1 ..\..\components\drivers\src\pipe.c + + portal.c 1 ..\..\components\drivers\src\portal.c + + ringbuffer.c 1 ..\..\components\drivers\src\ringbuffer.c + + workqueue.c 1 @@ -703,95 +782,37 @@ 1 ..\..\components\finsh\shell.c + + symbol.c 1 ..\..\components\finsh\symbol.c + + cmd.c 1 ..\..\components\finsh\cmd.c - - finsh_compiler.c - 1 - ..\..\components\finsh\finsh_compiler.c - - - finsh_error.c - 1 - ..\..\components\finsh\finsh_error.c - - - finsh_heap.c - 1 - ..\..\components\finsh\finsh_heap.c - - - finsh_init.c - 1 - ..\..\components\finsh\finsh_init.c - - - finsh_node.c - 1 - ..\..\components\finsh\finsh_node.c - - - finsh_ops.c - 1 - ..\..\components\finsh\finsh_ops.c - - - finsh_parser.c - 1 - ..\..\components\finsh\finsh_parser.c - - - finsh_var.c - 1 - ..\..\components\finsh\finsh_var.c - - - finsh_vm.c - 1 - ..\..\components\finsh\finsh_vm.c - - - finsh_token.c - 1 - ..\..\components\finsh\finsh_token.c - - - - Components - components.c + msh_cmd.c 1 - ..\..\components\init\components.c + ..\..\components\finsh\msh_cmd.c - - - libc - mem_std.c + msh.c 1 - ..\..\components\libc\armlibc\mem_std.c - - - stubs.c - 1 - ..\..\components\libc\armlibc\stubs.c + ..\..\components\finsh\msh.c - From bcb9ab1317f4c13d7f7f4897907f5b807bb5fe5e Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Fri, 28 Aug 2015 15:13:04 +0800 Subject: [PATCH 4/7] [finsh] Add mkfs command to msh --- components/finsh/msh_cmd.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/components/finsh/msh_cmd.c b/components/finsh/msh_cmd.c index cc8b2dce0a..44c3d8fd88 100644 --- a/components/finsh/msh_cmd.c +++ b/components/finsh/msh_cmd.c @@ -1,7 +1,7 @@ /* * internal commands for RT-Thread module shell * - * COPYRIGHT (C) 2013, Shanghai Real-Thread Technology Co., Ltd + * COPYRIGHT (C) 2013-2015, Shanghai Real-Thread Technology Co., Ltd * * This file is part of RT-Thread (http://www.rt-thread.org) * Maintainer: bernard.xiong @@ -25,6 +25,7 @@ * Change Logs: * Date Author Notes * 2013-03-30 Bernard the first verion for FinSH + * 2015-08-28 Bernard Add mkfs command. */ #include @@ -219,6 +220,33 @@ int cmd_mkdir(int argc, char** argv) } FINSH_FUNCTION_EXPORT_ALIAS(cmd_mkdir, __cmd_mkdir, Create the DIRECTORY.); +int cmd_mkfs(int argc, char** argv) +{ + int result = 0; + char* type="elm"; /* use the default file system type as 'fatfs' */ + + if (argc == 2) + { + result = dfs_mkfs(type, argv[1]); + } + else if (argc == 4) + { + if (strcmp(argv[1], "-t") == 0) + { + type = argv[2]; + result = dfs_mkfs(type, argv[1]); + } + } + else + { + rt_kprintf("Usage: mkfs [-t type] device\n"); + return 0; + } + + return 0; +} +FINSH_FUNCTION_EXPORT_ALIAS(cmd_mkfs, __cmd_mkfs, format disk with file system); + #endif #ifdef RT_USING_LWIP From 4d01aaf9320204eab017476f1c2737a32986a786 Mon Sep 17 00:00:00 2001 From: pangwei <271372443@qq.com> Date: Fri, 28 Aug 2015 16:57:41 +0800 Subject: [PATCH 5/7] [BSP]fixed some bugs for compile. Signed-off-by: pangwei <271372443@qq.com> --- bsp/mini2440/SConscript | 43 +- bsp/mini2440/applications/SConscript | 11 + bsp/mini2440/{ => applications}/application.c | 0 bsp/mini2440/{ => applications}/startup.c | 0 bsp/mini2440/drivers/SConscript | 44 + bsp/mini2440/{ => drivers}/board.c | 0 bsp/mini2440/{ => drivers}/board.h | 0 bsp/mini2440/{ => drivers}/console.c | 0 bsp/mini2440/{ => drivers}/dm9000.c | 0 bsp/mini2440/{ => drivers}/dm9000.h | 0 bsp/mini2440/{ => drivers}/key.c | 2 +- bsp/mini2440/{ => drivers}/lcd.h | 0 bsp/mini2440/{ => drivers}/lcd_a70.c | 0 bsp/mini2440/{ => drivers}/lcd_n35.c | 0 bsp/mini2440/{ => drivers}/lcd_t35.c | 0 bsp/mini2440/{ => drivers}/lcd_x35.c | 0 bsp/mini2440/{ => drivers}/led.c | 0 bsp/mini2440/{ => drivers}/led.h | 0 bsp/mini2440/{ => drivers}/sdcard.c | 0 bsp/mini2440/{ => drivers}/sdcard.h | 0 bsp/mini2440/{ => drivers}/touch.c | 2 +- bsp/mini2440/{ => drivers}/touch.h | 0 bsp/mini2440/project.Uv2 | 596 ++++++------- bsp/mini2440/project.uvproj | 821 ++---------------- bsp/mini2440/rtconfig.h | 2 +- bsp/mini2440/rtconfig.py | 2 +- 26 files changed, 433 insertions(+), 1090 deletions(-) create mode 100644 bsp/mini2440/applications/SConscript rename bsp/mini2440/{ => applications}/application.c (100%) rename bsp/mini2440/{ => applications}/startup.c (100%) create mode 100644 bsp/mini2440/drivers/SConscript rename bsp/mini2440/{ => drivers}/board.c (100%) rename bsp/mini2440/{ => drivers}/board.h (100%) rename bsp/mini2440/{ => drivers}/console.c (100%) rename bsp/mini2440/{ => drivers}/dm9000.c (100%) rename bsp/mini2440/{ => drivers}/dm9000.h (100%) rename bsp/mini2440/{ => drivers}/key.c (99%) rename bsp/mini2440/{ => drivers}/lcd.h (100%) rename bsp/mini2440/{ => drivers}/lcd_a70.c (100%) rename bsp/mini2440/{ => drivers}/lcd_n35.c (100%) rename bsp/mini2440/{ => drivers}/lcd_t35.c (100%) rename bsp/mini2440/{ => drivers}/lcd_x35.c (100%) rename bsp/mini2440/{ => drivers}/led.c (100%) rename bsp/mini2440/{ => drivers}/led.h (100%) rename bsp/mini2440/{ => drivers}/sdcard.c (100%) rename bsp/mini2440/{ => drivers}/sdcard.h (100%) rename bsp/mini2440/{ => drivers}/touch.c (99%) rename bsp/mini2440/{ => drivers}/touch.h (100%) diff --git a/bsp/mini2440/SConscript b/bsp/mini2440/SConscript index 0f869dc1a2..fe0ae941ae 100644 --- a/bsp/mini2440/SConscript +++ b/bsp/mini2440/SConscript @@ -1,37 +1,14 @@ -import rtconfig +# for module compiling +import os Import('RTT_ROOT') -from building import * -src_bsp = ['application.c', 'startup.c', 'board.c'] -src_drv = ['console.c', 'led.c'] +cwd = str(Dir('#')) +objs = [] +list = os.listdir(cwd) -if GetDepend('RT_USING_DFS'): - src_drv += ['sdcard.c'] +for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + objs = objs + SConscript(os.path.join(d, 'SConscript')) -if GetDepend('RT_USING_LWIP'): - src_drv += ['dm9000.c'] - -if GetDepend('RT_USING_RTGUI'): - src_drv += ['touch.c', 'key.c', 'calibration.c'] - -if GetDepend('RT_USING_FTK'): - src_drv += ['touch.c', 'key.c'] - -if GetDepend('RT_USING_RTI'): - src_drv += ['rti_stub.c'] - -if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_FTK'): - if rtconfig.RT_USING_LCD_TYPE == 'PNL_A70': - src_drv += ['lcd_a70.c'] - elif rtconfig.RT_USING_LCD_TYPE == 'PNL_N35': - src_drv += ['lcd_n35.c'] - elif rtconfig.RT_USING_LCD_TYPE == 'PNL_T35': - src_drv += ['lcd_t35.c'] - elif rtconfig.RT_USING_LCD_TYPE == 'PNL_X35': - src_drv += ['lcd_x35.c'] - -src = File(src_bsp + src_drv) -CPPPATH = [GetCurrentDir()] -group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH) - -Return('group') +Return('objs') diff --git a/bsp/mini2440/applications/SConscript b/bsp/mini2440/applications/SConscript new file mode 100644 index 0000000000..01eb940dfb --- /dev/null +++ b/bsp/mini2440/applications/SConscript @@ -0,0 +1,11 @@ +Import('RTT_ROOT') +Import('rtconfig') +from building import * + +cwd = os.path.join(str(Dir('#')), 'applications') +src = Glob('*.c') +CPPPATH = [cwd, str(Dir('#'))] + +group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) + +Return('group') diff --git a/bsp/mini2440/application.c b/bsp/mini2440/applications/application.c similarity index 100% rename from bsp/mini2440/application.c rename to bsp/mini2440/applications/application.c diff --git a/bsp/mini2440/startup.c b/bsp/mini2440/applications/startup.c similarity index 100% rename from bsp/mini2440/startup.c rename to bsp/mini2440/applications/startup.c diff --git a/bsp/mini2440/drivers/SConscript b/bsp/mini2440/drivers/SConscript new file mode 100644 index 0000000000..55c8b43cd5 --- /dev/null +++ b/bsp/mini2440/drivers/SConscript @@ -0,0 +1,44 @@ +Import('RTT_ROOT') +Import('rtconfig') +from building import * + +cwd = os.path.join(str(Dir('#')), 'drivers') + +# add the general drivers. +src = Split(""" +board.c +led.c +console.c +""") + +if GetDepend('RT_USING_DFS'): + src += ['sdcard.c'] + +if GetDepend('RT_USING_LWIP'): + src += ['dm9000.c'] + +if GetDepend('RT_USING_RTGUI'): + src += ['touch.c', 'key.c', 'calibration.c'] + +if GetDepend('RT_USING_FTK'): + src += ['touch.c', 'key.c'] + +if GetDepend('RT_USING_RTI'): + src += ['rti_stub.c'] + +if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_FTK'): + if rtconfig.RT_USING_LCD_TYPE == 'PNL_A70': + src += ['lcd_a70.c'] + elif rtconfig.RT_USING_LCD_TYPE == 'PNL_N35': + src += ['lcd_n35.c'] + elif rtconfig.RT_USING_LCD_TYPE == 'PNL_T35': + src += ['lcd_t35.c'] + elif rtconfig.RT_USING_LCD_TYPE == 'PNL_X35': + src += ['lcd_x35.c'] + +CPPPATH = [cwd] + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) + +Return('group') + diff --git a/bsp/mini2440/board.c b/bsp/mini2440/drivers/board.c similarity index 100% rename from bsp/mini2440/board.c rename to bsp/mini2440/drivers/board.c diff --git a/bsp/mini2440/board.h b/bsp/mini2440/drivers/board.h similarity index 100% rename from bsp/mini2440/board.h rename to bsp/mini2440/drivers/board.h diff --git a/bsp/mini2440/console.c b/bsp/mini2440/drivers/console.c similarity index 100% rename from bsp/mini2440/console.c rename to bsp/mini2440/drivers/console.c diff --git a/bsp/mini2440/dm9000.c b/bsp/mini2440/drivers/dm9000.c similarity index 100% rename from bsp/mini2440/dm9000.c rename to bsp/mini2440/drivers/dm9000.c diff --git a/bsp/mini2440/dm9000.h b/bsp/mini2440/drivers/dm9000.h similarity index 100% rename from bsp/mini2440/dm9000.h rename to bsp/mini2440/drivers/dm9000.h diff --git a/bsp/mini2440/key.c b/bsp/mini2440/drivers/key.c similarity index 99% rename from bsp/mini2440/key.c rename to bsp/mini2440/drivers/key.c index 1b5035e180..22e0b3e889 100644 --- a/bsp/mini2440/key.c +++ b/bsp/mini2440/drivers/key.c @@ -129,7 +129,7 @@ static void key_init(void) /* install key isr */ INTSUBMSK &= ~(BIT_SUB_RXD1); - rt_hw_interrupt_install(INTUART1, rt_key_handler, RT_NULL); + rt_hw_interrupt_install(INTUART1, rt_key_handler, RT_NULL , "INTUART1"); rt_hw_interrupt_umask(INTUART1); } diff --git a/bsp/mini2440/lcd.h b/bsp/mini2440/drivers/lcd.h similarity index 100% rename from bsp/mini2440/lcd.h rename to bsp/mini2440/drivers/lcd.h diff --git a/bsp/mini2440/lcd_a70.c b/bsp/mini2440/drivers/lcd_a70.c similarity index 100% rename from bsp/mini2440/lcd_a70.c rename to bsp/mini2440/drivers/lcd_a70.c diff --git a/bsp/mini2440/lcd_n35.c b/bsp/mini2440/drivers/lcd_n35.c similarity index 100% rename from bsp/mini2440/lcd_n35.c rename to bsp/mini2440/drivers/lcd_n35.c diff --git a/bsp/mini2440/lcd_t35.c b/bsp/mini2440/drivers/lcd_t35.c similarity index 100% rename from bsp/mini2440/lcd_t35.c rename to bsp/mini2440/drivers/lcd_t35.c diff --git a/bsp/mini2440/lcd_x35.c b/bsp/mini2440/drivers/lcd_x35.c similarity index 100% rename from bsp/mini2440/lcd_x35.c rename to bsp/mini2440/drivers/lcd_x35.c diff --git a/bsp/mini2440/led.c b/bsp/mini2440/drivers/led.c similarity index 100% rename from bsp/mini2440/led.c rename to bsp/mini2440/drivers/led.c diff --git a/bsp/mini2440/led.h b/bsp/mini2440/drivers/led.h similarity index 100% rename from bsp/mini2440/led.h rename to bsp/mini2440/drivers/led.h diff --git a/bsp/mini2440/sdcard.c b/bsp/mini2440/drivers/sdcard.c similarity index 100% rename from bsp/mini2440/sdcard.c rename to bsp/mini2440/drivers/sdcard.c diff --git a/bsp/mini2440/sdcard.h b/bsp/mini2440/drivers/sdcard.h similarity index 100% rename from bsp/mini2440/sdcard.h rename to bsp/mini2440/drivers/sdcard.h diff --git a/bsp/mini2440/touch.c b/bsp/mini2440/drivers/touch.c similarity index 99% rename from bsp/mini2440/touch.c rename to bsp/mini2440/drivers/touch.c index 5af6ab543e..49d5f713a6 100644 --- a/bsp/mini2440/touch.c +++ b/bsp/mini2440/drivers/touch.c @@ -384,7 +384,7 @@ static rt_err_t rtgui_touch_init(rt_device_t dev) ADCTSC = WAIT4INT(0); - rt_hw_interrupt_install(INTADC, rt_touch_handler, RT_NULL); + rt_hw_interrupt_install(INTADC, rt_touch_handler, RT_NULL , "INTADC"); rt_hw_interrupt_umask(INTADC); /* clear interrupt */ diff --git a/bsp/mini2440/touch.h b/bsp/mini2440/drivers/touch.h similarity index 100% rename from bsp/mini2440/touch.h rename to bsp/mini2440/drivers/touch.h diff --git a/bsp/mini2440/project.Uv2 b/bsp/mini2440/project.Uv2 index 7864fdd64e..7e7c3d8ea9 100644 --- a/bsp/mini2440/project.Uv2 +++ b/bsp/mini2440/project.Uv2 @@ -6,335 +6,275 @@ Target (RT-Thread Mini2440), 0x0004 // Tools: 'ARM-ADS' Group (Startup) Group (Kernel) Group (S3C24X0) -Group (pthreads) -Group (libc) -Group (libz) -Group (jpeg) -Group (libpng) -Group (libdl) -Group (finsh) -Group (LwIP) Group (Filesystem) +Group (jpeg) +Group (finsh) +Group (libc) +Group (libdl) +Group (LwIP) +Group (pthreads) -File 1,1,<./application.c> -File 1,1,<./startup.c> -File 1,1,<./board.c> -File 1,1,<./console.c> -File 1,1,<./led.c> -File 1,1,<./sdcard.c> -File 1,1,<./dm9000.c> -File 1,1,<../../src/clock.c> -File 1,1,<../../src/components.c> -File 1,1,<../../src/device.c> -File 1,1,<../../src/idle.c> -File 1,1,<../../src/ipc.c> -File 1,1,<../../src/irq.c> -File 1,1,<../../src/kservice.c> -File 1,1,<../../src/mem.c> -File 1,1,<../../src/mempool.c> -File 1,1,<../../src/module.c> -File 1,1,<../../src/object.c> -File 1,1,<../../src/scheduler.c> -File 1,1,<../../src/thread.c> -File 1,1,<../../src/timer.c> -File 1,1,<../../libcpu/arm/s3c24x0/cpu.c> -File 1,1,<../../libcpu/arm/s3c24x0/interrupt.c> -File 1,1,<../../libcpu/arm/s3c24x0/mmu.c> -File 1,1,<../../libcpu/arm/s3c24x0/rtc.c> -File 1,1,<../../libcpu/arm/s3c24x0/serial.c> -File 1,1,<../../libcpu/arm/s3c24x0/stack.c> -File 1,1,<../../libcpu/arm/s3c24x0/system_clock.c> -File 1,1,<../../libcpu/arm/s3c24x0/trap.c> -File 1,2,<../../libcpu/arm/s3c24x0/context_rvds.S> -File 1,2,<../../libcpu/arm/s3c24x0/start_rvds.S> -File 1,1,<../../libcpu/arm/common/backtrace.c> -File 1,1,<../../libcpu/arm/common/div0.c> -File 1,1,<../../libcpu/arm/common/showmem.c> -File 1,1,<../../components/pthreads/clock_time.c> -File 1,1,<../../components/pthreads/mqueue.c> -File 1,1,<../../components/pthreads/pthread.c> -File 1,1,<../../components/pthreads/pthread_attr.c> -File 1,1,<../../components/pthreads/pthread_barrier.c> -File 1,1,<../../components/pthreads/pthread_cond.c> -File 1,1,<../../components/pthreads/pthread_mutex.c> -File 1,1,<../../components/pthreads/pthread_rwlock.c> -File 1,1,<../../components/pthreads/pthread_spin.c> -File 1,1,<../../components/pthreads/pthread_tls.c> -File 1,1,<../../components/pthreads/sched.c> -File 1,1,<../../components/pthreads/semaphore.c> -File 1,1,<../../components/libc/armlibc/mem_std.c> -File 1,1,<../../components/libc/armlibc/stubs.c> -File 1,1,<../../components/external/libz/adler32.c> -File 1,1,<../../components/external/libz/compress.c> -File 1,1,<../../components/external/libz/crc32.c> -File 1,1,<../../components/external/libz/deflate.c> -File 1,1,<../../components/external/libz/infback.c> -File 1,1,<../../components/external/libz/inffast.c> -File 1,1,<../../components/external/libz/inflate.c> -File 1,1,<../../components/external/libz/inftrees.c> -File 1,1,<../../components/external/libz/trees.c> -File 1,1,<../../components/external/libz/uncompr.c> -File 1,1,<../../components/external/libz/zutil.c> -File 1,1,<../../components/external/jpeg/jaricom.c> -File 1,1,<../../components/external/jpeg/jcomapi.c> -File 1,1,<../../components/external/jpeg/jutils.c> -File 1,1,<../../components/external/jpeg/jerror.c> -File 1,1,<../../components/external/jpeg/jmemmgr.c> -File 1,1,<../../components/external/jpeg/jdapimin.c> -File 1,1,<../../components/external/jpeg/jdapistd.c> -File 1,1,<../../components/external/jpeg/jdarith.c> -File 1,1,<../../components/external/jpeg/jdtrans.c> -File 1,1,<../../components/external/jpeg/jdmaster.c> -File 1,1,<../../components/external/jpeg/jdinput.c> -File 1,1,<../../components/external/jpeg/jdmarker.c> -File 1,1,<../../components/external/jpeg/jdhuff.c> -File 1,1,<../../components/external/jpeg/jdmainct.c> -File 1,1,<../../components/external/jpeg/jdcoefct.c> -File 1,1,<../../components/external/jpeg/jdpostct.c> -File 1,1,<../../components/external/jpeg/jddctmgr.c> -File 1,1,<../../components/external/jpeg/jidctfst.c> -File 1,1,<../../components/external/jpeg/jidctflt.c> -File 1,1,<../../components/external/jpeg/jidctint.c> -File 1,1,<../../components/external/jpeg/jdsample.c> -File 1,1,<../../components/external/jpeg/jdcolor.c> -File 1,1,<../../components/external/jpeg/jquant1.c> -File 1,1,<../../components/external/jpeg/jquant2.c> -File 1,1,<../../components/external/jpeg/jdmerge.c> -File 1,1,<../../components/external/jpeg/jmemnobs.c> -File 1,1,<../../components/external/libpng/png.c> -File 1,1,<../../components/external/libpng/pngerror.c> -File 1,1,<../../components/external/libpng/pnggccrd.c> -File 1,1,<../../components/external/libpng/pngget.c> -File 1,1,<../../components/external/libpng/pngmem.c> -File 1,1,<../../components/external/libpng/pngpread.c> -File 1,1,<../../components/external/libpng/pngread.c> -File 1,1,<../../components/external/libpng/pngrio.c> -File 1,1,<../../components/external/libpng/pngrtran.c> -File 1,1,<../../components/external/libpng/pngrutil.c> -File 1,1,<../../components/external/libpng/pngset.c> -File 1,1,<../../components/external/libpng/pngtrans.c> -File 1,1,<../../components/external/libpng/pngvcrd.c> -File 1,1,<../../components/external/libpng/pngwio.c> -File 1,1,<../../components/external/libpng/pngwrite.c> -File 1,1,<../../components/external/libpng/pngwtran.c> -File 1,1,<../../components/external/libpng/pngwutil.c> -File 1,1,<../../components/libdl/dlclose.c> -File 1,1,<../../components/libdl/dlerror.c> -File 1,1,<../../components/libdl/dlopen.c> -File 1,1,<../../components/libdl/dlsym.c> -File 1,1,<../../components/finsh/shell.c> -File 1,1,<../../components/finsh/symbol.c> -File 1,1,<../../components/finsh/cmd.c> -File 1,1,<../../components/finsh/finsh_compiler.c> -File 1,1,<../../components/finsh/finsh_error.c> -File 1,1,<../../components/finsh/finsh_heap.c> -File 1,1,<../../components/finsh/finsh_init.c> -File 1,1,<../../components/finsh/finsh_node.c> -File 1,1,<../../components/finsh/finsh_ops.c> -File 1,1,<../../components/finsh/finsh_parser.c> -File 1,1,<../../components/finsh/finsh_var.c> -File 1,1,<../../components/finsh/finsh_vm.c> -File 1,1,<../../components/finsh/finsh_token.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/api_lib.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/api_msg.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/err.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/netbuf.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/netdb.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/netifapi.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/sockets.c> -File 1,1,<../../components/net/lwip-1.4.1/src/api/tcpip.c> -File 1,1,<../../components/net/lwip-1.4.1/src/arch/sys_arch.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/def.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/dhcp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/dns.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/init.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/memp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/netif.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/pbuf.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/raw.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/stats.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/sys.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/tcp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/tcp_in.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/tcp_out.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/timers.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/udp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/autoip.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/icmp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/igmp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet_chksum.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_addr.c> -File 1,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_frag.c> -File 1,1,<../../components/net/lwip-1.4.1/src/netif/etharp.c> -File 1,1,<../../components/net/lwip-1.4.1/src/netif/ethernetif.c> -File 1,1,<../../components/net/lwip-1.4.1/src/netif/slipif.c> -File 1,1,<../../components/dfs/src/dfs.c> -File 1,1,<../../components/dfs/src/dfs_file.c> -File 1,1,<../../components/dfs/src/dfs_fs.c> -File 1,1,<../../components/dfs/src/dfs_posix.c> -File 1,1,<../../components/dfs/filesystems/elmfat/dfs_elm.c> -File 1,1,<../../components/dfs/filesystems/elmfat/ff.c> -File 1,1,<../../components/dfs/filesystems/elmfat/option/cc936.c> -File 1,1,<../../components/dfs/filesystems/devfs/console.c> -File 1,1,<../../components/dfs/filesystems/devfs/devfs.c> -File 2,1,<../../src/clock.c> -File 2,1,<../../src/components.c> -File 2,1,<../../src/device.c> -File 2,1,<../../src/idle.c> -File 2,1,<../../src/ipc.c> -File 2,1,<../../src/irq.c> -File 2,1,<../../src/kservice.c> -File 2,1,<../../src/mem.c> -File 2,1,<../../src/mempool.c> -File 2,1,<../../src/module.c> -File 2,1,<../../src/object.c> -File 2,1,<../../src/scheduler.c> -File 2,1,<../../src/thread.c> -File 2,1,<../../src/timer.c> -File 3,1,<../../libcpu/arm/s3c24x0/cpu.c> -File 3,1,<../../libcpu/arm/s3c24x0/interrupt.c> -File 3,1,<../../libcpu/arm/s3c24x0/mmu.c> -File 3,1,<../../libcpu/arm/s3c24x0/rtc.c> -File 3,1,<../../libcpu/arm/s3c24x0/serial.c> -File 3,1,<../../libcpu/arm/s3c24x0/stack.c> -File 3,1,<../../libcpu/arm/s3c24x0/system_clock.c> -File 3,1,<../../libcpu/arm/s3c24x0/trap.c> -File 3,2,<../../libcpu/arm/s3c24x0/context_rvds.S> -File 3,2,<../../libcpu/arm/s3c24x0/start_rvds.S> -File 3,1,<../../libcpu/arm/common/backtrace.c> -File 3,1,<../../libcpu/arm/common/div0.c> -File 3,1,<../../libcpu/arm/common/showmem.c> -File 4,1,<../../components/pthreads/clock_time.c> -File 4,1,<../../components/pthreads/mqueue.c> -File 4,1,<../../components/pthreads/pthread.c> -File 4,1,<../../components/pthreads/pthread_attr.c> -File 4,1,<../../components/pthreads/pthread_barrier.c> -File 4,1,<../../components/pthreads/pthread_cond.c> -File 4,1,<../../components/pthreads/pthread_mutex.c> -File 4,1,<../../components/pthreads/pthread_rwlock.c> -File 4,1,<../../components/pthreads/pthread_spin.c> -File 4,1,<../../components/pthreads/pthread_tls.c> -File 4,1,<../../components/pthreads/sched.c> -File 4,1,<../../components/pthreads/semaphore.c> -File 5,1,<../../components/libc/armlibc/mem_std.c> -File 5,1,<../../components/libc/armlibc/stubs.c> -File 6,1,<../../components/external/libz/adler32.c> -File 6,1,<../../components/external/libz/compress.c> -File 6,1,<../../components/external/libz/crc32.c> -File 6,1,<../../components/external/libz/deflate.c> -File 6,1,<../../components/external/libz/infback.c> -File 6,1,<../../components/external/libz/inffast.c> -File 6,1,<../../components/external/libz/inflate.c> -File 6,1,<../../components/external/libz/inftrees.c> -File 6,1,<../../components/external/libz/trees.c> -File 6,1,<../../components/external/libz/uncompr.c> -File 6,1,<../../components/external/libz/zutil.c> -File 7,1,<../../components/external/jpeg/jaricom.c> -File 7,1,<../../components/external/jpeg/jcomapi.c> -File 7,1,<../../components/external/jpeg/jutils.c> -File 7,1,<../../components/external/jpeg/jerror.c> -File 7,1,<../../components/external/jpeg/jmemmgr.c> -File 7,1,<../../components/external/jpeg/jdapimin.c> -File 7,1,<../../components/external/jpeg/jdapistd.c> -File 7,1,<../../components/external/jpeg/jdarith.c> -File 7,1,<../../components/external/jpeg/jdtrans.c> -File 7,1,<../../components/external/jpeg/jdmaster.c> -File 7,1,<../../components/external/jpeg/jdinput.c> -File 7,1,<../../components/external/jpeg/jdmarker.c> -File 7,1,<../../components/external/jpeg/jdhuff.c> -File 7,1,<../../components/external/jpeg/jdmainct.c> -File 7,1,<../../components/external/jpeg/jdcoefct.c> -File 7,1,<../../components/external/jpeg/jdpostct.c> -File 7,1,<../../components/external/jpeg/jddctmgr.c> -File 7,1,<../../components/external/jpeg/jidctfst.c> -File 7,1,<../../components/external/jpeg/jidctflt.c> -File 7,1,<../../components/external/jpeg/jidctint.c> -File 7,1,<../../components/external/jpeg/jdsample.c> -File 7,1,<../../components/external/jpeg/jdcolor.c> -File 7,1,<../../components/external/jpeg/jquant1.c> -File 7,1,<../../components/external/jpeg/jquant2.c> -File 7,1,<../../components/external/jpeg/jdmerge.c> -File 7,1,<../../components/external/jpeg/jmemnobs.c> -File 8,1,<../../components/external/libpng/png.c> -File 8,1,<../../components/external/libpng/pngerror.c> -File 8,1,<../../components/external/libpng/pnggccrd.c> -File 8,1,<../../components/external/libpng/pngget.c> -File 8,1,<../../components/external/libpng/pngmem.c> -File 8,1,<../../components/external/libpng/pngpread.c> -File 8,1,<../../components/external/libpng/pngread.c> -File 8,1,<../../components/external/libpng/pngrio.c> -File 8,1,<../../components/external/libpng/pngrtran.c> -File 8,1,<../../components/external/libpng/pngrutil.c> -File 8,1,<../../components/external/libpng/pngset.c> -File 8,1,<../../components/external/libpng/pngtrans.c> -File 8,1,<../../components/external/libpng/pngvcrd.c> -File 8,1,<../../components/external/libpng/pngwio.c> -File 8,1,<../../components/external/libpng/pngwrite.c> -File 8,1,<../../components/external/libpng/pngwtran.c> -File 8,1,<../../components/external/libpng/pngwutil.c> -File 9,1,<../../components/libdl/dlclose.c> -File 9,1,<../../components/libdl/dlerror.c> -File 9,1,<../../components/libdl/dlopen.c> -File 9,1,<../../components/libdl/dlsym.c> -File 10,1,<../../components/finsh/shell.c> -File 10,1,<../../components/finsh/symbol.c> -File 10,1,<../../components/finsh/cmd.c> -File 10,1,<../../components/finsh/finsh_compiler.c> -File 10,1,<../../components/finsh/finsh_error.c> -File 10,1,<../../components/finsh/finsh_heap.c> -File 10,1,<../../components/finsh/finsh_init.c> -File 10,1,<../../components/finsh/finsh_node.c> -File 10,1,<../../components/finsh/finsh_ops.c> -File 10,1,<../../components/finsh/finsh_parser.c> -File 10,1,<../../components/finsh/finsh_var.c> -File 10,1,<../../components/finsh/finsh_vm.c> -File 10,1,<../../components/finsh/finsh_token.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/api_lib.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/api_msg.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/err.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/netbuf.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/netdb.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/netifapi.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/sockets.c> -File 11,1,<../../components/net/lwip-1.4.1/src/api/tcpip.c> -File 11,1,<../../components/net/lwip-1.4.1/src/arch/sys_arch.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/def.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/dhcp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/dns.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/init.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/memp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/netif.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/pbuf.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/raw.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/stats.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/sys.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/tcp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/tcp_in.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/tcp_out.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/timers.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/udp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/autoip.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/icmp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/igmp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet_chksum.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_addr.c> -File 11,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_frag.c> -File 11,1,<../../components/net/lwip-1.4.1/src/netif/etharp.c> -File 11,1,<../../components/net/lwip-1.4.1/src/netif/ethernetif.c> -File 11,1,<../../components/net/lwip-1.4.1/src/netif/slipif.c> -File 12,1,<../../components/dfs/src/dfs.c> -File 12,1,<../../components/dfs/src/dfs_file.c> -File 12,1,<../../components/dfs/src/dfs_fs.c> -File 12,1,<../../components/dfs/src/dfs_posix.c> -File 12,1,<../../components/dfs/filesystems/elmfat/dfs_elm.c> -File 12,1,<../../components/dfs/filesystems/elmfat/ff.c> -File 12,1,<../../components/dfs/filesystems/elmfat/option/cc936.c> -File 12,1,<../../components/dfs/filesystems/devfs/console.c> -File 12,1,<../../components/dfs/filesystems/devfs/devfs.c> +File 1,1,<.\application.c> +File 1,1,<.\startup.c> +File 1,1,<.\board.c> +File 1,1,<.\console.c> +File 1,1,<.\led.c> +File 1,1,<.\sdcard.c> +File 1,1,<.\dm9000.c> +File 1,1,<..\..\src\clock.c> +File 1,1,<..\..\src\device.c> +File 1,1,<..\..\src\idle.c> +File 1,1,<..\..\src\ipc.c> +File 1,1,<..\..\src\irq.c> +File 1,1,<..\..\src\kservice.c> +File 1,1,<..\..\src\mem.c> +File 1,1,<..\..\src\mempool.c> +File 1,1,<..\..\src\module.c> +File 1,1,<..\..\src\object.c> +File 1,1,<..\..\src\scheduler.c> +File 1,1,<..\..\src\thread.c> +File 1,1,<..\..\src\timer.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\cpu.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\interrupt.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\mmu.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\rtc.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\serial.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\stack.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\system_clock.c> +File 1,1,<..\..\libcpu\arm\s3c24x0\trap.c> +File 1,2,<..\..\libcpu\arm\s3c24x0\context_rvds.S> +File 1,2,<..\..\libcpu\arm\s3c24x0\start_rvds.S> +File 1,1,<..\..\libcpu\arm\common\backtrace.c> +File 1,1,<..\..\libcpu\arm\common\div0.c> +File 1,1,<..\..\libcpu\arm\common\showmem.c> +File 1,1,<..\..\components\dfs\src\dfs.c> +File 1,1,<..\..\components\dfs\src\dfs_file.c> +File 1,1,<..\..\components\dfs\src\dfs_fs.c> +File 1,1,<..\..\components\dfs\src\dfs_posix.c> +File 1,1,<..\..\components\dfs\filesystems\devfs\console.c> +File 1,1,<..\..\components\dfs\filesystems\devfs\devfs.c> +File 1,1,<..\..\components\dfs\filesystems\elmfat\dfs_elm.c> +File 1,1,<..\..\components\dfs\filesystems\elmfat\ff.c> +File 1,1,<..\..\components\dfs\filesystems\elmfat\option\cc936.c> +File 1,1,<..\..\components\external\jpeg\jaricom.c> +File 1,1,<..\..\components\external\jpeg\jcomapi.c> +File 1,1,<..\..\components\external\jpeg\jutils.c> +File 1,1,<..\..\components\external\jpeg\jerror.c> +File 1,1,<..\..\components\external\jpeg\jmemmgr.c> +File 1,1,<..\..\components\external\jpeg\jdapimin.c> +File 1,1,<..\..\components\external\jpeg\jdapistd.c> +File 1,1,<..\..\components\external\jpeg\jdarith.c> +File 1,1,<..\..\components\external\jpeg\jdtrans.c> +File 1,1,<..\..\components\external\jpeg\jdmaster.c> +File 1,1,<..\..\components\external\jpeg\jdinput.c> +File 1,1,<..\..\components\external\jpeg\jdmarker.c> +File 1,1,<..\..\components\external\jpeg\jdhuff.c> +File 1,1,<..\..\components\external\jpeg\jdmainct.c> +File 1,1,<..\..\components\external\jpeg\jdcoefct.c> +File 1,1,<..\..\components\external\jpeg\jdpostct.c> +File 1,1,<..\..\components\external\jpeg\jddctmgr.c> +File 1,1,<..\..\components\external\jpeg\jidctfst.c> +File 1,1,<..\..\components\external\jpeg\jidctflt.c> +File 1,1,<..\..\components\external\jpeg\jidctint.c> +File 1,1,<..\..\components\external\jpeg\jdsample.c> +File 1,1,<..\..\components\external\jpeg\jdcolor.c> +File 1,1,<..\..\components\external\jpeg\jquant1.c> +File 1,1,<..\..\components\external\jpeg\jquant2.c> +File 1,1,<..\..\components\external\jpeg\jdmerge.c> +File 1,1,<..\..\components\external\jpeg\jmemnobs.c> +File 1,1,<..\..\components\finsh\shell.c> +File 1,1,<..\..\components\finsh\symbol.c> +File 1,1,<..\..\components\finsh\cmd.c> +File 1,1,<..\..\components\finsh\finsh_compiler.c> +File 1,1,<..\..\components\finsh\finsh_error.c> +File 1,1,<..\..\components\finsh\finsh_heap.c> +File 1,1,<..\..\components\finsh\finsh_init.c> +File 1,1,<..\..\components\finsh\finsh_node.c> +File 1,1,<..\..\components\finsh\finsh_ops.c> +File 1,1,<..\..\components\finsh\finsh_parser.c> +File 1,1,<..\..\components\finsh\finsh_var.c> +File 1,1,<..\..\components\finsh\finsh_vm.c> +File 1,1,<..\..\components\finsh\finsh_token.c> +File 1,1,<..\..\components\libc\armlibc\mem_std.c> +File 1,1,<..\..\components\libc\armlibc\stubs.c> +File 1,1,<..\..\components\libdl\dlclose.c> +File 1,1,<..\..\components\libdl\dlerror.c> +File 1,1,<..\..\components\libdl\dlopen.c> +File 1,1,<..\..\components\libdl\dlsym.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\api_lib.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\api_msg.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\err.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\netbuf.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\netdb.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\netifapi.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\sockets.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\api\tcpip.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\arch\sys_arch.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\def.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\dhcp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\dns.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\init.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\memp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\netif.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\pbuf.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\raw.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\stats.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\sys.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\tcp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_in.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_out.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\timers.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\udp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\autoip.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\icmp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\igmp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet_chksum.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_addr.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_frag.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\netif\etharp.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\netif\ethernetif.c> +File 1,1,<..\..\components\net\lwip-1.4.1\src\netif\slipif.c> +File 1,1,<..\..\components\pthreads\clock_time.c> +File 1,1,<..\..\components\pthreads\mqueue.c> +File 1,1,<..\..\components\pthreads\pthread.c> +File 1,1,<..\..\components\pthreads\pthread_attr.c> +File 1,1,<..\..\components\pthreads\pthread_barrier.c> +File 1,1,<..\..\components\pthreads\pthread_cond.c> +File 1,1,<..\..\components\pthreads\pthread_mutex.c> +File 1,1,<..\..\components\pthreads\pthread_rwlock.c> +File 1,1,<..\..\components\pthreads\pthread_spin.c> +File 1,1,<..\..\components\pthreads\pthread_tls.c> +File 1,1,<..\..\components\pthreads\sched.c> +File 1,1,<..\..\components\pthreads\semaphore.c> +File 2,1,<..\..\src\clock.c> +File 2,1,<..\..\src\device.c> +File 2,1,<..\..\src\idle.c> +File 2,1,<..\..\src\ipc.c> +File 2,1,<..\..\src\irq.c> +File 2,1,<..\..\src\kservice.c> +File 2,1,<..\..\src\mem.c> +File 2,1,<..\..\src\mempool.c> +File 2,1,<..\..\src\module.c> +File 2,1,<..\..\src\object.c> +File 2,1,<..\..\src\scheduler.c> +File 2,1,<..\..\src\thread.c> +File 2,1,<..\..\src\timer.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\cpu.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\interrupt.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\mmu.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\rtc.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\serial.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\stack.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\system_clock.c> +File 3,1,<..\..\libcpu\arm\s3c24x0\trap.c> +File 3,2,<..\..\libcpu\arm\s3c24x0\context_rvds.S> +File 3,2,<..\..\libcpu\arm\s3c24x0\start_rvds.S> +File 3,1,<..\..\libcpu\arm\common\backtrace.c> +File 3,1,<..\..\libcpu\arm\common\div0.c> +File 3,1,<..\..\libcpu\arm\common\showmem.c> +File 4,1,<..\..\components\dfs\src\dfs.c> +File 4,1,<..\..\components\dfs\src\dfs_file.c> +File 4,1,<..\..\components\dfs\src\dfs_fs.c> +File 4,1,<..\..\components\dfs\src\dfs_posix.c> +File 4,1,<..\..\components\dfs\filesystems\devfs\console.c> +File 4,1,<..\..\components\dfs\filesystems\devfs\devfs.c> +File 4,1,<..\..\components\dfs\filesystems\elmfat\dfs_elm.c> +File 4,1,<..\..\components\dfs\filesystems\elmfat\ff.c> +File 4,1,<..\..\components\dfs\filesystems\elmfat\option\cc936.c> +File 5,1,<..\..\components\external\jpeg\jaricom.c> +File 5,1,<..\..\components\external\jpeg\jcomapi.c> +File 5,1,<..\..\components\external\jpeg\jutils.c> +File 5,1,<..\..\components\external\jpeg\jerror.c> +File 5,1,<..\..\components\external\jpeg\jmemmgr.c> +File 5,1,<..\..\components\external\jpeg\jdapimin.c> +File 5,1,<..\..\components\external\jpeg\jdapistd.c> +File 5,1,<..\..\components\external\jpeg\jdarith.c> +File 5,1,<..\..\components\external\jpeg\jdtrans.c> +File 5,1,<..\..\components\external\jpeg\jdmaster.c> +File 5,1,<..\..\components\external\jpeg\jdinput.c> +File 5,1,<..\..\components\external\jpeg\jdmarker.c> +File 5,1,<..\..\components\external\jpeg\jdhuff.c> +File 5,1,<..\..\components\external\jpeg\jdmainct.c> +File 5,1,<..\..\components\external\jpeg\jdcoefct.c> +File 5,1,<..\..\components\external\jpeg\jdpostct.c> +File 5,1,<..\..\components\external\jpeg\jddctmgr.c> +File 5,1,<..\..\components\external\jpeg\jidctfst.c> +File 5,1,<..\..\components\external\jpeg\jidctflt.c> +File 5,1,<..\..\components\external\jpeg\jidctint.c> +File 5,1,<..\..\components\external\jpeg\jdsample.c> +File 5,1,<..\..\components\external\jpeg\jdcolor.c> +File 5,1,<..\..\components\external\jpeg\jquant1.c> +File 5,1,<..\..\components\external\jpeg\jquant2.c> +File 5,1,<..\..\components\external\jpeg\jdmerge.c> +File 5,1,<..\..\components\external\jpeg\jmemnobs.c> +File 6,1,<..\..\components\finsh\shell.c> +File 6,1,<..\..\components\finsh\symbol.c> +File 6,1,<..\..\components\finsh\cmd.c> +File 6,1,<..\..\components\finsh\finsh_compiler.c> +File 6,1,<..\..\components\finsh\finsh_error.c> +File 6,1,<..\..\components\finsh\finsh_heap.c> +File 6,1,<..\..\components\finsh\finsh_init.c> +File 6,1,<..\..\components\finsh\finsh_node.c> +File 6,1,<..\..\components\finsh\finsh_ops.c> +File 6,1,<..\..\components\finsh\finsh_parser.c> +File 6,1,<..\..\components\finsh\finsh_var.c> +File 6,1,<..\..\components\finsh\finsh_vm.c> +File 6,1,<..\..\components\finsh\finsh_token.c> +File 7,1,<..\..\components\libc\armlibc\mem_std.c> +File 7,1,<..\..\components\libc\armlibc\stubs.c> +File 8,1,<..\..\components\libdl\dlclose.c> +File 8,1,<..\..\components\libdl\dlerror.c> +File 8,1,<..\..\components\libdl\dlopen.c> +File 8,1,<..\..\components\libdl\dlsym.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\api_lib.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\api_msg.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\err.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\netbuf.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\netdb.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\netifapi.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\sockets.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\api\tcpip.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\arch\sys_arch.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\def.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\dhcp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\dns.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\init.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\memp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\netif.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\pbuf.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\raw.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\stats.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\sys.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\tcp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_in.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_out.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\timers.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\udp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\autoip.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\icmp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\igmp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet_chksum.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_addr.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_frag.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\netif\etharp.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\netif\ethernetif.c> +File 9,1,<..\..\components\net\lwip-1.4.1\src\netif\slipif.c> +File 10,1,<..\..\components\pthreads\clock_time.c> +File 10,1,<..\..\components\pthreads\mqueue.c> +File 10,1,<..\..\components\pthreads\pthread.c> +File 10,1,<..\..\components\pthreads\pthread_attr.c> +File 10,1,<..\..\components\pthreads\pthread_barrier.c> +File 10,1,<..\..\components\pthreads\pthread_cond.c> +File 10,1,<..\..\components\pthreads\pthread_mutex.c> +File 10,1,<..\..\components\pthreads\pthread_rwlock.c> +File 10,1,<..\..\components\pthreads\pthread_spin.c> +File 10,1,<..\..\components\pthreads\pthread_tls.c> +File 10,1,<..\..\components\pthreads\sched.c> +File 10,1,<..\..\components\pthreads\semaphore.c> @@ -397,7 +337,7 @@ Options 1,0,0 // Target 'RT-Thread Mini2440' ADSCMISC (--diag_suppress=870) ADSCDEFN (RT_USING_ARM_LIBC) ADSCUDEF () - ADSCINCD (../../components/libdl;../../components/external/libpng;../../libcpu/arm/s3c24x0;../../components/finsh;../../components/net/lwip-1.4.1/src;../../components/pthreads;../../components/dfs/filesystems/elmfat;../../libcpu/arm/common;../../components/dfs/filesystems/devfs;.;../../components/external/libz;../../components/net/lwip-1.4.1/src/include/netif;../../include;../../components/dfs/include;../../components/net/lwip-1.4.1/src/include;../../components/external/jpeg;../../components/libc/armlibc;../../components/net/lwip-1.4.1/src/arch/include;../../components/net/lwip-1.4.1/src/include/ipv4) + ADSCINCD (..\..\components\net\lwip-1.4.1\src;..\..\components\pthreads;..\..\components\libdl;..\..\components\dfs\filesystems\elmfat;..\..\components\net\lwip-1.4.1\src\include;..\..\libcpu\arm\s3c24x0;..\..\components\net\lwip-1.4.1\src\include\ipv4;..\..\components\net\lwip-1.4.1\src\include\netif;.;..\..\include;..\..\components\external\jpeg;..\..\components\dfs\include;..\..\components\libc\armlibc;..\..\libcpu\arm\common;..\..\components\net\lwip-1.4.1\src\arch\include;..\..\components\finsh;..\..\components\dfs\filesystems\devfs) ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSAMISC () ADSADEFN () diff --git a/bsp/mini2440/project.uvproj b/bsp/mini2440/project.uvproj index b8bfc0d2f8..1817b2984b 100644 --- a/bsp/mini2440/project.uvproj +++ b/bsp/mini2440/project.uvproj @@ -161,10 +161,11 @@ 1 0 0 - 0 + 1 1 4098 + 1 Segger\JLTAgdi.dll "" () @@ -348,9 +349,9 @@ 0 --diag_suppress=870 - + RT_USING_ARM_LIBC - .;..\..\components\dfs;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\include;..\..\components\external\jpeg;..\..\components\external\libpng;..\..\components\external\libz;..\..\components\finsh;..\..\components\libdl;..\..\components\net\lwip\src;..\..\components\net\lwip\src\arch\include;..\..\components\net\lwip\src\include;..\..\components\net\lwip\src\include\ipv4;..\..\components\net\lwip\src\include\netif;..\..\components\pthreads;..\..\components\rtgui\common;..\..\components\rtgui\include;..\..\components\rtgui\server;..\..\components\rtgui\widgets;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\s3c24x0 + applications;.;drivers;..\..\include;..\..\libcpu\arm\s3c24x0;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\external\jpeg;..\..\components\finsh;..\..\components\libc\armlibc;..\..\components\libdl;..\..\components\net\lwip-1.4.1\src;..\..\components\net\lwip-1.4.1\src\include;..\..\components\net\lwip-1.4.1\src\include\ipv4;..\..\components\net\lwip-1.4.1\src\arch\include;..\..\components\net\lwip-1.4.1\src\include\netif;..\..\components\pthreads @@ -381,7 +382,7 @@ rtthread-mini2440.sct - --keep __rtmsym_* --keep __fsym_* --keep __vsym_* + --keep *.o(RTMSymTab) --keep *.o(FSymTab) --keep *.o(VSymTab) @@ -389,62 +390,47 @@ - Startup + Applications application.c 1 - .\application.c + applications\application.c startup.c 1 - .\startup.c + applications\startup.c + + + + Drivers + board.c 1 - .\board.c - - - console.c - 1 - .\console.c + drivers\board.c led.c 1 - .\led.c + drivers\led.c + + + console.c + 1 + drivers\console.c sdcard.c 1 - .\sdcard.c + drivers\sdcard.c dm9000.c 1 - .\dm9000.c - - - touch.c - 1 - .\touch.c - - - key.c - 1 - .\key.c - - - calibration.c - 1 - .\calibration.c - - - lcd_t35.c - 1 - .\lcd_t35.c + drivers\dm9000.c @@ -596,21 +582,31 @@ 1 ..\..\components\dfs\src\dfs.c - - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - dfs_file.c 1 ..\..\components\dfs\src\dfs_file.c + + dfs_fs.c + 1 + ..\..\components\dfs\src\dfs_fs.c + dfs_posix.c 1 ..\..\components\dfs\src\dfs_posix.c + + devfs_console.c + 1 + ..\..\components\dfs\filesystems\devfs\console.c + + + devfs.c + 1 + ..\..\components\dfs\filesystems\devfs\devfs.c + dfs_elm.c 1 @@ -626,16 +622,6 @@ 1 ..\..\components\dfs\filesystems\elmfat\option\cc936.c - - devfs.c - 1 - ..\..\components\dfs\filesystems\devfs\devfs.c - - - devfs_console.c - 1 - ..\..\components\dfs\filesystems\devfs\console.c - @@ -773,159 +759,19 @@ - - libpng - - - png.c - 1 - ..\..\components\external\libpng\png.c - - - pngerror.c - 1 - ..\..\components\external\libpng\pngerror.c - - - pnggccrd.c - 1 - ..\..\components\external\libpng\pnggccrd.c - - - pngget.c - 1 - ..\..\components\external\libpng\pngget.c - - - pngmem.c - 1 - ..\..\components\external\libpng\pngmem.c - - - pngpread.c - 1 - ..\..\components\external\libpng\pngpread.c - - - pngread.c - 1 - ..\..\components\external\libpng\pngread.c - - - pngrio.c - 1 - ..\..\components\external\libpng\pngrio.c - - - pngrtran.c - 1 - ..\..\components\external\libpng\pngrtran.c - - - pngrutil.c - 1 - ..\..\components\external\libpng\pngrutil.c - - - pngset.c - 1 - ..\..\components\external\libpng\pngset.c - - - pngtrans.c - 1 - ..\..\components\external\libpng\pngtrans.c - - - pngvcrd.c - 1 - ..\..\components\external\libpng\pngvcrd.c - - - pngwio.c - 1 - ..\..\components\external\libpng\pngwio.c - - - pngwrite.c - 1 - ..\..\components\external\libpng\pngwrite.c - - - pngwtran.c - 1 - ..\..\components\external\libpng\pngwtran.c - - - pngwutil.c - 1 - ..\..\components\external\libpng\pngwutil.c - - - - - libz - - - adler32.c - 1 - ..\..\components\external\libz\adler32.c - - - compress.c - 1 - ..\..\components\external\libz\compress.c - - - crc32.c - 1 - ..\..\components\external\libz\crc32.c - - - deflate.c - 1 - ..\..\components\external\libz\deflate.c - - - infback.c - 1 - ..\..\components\external\libz\infback.c - - - inffast.c - 1 - ..\..\components\external\libz\inffast.c - - - inflate.c - 1 - ..\..\components\external\libz\inflate.c - - - inftrees.c - 1 - ..\..\components\external\libz\inftrees.c - - - trees.c - 1 - ..\..\components\external\libz\trees.c - - - uncompr.c - 1 - ..\..\components\external\libz\uncompr.c - - - zutil.c - 1 - ..\..\components\external\libz\zutil.c - - - finsh + + shell.c + 1 + ..\..\components\finsh\shell.c + + + symbol.c + 1 + ..\..\components\finsh\symbol.c + cmd.c 1 @@ -966,11 +812,6 @@ 1 ..\..\components\finsh\finsh_parser.c - - finsh_token.c - 1 - ..\..\components\finsh\finsh_token.c - finsh_var.c 1 @@ -982,14 +823,24 @@ ..\..\components\finsh\finsh_vm.c - shell.c + finsh_token.c 1 - ..\..\components\finsh\shell.c + ..\..\components\finsh\finsh_token.c + + + + + libc + + + mem_std.c + 1 + ..\..\components\libc\armlibc\mem_std.c - symbol.c + stubs.c 1 - ..\..\components\finsh\symbol.c + ..\..\components\libc\armlibc\stubs.c @@ -1024,177 +875,177 @@ api_lib.c 1 - ..\..\components\net\lwip\src\api\api_lib.c + ..\..\components\net\lwip-1.4.1\src\api\api_lib.c api_msg.c 1 - ..\..\components\net\lwip\src\api\api_msg.c + ..\..\components\net\lwip-1.4.1\src\api\api_msg.c err.c 1 - ..\..\components\net\lwip\src\api\err.c + ..\..\components\net\lwip-1.4.1\src\api\err.c netbuf.c 1 - ..\..\components\net\lwip\src\api\netbuf.c + ..\..\components\net\lwip-1.4.1\src\api\netbuf.c netdb.c 1 - ..\..\components\net\lwip\src\api\netdb.c + ..\..\components\net\lwip-1.4.1\src\api\netdb.c netifapi.c 1 - ..\..\components\net\lwip\src\api\netifapi.c + ..\..\components\net\lwip-1.4.1\src\api\netifapi.c sockets.c 1 - ..\..\components\net\lwip\src\api\sockets.c + ..\..\components\net\lwip-1.4.1\src\api\sockets.c tcpip.c 1 - ..\..\components\net\lwip\src\api\tcpip.c + ..\..\components\net\lwip-1.4.1\src\api\tcpip.c sys_arch.c 1 - ..\..\components\net\lwip\src\arch\sys_arch.c + ..\..\components\net\lwip-1.4.1\src\arch\sys_arch.c def.c 1 - ..\..\components\net\lwip\src\core\def.c + ..\..\components\net\lwip-1.4.1\src\core\def.c dhcp.c 1 - ..\..\components\net\lwip\src\core\dhcp.c + ..\..\components\net\lwip-1.4.1\src\core\dhcp.c dns.c 1 - ..\..\components\net\lwip\src\core\dns.c + ..\..\components\net\lwip-1.4.1\src\core\dns.c init.c 1 - ..\..\components\net\lwip\src\core\init.c + ..\..\components\net\lwip-1.4.1\src\core\init.c memp.c 1 - ..\..\components\net\lwip\src\core\memp.c + ..\..\components\net\lwip-1.4.1\src\core\memp.c netif.c 1 - ..\..\components\net\lwip\src\core\netif.c + ..\..\components\net\lwip-1.4.1\src\core\netif.c pbuf.c 1 - ..\..\components\net\lwip\src\core\pbuf.c + ..\..\components\net\lwip-1.4.1\src\core\pbuf.c raw.c 1 - ..\..\components\net\lwip\src\core\raw.c + ..\..\components\net\lwip-1.4.1\src\core\raw.c stats.c 1 - ..\..\components\net\lwip\src\core\stats.c + ..\..\components\net\lwip-1.4.1\src\core\stats.c sys.c 1 - ..\..\components\net\lwip\src\core\sys.c + ..\..\components\net\lwip-1.4.1\src\core\sys.c tcp.c 1 - ..\..\components\net\lwip\src\core\tcp.c + ..\..\components\net\lwip-1.4.1\src\core\tcp.c tcp_in.c 1 - ..\..\components\net\lwip\src\core\tcp_in.c + ..\..\components\net\lwip-1.4.1\src\core\tcp_in.c tcp_out.c 1 - ..\..\components\net\lwip\src\core\tcp_out.c + ..\..\components\net\lwip-1.4.1\src\core\tcp_out.c timers.c 1 - ..\..\components\net\lwip\src\core\timers.c + ..\..\components\net\lwip-1.4.1\src\core\timers.c udp.c 1 - ..\..\components\net\lwip\src\core\udp.c + ..\..\components\net\lwip-1.4.1\src\core\udp.c autoip.c 1 - ..\..\components\net\lwip\src\core\ipv4\autoip.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\autoip.c icmp.c 1 - ..\..\components\net\lwip\src\core\ipv4\icmp.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\icmp.c igmp.c 1 - ..\..\components\net\lwip\src\core\ipv4\igmp.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\igmp.c inet.c 1 - ..\..\components\net\lwip\src\core\ipv4\inet.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\inet.c inet_chksum.c 1 - ..\..\components\net\lwip\src\core\ipv4\inet_chksum.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\inet_chksum.c ip.c 1 - ..\..\components\net\lwip\src\core\ipv4\ip.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\ip.c ip_addr.c 1 - ..\..\components\net\lwip\src\core\ipv4\ip_addr.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_addr.c ip_frag.c 1 - ..\..\components\net\lwip\src\core\ipv4\ip_frag.c + ..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_frag.c etharp.c 1 - ..\..\components\net\lwip\src\netif\etharp.c + ..\..\components\net\lwip-1.4.1\src\netif\etharp.c ethernetif.c 1 - ..\..\components\net\lwip\src\netif\ethernetif.c + ..\..\components\net\lwip-1.4.1\src\netif\ethernetif.c slipif.c 1 - ..\..\components\net\lwip\src\netif\slipif.c + ..\..\components\net\lwip-1.4.1\src\netif\slipif.c @@ -1263,486 +1114,6 @@ - - RTGUI - - - blit.c - 1 - ..\..\components\rtgui\common\blit.c - - - color.c - 1 - ..\..\components\rtgui\common\color.c - - - region.c - 1 - ..\..\components\rtgui\common\region.c - - - rtgui_object.c - 1 - ..\..\components\rtgui\common\rtgui_object.c - - - rtgui_system.c - 1 - ..\..\components\rtgui\common\rtgui_system.c - - - rtgui_theme.c - 1 - ..\..\components\rtgui\common\rtgui_theme.c - - - rtgui_xml.c - 1 - ..\..\components\rtgui\common\rtgui_xml.c - - - rtgui_app.c - 1 - ..\..\components\rtgui\common\rtgui_app.c - - - dc.c - 1 - ..\..\components\rtgui\common\dc.c - - - dc_hw.c - 1 - ..\..\components\rtgui\common\dc_hw.c - - - dc_buffer.c - 1 - ..\..\components\rtgui\common\dc_buffer.c - - - dc_client.c - 1 - ..\..\components\rtgui\common\dc_client.c - - - filerw.c - 1 - ..\..\components\rtgui\common\filerw.c - - - image.c - 1 - ..\..\components\rtgui\common\image.c - - - image_xpm.c - 1 - ..\..\components\rtgui\common\image_xpm.c - - - image_hdc.c - 1 - ..\..\components\rtgui\common\image_hdc.c - - - image_bmp.c - 1 - ..\..\components\rtgui\common\image_bmp.c - - - image_png.c - 1 - ..\..\components\rtgui\common\image_png.c - - - image_jpg.c - 1 - ..\..\components\rtgui\common\image_jpg.c - - - image_container.c - 1 - ..\..\components\rtgui\common\image_container.c - - - font.c - 1 - ..\..\components\rtgui\common\font.c - - - font_bmp.c - 1 - ..\..\components\rtgui\common\font_bmp.c - - - font_hz_file.c - 1 - ..\..\components\rtgui\common\font_hz_file.c - - - font_hz_bmp.c - 1 - ..\..\components\rtgui\common\font_hz_bmp.c - - - asc12font.c - 1 - ..\..\components\rtgui\common\asc12font.c - - - asc16font.c - 1 - ..\..\components\rtgui\common\asc16font.c - - - hz12font.c - 1 - ..\..\components\rtgui\common\hz12font.c - - - hz16font.c - 1 - ..\..\components\rtgui\common\hz16font.c - - - framebuffer_driver.c - 1 - ..\..\components\rtgui\common\framebuffer_driver.c - - - pixel_driver.c - 1 - ..\..\components\rtgui\common\pixel_driver.c - - - rtgui_mv_model.c - 1 - ..\..\components\rtgui\common\rtgui_mv_model.c - - - driver.c - 1 - ..\..\components\rtgui\server\driver.c - - - mouse.c - 1 - ..\..\components\rtgui\server\mouse.c - - - server.c - 1 - ..\..\components\rtgui\server\server.c - - - topwin.c - 1 - ..\..\components\rtgui\server\topwin.c - - - box.c - 1 - ..\..\components\rtgui\widgets\box.c - - - button.c - 1 - ..\..\components\rtgui\widgets\button.c - - - checkbox.c - 1 - ..\..\components\rtgui\widgets\checkbox.c - - - combobox.c - 1 - ..\..\components\rtgui\widgets\combobox.c - - - iconbox.c - 1 - ..\..\components\rtgui\widgets\iconbox.c - - - label.c - 1 - ..\..\components\rtgui\widgets\label.c - - - textview.c - 1 - ..\..\components\rtgui\widgets\textview.c - - - listctrl.c - 1 - ..\..\components\rtgui\widgets\listctrl.c - - - menu.c - 1 - ..\..\components\rtgui\widgets\menu.c - - - progressbar.c - 1 - ..\..\components\rtgui\widgets\progressbar.c - - - radiobox.c - 1 - ..\..\components\rtgui\widgets\radiobox.c - - - slider.c - 1 - ..\..\components\rtgui\widgets\slider.c - - - scrollbar.c - 1 - ..\..\components\rtgui\widgets\scrollbar.c - - - staticline.c - 1 - ..\..\components\rtgui\widgets\staticline.c - - - textbox.c - 1 - ..\..\components\rtgui\widgets\textbox.c - - - listbox.c - 1 - ..\..\components\rtgui\widgets\listbox.c - - - title.c - 1 - ..\..\components\rtgui\widgets\title.c - - - notebook.c - 1 - ..\..\components\rtgui\widgets\notebook.c - - - container.c - 1 - ..\..\components\rtgui\widgets\container.c - - - list_view.c - 1 - ..\..\components\rtgui\widgets\list_view.c - - - filelist_view.c - 1 - ..\..\components\rtgui\widgets\filelist_view.c - - - widget.c - 1 - ..\..\components\rtgui\widgets\widget.c - - - window.c - 1 - ..\..\components\rtgui\widgets\window.c - - - panel.c - 1 - ..\..\components\rtgui\widgets\panel.c - - - groupbox.c - 1 - ..\..\components\rtgui\widgets\groupbox.c - - - edit.c - 1 - ..\..\components\rtgui\widgets\edit.c - - - mv_view.c - 1 - ..\..\components\rtgui\widgets\mv_view.c - - - plot.c - 1 - ..\..\components\rtgui\widgets\plot.c - - - plot_curve.c - 1 - ..\..\components\rtgui\widgets\plot_curve.c - - - - - gui_examples - - - demo_application.c - 1 - ..\..\examples\gui\demo_application.c - - - demo_view.c - 1 - ..\..\examples\gui\demo_view.c - - - demo_xml.c - 1 - ..\..\examples\gui\demo_xml.c - - - demo_view_benchmark.c - 1 - ..\..\examples\gui\demo_view_benchmark.c - - - demo_view_dc.c - 1 - ..\..\examples\gui\demo_view_dc.c - - - demo_view_ttf.c - 1 - ..\..\examples\gui\demo_view_ttf.c - - - demo_view_dc_buffer.c - 1 - ..\..\examples\gui\demo_view_dc_buffer.c - - - demo_view_animation.c - 1 - ..\..\examples\gui\demo_view_animation.c - - - demo_view_buffer_animation.c - 1 - ..\..\examples\gui\demo_view_buffer_animation.c - - - demo_view_instrument_panel.c - 1 - ..\..\examples\gui\demo_view_instrument_panel.c - - - demo_view_window.c - 1 - ..\..\examples\gui\demo_view_window.c - - - demo_view_label.c - 1 - ..\..\examples\gui\demo_view_label.c - - - demo_view_button.c - 1 - ..\..\examples\gui\demo_view_button.c - - - demo_view_checkbox.c - 1 - ..\..\examples\gui\demo_view_checkbox.c - - - demo_view_progressbar.c - 1 - ..\..\examples\gui\demo_view_progressbar.c - - - demo_view_scrollbar.c - 1 - ..\..\examples\gui\demo_view_scrollbar.c - - - demo_view_radiobox.c - 1 - ..\..\examples\gui\demo_view_radiobox.c - - - demo_view_textbox.c - 1 - ..\..\examples\gui\demo_view_textbox.c - - - demo_view_listbox.c - 1 - ..\..\examples\gui\demo_view_listbox.c - - - demo_view_menu.c - 1 - ..\..\examples\gui\demo_view_menu.c - - - demo_view_listctrl.c - 1 - ..\..\examples\gui\demo_view_listctrl.c - - - demo_view_combobox.c - 1 - ..\..\examples\gui\demo_view_combobox.c - - - demo_view_slider.c - 1 - ..\..\examples\gui\demo_view_slider.c - - - demo_view_notebook.c - 1 - ..\..\examples\gui\demo_view_notebook.c - - - demo_view_mywidget.c - 1 - ..\..\examples\gui\demo_view_mywidget.c - - - demo_view_box.c - 1 - ..\..\examples\gui\demo_view_box.c - - - demo_view_edit.c - 1 - ..\..\examples\gui\demo_view_edit.c - - - demo_view_bmp.c - 1 - ..\..\examples\gui\demo_view_bmp.c - - - demo_plot.c - 1 - ..\..\examples\gui\demo_plot.c - - - mywidget.c - 1 - ..\..\examples\gui\mywidget.c - - - diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h index b85996ab24..0b5ea9732b 100644 --- a/bsp/mini2440/rtconfig.h +++ b/bsp/mini2440/rtconfig.h @@ -212,7 +212,7 @@ // #define RTGUI_IMAGE_JPEG // -#define RTGUI_IMAGE_PNG +//#define RTGUI_IMAGE_PNG // #define RTGUI_IMAGE_BMP // diff --git a/bsp/mini2440/rtconfig.py b/bsp/mini2440/rtconfig.py index 964030a19d..e8734cdafb 100644 --- a/bsp/mini2440/rtconfig.py +++ b/bsp/mini2440/rtconfig.py @@ -9,7 +9,7 @@ ARCH = 'arm' CPU = 's3c24x0' TextBase = '0x30000000' -CROSS_TOOL = 'gcc' +CROSS_TOOL = 'keil' if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') From 7610ce36077abda8fc2324b546eb7e689067af64 Mon Sep 17 00:00:00 2001 From: ardafu Date: Mon, 31 Aug 2015 09:36:26 +0800 Subject: [PATCH 6/7] [BSP] [ASM9260T] Fix compile errors. 1. Add Heap_Size define for Keil toolchain 2. Disable pthreads in rtconfig.h --- bsp/asm9260t/platform/rt_low_level_keil.inc | 1 + bsp/asm9260t/rtconfig.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bsp/asm9260t/platform/rt_low_level_keil.inc b/bsp/asm9260t/platform/rt_low_level_keil.inc index c3cde15ded..7b3c8cfe99 100644 --- a/bsp/asm9260t/platform/rt_low_level_keil.inc +++ b/bsp/asm9260t/platform/rt_low_level_keil.inc @@ -29,4 +29,5 @@ ABT_STK_SIZE EQU 512 IRQ_STK_SIZE EQU 1024 FIQ_STK_SIZE EQU 1024 SYS_STK_SIZE EQU 512 +Heap_Size EQU 512 END diff --git a/bsp/asm9260t/rtconfig.h b/bsp/asm9260t/rtconfig.h index 4b47b1a6d8..13a47dce77 100644 --- a/bsp/asm9260t/rtconfig.h +++ b/bsp/asm9260t/rtconfig.h @@ -65,7 +65,7 @@ /* SECTION: the runtime libc library */ /* the runtime libc library */ #define RT_USING_LIBC -#define RT_USING_PTHREADS +//#define RT_USING_PTHREADS /* Using Module System */ //#define RT_USING_MODULE From 23b5fe5239a00260dfafb321112760b6200c377f Mon Sep 17 00:00:00 2001 From: quintin Date: Mon, 31 Aug 2015 14:57:01 +0800 Subject: [PATCH 7/7] fix DMA tx mod tx_dma->activated flag init bug. --- components/drivers/serial/serial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index 8744aa4657..f5a199e10b 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -27,6 +27,8 @@ * the size of ring buffer. * 2014-07-10 bernard rewrite serial framework * 2014-12-31 bernard use open_flag for poll_tx stream mode. + * 2015-05-19 Quintin fix DMA tx mod tx_dma->activated flag !=RT_FALSE BUG + * in open function. */ #include @@ -302,6 +304,7 @@ static rt_err_t rt_serial_open(struct rt_device *dev, rt_uint16_t oflag) tx_dma = (struct rt_serial_tx_dma*) rt_malloc (sizeof(struct rt_serial_tx_dma)); RT_ASSERT(tx_dma != RT_NULL); + tx_dma->activated = RT_FALSE; rt_data_queue_init(&(tx_dma->data_queue), 8, 4, RT_NULL); serial->serial_tx = tx_dma;