[console] 解决在没有定义RT_USING_DEVICE的情况下使用device报错的问题

* [console] 解决在没有定义RT_USING_DEVICE的情况下使用device报错的问题

* format codes

* [libc] 整理格式

* refresh projects

2 files changed, 162 insertions, 89 deletions

diff --git a/bsp/mb9bf506r/project.ewp b/bsp/mb9bf506r/project.ewp
index d64503ac93..e4b889de6d 100644
--- a/bsp/mb9bf506r/project.ewp
+++ b/bsp/mb9bf506r/project.ewp
@@ -155,6 +155,7 @@
         <option>

           <name>CCDefines</name>

           <state />

+          <state>RT_USING_DLIBC</state>

           <state>__RTTHREAD__</state>

         </option>

         <option>

@@ -285,12 +286,12 @@
         <option>

           <name>CCIncludePath2</name>

           <state />

-          <state>$PROJ_DIR$\..\..\components\libc\compilers\common\nogcc</state>

-          <state>$PROJ_DIR$\libraries\CMSIS\Include</state>

           <state>$PROJ_DIR$\..\..\include</state>

+          <state>$PROJ_DIR$\libraries\CMSIS\Include</state>

+          <state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>

           <state>$PROJ_DIR$\..\..\components\libc\posix\ipc</state>

           <state>$PROJ_DIR$\drivers</state>

-          <state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>

+          <state>$PROJ_DIR$\..\..\components\libc\compilers\common\nogcc</state>

           <state>$PROJ_DIR$\..\..\examples\utest\testcases\kernel</state>

           <state>$PROJ_DIR$\.</state>

           <state>$PROJ_DIR$\applications</state>

@@ -1037,6 +1038,7 @@
         <option>

           <name>CCDefines</name>

           <state>NDEBUG</state>

+          <state>RT_USING_DLIBC</state>

           <state>__RTTHREAD__</state>

         </option>

         <option>

@@ -1167,12 +1169,12 @@
         <option>

           <name>CCIncludePath2</name>

           <state />

-          <state>$PROJ_DIR$\..\..\components\libc\compilers\common\nogcc</state>

-          <state>$PROJ_DIR$\libraries\CMSIS\Include</state>

           <state>$PROJ_DIR$\..\..\include</state>

+          <state>$PROJ_DIR$\libraries\CMSIS\Include</state>

+          <state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>

           <state>$PROJ_DIR$\..\..\components\libc\posix\ipc</state>

           <state>$PROJ_DIR$\drivers</state>

-          <state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>

+          <state>$PROJ_DIR$\..\..\components\libc\compilers\common\nogcc</state>

           <state>$PROJ_DIR$\..\..\examples\utest\testcases\kernel</state>

           <state>$PROJ_DIR$\.</state>

           <state>$PROJ_DIR$\applications</state>

@@ -1767,10 +1769,10 @@
   <group>

     <name>Applications</name>

     <file>

-      <name>$PROJ_DIR$\applications\application.c</name>

+      <name>$PROJ_DIR$\applications\startup.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\applications\startup.c</name>

+      <name>$PROJ_DIR$\applications\application.c</name>

     </file>

   </group>

   <group>

@@ -1783,6 +1785,42 @@
     </file>

   </group>

   <group>

+    <name>Compiler</name>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\common\time.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\common\stdlib.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscalls.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_close.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_write.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_lseek.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_mem.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_remove.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_read.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\environ.c</name>

+    </file>

+    <file>

+      <name>$PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_open.c</name>

+    </file>

+  </group>

+  <group>

     <name>CPU</name>

     <file>

       <name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>

@@ -1794,10 +1832,10 @@
       <name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>

+      <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>

+      <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>

     </file>

   </group>

   <group>

@@ -1806,40 +1844,40 @@
       <name>$PROJ_DIR$\..\..\components\drivers\serial\serial.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\pipe.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\workqueue.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\waitqueue.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\completion.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\workqueue.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\pipe.c</name>

     </file>

     <file>

       <name>$PROJ_DIR$\..\..\components\drivers\src\dataqueue.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\components\drivers\src\completion.c</name>

+      <name>$PROJ_DIR$\..\..\components\drivers\src\waitqueue.c</name>

     </file>

   </group>

   <group>

     <name>Drivers</name>

     <file>

-      <name>$PROJ_DIR$\drivers\board.c</name>

+      <name>$PROJ_DIR$\drivers\led.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\drivers\led.c</name>

+      <name>$PROJ_DIR$\drivers\fm3_uart.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\drivers\nand.c</name>

+      <name>$PROJ_DIR$\drivers\board.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\drivers\fm3_uart.c</name>

+      <name>$PROJ_DIR$\drivers\nand.c</name>

     </file>

   </group>

   <group>

@@ -1854,52 +1892,49 @@
   <group>

     <name>Kernel</name>

     <file>

-      <name>$PROJ_DIR$\..\..\src\ipc.c</name>

+      <name>$PROJ_DIR$\..\..\src\mempool.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\timer.c</name>

+      <name>$PROJ_DIR$\..\..\src\device.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\clock.c</name>

+      <name>$PROJ_DIR$\..\..\src\ipc.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\thread.c</name>

+      <name>$PROJ_DIR$\..\..\src\memheap.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\irq.c</name>

+      <name>$PROJ_DIR$\..\..\src\object.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\memheap.c</name>

+      <name>$PROJ_DIR$\..\..\src\scheduler.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\device.c</name>

+      <name>$PROJ_DIR$\..\..\src\mem.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\mempool.c</name>

+      <name>$PROJ_DIR$\..\..\src\clock.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\kservice.c</name>

+      <name>$PROJ_DIR$\..\..\src\components.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\scheduler.c</name>

+      <name>$PROJ_DIR$\..\..\src\thread.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\mem.c</name>

+      <name>$PROJ_DIR$\..\..\src\kservice.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\components.c</name>

+      <name>$PROJ_DIR$\..\..\src\idle.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\object.c</name>

+      <name>$PROJ_DIR$\..\..\src\irq.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\src\idle.c</name>

+      <name>$PROJ_DIR$\..\..\src\timer.c</name>

     </file>

   </group>

   <group>

-    <name>libc</name>

-  </group>

-  <group>

     <name>POSIX</name>

   </group>

   <group>

diff --git a/bsp/mb9bf506r/project.uvproj b/bsp/mb9bf506r/project.uvproj
index 75b65943d0..8e5721bd6f 100644
--- a/bsp/mb9bf506r/project.uvproj
+++ b/bsp/mb9bf506r/project.uvproj
@@ -341,9 +341,9 @@
             <uThumb>0</uThumb>
             <VariousControls>
               <MiscControls />
-              <Define>__RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
+              <Define>__RTTHREAD__, RT_USING_ARM_LIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>applications;.;libraries\Device\FUJISTU\MB9BF50x\Include;libraries\CMSIS\Include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\components\libc\posix\ipc;..\..\examples\utest\testcases\kernel</IncludePath>
+              <IncludePath>applications;.;libraries\Device\FUJISTU\MB9BF50x\Include;libraries\CMSIS\Include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\posix\io\poll;..\..\components\libc\posix\ipc;..\..\examples\utest\testcases\kernel</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -415,6 +415,44 @@
           </Files>
         </Group>
         <Group>
+          <GroupName>Compiler</GroupName>
+          <Files>
+            <File>
+              <FileName>syscall_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\components\libc\compilers\armlibc\syscall_mem.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>libc_syms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\components\libc\compilers\armlibc\libc_syms.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>syscalls.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\components\libc\compilers\armlibc\syscalls.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>stdlib.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\components\libc\compilers\common\stdlib.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>time.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\components\libc\compilers\common\time.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
           <GroupName>CPU</GroupName>
           <Files>
             <File>
@@ -425,16 +463,16 @@
           </Files>
           <Files>
             <File>
-              <FileName>showmem.c</FileName>
+              <FileName>backtrace.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath>
+              <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>backtrace.c</FileName>
+              <FileName>showmem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath>
+              <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -463,9 +501,9 @@
           </Files>
           <Files>
             <File>
-              <FileName>pipe.c</FileName>
+              <FileName>ringbuffer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\pipe.c</FilePath>
+              <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -477,37 +515,37 @@
           </Files>
           <Files>
             <File>
-              <FileName>waitqueue.c</FileName>
+              <FileName>dataqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>dataqueue.c</FileName>
+              <FileName>waitqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>workqueue.c</FileName>
+              <FileName>ringblk_buf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\workqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>ringbuffer.c</FileName>
+              <FileName>workqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath>
+              <FilePath>..\..\components\drivers\src\workqueue.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>ringblk_buf.c</FileName>
+              <FileName>pipe.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath>
+              <FilePath>..\..\components\drivers\src\pipe.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -515,16 +553,16 @@
           <GroupName>Drivers</GroupName>
           <Files>
             <File>
-              <FileName>board.c</FileName>
+              <FileName>fm3_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>drivers\board.c</FilePath>
+              <FilePath>drivers\fm3_uart.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>nand.c</FileName>
+              <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>drivers\nand.c</FilePath>
+              <FilePath>drivers\board.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -536,9 +574,9 @@
           </Files>
           <Files>
             <File>
-              <FileName>fm3_uart.c</FileName>
+              <FileName>nand.c</FileName>
               <FileType>1</FileType>
-              <FilePath>drivers\fm3_uart.c</FilePath>
+              <FilePath>drivers\nand.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -563,100 +601,100 @@
           <GroupName>Kernel</GroupName>
           <Files>
             <File>
-              <FileName>kservice.c</FileName>
+              <FileName>irq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\kservice.c</FilePath>
+              <FilePath>..\..\src\irq.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>device.c</FileName>
+              <FileName>timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\device.c</FilePath>
+              <FilePath>..\..\src\timer.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>irq.c</FileName>
+              <FileName>scheduler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\irq.c</FilePath>
+              <FilePath>..\..\src\scheduler.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>mem.c</FileName>
+              <FileName>memheap.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\mem.c</FilePath>
+              <FilePath>..\..\src\memheap.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>clock.c</FileName>
+              <FileName>idle.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\clock.c</FilePath>
+              <FilePath>..\..\src\idle.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>object.c</FileName>
+              <FileName>thread.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\object.c</FilePath>
+              <FilePath>..\..\src\thread.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>mempool.c</FileName>
+              <FileName>device.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\mempool.c</FilePath>
+              <FilePath>..\..\src\device.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>ipc.c</FileName>
+              <FileName>mempool.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\ipc.c</FilePath>
+              <FilePath>..\..\src\mempool.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>scheduler.c</FileName>
+              <FileName>kservice.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\scheduler.c</FilePath>
+              <FilePath>..\..\src\kservice.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>idle.c</FileName>
+              <FileName>object.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\idle.c</FilePath>
+              <FilePath>..\..\src\object.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>timer.c</FileName>
+              <FileName>clock.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\timer.c</FilePath>
+              <FilePath>..\..\src\clock.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>components.c</FileName>
+              <FileName>ipc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\components.c</FilePath>
+              <FilePath>..\..\src\ipc.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>thread.c</FileName>
+              <FileName>mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\thread.c</FilePath>
+              <FilePath>..\..\src\mem.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>memheap.c</FileName>
+              <FileName>components.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\memheap.c</FilePath>
+              <FilePath>..\..\src\components.c</FilePath>
             </File>
           </Files>
         </Group>