Size of array to contain CFI command is already defined in a macro.
Signed-off-by: Antonio Borneo <[email protected]>
---
src/flash/nor/cfi.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index b0c7b0b..30fe050 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -226,7 +226,7 @@ static uint32_t cfi_query_u32(struct flash_bank *bank, int
sector, uint32_t offs
static void cfi_intel_clear_status_register(struct flash_bank *bank)
{
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
if (target->state != TARGET_HALTED)
{
@@ -320,7 +320,7 @@ static int cfi_read_intel_pri_ext(struct flash_bank *bank)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_intel_pri_ext *pri_ext = malloc(sizeof(struct
cfi_intel_pri_ext));
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
cfi_info->pri_ext = pri_ext;
@@ -386,7 +386,7 @@ static int cfi_read_spansion_pri_ext(struct flash_bank
*bank)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct
cfi_spansion_pri_ext));
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
cfi_info->pri_ext = pri_ext;
@@ -452,7 +452,7 @@ static int cfi_read_atmel_pri_ext(struct flash_bank *bank)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct
cfi_spansion_pri_ext));
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
/* ATMEL devices use the same CFI primary command set (0x2) as
AMD/Spansion,
* but a different primary extended query table.
@@ -648,7 +648,7 @@ static int cfi_intel_erase(struct flash_bank *bank, int
first, int last)
int retval;
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
int i;
cfi_intel_clear_status_register(bank);
@@ -693,7 +693,7 @@ static int cfi_spansion_erase(struct flash_bank *bank, int
first, int last)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
int i;
for (i = first; i <= last; i++)
@@ -794,7 +794,7 @@ static int cfi_intel_protect(struct flash_bank *bank, int
set, int first, int la
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
int retry = 0;
int i;
@@ -1555,7 +1555,7 @@ static int cfi_intel_write_word(struct flash_bank *bank,
uint8_t *word, uint32_t
int retval;
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
cfi_intel_clear_status_register(bank);
cfi_command(bank, 0x40, command);
@@ -1589,7 +1589,7 @@ static int cfi_intel_write_words(struct flash_bank *bank,
uint8_t *word, uint32_
int retval;
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
/* Calculate buffer size and boundary mask */
uint32_t buffersize = (1UL << cfi_info->max_buf_write_size) *
(bank->bus_width / bank->chip_width);
@@ -1683,7 +1683,7 @@ static int cfi_spansion_write_word(struct flash_bank
*bank, uint8_t *word, uint3
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
cfi_command(bank, 0xaa, command);
if ((retval = target_write_memory(target, flash_address(bank, 0,
pri_ext->_unlock1), bank->bus_width, 1, command)) != ERROR_OK)
@@ -1728,7 +1728,7 @@ static int cfi_spansion_write_words(struct flash_bank
*bank, uint8_t *word, uint
int retval;
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
/* Calculate buffer size and boundary mask */
@@ -2114,7 +2114,7 @@ static int cfi_query_string(struct flash_bank *bank, int
address)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
int retval;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
cfi_command(bank, 0x98, command);
if ((retval = target_write_memory(target, flash_address(bank, 0,
address), bank->bus_width, 1, command)) != ERROR_OK)
@@ -2151,7 +2151,7 @@ static int cfi_probe(struct flash_bank *bank)
{
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
int num_sectors = 0;
int i;
int sector = 0;
@@ -2474,7 +2474,7 @@ static int cfi_spansion_protect_check(struct flash_bank
*bank)
struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
struct target *target = bank->target;
- uint8_t command[8];
+ uint8_t command[CFI_MAX_BUS_WIDTH];
int i;
cfi_command(bank, 0xaa, command);
--
1.5.2.2
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
