Firebee/BaS_gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

continued implementing flash routines

Browse Source
This commit is contained in:
Markus Fröschle
2013-02-14 13:58:27 +00:00
parent b49c9e628d
commit 1a6d81ed1d
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/s19reader.h
View File

@@ -35,7 +35,8 @@ typedef enum
SREC_CORRUPT, /* file doesn't seem to contain valid S-records */ SREC_CORRUPT, /* file doesn't seem to contain valid S-records */
MEMCPY_FAILED, /* could not copy buffer to destination */ MEMCPY_FAILED, /* could not copy buffer to destination */
CODE_OVERLAPS, /* copying would overwrite ourself */ CODE_OVERLAPS, /* copying would overwrite ourself */
VERIFY_FAILED /* destination does not read as we've written to */ VERIFY_FAILED, /* destination does not read as we've written to */
ILLEGAL_SECTOR /* flash sector number invalid */
} err_t; } err_t;
typedef err_t (*memcpy_callback_t)(uint8_t *dst, uint8_t *src, uint32_t length); typedef err_t (*memcpy_callback_t)(uint8_t *dst, uint8_t *src, uint32_t length);

37
sources/basflash.c
View File

@@ -94,12 +94,41 @@ static const struct romram flash_areas[] =
}; };
static const int num_flash_areas = sizeof(flash_areas) / sizeof(struct romram); static const int num_flash_areas = sizeof(flash_areas) / sizeof(struct romram);
#define FLASH_ADDRESS 0xe0000000
static volatile uint16_t *flash_unlock1 = (volatile uint16_t *) FLASH_ADDRESS + 0xaaa;
static volatile uint16_t *flash_unlock2 = (volatile uint16_t *) FLASH_ADDRESS + 0x554;
static const uint16_t cmd_unlock1 = 0xaa;
static const uint16_t cmd_unlock2 = 0x55;
static const uint16_t cmd_sector_erase1 = 0x80;
static const uint16_t cmd_sector_erase2 = 0x30;
static const uint16_t cmd_sector_erase_suspend = 0xb0;
static const uint16_t cmd_sector_erase_resume = 0x30;
static const uint16_t cmd_program = 0xa0;
static const uint16_t cmd_autoselect = 0x90;
static const uint16_t cmd_read = 0xf0;
extern err_t simulate(); extern err_t simulate();
extern err_t memcpy(); extern err_t memcpy();
extern err_t verify(); extern err_t verify();
/*
* erase a flash sector
*
* sector_num is the index into the sector table above.
*
* FIXME: need to disable data cache to ensure proper operation
*/
err_t erase_flash_sector(int sector_num) err_t erase_flash_sector(int sector_num)
{ {
volatile uint32_t rd;
uint32_t size;
*flash_unlock1 = cmd_unlock1;
*flash_unlock2 = cmd_unlock2;
*flash_unlock1 = cmd_autoselect;
rd = * (volatile uint32_t *) FLASH_ADDRESS;
* (volatile uint32_t *) FLASH_ADDRESS = size;
(void) rd; /* get rid of "unused variable" compiler warning */
return OK; return OK;
} }
@@ -122,6 +151,8 @@ err_t erase_flash_region(void *start_address, uint32_t length)
sector = i; sector = i;
} }
if (sector >= 0 && sector <= num_flash_sectors)
{
/* /*
* erase sectors until free space equals length * erase sectors until free space equals length
* *
@@ -131,7 +162,11 @@ err_t erase_flash_region(void *start_address, uint32_t length)
err = erase_flash_sector(sector); err = erase_flash_sector(sector);
sector++; sector++;
} while ((void *) mx29lv640d_flash_sectors[sector] < start_address + length && ! err); } while ((void *) mx29lv640d_flash_sectors[sector] < start_address + length && ! err);
}
else
{
err = ILLEGAL_SECTOR;
}
return err; return err;
} }