diff options
| author | bernard <[email protected]> | 2014-04-05 23:40:18 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2014-04-05 23:40:18 +0800 |
| commit | f07bb06437d39762376acd17daf106cd4267c042 (patch) | |
| tree | 748ee28ba2d1c30096ee3041e178c3ff4fc9d65a | |
| parent | 625c8f2126373dadb5a4422302516e47f39a9688 (diff) | |
[BSP] Remove the components initialization management.
| -rw-r--r-- | bsp/lpc176x/applications/application.c | 32 | ||||
| -rw-r--r-- | bsp/lpc176x/applications/startup.c | 21 | ||||
| -rw-r--r-- | bsp/lpc176x/project.uvopt | 43 | ||||
| -rw-r--r-- | bsp/lpc176x/project.uvproj | 4 |
4 files changed, 50 insertions, 50 deletions
diff --git a/bsp/lpc176x/applications/application.c b/bsp/lpc176x/applications/application.c index f534c7352a..2e30e44e4a 100644 --- a/bsp/lpc176x/applications/application.c +++ b/bsp/lpc176x/applications/application.c @@ -21,12 +21,20 @@ #ifdef RT_USING_LWIP #include <emac.h> +#include <netif/ethernetif.h> +extern int lwip_system_init(void); #endif + #ifdef RT_USING_DFS #include <dfs_fs.h> #include <sd.h> #endif +#ifdef RT_USING_FINSH +#include <shell.h> +#include <finsh.h> +#endif + /* thread phase init */ void rt_init_thread_entry(void *parameter) { @@ -36,18 +44,40 @@ void rt_init_thread_entry(void *parameter) #ifdef RT_USING_LWIP /* register Ethernet interface device */ lpc17xx_emac_hw_init(); + + /* initialize lwip stack */ + /* register ethernetif device */ + eth_system_device_init(); + + /* initialize lwip system */ + lwip_system_init(); + rt_kprintf("TCP/IP initialized!\n"); #endif /* Filesystem Initialization */ #ifdef RT_USING_DFS rt_hw_sdcard_init(); - + + /* initialize the device file system */ + dfs_init(); + +#ifdef RT_USING_DFS_ELMFAT + /* initialize the elm chan FatFS file system*/ + elm_init(); +#endif + /* mount sd card fat partition 1 as root directory */ if (dfs_mount("sd0", "/", "elm", 0, 0) == 0) rt_kprintf("File System initialized!\n"); else rt_kprintf("File System init failed!\n"); #endif + +#ifdef RT_USING_FINSH + /* initialize finsh */ + finsh_system_init(); + finsh_set_device(RT_CONSOLE_DEVICE_NAME); +#endif } int rt_application_init() diff --git a/bsp/lpc176x/applications/startup.c b/bsp/lpc176x/applications/startup.c index f332155b17..9c08294569 100644 --- a/bsp/lpc176x/applications/startup.c +++ b/bsp/lpc176x/applications/startup.c @@ -16,20 +16,13 @@ #include <rthw.h> #include <rtthread.h> -#include "LPC17xx.h" -#include "board.h" - -#ifdef RT_USING_DFS -#include "sd.h" -#endif - /** - * @addtogroup LPC17 + * @addtogroup LPC176x */ /*@{*/ - -extern int rt_application_init(void); +#include <board.h> +extern int rt_application_init(void); #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -84,14 +77,6 @@ void rtthread_startup(void) /* initialize scheduler system */ rt_system_scheduler_init(); -#ifdef RT_USING_DEVICE -#ifdef RT_USING_DFS - rt_hw_sdcard_init(); -#endif - /* initialize all device */ - rt_device_init_all(); -#endif - /* initialize application */ rt_application_init(); diff --git a/bsp/lpc176x/project.uvopt b/bsp/lpc176x/project.uvopt index e2eb07d801..f9320dace5 100644 --- a/bsp/lpc176x/project.uvopt +++ b/bsp/lpc176x/project.uvopt @@ -43,7 +43,7 @@ <PageWidth>79</PageWidth> <PageLength>66</PageLength> <TabStop>8</TabStop> - <ListingPath>.\obj\</ListingPath> + <ListingPath>.\build\</ListingPath> </OPTLEX> <ListingPage> <CreateCListing>1</CreateCListing> @@ -71,7 +71,7 @@ <LExpSel>0</LExpSel> </OPTXL> <OPTFL> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> @@ -122,21 +122,6 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> - <Key>DLGTARM</Key> - <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(350=-1,-1,-1,-1,0)(250=-1,-1,-1,-1,0)(270=-1,-1,-1,-1,0)(313=-1,-1,-1,-1,0)(291=-1,-1,-1,-1,0)(302=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(320=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(330=-1,-1,-1,-1,0)(332=-1,-1,-1,-1,0)(333=-1,-1,-1,-1,0)(334=-1,-1,-1,-1,0)(335=-1,-1,-1,-1,0)(336=-1,-1,-1,-1,0)(345=-1,-1,-1,-1,0)(346=-1,-1,-1,-1,0)(381=-1,-1,-1,-1,0)(382=-1,-1,-1,-1,0)(383=-1,-1,-1,-1,0)(384=-1,-1,-1,-1,0)(197=-1,-1,-1,-1,0)(198=-1,-1,-1,-1,0)(191=-1,-1,-1,-1,0)(192=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(261=-1,-1,-1,-1,0)(262=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(124=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(142=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(400=-1,-1,-1,-1,0)(370=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(280=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)</Name> - </SetRegEntry> - <SetRegEntry> - <Number>0</Number> - <Key>ARMDBGFLAGS</Key> - <Name></Name> - </SetRegEntry> - <SetRegEntry> - <Number>0</Number> - <Key>DLGUARM</Key> - <Name></Name> - </SetRegEntry> - <SetRegEntry> - <Number>0</Number> <Key>JL2CM3</Key> <Name>-U20090928 -O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD10000000 -FC800 -FN1 -FF0LPC_IAP_512 -FS00 -FL080000</Name> </SetRegEntry> @@ -158,7 +143,7 @@ <aSer1>0</aSer1> <aSer2>0</aSer2> <aPa>0</aPa> - <viewmode>1</viewmode> + <viewmode>0</viewmode> <vrSel>0</vrSel> <aSym>0</aSym> <aTbox>0</aTbox> @@ -211,8 +196,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>117</TopLine> - <CurrentLine>123</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>CMSIS\CM3\DeviceSupport\NXP\LPC17xx\startup\arm\startup_LPC17xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath> @@ -223,7 +208,7 @@ <Group> <GroupName>Applications</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -233,10 +218,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>33</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>10</TopLine> - <CurrentLine>64</CurrentLine> + <TopLine>46</TopLine> + <CurrentLine>57</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>applications\application.c</PathWithFileName> <FilenameWithoutPath>application.c</FilenameWithoutPath> @@ -265,10 +250,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>18</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>91</TopLine> - <CurrentLine>115</CurrentLine> + <TopLine>19</TopLine> + <CurrentLine>24</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>applications\startup.c</PathWithFileName> <FilenameWithoutPath>startup.c</FilenameWithoutPath> @@ -411,8 +396,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>63</TopLine> - <CurrentLine>69</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\src\idle.c</PathWithFileName> <FilenameWithoutPath>idle.c</FilenameWithoutPath> diff --git a/bsp/lpc176x/project.uvproj b/bsp/lpc176x/project.uvproj index c9144e4833..b9c21cf445 100644 --- a/bsp/lpc176x/project.uvproj +++ b/bsp/lpc176x/project.uvproj @@ -44,14 +44,14 @@ <NotGenerated>0</NotGenerated> <InvalidFlash>1</InvalidFlash> </TargetStatus> - <OutputDirectory>.\obj\</OutputDirectory> + <OutputDirectory>.\build\</OutputDirectory> <OutputName>rtthread-lpc</OutputName> <CreateExecutable>1</CreateExecutable> <CreateLib>0</CreateLib> <CreateHexFile>0</CreateHexFile> <DebugInformation>1</DebugInformation> <BrowseInformation>1</BrowseInformation> - <ListingPath>.\obj\</ListingPath> + <ListingPath>.\build\</ListingPath> <HexFormatSelection>1</HexFormatSelection> <Merge32K>0</Merge32K> <CreateBatchFile>0</CreateBatchFile> |
