diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-05-13 13:27:01 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-05-13 13:27:01 +0300 |
| commit | 15dfc2cdcbc2e518c09c1ee75f32ff149d4a337d (patch) | |
| tree | 4c0b49773706b85282e6f6b1ec3d2e949d3ca22e /Software/Embedded_SW/Embedded/Drivers/flash_ram | |
| parent | 6a49e917c587dcbbfe8175b8dde73840b7d105fc (diff) | |
| parent | cd750d626d3780990797faf09446033bbaa4311c (diff) | |
| download | Tango-15dfc2cdcbc2e518c09c1ee75f32ff149d4a337d.tar.gz Tango-15dfc2cdcbc2e518c09c1ee75f32ff149d4a337d.zip | |
commit merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/flash_ram')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c | 13 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h | 16 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c index 7ffa0325a..c1a5bcc9f 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c @@ -131,10 +131,10 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b // return(1); } -uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize) +uint32_t EraseFlashSection(uint32_t ui32FlashStart) { - volatile uint32_t ui32Idx; - //uint32_t status; + volatile uint32_t ui32Idx = ui32FlashStart; + uint32_t status; #ifdef FLASH_DEBUG Address[RxIndex] = ui32FlashStart; Size[RxIndex] = ui32FileSize; @@ -142,11 +142,8 @@ uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize) if (RxIndex++>=MAX_CONT_LOG) RxIndex = 0; #endif - for(ui32Idx = ui32FlashStart; ui32Idx < ui32FlashStart+ui32FileSize; ui32Idx += 1024) - { - //status = FlashErase(ui32Idx); - } - return OK; + status = FlashErase(ui32Idx); + return status; } //Each word may not be subject to more than a specific number of programming cycles before an diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h index ae0ca32e9..983c3954c 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h @@ -10,13 +10,19 @@ #define FLASH_RAM_BASE 0x000F0000 +#define EMBEDDED_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) +#define PROCESS_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) +#define DANCERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) +#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X4000) +#define ALARM_SECTION_FLASH (FLASH_RAM_BASE + 0XC000 ) +#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X8000) + #define EMBEDDED_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0000 ) #define PROCESS_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0400 ) #define DANCERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0500) -#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X1000) -#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0X2000 ) -#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X6000) -#define OTHER_MAP_IN_FLASH (FLASH_RAM_BASE + 0X8000) +#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000) +#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0XC000 ) +#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X8000) #define FLASH_SIZE 0X10000 @@ -30,7 +36,7 @@ //***************************************************************************** uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* buffer); void FlashInit(void); -uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize); +uint32_t EraseFlashSection(uint32_t ui32FlashStart); |