Marcel Jost <marcel.jost@bfh.ch>:

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

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 5cea4d48af232e4c0c8cb29aa6b2980a08c5c502..4cba9d908560453b472005d50d46c151619c4c9d 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -156,6 +156,7 @@ static const ft2232_layout_t  ft2232_layouts[] =
        { "oocdlink",             jtagkey_init,              jtagkey_reset,      NULL                    },
        { "signalyzer",           usbjtag_init,              usbjtag_reset,      NULL                    },
        { "evb_lm3s811",          usbjtag_init,              usbjtag_reset,      NULL                    },
+       { "luminary_icdi",        usbjtag_init,              usbjtag_reset,      NULL                    },
        { "olimex-jtag",          olimex_jtag_init,          olimex_jtag_reset,  olimex_jtag_blink       },
        { "flyswatter",           flyswatter_init,           flyswatter_reset,   flyswatter_jtag_blink   },
        { "turtelizer2",          turtle_init,               turtle_reset,       turtle_jtag_blink       },
@@ -411,8 +412,8 @@ static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
 
        if (*bytes_read < size)
        {
-               LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)", 
-                         (unsigned int)(*bytes_read), 
+               LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)",
+                         (unsigned int)(*bytes_read),
                          (unsigned int)size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
@@ -876,7 +877,7 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
                        buffer_write(buffer[cur_byte]);
        }
 
-       if (( ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
+       if ((ir_scan && (tap_get_end_state() == TAP_IRSHIFT))
          || (!ir_scan && (tap_get_end_state() == TAP_DRSHIFT)))
        {
                if (type == SCAN_IO)
@@ -965,7 +966,7 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
                  ft2232_buffer_size, (int)bytes_written);
        ft2232_buffer_size = 0;
 
@@ -1019,8 +1020,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't write MPSSE commands to FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
-                         ft2232_buffer_size, 
+               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+                         ft2232_buffer_size,
                          (int)bytes_written);
                ft2232_buffer_size = 0;
 
@@ -1031,8 +1032,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                                LOG_ERROR("couldn't read from FT2232");
                                exit(-1);
                        }
-                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
-                                 thisrun_read, 
+                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+                                 thisrun_read,
                                  (int)bytes_read);
                        receive_pointer += bytes_read;
                }
@@ -1129,8 +1130,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
-                 ft2232_buffer_size, 
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+                 ft2232_buffer_size,
                  (int)bytes_written);
        ft2232_buffer_size = 0;
 
@@ -1141,8 +1142,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't read from FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
-                         thisrun_read, 
+               LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+                         thisrun_read,
                          (int)bytes_read);
                receive_pointer += bytes_read;
        }
@@ -1588,7 +1589,7 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
        DEBUG_JTAG_IO("pathmove: %i states, current: %s  end: %s", num_states,
                        tap_state_name(tap_get_state()),
                        tap_state_name(path[num_states-1])
-                       );
+);
 
        /* only send the maximum buffer size that FT2232C can handle */
        predicted_size = 3 * CEIL(num_states, 7);
@@ -2163,6 +2164,15 @@ static int usbjtag_init(void)
                low_output    = 0x88;
                low_direction = 0x8b;
        }
+       else if (strcmp(ft2232_layout, "luminary_icdi") == 0)
+       {
+               nTRST = 0x0;
+               nTRSTnOE = 0x00;
+               nSRST = 0x20;
+               nSRSTnOE = 0x20;
+               low_output    = 0x88;
+               low_direction = 0xcb;
+       }
        else
        {
                LOG_ERROR("BUG: usbjtag_init called for unknown layout '%s'", ft2232_layout);