This is an automated email from Gerrit. Spencer Oliver ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2293
-- gerrit commit a4fab852654f9b97e83ff7c53fd5643590608e62 Author: Spencer Oliver <[email protected]> Date: Thu Sep 11 22:08:34 2014 +0100 flash: constify driver data structures Change-Id: Ia5c3de48119f036e1d7a41be62a672a6fb37e59b Signed-off-by: Spencer Oliver <[email protected]> diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c index d4bd5b9..d3d143f 100644 --- a/src/flash/nor/fm3.c +++ b/src/flash/nor/fm3.c @@ -240,7 +240,7 @@ static int fm3_erase(struct flash_bank *bank, int first, int last) /* R0 keeps Flash Sequence address 1 (u32FlashSeq1) */ /* R1 keeps Flash Sequence address 2 (u32FlashSeq2) */ /* R2 keeps Flash Offset address (ofs) */ - const uint8_t fm3_flash_erase_sector_code[] = { + static const uint8_t fm3_flash_erase_sector_code[] = { /* *(uint16_t*)u32FlashSeq1 = 0xAA; */ 0xAA, 0x24, /* MOVS R4, #0xAA */ 0x04, 0x80, /* STRH R4, [R0, #0] */ @@ -849,7 +849,7 @@ static int fm3_chip_erase(struct flash_bank *bank) /* RAMCODE used for fm3 Flash chip erase: */ /* R0 keeps Flash Sequence address 1 (u32FlashSeq1) */ /* R1 keeps Flash Sequence address 2 (u32FlashSeq2) */ - const uint8_t fm3_flash_erase_chip_code[] = { + static const uint8_t fm3_flash_erase_chip_code[] = { /* *(uint16_t*)u32FlashSeq1 = 0xAA; */ 0xAA, 0x22, /* MOVS R2, #0xAA */ 0x02, 0x80, /* STRH R2, [R0, #0] */ diff --git a/src/flash/nor/non_cfi.c b/src/flash/nor/non_cfi.c index 9735bdb..72f11e5 100644 --- a/src/flash/nor/non_cfi.c +++ b/src/flash/nor/non_cfi.c @@ -33,7 +33,7 @@ #define ERASE_REGION(num, size) (((size/256) << 16) | (num-1)) /* non-CFI compatible flashes */ -static struct non_cfi non_cfi_flashes[] = { +static const struct non_cfi non_cfi_flashes[] = { { .mfr = CFI_MFR_SST, .id = 0xd4, @@ -472,7 +472,7 @@ void cfi_fixup_non_cfi(struct flash_bank *bank) { unsigned int mask; struct cfi_flash_bank *cfi_info = bank->driver_priv; - struct non_cfi *non_cfi = non_cfi_flashes; + const struct non_cfi *non_cfi = non_cfi_flashes; if (cfi_info->x16_as_x8) mask = 0xFF; diff --git a/src/flash/nor/nrf51.c b/src/flash/nor/nrf51.c index adb4004..711d6fb 100644 --- a/src/flash/nor/nrf51.c +++ b/src/flash/nor/nrf51.c @@ -920,8 +920,9 @@ static int nrf51_info(struct flash_bank *bank, char *buf, int buf_size) if (res != ERROR_OK) return res; - struct { - uint32_t address, value; + static struct { + const uint32_t address; + uint32_t value; } ficr[] = { { .address = NRF51_FICR_CODEPAGESIZE }, { .address = NRF51_FICR_CODESIZE }, -- ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
