rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sn32: slight flash cleanup 

guard the jumploader on any flash operation
thanks to @gloryhzw
This commit is contained in:
Dimitris Mantzouranis 2021-10-17 22:45:45 +03:00
parent 77e28ce0f0
commit 82b25f3972
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
os/hal/ports/SN32/LLD/SN32F24xB/FLASH/Flash.c
View File

@ -20,13 +20,10 @@
/*_____ I N C L U D E S ____________________________________________________*/
#include "Flash.h"
/*_____ D E C L A R A T I O N S ____________________________________________*/
uint32_t wFLASH_PGRAM[2];
/*_____ D E F I N I T I O N S ______________________________________________*/
#define SN32_JUMPLOADER_SIZE 0x200
/*_____ M A C R O S ________________________________________________________*/
@ -42,6 +39,10 @@ uint32_t wFLASH_PGRAM[2];
*****************************************************************************/
FLASH_Status FLASH_EraseSector (uint32_t adr)
{
// never touch the jumploader
if (adr < SN32_JUMPLOADER_SIZE)
return FLASH_FAIL;
SN_FLASH->CTRL = FLASH_PER; // Page Erase Enabled
SN_FLASH->ADDR = adr; // Page Address
@ -65,8 +66,12 @@ FLASH_Status FLASH_EraseSector (uint32_t adr)
* Return : FLASH_OKAY or FLASH_FAIL
* Note : None
*****************************************************************************/
FLASH_Status FLASH_ProgramPage (uint32_t adr, uint32_t sz, uint16_t Data)
FLASH_Status FLASH_ProgramPage (uint32_t adr, uint32_t sz, uint32_t Data)
{
// never touch the jumploader
if (adr < SN32_JUMPLOADER_SIZE)
return FLASH_FAIL;
SN_FLASH->CTRL = FLASH_PG; // Programming Enabled
SN_FLASH->ADDR = adr;
@ -74,9 +79,9 @@ FLASH_Status FLASH_ProgramPage (uint32_t adr, uint32_t sz, uint16_t Data)
*(uint32_t*)adr = Data;
while (sz){
while (sz) {
SN_FLASH->DATA = *((uint32_t *)adr);
SN_FLASH->DATA = Data;
FLASH_WAIT_FOR_DONE
@ -113,7 +118,7 @@ FLASH_Status FLASH_ProgramPage (uint32_t adr, uint32_t sz, uint16_t Data)
* Return : FLASH_OKAY or FLASH_ERR
* Note : None
*****************************************************************************/
FLASH_Status FLASH_ProgramWord(uint32_t adr, uint16_t Data) {
FLASH_Status FLASH_ProgramDWord(uint32_t adr, uint32_t Data) {
FLASH_Status status = FLASH_ProgramPage(adr, 4, Data);
return status;

5
os/hal/ports/SN32/LLD/SN32F24xB/FLASH/Flash.h
View File

@ -37,13 +37,12 @@
#define __FLASH_CLEAR_ERROR_STATUS SN_FLASH->STATUS &= ~FLASH_PGERR
/*_____ D E C L A R A T I O N S ____________________________________________*/
extern uint32_t wFLASH_PGRAM[2];
typedef enum { FLASH_FAIL, FLASH_OKAY} FLASH_Status;
void FLASH_MassErase (void);
FLASH_Status FLASH_EraseSector (uint32_t);
FLASH_Status FLASH_ProgramPage (uint32_t, uint32_t, uint16_t);
FLASH_Status FLASH_ProgramWord(uint32_t, uint16_t);
FLASH_Status FLASH_ProgramPage (uint32_t, uint32_t, uint32_t);
FLASH_Status FLASH_ProgramDWord(uint32_t, uint32_t);
uint16_t FLASH_Checksum(void);
#endif /* __SN32F240B_FLASH_H */