Skip to content

Commit 4a4f00d

Browse files
mysterywolfmysterywolf
authored
Merge pull request #8 from RT-Thread/master
pr
2 parents 3bca2cf + 4c399f8 commit 4a4f00d

File tree

371 files changed

+70240
-35709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+70240
-35709
lines changed

‎bsp/gd32450z-eval/drivers/drv_spi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static rt_err_t configure(struct rt_spi_device* device,
130130
}
131131
} /* baudrate */
132132

133-
switch(configuration->mode)
133+
switch(configuration->mode & RT_SPI_MODE_3)
134134
{
135135
case RT_SPI_MODE_0:
136136
spi_init_struct.clock_polarity_phase = SPI_CK_PL_LOW_PH_1EDGE;

‎bsp/lpc176x/project.ewp‎

Lines changed: 64 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
<option>
156156
<name>CCDefines</name>
157157
<state />
158+
<state>__RTTHREAD__</state>
158159
</option>
159160
<option>
160161
<name>CCPreprocFile</name>
@@ -284,14 +285,13 @@
284285
<option>
285286
<name>CCIncludePath2</name>
286287
<state />
287-
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
288288
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src</state>
289-
<state>$PROJ_DIR$\applications</state>
289+
<state>$PROJ_DIR$\..\..\include</state>
290290
<state>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx</state>
291291
<state>$PROJ_DIR$\drivers</state>
292-
<state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>
292+
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
293293
<state>$PROJ_DIR$\.</state>
294-
<state>$PROJ_DIR$\..\..\include</state>
294+
<state>$PROJ_DIR$\applications</state>
295295
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\netif</state>
296296
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
297297
<state>$PROJ_DIR$\CMSIS\CMSIS\Include</state>
@@ -1037,6 +1037,7 @@
10371037
<option>
10381038
<name>CCDefines</name>
10391039
<state>NDEBUG</state>
1040+
<state>__RTTHREAD__</state>
10401041
</option>
10411042
<option>
10421043
<name>CCPreprocFile</name>
@@ -1166,14 +1167,13 @@
11661167
<option>
11671168
<name>CCIncludePath2</name>
11681169
<state />
1169-
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
11701170
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src</state>
1171-
<state>$PROJ_DIR$\applications</state>
1171+
<state>$PROJ_DIR$\..\..\include</state>
11721172
<state>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx</state>
11731173
<state>$PROJ_DIR$\drivers</state>
1174-
<state>$PROJ_DIR$\..\..\components\libc\compilers\common</state>
1174+
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
11751175
<state>$PROJ_DIR$\.</state>
1176-
<state>$PROJ_DIR$\..\..\include</state>
1176+
<state>$PROJ_DIR$\applications</state>
11771177
<state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\netif</state>
11781178
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
11791179
<state>$PROJ_DIR$\CMSIS\CMSIS\Include</state>
@@ -1765,155 +1765,149 @@
17651765
</settings>
17661766
</configuration>
17671767
<group>
1768-
<name>Kernel</name>
1769-
<file>
1770-
<name>$PROJ_DIR$\..\..\src\clock.c</name>
1771-
</file>
1768+
<name>Applications</name>
17721769
<file>
1773-
<name>$PROJ_DIR$\..\..\src\components.c</name>
1770+
<name>$PROJ_DIR$\applications\application.c</name>
17741771
</file>
17751772
<file>
1776-
<name>$PROJ_DIR$\..\..\src\cpu.c</name>
1773+
<name>$PROJ_DIR$\applications\platform.c</name>
17771774
</file>
17781775
<file>
1779-
<name>$PROJ_DIR$\..\..\src\device.c</name>
1776+
<name>$PROJ_DIR$\applications\startup.c</name>
17801777
</file>
1778+
</group>
1779+
<group>
1780+
<name>CMSIS</name>
17811781
<file>
1782-
<name>$PROJ_DIR$\..\..\src\idle.c</name>
1782+
<name>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx\system_LPC17xx.c</name>
17831783
</file>
17841784
<file>
1785-
<name>$PROJ_DIR$\..\..\src\ipc.c</name>
1785+
<name>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx\startup\iar\startup_LPC17xx.s</name>
17861786
</file>
1787+
</group>
1788+
<group>
1789+
<name>CPU</name>
17871790
<file>
1788-
<name>$PROJ_DIR$\..\..\src\irq.c</name>
1791+
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
17891792
</file>
17901793
<file>
1791-
<name>$PROJ_DIR$\..\..\src\kservice.c</name>
1794+
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
17921795
</file>
17931796
<file>
1794-
<name>$PROJ_DIR$\..\..\src\mem.c</name>
1797+
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
17951798
</file>
17961799
<file>
1797-
<name>$PROJ_DIR$\..\..\src\memheap.c</name>
1800+
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
17981801
</file>
17991802
<file>
1800-
<name>$PROJ_DIR$\..\..\src\mempool.c</name>
1803+
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
18011804
</file>
1805+
</group>
1806+
<group>
1807+
<name>Drivers</name>
18021808
<file>
1803-
<name>$PROJ_DIR$\..\..\src\object.c</name>
1809+
<name>$PROJ_DIR$\drivers\board.c</name>
18041810
</file>
18051811
<file>
1806-
<name>$PROJ_DIR$\..\..\src\scheduler.c</name>
1812+
<name>$PROJ_DIR$\drivers\emac.c</name>
18071813
</file>
18081814
<file>
1809-
<name>$PROJ_DIR$\..\..\src\signal.c</name>
1815+
<name>$PROJ_DIR$\drivers\led.c</name>
18101816
</file>
18111817
<file>
1812-
<name>$PROJ_DIR$\..\..\src\thread.c</name>
1818+
<name>$PROJ_DIR$\drivers\spi.c</name>
18131819
</file>
18141820
<file>
1815-
<name>$PROJ_DIR$\..\..\src\timer.c</name>
1821+
<name>$PROJ_DIR$\drivers\uart.c</name>
18161822
</file>
18171823
</group>
18181824
<group>
1819-
<name>Applications</name>
1825+
<name>finsh</name>
18201826
<file>
1821-
<name>$PROJ_DIR$\applications\application.c</name>
1827+
<name>$PROJ_DIR$\..\..\components\finsh\shell.c</name>
18221828
</file>
18231829
<file>
1824-
<name>$PROJ_DIR$\applications\platform.c</name>
1830+
<name>$PROJ_DIR$\..\..\components\finsh\cmd.c</name>
18251831
</file>
18261832
<file>
1827-
<name>$PROJ_DIR$\applications\startup.c</name>
1833+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_compiler.c</name>
18281834
</file>
1829-
</group>
1830-
<group>
1831-
<name>CMSIS</name>
18321835
<file>
1833-
<name>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx\system_LPC17xx.c</name>
1836+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_error.c</name>
18341837
</file>
18351838
<file>
1836-
<name>$PROJ_DIR$\CMSIS\CM3\DeviceSupport\NXP\LPC17xx\startup\iar\startup_LPC17xx.s</name>
1839+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_heap.c</name>
18371840
</file>
1838-
</group>
1839-
<group>
1840-
<name>Drivers</name>
18411841
<file>
1842-
<name>$PROJ_DIR$\drivers\board.c</name>
1842+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_init.c</name>
18431843
</file>
18441844
<file>
1845-
<name>$PROJ_DIR$\drivers\emac.c</name>
1845+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_node.c</name>
18461846
</file>
18471847
<file>
1848-
<name>$PROJ_DIR$\drivers\led.c</name>
1848+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_ops.c</name>
18491849
</file>
18501850
<file>
1851-
<name>$PROJ_DIR$\drivers\spi.c</name>
1851+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_parser.c</name>
18521852
</file>
18531853
<file>
1854-
<name>$PROJ_DIR$\drivers\uart.c</name>
1854+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_var.c</name>
18551855
</file>
1856-
</group>
1857-
<group>
1858-
<name>cpu</name>
18591856
<file>
1860-
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
1857+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_vm.c</name>
18611858
</file>
18621859
<file>
1863-
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
1860+
<name>$PROJ_DIR$\..\..\components\finsh\finsh_token.c</name>
18641861
</file>
1862+
</group>
1863+
<group>
1864+
<name>Kernel</name>
18651865
<file>
1866-
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
1866+
<name>$PROJ_DIR$\..\..\src\clock.c</name>
18671867
</file>
18681868
<file>
1869-
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
1869+
<name>$PROJ_DIR$\..\..\src\components.c</name>
18701870
</file>
18711871
<file>
1872-
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
1872+
<name>$PROJ_DIR$\..\..\src\device.c</name>
18731873
</file>
1874-
</group>
1875-
<group>
1876-
<name>finsh</name>
18771874
<file>
1878-
<name>$PROJ_DIR$\..\..\components\finsh\shell.c</name>
1875+
<name>$PROJ_DIR$\..\..\src\idle.c</name>
18791876
</file>
18801877
<file>
1881-
<name>$PROJ_DIR$\..\..\components\finsh\cmd.c</name>
1878+
<name>$PROJ_DIR$\..\..\src\ipc.c</name>
18821879
</file>
18831880
<file>
1884-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_compiler.c</name>
1881+
<name>$PROJ_DIR$\..\..\src\irq.c</name>
18851882
</file>
18861883
<file>
1887-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_error.c</name>
1884+
<name>$PROJ_DIR$\..\..\src\kservice.c</name>
18881885
</file>
18891886
<file>
1890-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_heap.c</name>
1887+
<name>$PROJ_DIR$\..\..\src\mem.c</name>
18911888
</file>
18921889
<file>
1893-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_init.c</name>
1890+
<name>$PROJ_DIR$\..\..\src\memheap.c</name>
18941891
</file>
18951892
<file>
1896-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_node.c</name>
1893+
<name>$PROJ_DIR$\..\..\src\mempool.c</name>
18971894
</file>
18981895
<file>
1899-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_ops.c</name>
1896+
<name>$PROJ_DIR$\..\..\src\object.c</name>
19001897
</file>
19011898
<file>
1902-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_parser.c</name>
1899+
<name>$PROJ_DIR$\..\..\src\scheduler.c</name>
19031900
</file>
19041901
<file>
1905-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_var.c</name>
1902+
<name>$PROJ_DIR$\..\..\src\signal.c</name>
19061903
</file>
19071904
<file>
1908-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_vm.c</name>
1905+
<name>$PROJ_DIR$\..\..\src\thread.c</name>
19091906
</file>
19101907
<file>
1911-
<name>$PROJ_DIR$\..\..\components\finsh\finsh_token.c</name>
1908+
<name>$PROJ_DIR$\..\..\src\timer.c</name>
19121909
</file>
19131910
</group>
1914-
<group>
1915-
<name>libc</name>
1916-
</group>
19171911
<group>
19181912
<name>lwIP</name>
19191913
<file>

0 commit comments

Comments
 (0)