4
0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-01 12:50:23 +08:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
zyh 2018-04-10 10:36:20 +08:00
commit 6c814db161
9 changed files with 1013 additions and 1696 deletions

View File

@ -298,32 +298,28 @@
</option> </option>
<option> <option>
<name>CCIncludePath2</name> <name>CCIncludePath2</name>
<state>$PROJ_DIR$\../../components/drivers/include</state> <state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\../../libcpu/arm/cortex-m4</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\netif</state>
<state>$PROJ_DIR$\Libraries/CMSIS</state> <state>$PROJ_DIR$\Libraries\CMSIS\GD\GD32F4xx\Include</state>
<state>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Include</state> <state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include</state> <state>$PROJ_DIR$\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\../../components/finsh</state> <state>$PROJ_DIR$\..\..\components\dfs\filesystems\devfs</state>
<state>$PROJ_DIR$\Libraries/CMSIS/GD/GD32F4xx/Include</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src</state>
<state>$PROJ_DIR$\drivers</state> <state>$PROJ_DIR$\drivers</state>
<state>$PROJ_DIR$\../../libcpu/arm/common</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
<state>$PROJ_DIR$\../../components/dfs/filesystems/devfs</state> <state>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Include</state>
<state>$PROJ_DIR$\.</state> <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/arch/include</state> <state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\../../components/drivers/spi</state> <state>$PROJ_DIR$\..\..\components\drivers\spi\sfud\inc</state>
<state>$PROJ_DIR$\../../components/gui/include/rtgui</state> <state>$PROJ_DIR$\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\../../components/dfs/filesystems/elmfat</state> <state>$PROJ_DIR$\Libraries\CMSIS</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/posix</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include</state>
<state>$PROJ_DIR$\..\..\components\drivers\spi</state>
<state>$PROJ_DIR$\applications</state> <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\../../include</state> <state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\../../components/gui/include/rtgui/widgets</state> <state>$PROJ_DIR$\..\..\components\dfs\filesystems\elmfat</state>
<state>$PROJ_DIR$\../../components/gui/include</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\posix</state>
<state>$PROJ_DIR$\../../components/drivers/spi/sfud/inc</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\arch\include</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/netif</state>
<state>$PROJ_DIR$\../../components/dfs/include</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/ipv4</state>
<state>$PROJ_DIR$\../../components/gui/src</state>
</option> </option>
<option> <option>
<name>CCStdIncCheck</name> <name>CCStdIncCheck</name>
@ -1268,32 +1264,28 @@
<option> <option>
<name>CCIncludePath2</name> <name>CCIncludePath2</name>
<state /> <state />
<state>$PROJ_DIR$\../../components/drivers/include</state> <state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\../../libcpu/arm/cortex-m4</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\netif</state>
<state>$PROJ_DIR$\Libraries/CMSIS</state> <state>$PROJ_DIR$\Libraries\CMSIS\GD\GD32F4xx\Include</state>
<state>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Include</state> <state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include</state> <state>$PROJ_DIR$\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\../../components/finsh</state> <state>$PROJ_DIR$\..\..\components\dfs\filesystems\devfs</state>
<state>$PROJ_DIR$\Libraries/CMSIS/GD/GD32F4xx/Include</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src</state>
<state>$PROJ_DIR$\drivers</state> <state>$PROJ_DIR$\drivers</state>
<state>$PROJ_DIR$\../../libcpu/arm/common</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4</state>
<state>$PROJ_DIR$\../../components/dfs/filesystems/devfs</state> <state>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Include</state>
<state>$PROJ_DIR$\.</state> <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/arch/include</state> <state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\../../components/drivers/spi</state> <state>$PROJ_DIR$\..\..\components\drivers\spi\sfud\inc</state>
<state>$PROJ_DIR$\../../components/gui/include/rtgui</state> <state>$PROJ_DIR$\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\../../components/dfs/filesystems/elmfat</state> <state>$PROJ_DIR$\Libraries\CMSIS</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/posix</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include</state>
<state>$PROJ_DIR$\..\..\components\drivers\spi</state>
<state>$PROJ_DIR$\applications</state> <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\../../include</state> <state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\../../components/gui/include/rtgui/widgets</state> <state>$PROJ_DIR$\..\..\components\dfs\filesystems\elmfat</state>
<state>$PROJ_DIR$\../../components/gui/include</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\posix</state>
<state>$PROJ_DIR$\../../components/drivers/spi/sfud/inc</state> <state>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\arch\include</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/netif</state>
<state>$PROJ_DIR$\../../components/dfs/include</state>
<state>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/include/ipv4</state>
<state>$PROJ_DIR$\../../components/gui/src</state>
</option> </option>
<option> <option>
<name>CCStdIncCheck</name> <name>CCStdIncCheck</name>
@ -1941,561 +1933,429 @@
</settings> </settings>
</configuration> </configuration>
<group> <group>
<name>Drivers</name> <name>Applications</name>
<file> <file>
<name>$PROJ_DIR$\drivers/board.c</name> <name>$PROJ_DIR$\applications\application.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\drivers/drv_exmc_sdram.c</name> <name>$PROJ_DIR$\applications\rtgui_demo.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\drivers/drv_usart.c</name> <name>$PROJ_DIR$\applications\startup.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/drv_enet.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/synopsys_emac.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/drv_lcd.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/gd32f450z_lcd_eval.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/drv_spi_flash.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers/drv_spi.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>Applications</name> <name>Drivers</name>
<file> <file>
<name>$PROJ_DIR$\applications/application.c</name> <name>$PROJ_DIR$\drivers\board.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\applications/rtgui_demo.c</name> <name>$PROJ_DIR$\drivers\drv_exmc_sdram.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\applications/startup.c</name> <name>$PROJ_DIR$\drivers\drv_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers\drv_enet.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers\synopsys_emac.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers\drv_spi_flash.c</name>
</file>
<file>
<name>$PROJ_DIR$\drivers\drv_spi.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>GD32_Lib</name> <name>GD32_Lib</name>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_adc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_adc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_can.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_can.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_crc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_crc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_ctc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ctc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_dac.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dac.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_dbg.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dbg.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_dci.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dci.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_dma.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dma.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_enet.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_enet.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_exmc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exmc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_exti.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exti.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_fmc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fmc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_fwdgt.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fwdgt.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_gpio.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_gpio.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_i2c.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_i2c.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_ipa.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ipa.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_iref.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_iref.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_misc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_misc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_pmu.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_pmu.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_rcu.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rcu.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_rtc.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rtc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_sdio.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_sdio.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_spi.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_spi.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_syscfg.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_syscfg.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_timer.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_timer.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_tli.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_tli.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_trng.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_trng.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_usart.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_usart.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/GD32F4xx_standard_peripheral/Source/gd32f4xx_wwdgt.c</name> <name>$PROJ_DIR$\Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_wwdgt.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/CMSIS/GD/GD32F4xx/Source/system_gd32f4xx.c</name> <name>$PROJ_DIR$\Libraries\CMSIS\GD\GD32F4xx\Source\system_gd32f4xx.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\Libraries/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s</name> <name>$PROJ_DIR$\Libraries\CMSIS\GD\GD32F4xx\Source\IAR\startup_gd32f4xx.s</name>
</file> </file>
</group> </group>
<group> <group>
<name>Kernel</name> <name>Kernel</name>
<file> <file>
<name>$PROJ_DIR$\../../src/clock.c</name> <name>$PROJ_DIR$\..\..\src\clock.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/components.c</name> <name>$PROJ_DIR$\..\..\src\components.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/device.c</name> <name>$PROJ_DIR$\..\..\src\device.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/idle.c</name> <name>$PROJ_DIR$\..\..\src\idle.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/ipc.c</name> <name>$PROJ_DIR$\..\..\src\ipc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/irq.c</name> <name>$PROJ_DIR$\..\..\src\irq.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/kservice.c</name> <name>$PROJ_DIR$\..\..\src\kservice.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/mem.c</name> <name>$PROJ_DIR$\..\..\src\mem.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/memheap.c</name> <name>$PROJ_DIR$\..\..\src\memheap.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/mempool.c</name> <name>$PROJ_DIR$\..\..\src\mempool.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/module.c</name> <name>$PROJ_DIR$\..\..\src\module.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/object.c</name> <name>$PROJ_DIR$\..\..\src\object.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/scheduler.c</name> <name>$PROJ_DIR$\..\..\src\scheduler.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/signal.c</name> <name>$PROJ_DIR$\..\..\src\signal.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/thread.c</name> <name>$PROJ_DIR$\..\..\src\thread.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../src/timer.c</name> <name>$PROJ_DIR$\..\..\src\timer.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>CORTEX-M4</name> <name>CORTEX-M4</name>
<file> <file>
<name>$PROJ_DIR$\../../libcpu/arm/cortex-m4/cpuport.c</name> <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m4\cpuport.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../libcpu/arm/cortex-m4/context_iar.S</name> <name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m4\context_iar.S</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../libcpu/arm/common/backtrace.c</name> <name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../libcpu/arm/common/div0.c</name> <name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../libcpu/arm/common/showmem.c</name> <name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
</file>
</group>
<group>
<name>DeviceDrivers</name>
<file>
<name>$PROJ_DIR$\../../components/drivers/i2c/i2c_core.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/i2c/i2c_dev.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/i2c/i2c-bit-ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/serial/serial.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/rtc/rtc.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/spi/spi_core.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/spi/spi_dev.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/spi/spi_flash_sfud.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/spi/sfud/src/sfud.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/completion.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/dataqueue.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/pipe.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/ringbuffer.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/waitqueue.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/drivers/src/workqueue.c</name>
</file>
</group>
<group>
<name>finsh</name>
<file>
<name>$PROJ_DIR$\../../components/finsh/shell.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/symbol.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_compiler.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_error.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_heap.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_init.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_node.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_parser.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_var.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_vm.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/finsh/finsh_token.c</name>
</file>
</group>
<group>
<name>GuiEngine</name>
<file>
<name>$PROJ_DIR$\../../components/gui/src/asc12font.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/asc16font.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/blit.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/box.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/color.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/container.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_blend.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_buffer.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_client.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_hw.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_rotozoom.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/dc_trans.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/filerw.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font_bmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font_fnt.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font_freetype.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font_hz_bmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/font_hz_file.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/hz12font.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/hz16font.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_bmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_container.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_hdc.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_jpg.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_png.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/image_xpm.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/matrix.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/mouse.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/region.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/rtgui_app.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/rtgui_driver.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/rtgui_object.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/rtgui_system.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/server.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/title.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/topwin.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/widget.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/gui/src/window.c</name>
</file>
</group>
<group>
<name>lwIP</name>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/arch/sys_arch.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/api_lib.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/api_msg.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/err.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/netbuf.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/netdb.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/netifapi.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/sockets.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/api/tcpip.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/def.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/dns.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/inet_chksum.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/init.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ip.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/memp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/netif.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/pbuf.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/raw.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/stats.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/sys.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/tcp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/tcp_in.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/tcp_out.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/timeouts.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/udp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/netif/ethernet.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/netif/ethernetif.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/netif/lowpan6.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/autoip.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/dhcp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/etharp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/icmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/igmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/ip4.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/ip4_addr.c</name>
</file>
<file>
<name>$PROJ_DIR$\../../components/net/lwip-2.0.2/src/core/ipv4/ip4_frag.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>Filesystem</name> <name>Filesystem</name>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/src/dfs.c</name> <name>$PROJ_DIR$\..\..\components\dfs\src\dfs.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/src/dfs_file.c</name> <name>$PROJ_DIR$\..\..\components\dfs\src\dfs_file.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/src/dfs_fs.c</name> <name>$PROJ_DIR$\..\..\components\dfs\src\dfs_fs.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/src/dfs_posix.c</name> <name>$PROJ_DIR$\..\..\components\dfs\src\dfs_posix.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/filesystems/devfs/devfs.c</name> <name>$PROJ_DIR$\..\..\components\dfs\filesystems\devfs\devfs.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/filesystems/elmfat/dfs_elm.c</name> <name>$PROJ_DIR$\..\..\components\dfs\filesystems\elmfat\dfs_elm.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\../../components/dfs/filesystems/elmfat/ff.c</name> <name>$PROJ_DIR$\..\..\components\dfs\filesystems\elmfat\ff.c</name>
</file>
</group>
<group>
<name>DeviceDrivers</name>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\i2c\i2c_core.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\i2c\i2c_dev.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\i2c\i2c-bit-ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\rtc\rtc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\serial\serial.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\spi\spi_core.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\spi\spi_dev.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\spi\spi_flash_sfud.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\spi\sfud\src\sfud.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\completion.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\dataqueue.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\pipe.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\waitqueue.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\drivers\src\workqueue.c</name>
</file>
</group>
<group>
<name>finsh</name>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\shell.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\symbol.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_compiler.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_error.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_heap.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_init.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_node.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_parser.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_var.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_vm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_token.c</name>
</file>
</group>
<group>
<name>lwIP</name>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\api_lib.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\api_msg.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\err.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\netbuf.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\netdb.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\netifapi.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\sockets.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\api\tcpip.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\def.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\dns.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\init.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ip.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\memp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\netif.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\pbuf.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\raw.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\stats.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\sys.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\tcp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\tcp_in.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\tcp_out.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\timeouts.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\udp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\netif\ethernet.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_frag.c</name>
</file> </file>
</group> </group>
</project> </project>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1345,7 +1345,13 @@ status_t ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const uint8_t *d
#else #else
address = (uint32_t)curBuffDescrip->buffer; address = (uint32_t)curBuffDescrip->buffer;
#endif /* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */ #endif /* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
memcpy((void *)address, data, length);
{
// Change SDK to reduce memory copy
extern void pbuf2mem(const uint8_t *data, void *dataptr, uint32_t len);
pbuf2mem(data, (void *)address, length);
}
//memcpy((void *)address, data, length);
/* Set data length. */ /* Set data length. */
curBuffDescrip->length = length; curBuffDescrip->length = length;
#ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE #ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE

View File

@ -16,7 +16,7 @@
#include <rtdevice.h> #include <rtdevice.h>
#ifdef RT_USING_FINSH #ifdef RT_USING_FINSH
#include <finsh.h> #include <finsh.h>
#endif #endif
#include "fsl_enet.h" #include "fsl_enet.h"
@ -73,18 +73,18 @@ ALIGN(ENET_BUFF_ALIGNMENT) rt_uint8_t g_rxDataBuff[ENET_RXBD_NUM][RT_ALIGN(ENET_
static struct rt_imxrt_eth imxrt_eth_device; static struct rt_imxrt_eth imxrt_eth_device;
void _enet_rx_callback(struct rt_imxrt_eth * eth) void _enet_rx_callback(struct rt_imxrt_eth *eth)
{ {
rt_err_t result; rt_err_t result;
ENET_DisableInterrupts(eth->enet_base, kENET_RxFrameInterrupt); ENET_DisableInterrupts(eth->enet_base, kENET_RxFrameInterrupt);
result = eth_device_ready(&(eth->parent)); result = eth_device_ready(&(eth->parent));
if( result != RT_EOK ) if (result != RT_EOK)
rt_kprintf("RX err =%d\n", result ); rt_kprintf("RX err =%d\n", result);
} }
void _enet_tx_callback(struct rt_imxrt_eth * eth) void _enet_tx_callback(struct rt_imxrt_eth *eth)
{ {
if (eth->tx_is_waiting == RT_TRUE) if (eth->tx_is_waiting == RT_TRUE)
{ {
@ -95,7 +95,7 @@ void _enet_tx_callback(struct rt_imxrt_eth * eth)
void _enet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *userData) void _enet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *userData)
{ {
switch(event) switch (event)
{ {
case kENET_RxEvent: case kENET_RxEvent:
@ -314,8 +314,6 @@ static void _enet_io_init(void)
Pull / Keep Select Field: Pull Pull / Keep Select Field: Pull
Pull Up / Down Config. Field: 100K Ohm Pull Up Pull Up / Down Config. Field: 100K Ohm Pull Up
Hyst. Enable Field: Hysteresis Disabled */ Hyst. Enable Field: Hysteresis Disabled */
} }
static void _enet_clk_init(void) static void _enet_clk_init(void)
@ -353,7 +351,8 @@ static void _enet_config(void)
uint32_t sysClock; uint32_t sysClock;
/* prepare the buffer configuration. */ /* prepare the buffer configuration. */
enet_buffer_config_t buffConfig = { enet_buffer_config_t buffConfig =
{
ENET_RXBD_NUM, ENET_RXBD_NUM,
ENET_TXBD_NUM, ENET_TXBD_NUM,
SDK_SIZEALIGN(ENET_RXBUFF_SIZE, ENET_BUFF_ALIGNMENT), SDK_SIZEALIGN(ENET_RXBUFF_SIZE, ENET_BUFF_ALIGNMENT),
@ -390,6 +389,43 @@ static void _enet_config(void)
ENET_ActiveRead(imxrt_eth_device.enet_base); ENET_ActiveRead(imxrt_eth_device.enet_base);
} }
#if defined(ETH_RX_DUMP) || defined(ETH_TX_DUMP)
static void packet_dump(const char *msg, const struct pbuf *p)
{
const struct pbuf *q;
rt_uint32_t i, j;
rt_uint8_t *ptr;
rt_kprintf("%s %d byte\n", msg, p->tot_len);
i = 0;
for (q = p; q != RT_NULL; q = q->next)
{
ptr = q->payload;
for (j = 0; j < q->len; j++)
{
if ((i % 8) == 0)
{
rt_kprintf(" ");
}
if ((i % 16) == 0)
{
rt_kprintf("\r\n");
}
rt_kprintf("%02x ", *ptr);
i++;
ptr++;
}
}
rt_kprintf("\n\n");
}
#else
#define packet_dump(...)
#endif /* dump */
/* initialize the interface */ /* initialize the interface */
static rt_err_t rt_imxrt_eth_init(rt_device_t dev) static rt_err_t rt_imxrt_eth_init(rt_device_t dev)
{ {
@ -411,14 +447,14 @@ static rt_err_t rt_imxrt_eth_close(rt_device_t dev)
return RT_EOK; return RT_EOK;
} }
static rt_size_t rt_imxrt_eth_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size) static rt_size_t rt_imxrt_eth_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
{ {
dbg_log(DBG_LOG, "rt_imxrt_eth_read...\n"); dbg_log(DBG_LOG, "rt_imxrt_eth_read...\n");
rt_set_errno(-RT_ENOSYS); rt_set_errno(-RT_ENOSYS);
return 0; return 0;
} }
static rt_size_t rt_imxrt_eth_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size) static rt_size_t rt_imxrt_eth_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
{ {
dbg_log(DBG_LOG, "rt_imxrt_eth_write...\n"); dbg_log(DBG_LOG, "rt_imxrt_eth_write...\n");
rt_set_errno(-RT_ENOSYS); rt_set_errno(-RT_ENOSYS);
@ -428,11 +464,11 @@ static rt_size_t rt_imxrt_eth_write (rt_device_t dev, rt_off_t pos, const void*
static rt_err_t rt_imxrt_eth_control(rt_device_t dev, int cmd, void *args) static rt_err_t rt_imxrt_eth_control(rt_device_t dev, int cmd, void *args)
{ {
dbg_log(DBG_LOG, "rt_imxrt_eth_control...\n"); dbg_log(DBG_LOG, "rt_imxrt_eth_control...\n");
switch(cmd) switch (cmd)
{ {
case NIOCTL_GADDR: case NIOCTL_GADDR:
/* get mac address */ /* get mac address */
if(args) rt_memcpy(args, imxrt_eth_device.dev_addr, 6); if (args) rt_memcpy(args, imxrt_eth_device.dev_addr, 6);
else return -RT_ERROR; else return -RT_ERROR;
break; break;
@ -445,7 +481,7 @@ static rt_err_t rt_imxrt_eth_control(rt_device_t dev, int cmd, void *args)
/* ethernet device interface */ /* ethernet device interface */
/* transmit packet. */ /* transmit packet. */
rt_err_t rt_imxrt_eth_tx( rt_device_t dev, struct pbuf* p) rt_err_t rt_imxrt_eth_tx(rt_device_t dev, struct pbuf *p)
{ {
rt_err_t result = RT_EOK; rt_err_t result = RT_EOK;
enet_handle_t * enet_handle = &imxrt_eth_device.enet_handle; enet_handle_t * enet_handle = &imxrt_eth_device.enet_handle;
@ -456,42 +492,38 @@ rt_err_t rt_imxrt_eth_tx( rt_device_t dev, struct pbuf* p)
dbg_log(DBG_LOG, "rt_imxrt_eth_tx: %d\n", p->len); dbg_log(DBG_LOG, "rt_imxrt_eth_tx: %d\n", p->len);
#ifdef ETH_TX_DUMP #ifdef ETH_TX_DUMP
{ packet_dump("send", p);
int i;
uint8_t * buf;
buf = (uint8_t *)p->payload;
for (i = 0; i < p->len; i++)
{
dbg_log(DBG_LOG, "%02X ", buf[i]);
if (i % 16 == 15)
dbg_log(DBG_LOG, "\n");
}
dbg_log(DBG_LOG, "\n");
}
#endif #endif
do do
{ {
result = ENET_SendFrame(imxrt_eth_device.enet_base, enet_handle, p->payload, p->len); result = ENET_SendFrame(imxrt_eth_device.enet_base, enet_handle, (const uint8_t *)p, p->tot_len);
if (result == kStatus_ENET_TxFrameBusy) if (result == kStatus_ENET_TxFrameBusy)
{ {
imxrt_eth_device.tx_is_waiting = RT_TRUE;
rt_sem_take(&imxrt_eth_device.tx_wait, RT_WAITING_FOREVER); rt_sem_take(&imxrt_eth_device.tx_wait, RT_WAITING_FOREVER);
} }
} while (result == kStatus_ENET_TxFrameBusy); }
while (result == kStatus_ENET_TxFrameBusy);
return RT_EOK; return RT_EOK;
} }
void pbuf2mem(const uint8_t *data, void *dataptr, uint32_t len)
{
pbuf_copy_partial((const struct pbuf *)data, dataptr, len, 0);
}
/* reception packet. */ /* reception packet. */
struct pbuf *rt_imxrt_eth_rx(rt_device_t dev) struct pbuf *rt_imxrt_eth_rx(rt_device_t dev)
{ {
uint32_t length = 0; uint32_t length = 0;
status_t status; status_t status;
struct pbuf* p = RT_NULL; struct pbuf *p = RT_NULL;
enet_handle_t * enet_handle = &imxrt_eth_device.enet_handle; enet_handle_t *enet_handle = &imxrt_eth_device.enet_handle;
ENET_Type *enet_base = imxrt_eth_device.enet_base; ENET_Type *enet_base = imxrt_eth_device.enet_base;
enet_data_error_stats_t *error_statistic = &imxrt_eth_device.error_statistic; enet_data_error_stats_t *error_statistic = &imxrt_eth_device.error_statistic;
@ -509,20 +541,9 @@ struct pbuf *rt_imxrt_eth_rx(rt_device_t dev)
status = ENET_ReadFrame(enet_base, enet_handle, p->payload, length); status = ENET_ReadFrame(enet_base, enet_handle, p->payload, length);
if (status == kStatus_Success) if (status == kStatus_Success)
{ {
#ifdef ETH_RX_DUMP #ifdef ETH_RX_DUMP
uint8_t *buf; packet_dump("recv", p);
int i; #endif
ETH_PRINTF("A frame received. the length:%d\n", p->len);
buf = (uint8_t *)p->payload;
for (i = 0; i < p->len; i++)
{
dbg_log(DBG_LOG, "%02X ", buf[i]);
if (i % 16 == 15)
dbg_log(DBG_LOG, "\n");
}
dbg_log(DBG_LOG, "\n");
#endif
return p; return p;
} }
else else
@ -552,7 +573,6 @@ struct pbuf *rt_imxrt_eth_rx(rt_device_t dev)
static void phy_monitor_thread_entry(void *parameter) static void phy_monitor_thread_entry(void *parameter)
{ {
phy_speed_t speed; phy_speed_t speed;
phy_duplex_t duplex; phy_duplex_t duplex;
bool link = false; bool link = false;
@ -629,12 +649,12 @@ static int rt_hw_imxrt_eth_init(void)
/* OUI 00-80-E1 STMICROELECTRONICS. */ /* OUI 00-80-E1 STMICROELECTRONICS. */
imxrt_eth_device.dev_addr[0] = 0x00; imxrt_eth_device.dev_addr[0] = 0x00;
imxrt_eth_device.dev_addr[1] = 0x80; imxrt_eth_device.dev_addr[1] = 0x04;
imxrt_eth_device.dev_addr[2] = 0xE1; imxrt_eth_device.dev_addr[2] = 0x9F;
/* generate MAC addr from 96bit unique ID (only for test). */ /* generate MAC addr from 96bit unique ID (only for test). */
imxrt_eth_device.dev_addr[3] = 0x12; imxrt_eth_device.dev_addr[3] = 0x05;
imxrt_eth_device.dev_addr[4] = 0x34; imxrt_eth_device.dev_addr[4] = 0x44;
imxrt_eth_device.dev_addr[5] = 0x56; imxrt_eth_device.dev_addr[5] = 0xE5;
imxrt_eth_device.speed = kENET_MiiSpeed100M; imxrt_eth_device.speed = kENET_MiiSpeed100M;
imxrt_eth_device.duplex = kENET_MiiFullDuplex; imxrt_eth_device.duplex = kENET_MiiFullDuplex;
@ -891,7 +911,6 @@ void enet_rx_stat(void)
void enet_buf_info(void) void enet_buf_info(void)
{ {
int i = 0; int i = 0;
for (i = 0; i < ENET_RXBD_NUM; i++) for (i = 0; i < ENET_RXBD_NUM; i++)
{ {

View File

@ -247,7 +247,7 @@ FINSH_FUNCTION_EXPORT(list_date, show date and time.)
FINSH_FUNCTION_EXPORT(set_date, set date. e.g: set_date(2010,2,28)) FINSH_FUNCTION_EXPORT(set_date, set date. e.g: set_date(2010,2,28))
FINSH_FUNCTION_EXPORT(set_time, set time. e.g: set_time(23,59,59)) FINSH_FUNCTION_EXPORT(set_time, set time. e.g: set_time(23,59,59))
#if defined(RT_USING_FINSH) #if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH)
static void date(uint8_t argc, char **argv) static void date(uint8_t argc, char **argv)
{ {
if (argc == 1) if (argc == 1)
@ -308,6 +308,6 @@ static void date(uint8_t argc, char **argv)
} }
} }
MSH_CMD_EXPORT(date, get date and time or set [year month day hour min sec]); MSH_CMD_EXPORT(date, get date and time or set [year month day hour min sec]);
#endif /* defined(RT_USING_FINSH) */ #endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */
#endif /* RT_USING_FINSH */ #endif /* RT_USING_FINSH */

View File

@ -358,7 +358,7 @@ rt_err_t rt_pipe_close (rt_device_t device)
rt_size_t rt_pipe_read (rt_device_t device, rt_off_t pos, void *buffer, rt_size_t count) rt_size_t rt_pipe_read (rt_device_t device, rt_off_t pos, void *buffer, rt_size_t count)
{ {
uint8_t *pbuf; uint8_t *pbuf;
int read_bytes = 0; rt_size_t read_bytes = 0;
rt_pipe_t *pipe = (rt_pipe_t *)device; rt_pipe_t *pipe = (rt_pipe_t *)device;
if (device == RT_NULL) if (device == RT_NULL)
@ -386,7 +386,7 @@ rt_size_t rt_pipe_read (rt_device_t device, rt_off_t pos, void *buffer, rt_siz
rt_size_t rt_pipe_write (rt_device_t device, rt_off_t pos, const void *buffer, rt_size_t count) rt_size_t rt_pipe_write (rt_device_t device, rt_off_t pos, const void *buffer, rt_size_t count)
{ {
uint8_t *pbuf; uint8_t *pbuf;
int write_bytes = 0; rt_size_t write_bytes = 0;
rt_pipe_t *pipe = (rt_pipe_t *)device; rt_pipe_t *pipe = (rt_pipe_t *)device;
if (device == RT_NULL) if (device == RT_NULL)

View File

@ -282,7 +282,7 @@ RTM_EXPORT(system);
static int _msh_exec_cmd(char *cmd, rt_size_t length, int *retp) static int _msh_exec_cmd(char *cmd, rt_size_t length, int *retp)
{ {
int argc; int argc;
int cmd0_size = 0; rt_size_t cmd0_size = 0;
cmd_function_t cmd_func; cmd_function_t cmd_func;
char *argv[RT_FINSH_ARG_MAX]; char *argv[RT_FINSH_ARG_MAX];
@ -448,7 +448,7 @@ void msh_auto_complete_path(char *path)
} }
else else
{ {
int length, min_length; rt_size_t length, min_length;
min_length = 0; min_length = 0;
for (;;) for (;;)

View File

@ -95,7 +95,7 @@ rt_err_t rt_mp_init(struct rt_mempool *mp,
rt_size_t block_size) rt_size_t block_size)
{ {
rt_uint8_t *block_ptr; rt_uint8_t *block_ptr;
register rt_base_t offset; register rt_size_t offset;
/* parameter check */ /* parameter check */
RT_ASSERT(mp != RT_NULL); RT_ASSERT(mp != RT_NULL);
@ -200,7 +200,7 @@ rt_mp_t rt_mp_create(const char *name,
{ {
rt_uint8_t *block_ptr; rt_uint8_t *block_ptr;
struct rt_mempool *mp; struct rt_mempool *mp;
register rt_base_t offset; register rt_size_t offset;
RT_DEBUG_NOT_IN_INTERRUPT; RT_DEBUG_NOT_IN_INTERRUPT;