Hi,
a small CFI cleanup bit that has been in my local version for some time.
cu
Michael
Index: src/flash/cfi.c
===================================================================
--- src/flash/cfi.c (revision 2606)
+++ src/flash/cfi.c (working copy)
@@ -74,7 +74,7 @@
static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *flash, void *param);
/* fixup after reading cmdset 0002 primary query table */
-static cfi_fixup_t cfi_0002_fixups[] = {
+static const cfi_fixup_t cfi_0002_fixups[] = {
{CFI_MFR_SST, 0x00D4, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
{CFI_MFR_SST, 0x00D5, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
{CFI_MFR_SST, 0x00D6, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
@@ -90,14 +90,14 @@
};
/* fixup after reading cmdset 0001 primary query table */
-static cfi_fixup_t cfi_0001_fixups[] = {
+static const cfi_fixup_t cfi_0001_fixups[] = {
{0, 0, NULL, NULL}
};
-static void cfi_fixup(flash_bank_t *bank, cfi_fixup_t *fixups)
+static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups)
{
cfi_flash_bank_t *cfi_info = bank->driver_priv;
- cfi_fixup_t *f;
+ const cfi_fixup_t *f;
for (f = fixups; f->fixup; f++)
{
Index: src/flash/non_cfi.c
===================================================================
--- src/flash/non_cfi.c (revision 2606)
+++ src/flash/non_cfi.c (working copy)
@@ -32,7 +32,7 @@
#define ERASE_REGION(num, size) (((size/256) << 16) | (num-1))
/* non-CFI compatible flashes */
-non_cfi_t non_cfi_flashes[] = {
+static non_cfi_t non_cfi_flashes[] = {
{
.mfr = CFI_MFR_SST,
.id = 0xd4,
Index: src/flash/non_cfi.h
===================================================================
--- src/flash/non_cfi.h (revision 2606)
+++ src/flash/non_cfi.h (working copy)
@@ -35,7 +35,6 @@
uint8_t status_poll_mask;
} non_cfi_t;
-extern non_cfi_t non_cfi_flashes[];
extern void cfi_fixup_non_cfi(flash_bank_t *bank);
#endif /* NON_CFI_H */
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
