diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-24 20:32:10 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-25 10:32:00 -0800 |
| commit | 4946925bea77a4aace6c310b2b724cf2095c6719 (patch) | |
| tree | 3f881c5a7125fce193efd20d008e29212ecb29b9 /src/flash | |
| parent | a3d81eed4d2aac51056f36d7c00ee639bb39c552 (diff) | |
| download | openocd+libswd-4946925bea77a4aace6c310b2b724cf2095c6719.tar.gz openocd+libswd-4946925bea77a4aace6c310b2b724cf2095c6719.tar.bz2 openocd+libswd-4946925bea77a4aace6c310b2b724cf2095c6719.tar.xz openocd+libswd-4946925bea77a4aace6c310b2b724cf2095c6719.zip | |
use ARRAY_SIZE macro
Search and destroy lingering cases where the ARRAY_SIZE macro should
be used to convey more intrinsic meaning in the OpenOCD code.
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/avrf.c | 4 | ||||
| -rw-r--r-- | src/flash/tms470.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/flash/avrf.c b/src/flash/avrf.c index 1c484643..687dd4b5 100644 --- a/src/flash/avrf.c +++ b/src/flash/avrf.c @@ -290,7 +290,7 @@ static int avrf_probe(struct flash_bank *bank) LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); } - for (i = 0; i < (int)(sizeof(avft_chips_info) / sizeof(avft_chips_info[0])); i++) + for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) { if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) { @@ -369,7 +369,7 @@ static int avrf_info(struct flash_bank *bank, char *buf, int buf_size) LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); } - for (i = 0; i < (int)(sizeof(avft_chips_info) / sizeof(avft_chips_info[0])); i++) + for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) { if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) { diff --git a/src/flash/tms470.c b/src/flash/tms470.c index 682013ef..59659346 100644 --- a/src/flash/tms470.c +++ b/src/flash/tms470.c @@ -46,7 +46,7 @@ const struct flash_sector TMS470R1A256_SECTORS[] = { }; #define TMS470R1A256_NUM_SECTORS \ - (sizeof(TMS470R1A256_SECTORS)/sizeof(TMS470R1A256_SECTORS[0])) + ARRAY_SIZE(TMS470R1A256_SECTORS) const struct flash_sector TMS470R1A288_BANK0_SECTORS[] = { {0x00000000, 0x00002000, -1, -1}, @@ -56,7 +56,7 @@ const struct flash_sector TMS470R1A288_BANK0_SECTORS[] = { }; #define TMS470R1A288_BANK0_NUM_SECTORS \ - (sizeof(TMS470R1A288_BANK0_SECTORS)/sizeof(TMS470R1A288_BANK0_SECTORS[0])) + ARRAY_SIZE(TMS470R1A288_BANK0_SECTORS) const struct flash_sector TMS470R1A288_BANK1_SECTORS[] = { {0x00040000, 0x00010000, -1, -1}, @@ -66,7 +66,7 @@ const struct flash_sector TMS470R1A288_BANK1_SECTORS[] = { }; #define TMS470R1A288_BANK1_NUM_SECTORS \ - (sizeof(TMS470R1A288_BANK1_SECTORS)/sizeof(TMS470R1A288_BANK1_SECTORS[0])) + ARRAY_SIZE(TMS470R1A288_BANK1_SECTORS) const struct flash_sector TMS470R1A384_BANK0_SECTORS[] = { {0x00000000, 0x00002000, -1, -1}, @@ -82,7 +82,7 @@ const struct flash_sector TMS470R1A384_BANK0_SECTORS[] = { }; #define TMS470R1A384_BANK0_NUM_SECTORS \ - (sizeof(TMS470R1A384_BANK0_SECTORS)/sizeof(TMS470R1A384_BANK0_SECTORS[0])) + ARRAY_SIZE(TMS470R1A384_BANK0_SECTORS) const struct flash_sector TMS470R1A384_BANK1_SECTORS[] = { {0x00020000, 0x00008000, -1, -1}, @@ -92,7 +92,7 @@ const struct flash_sector TMS470R1A384_BANK1_SECTORS[] = { }; #define TMS470R1A384_BANK1_NUM_SECTORS \ - (sizeof(TMS470R1A384_BANK1_SECTORS)/sizeof(TMS470R1A384_BANK1_SECTORS[0])) + ARRAY_SIZE(TMS470R1A384_BANK1_SECTORS) const struct flash_sector TMS470R1A384_BANK2_SECTORS[] = { {0x00040000, 0x00008000, -1, -1}, @@ -102,7 +102,7 @@ const struct flash_sector TMS470R1A384_BANK2_SECTORS[] = { }; #define TMS470R1A384_BANK2_NUM_SECTORS \ - (sizeof(TMS470R1A384_BANK2_SECTORS)/sizeof(TMS470R1A384_BANK2_SECTORS[0])) + ARRAY_SIZE(TMS470R1A384_BANK2_SECTORS) /* ---------------------------------------------------------------------- */ |