From: Zachary T Welch Date: Fri, 13 Nov 2009 15:37:40 +0000 (-0800) Subject: cfi_unlock_addresses_t -> struct cfi_unlock_addresses X-Git-Tag: v0.4.0-rc1~757 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4c28cc68edfb6a3ced1e31fae8a91fbbbc2f02cf;p=openocd cfi_unlock_addresses_t -> struct cfi_unlock_addresses Remove misleading typedef and redundant suffix from struct cfi_unlock_addresses. --- diff --git a/src/flash/cfi.c b/src/flash/cfi.c index ad311d4b..5cfac15f 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -35,7 +35,7 @@ /* defines internal maximum size for code fragment in cfi_intel_write_block() */ #define CFI_MAX_INTEL_CODESIZE 256 -static cfi_unlock_addresses_t cfi_unlock_addresses[] = +static struct cfi_unlock_addresses cfi_unlock_addresses[] = { [CFI_UNLOCK_555_2AA] = { .unlock1 = 0x555, .unlock2 = 0x2aa }, [CFI_UNLOCK_5555_2AAA] = { .unlock1 = 0x5555, .unlock2 = 0x2aaa }, @@ -2111,7 +2111,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param) { struct cfi_flash_bank *cfi_info = bank->driver_priv; struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext; - cfi_unlock_addresses_t *unlock_addresses = param; + struct cfi_unlock_addresses *unlock_addresses = param; pri_ext->_unlock1 = unlock_addresses->unlock1; pri_ext->_unlock2 = unlock_addresses->unlock2; diff --git a/src/flash/cfi.h b/src/flash/cfi.h index 78fdd4da..73f8ea12 100644 --- a/src/flash/cfi.h +++ b/src/flash/cfi.h @@ -136,11 +136,11 @@ enum { CFI_UNLOCK_5555_2AAA, }; -typedef struct cfi_unlock_addresses_s +struct cfi_unlock_addresses { uint32_t unlock1; uint32_t unlock2; -} cfi_unlock_addresses_t; +}; typedef struct cfi_fixup_s {