projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use ARRAY_SIZE macro
[fw/openocd]
/
src
/
jtag
/
ft2232.c
diff --git
a/src/jtag/ft2232.c
b/src/jtag/ft2232.c
index 73cbaf3c626730845f618e33ea3e554ab757c9a7..29b6389ced29d94a6fe7962f0feafb374a2b608a 100644
(file)
--- a/
src/jtag/ft2232.c
+++ b/
src/jtag/ft2232.c
@@
-1949,7
+1949,7
@@
static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
{
static const char* type_str[] =
{"BM", "AM", "100AX", "UNKNOWN", "2232C", "232R", "2232H", "4232H"};
{
static const char* type_str[] =
{"BM", "AM", "100AX", "UNKNOWN", "2232C", "232R", "2232H", "4232H"};
- unsigned no_of_known_types =
sizeof(type_str) / sizeof(type_str[0]
) - 1;
+ unsigned no_of_known_types =
ARRAY_SIZE(type_str
) - 1;
unsigned type_index = ((unsigned)ftdi_device <= no_of_known_types)
? ftdi_device : FT_DEVICE_UNKNOWN;
LOG_INFO("device: %lu \"%s\"", ftdi_device, type_str[type_index]);
unsigned type_index = ((unsigned)ftdi_device <= no_of_known_types)
? ftdi_device : FT_DEVICE_UNKNOWN;
LOG_INFO("device: %lu \"%s\"", ftdi_device, type_str[type_index]);
@@
-2034,7
+2034,7
@@
static int ft2232_init_libftdi(uint16_t vid, uint16_t pid, int more, int* try_mo
ftdi_device = ftdic.type;
static const char* type_str[] =
{"AM", "BM", "2232C", "R", "2232H", "4232H", "Unknown"};
ftdi_device = ftdic.type;
static const char* type_str[] =
{"AM", "BM", "2232C", "R", "2232H", "4232H", "Unknown"};
- unsigned no_of_known_types =
sizeof(type_str) / sizeof(type_str[0]
) - 1;
+ unsigned no_of_known_types =
ARRAY_SIZE(type_str
) - 1;
unsigned type_index = ((unsigned)ftdi_device < no_of_known_types)
? ftdi_device : no_of_known_types;
LOG_DEBUG("FTDI chip type: %i \"%s\"", (int)ftdi_device, type_str[type_index]);
unsigned type_index = ((unsigned)ftdi_device < no_of_known_types)
? ftdi_device : no_of_known_types;
LOG_DEBUG("FTDI chip type: %i \"%s\"", (int)ftdi_device, type_str[type_index]);