arm-jtag-ew: -Wshadow fix

[openocd] / src / jtag / drivers / ft2232.c

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index dd11aec666aa097896785b3e06b81846d24bd11d..2ac410a5d968a056d2b5e23efdafa60a5a1fb13e 100644 (file)
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -1978,7 +1978,7 @@ static int ft2232_execute_command(struct jtag_command *cmd)
        {
        case JTAG_RESET:        retval = ft2232_execute_reset(cmd); break;
        case JTAG_RUNTEST:      retval = ft2232_execute_runtest(cmd); break;
-       case JTAG_STATEMOVE: retval = ft2232_execute_statemove(cmd); break;
+       case JTAG_TLR_RESET: retval = ft2232_execute_statemove(cmd); break;
        case JTAG_PATHMOVE:     retval = ft2232_execute_pathmove(cmd); break;
        case JTAG_SCAN:         retval = ft2232_execute_scan(cmd); break;
        case JTAG_SLEEP:        retval = ft2232_execute_sleep(cmd); break;
@@ -2433,7 +2433,7 @@ static int ftx232_init_tail(void)
 
        if (((ft2232_write(buf, 3, &bytes_written)) != ERROR_OK) || (bytes_written != 3))
        {
-               LOG_ERROR("couldn't initialize FT2232 with 'USBJTAG' layout");
+               LOG_ERROR("couldn't initialize FT2232 DBUS");
                return ERROR_JTAG_INIT_FAILED;
        }