diff --git a/README.md b/README.md
index 8254873..82196af 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,12 @@ EasyFlash是一款开源的轻量级嵌入式Flash存储器库,主要为MCU(Mi
|源文件 |描述 |
|:------------------------------ |:----- |
-|\flash\src\flash_env.c |Env(常规模式)相关操作接口及实现源码|
-|\flash\src\flash_env_wl.c |Env(磨损平衡模式)相关操作接口及实现源码|
-|\flash\src\flash_iap.c |IAP 相关操作接口及实现源码|
-|\flash\src\flash_utils.c |EasyFlash常用小工具,例如:CRC32|
-|\flash\src\flash.c |目前只包含EasyFlash初始化方法|
-|\flash\port\flash_port.c |不同平台下的EasyFlash移植接口及配置参数|
+|\easyflash\src\flash_env.c |Env(常规模式)相关操作接口及实现源码|
+|\easyflash\src\flash_env_wl.c |Env(磨损平衡模式)相关操作接口及实现源码|
+|\easyflash\src\flash_iap.c |IAP 相关操作接口及实现源码|
+|\easyflash\src\flash_utils.c |EasyFlash常用小工具,例如:CRC32|
+|\easyflash\src\flash.c |目前只包含EasyFlash初始化方法|
+|\easyflash\port\flash_port.c |不同平台下的EasyFlash移植接口及配置参数|
|\demo\stm32f10x\non_os |stm32f10x裸机的demo|
|\demo\stm32f10x\rtt |stm32f10x基于[RT-Thread](http://www.rt-thread.org/)的demo|
|\demo\stm32f4xx |stm32f4xx基于[RT-Thread](http://www.rt-thread.org/)的demo|
@@ -38,7 +38,7 @@ Demo平台:STM32F103RET6 + RT-Thread 1.2.2 + Env(2K bytes)
### 1.3、支持平台
-目前已移植硬件平台有 `stm32f10x`与 `stm32f4xx` 系列的片内Flash,这个也是笔者产品使用的平台。其余平台的移植难度不大,在项目的设计之初就有考虑针对所有平台的适配性问题(64位除外),所以对所有移植接口都有做预留。移植只需修改 `\flash\port\flash_port.c` 一个文件,实现里面的擦、写、读及打印功能即可。
+目前已移植硬件平台有 `stm32f10x`与 `stm32f4xx` 系列的片内Flash,这个也是笔者产品使用的平台。其余平台的移植难度不大,在项目的设计之初就有考虑针对所有平台的适配性问题(64位除外),所以对所有移植接口都有做预留。移植只需修改 `\easyflash\port\flash_port.c` 一个文件,实现里面的擦、写、读及打印功能即可。
欢迎大家 **fork and pull request**([Github](https://github.com/armink/EasyFlash)|[OSChina](http://git.oschina.net/armink/EasyFlash)|[Coding](https://coding.net/u/armink/p/EasyFlash/git)) 。开源软件的成功离不开所有人的努力,也希望该项目能够帮助大家降低开发周期,让产品更早的获得成功。
@@ -79,12 +79,12 @@ EasyFlash is an open source lightweight embedded flash memory library. It provid
|Source file |Description |
|:------------------------------ |:----- |
-|\flash\src\flash_env.c |Env (normal mode) interface and implementation source code.|
-|\flash\src\flash_env_wl.c |Env (wear leveling mode) interface and implementation source code.|
-|\flash\src\flash_iap.c |IAP interface and implementation source code.|
-|\flash\src\flash_utils.c |EasyFlash utils. For example CRC32.|
-|\flash\src\flash.c |Currently contains EasyFlash initialization function only. |
-|\flash\port\flash_port.c |EasyFlash portable interface and configuration for different platforms.|
+|\easyflash\src\flash_env.c |Env (normal mode) interface and implementation source code.|
+|\easyflash\src\flash_env_wl.c |Env (wear leveling mode) interface and implementation source code.|
+|\easyflash\src\flash_iap.c |IAP interface and implementation source code.|
+|\easyflash\src\flash_utils.c |EasyFlash utils. For example CRC32.|
+|\easyflash\src\flash.c |Currently contains EasyFlash initialization function only. |
+|\easyflash\port\flash_port.c |EasyFlash portable interface and configuration for different platforms.|
|\demo\stm32f10x\non_os |stm32f10x non-os demo.|
|\demo\stm32f10x\rtt |stm32f10x demo base on [RT-Thread](http://www.rt-thread.org/).|
|\demo\stm32f4xx |stm32f4xx demo base on [RT-Thread](http://www.rt-thread.org/).|
@@ -100,7 +100,7 @@ Actual : ROM: 6K bytes RAM: 2.6K bytes
### 1.3 Supported platforms
-Hardware platform has been ported `stm32f10x` and `stm32f4xx` series of on-chip Flash. This is my product platform. Remaining platform porting difficulty is little. The porting just modify `\flash\port\flash_port.c` file. Implement erase, write, read, print feature.
+Hardware platform has been ported `stm32f10x` and `stm32f4xx` series of on-chip Flash. This is my product platform. Remaining platform porting difficulty is little. The porting just modify `\easyflash\port\flash_port.c` file. Implement erase, write, read, print feature.
Welcome everyone to **fork and pull request**([Github](https://github.com/armink/EasyFlash)|[OSChina](http://git.oschina.net/armink/EasyFlash)|[Coding](https://coding.net/u/armink/p/EasyFlash/git)). The open source software success is inseparable from everyone efforts. I hope this project will help everyone reduce product development cycle and make product to success earlier.
diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.dep b/demo/stm32f10x/non_os/EWARM/EasyFlash.dep
index 4f7f943..9d7235a 100644
--- a/demo/stm32f10x/non_os/EWARM/EasyFlash.dep
+++ b/demo/stm32f10x/non_os/EWARM/EasyFlash.dep
@@ -2,571 +2,10 @@
2
- 3663988429
+ 584004130
stm32f103xE
-
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_exti.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_port.pbi
- $PROJ_DIR$\stm32f103xE\Obj\flash_iap.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_rtc.o
- $PROJ_DIR$\stm32f103xE\Obj\bsp.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_can.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_rcc.pbi
- $PROJ_DIR$\stm32f103xE\Obj\app.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_env_wl.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_spi.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_it.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_adc.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_bkp.pbi
- $PROJ_DIR$\stm32f103xE\Obj\flash_port.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_i2c.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_cec.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_crc.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_rcc.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_iwdg.pbi
- $PROJ_DIR$\stm32f103xE\Obj\flash.o
- $PROJ_DIR$\stm32f103xE\Obj\misc.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dac.pbi
- $PROJ_DIR$\stm32f103xE\Exe\EasyFlash.bin
- $PROJ_DIR$\stm32f103xE\Obj\flash_utils.pbi
- $PROJ_DIR$\stm32f103xE\Obj\app.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_it.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_adc.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_crc.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dbgmcu.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_utils.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_env_wl.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_iap.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_bkp.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_pwr.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_fsmc.o
- $PROJ_DIR$\stm32f103xE\Obj\system_stm32f10x.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_tim.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_sdio.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_usart.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_spi.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_sdio.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_rtc.pbi
- $PROJ_DIR$\stm32f103xE\Obj\bsp.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_usart.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_exti.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_can.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dma.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dac.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_flash.o
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_wwdg.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_env.o
- $PROJ_DIR$\stm32f103xE\Obj\system_stm32f10x.o
- $PROJ_DIR$\stm32f103xE\Obj\flash_env.pbi
- $PROJ_DIR$\stm32f103xE\Exe\EasyFlash.out
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_pwr.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_i2c.o
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_cec.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dma.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_gpio.o
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_tim.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_fsmc.pbi
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_wwdg.pbi
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_gpio.pbi
- $PROJ_DIR$\stm32f103xE\Obj\misc.o
- $PROJ_DIR$\stm32f103xE\Obj\flash.pbi
- $PROJ_DIR$\stm32f103xE\Obj\startup_stm32f10x_hd.o
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_flash.pbi
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_dbgmcu.pbi
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c
- $PROJ_DIR$\stm32f103xE\Obj\EasyFlash.pbd
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c
- $PROJ_DIR$\stm32f103xE\Obj\stm32f10x_iwdg.o
- $PROJ_DIR$\..\components\others\bsp.c
- $PROJ_DIR$\..\Libraries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_hd.s
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c
- $PROJ_DIR$\..\app\src\app.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c
- $PROJ_DIR$\..\Libraries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c
- $PROJ_DIR$\..\..\..\..\flash\src\flash_utils.c
- $PROJ_DIR$\..\..\..\..\flash\src\flash_iap.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c
- $PROJ_DIR$\..\..\..\..\flash\src\flash.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c
- $PROJ_DIR$\..\app\src\stm32f10x_it.c
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c
- $PROJ_DIR$\..\components\flash\port\flash_port.c
- $PROJ_DIR$\..\..\..\..\flash\src\flash_env.c
- $PROJ_DIR$\..\..\..\..\flash\src\flash_env_wl.c
-
-
- [ROOT_NODE]
-
-
- ILINK
- 53
-
-
-
-
- $PROJ_DIR$\stm32f103xE\Exe\EasyFlash.out
-
-
- OBJCOPY
- 22
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c
-
-
- ICCARM
- 9
-
-
- BICOMP
- 39
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c
-
-
- ICCARM
- 28
-
-
- BICOMP
- 77
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c
-
-
- ICCARM
- 37
-
-
- BICOMP
- 40
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c
-
-
- ICCARM
- 59
-
-
- BICOMP
- 71
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c
-
-
- ICCARM
- 3
-
-
- BICOMP
- 41
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c
-
-
- ICCARM
- 49
-
-
- BICOMP
- 67
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c
-
-
- ICCARM
- 17
-
-
- BICOMP
- 6
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c
-
-
- ICCARM
- 48
-
-
- BICOMP
- 76
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c
-
-
- ICCARM
- 38
-
-
- BICOMP
- 43
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c
-
-
- ICCARM
- 85
-
-
- BICOMP
- 18
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c
-
-
- ICCARM
- 36
-
-
- BICOMP
- 64
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c
-
-
- ICCARM
- 46
-
-
- BICOMP
- 58
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c
-
-
- ICCARM
- 0
-
-
- BICOMP
- 44
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c
-
-
- ICCARM
- 55
-
-
- BICOMP
- 14
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c
-
-
- ICCARM
- 33
-
-
- BICOMP
- 54
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c
-
-
- ICCARM
- 34
-
-
- BICOMP
- 65
-
-
-
-
- $PROJ_DIR$\..\components\others\bsp.c
-
-
- ICCARM
- 4
-
-
- BICOMP
- 42
-
-
-
-
- $PROJ_DIR$\..\Libraries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_hd.s
-
-
- AARM
- 74
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c
-
-
- ICCARM
- 32
-
-
- BICOMP
- 12
-
-
-
-
- $PROJ_DIR$\..\app\src\app.c
-
-
- ICCARM
- 7
-
-
- BICOMP
- 24
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c
-
-
- ICCARM
- 15
-
-
- BICOMP
- 57
-
-
-
-
- $PROJ_DIR$\..\Libraries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c
-
-
- ICCARM
- 51
-
-
- BICOMP
- 35
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c
-
-
- ICCARM
- 47
-
-
- BICOMP
- 21
-
-
-
-
- $PROJ_DIR$\..\..\..\..\flash\src\flash_utils.c
-
-
- ICCARM
- 29
-
-
- BICOMP
- 23
-
-
-
-
- $PROJ_DIR$\..\..\..\..\flash\src\flash_iap.c
-
-
- ICCARM
- 2
-
-
- BICOMP
- 31
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c
-
-
- ICCARM
- 72
-
-
- BICOMP
- 20
-
-
-
-
- $PROJ_DIR$\..\..\..\..\flash\src\flash.c
-
-
- ICCARM
- 19
-
-
- BICOMP
- 73
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c
-
-
- ICCARM
- 45
-
-
- BICOMP
- 5
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c
-
-
- ICCARM
- 16
-
-
- BICOMP
- 27
-
-
-
-
- $PROJ_DIR$\..\app\src\stm32f10x_it.c
-
-
- ICCARM
- 10
-
-
- BICOMP
- 25
-
-
-
-
- $PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c
-
-
- ICCARM
- 26
-
-
- BICOMP
- 11
-
-
-
-
- $PROJ_DIR$\..\components\flash\port\flash_port.c
-
-
- ICCARM
- 13
-
-
- BICOMP
- 1
-
-
-
-
- $PROJ_DIR$\..\..\..\..\flash\src\flash_env.c
-
-
- ICCARM
- 50
-
-
- BICOMP
- 52
-
-
-
-
- $PROJ_DIR$\..\..\..\..\flash\src\flash_env_wl.c
-
-
- ICCARM
- 30
-
-
- BICOMP
- 8
-
-
-
+
diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.ewp b/demo/stm32f10x/non_os/EWARM/EasyFlash.ewp
index 798e660..17c1362 100644
--- a/demo/stm32f10x/non_os/EWARM/EasyFlash.ewp
+++ b/demo/stm32f10x/non_os/EWARM/EasyFlash.ewp
@@ -301,7 +301,7 @@
$PROJ_DIR$\..\Libraries\STM32F10x_StdPeriph_Driver\inc
$PROJ_DIR$\..\Libraries\CMSIS_EWARM\Include
$PROJ_DIR$\..\Libraries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x
- $PROJ_DIR$\..\..\..\..\flash\inc
+ $PROJ_DIR$\..\..\..\..\easyflash\inc