X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fversaloon%2Fusbtoxxx%2Fusbtoxxx.c;h=b46bbe0e0f2839fc6479aba800af91a7f205ec8b;hb=7beb6a4e5b832f376c4bb5b29f86aaee9acd46d7;hp=53a7e989b333db29befd7f2357407815f96752d7;hpb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;p=openocd.git

diff --git a/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c b/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
index 53a7e989b3..b46bbe0e0f 100644
--- a/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
+++ b/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
@@ -29,7 +29,7 @@
 
 #define N_A "n/a"
 
-const char *types_name[96] = {
+static const char *types_name[96] = {
 	"usbtousart", "usbtospi", "usbtoi2c", "usbtogpio", "usbtocan", "usbtopwm",
 	"usbtoadc", "usbtodac",
 	"usbtomicrowire", "usbtoswim", "usbtodusi", N_A, N_A, N_A, "usbtopower", "usbtodelay",
@@ -48,15 +48,15 @@ uint8_t usbtoxxx_abilities[USB_TO_XXX_ABILITIES_LEN];
 
 #define usbtoxxx_get_type_name(type)	\
 	types_name[((type) - VERSALOON_USB_TO_XXX_CMD_START) \
-		   % (sizeof(types_name) / sizeof(types_name[0]))]
+		   % ARRAY_SIZE(types_name)]
 
 static uint8_t type_pre;
 static uint16_t usbtoxxx_buffer_index;
 static uint16_t usbtoxxx_current_cmd_index;
 static uint8_t *usbtoxxx_buffer;
 
-uint16_t collect_index;
-uint8_t collect_cmd;
+static uint16_t collect_index;
+static uint8_t collect_cmd;
 static uint8_t poll_nesting;
 
 struct usbtoxxx_context_t {
@@ -86,7 +86,7 @@ static void usbtoxxx_pop_context(struct usbtoxxx_context_t *c)
 	versaloon_pending_idx = c->versaloon_pending_idx;
 }
 
-RESULT usbtoxxx_validate_current_command_type(void)
+static RESULT usbtoxxx_validate_current_command_type(void)
 {
 	if (type_pre > 0) {
 		/* not the first command */
@@ -272,7 +272,7 @@ bool usbtoxxx_interface_supported(uint8_t cmd)
 	return (usbtoxxx_abilities[cmd  / 8] & (1 << (cmd % 8))) > 0;
 }
 
-RESULT usbtoxxx_ensure_buffer_size(uint16_t cmdlen)
+static RESULT usbtoxxx_ensure_buffer_size(uint16_t cmdlen)
 {
 	/* check free space, commit if not enough */
 	if (((usbtoxxx_buffer_index + usbtoxxx_current_cmd_index + cmdlen)