adapter speed: require init script setting and centralize activation from drivers...

[fw/openocd] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index f2db47b3ad683bde43322d2570810bfc598163a2..7a3a0f2eacc416a52ca016205b54d13afa21e658 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -618,6 +618,11 @@ int interface_jtag_add_ir_scan(struct jtag_tap *active, const struct scan_field
                        assert(scan_size <= 32);
                        shiftValueInner(TAP_IRSHIFT, pause_state, scan_size, 0xffffffff);
 
+                       /* Optimization code will check what the cur_instr is set to, so
+                        * we must set it to bypass value.
+                        */
+                       buf_set_ones(tap->cur_instr, tap->ir_length);
+
                        tap->bypass = 1;
                }
        }
@@ -848,7 +853,7 @@ static void jtag_pre_post_bits(struct jtag_tap *tap, int *pre, int *post)
                        TAP_IDLE);
 */
 
-void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count)
+void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, const uint8_t *buffer, int little, int count)
 {
 #if 0
        int i;
@@ -890,7 +895,7 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer,
 
 
 
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap * tap, uint32_t opcode, uint32_t * data, size_t count)
+int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap * tap, uint32_t opcode, const uint32_t * data, size_t count)
 {
        /* bypass bits before and after */
        int pre_bits;
@@ -900,7 +905,7 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap * tap, uint32_t opc
 
        if ((pre_bits > 32) || (post_bits > 32))
        {
-               int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *, uint32_t, uint32_t *, size_t);
+               int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *, uint32_t, const uint32_t *, size_t);
                return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
        } else
        {
@@ -1036,6 +1041,8 @@ static const struct command_registration zy1000_commands[] = {
 };
 
 
+#if !BUILD_ZY1000_MASTER
+
 static int tcp_ip = -1;
 
 /* Write large packets if we can */
@@ -1116,9 +1123,6 @@ enum ZY1000_CMD
        ZY1000_CMD_WAITIDLE = 2
 };
 
-
-#if !BUILD_ZY1000_MASTER
-
 #include <sys/socket.h> /* for socket(), connect(), send(), and recv() */
 #include <arpa/inet.h>  /* for sockaddr_in and inet_addr() */
 
@@ -1363,132 +1367,12 @@ static void writeShiftValue(uint8_t *data, int bits)
 
 #if BUILD_ZY1000_MASTER
 
-pthread_t thread;
-
 #if BUILD_ECOSBOARD
 static char watchdog_stack[2048];
 static cyg_thread watchdog_thread_object;
 static cyg_handle_t watchdog_thread_handle;
 #endif
 
-/* Infinite loop peeking & poking */
-static void tcpipserver(void)
-{
-       for (;;)
-       {
-               uint32_t address;
-               if (!readLong(&address))
-                       return;
-               enum ZY1000_CMD c = (address >> 24) & 0xff;
-               address &= 0xffffff;
-               switch (c)
-               {
-                       case ZY1000_CMD_POKE:
-                       {
-                               uint32_t data;
-                               if (!readLong(&data))
-                                       return;
-                               address &= ~0x80000000;
-                               ZY1000_POKE(address + ZY1000_JTAG_BASE, data);
-                               break;
-                       }
-                       case ZY1000_CMD_PEEK:
-                       {
-                               uint32_t data;
-                               ZY1000_PEEK(address + ZY1000_JTAG_BASE, data);
-                               if (!writeLong(data))
-                                       return;
-                               break;
-                       }
-                       case ZY1000_CMD_SLEEP:
-                       {
-                               uint32_t data;
-                               if (!readLong(&data))
-                                       return;
-                               /* Wait for some us */
-                               usleep(data);
-                               break;
-                       }
-                       case ZY1000_CMD_WAITIDLE:
-                       {
-                               waitIdle();
-                               break;
-                       }
-                       default:
-                               return;
-               }
-       }
-}
-
-
-static void *tcpip_server(void *data)
-{
-       int so_reuseaddr_option = 1;
-
-       int fd;
-       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
-       {
-               LOG_ERROR("error creating socket: %s", strerror(errno));
-               exit(-1);
-       }
-
-       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*) &so_reuseaddr_option,
-                       sizeof(int));
-
-       struct sockaddr_in sin;
-       unsigned int address_size;
-       address_size = sizeof(sin);
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = INADDR_ANY;
-       sin.sin_port = htons(7777);
-
-       if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) == -1)
-       {
-               LOG_ERROR("couldn't bind to socket: %s", strerror(errno));
-               exit(-1);
-       }
-
-       if (listen(fd, 1) == -1)
-       {
-               LOG_ERROR("couldn't listen on socket: %s", strerror(errno));
-               exit(-1);
-       }
-
-
-       for (;;)
-       {
-               tcp_ip = accept(fd, (struct sockaddr *) &sin, &address_size);
-               if (tcp_ip < 0)
-               {
-                       continue;
-               }
-
-               int flag = 1;
-               setsockopt(tcp_ip,      /* socket affected */
-                               IPPROTO_TCP,            /* set option at TCP level */
-                               TCP_NODELAY,            /* name of option */
-                               (char *)&flag,          /* the cast is historical cruft */
-                               sizeof(int));           /* length of option value */
-
-               bool save_poll = jtag_poll_get_enabled();
-
-               /* polling will screw up the "connection" */
-               jtag_poll_set_enabled(false);
-
-               tcpipserver();
-
-               jtag_poll_set_enabled(save_poll);
-
-               close(tcp_ip);
-
-       }
-       /* Never reached actually */
-       close(fd);
-
-       return NULL;
-}
-
 #ifdef WATCHDOG_BASE
 /* If we connect to port 8888 we must send a char every 10s or the board resets itself */
 static void watchdog_server(cyg_addrword_t data)
@@ -1621,15 +1505,8 @@ int zy1000_init(void)
 
         /* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */
        zy1000_reset(0, 0);
-       int jtag_speed_var;
-       int retval = jtag_get_speed(&jtag_speed_var);
-       if (retval != ERROR_OK)
-               return retval;
-       zy1000_speed(jtag_speed_var);
 
 #if BUILD_ZY1000_MASTER
-       pthread_create(&thread, NULL, tcpip_server, NULL);
-
 #if BUILD_ECOSBOARD
 #ifdef WATCHDOG_BASE
        cyg_thread_create(1, watchdog_server, (cyg_addrword_t) 0, "watchdog tcip/ip server",