Support newer OSBDM firmware

[openocd.git] / src / jtag / drivers / osbdm.c

diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c
index 66dbf3de1d61bc08797f6a59ea02686caa53081d..15ffad97873cdb67cdd9ef30cc7016ab568a441a 100644 (file)
--- a/src/jtag/drivers/osbdm.c
+++ b/src/jtag/drivers/osbdm.c
@@ -130,8 +130,8 @@ static struct queue *queue_alloc(void)
 
 /* Lists of valid VID/PID pairs
  */
 
 /* Lists of valid VID/PID pairs
  */

-static const uint16_t osbdm_vid[] = { 0x15a2, 0x15a2, 0 };
-static const uint16_t osbdm_pid[] = { 0x0042, 0x0058, 0 };
+static const uint16_t osbdm_vid[] = { 0x15a2, 0x15a2, 0x15a2, 0 };
+static const uint16_t osbdm_pid[] = { 0x0042, 0x0058, 0x005e, 0 };

 
 struct osbdm {
        struct jtag_libusb_device_handle *devh; /* USB handle */
 
 struct osbdm {
        struct jtag_libusb_device_handle *devh; /* USB handle */


@@ -690,33 +690,12 @@ static int osbdm_init(void)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-static int osbdm_khz(int khz, int *speed)
-{
-       *speed = khz;
-       return ERROR_OK;
-}
-
-static int osbdm_speed(int speed)
-{
-       return ERROR_OK;
-}
-
-static int osbdm_speed_div(int speed, int *khz)
-{
-       *khz = speed;
-       return ERROR_OK;
-}
-

 struct jtag_interface osbdm_interface = {
        .name = "osbdm",
 
        .transports = jtag_only,
        .execute_queue = osbdm_execute_queue,
 
 struct jtag_interface osbdm_interface = {
        .name = "osbdm",
 
        .transports = jtag_only,
        .execute_queue = osbdm_execute_queue,
 

-       .khz = osbdm_khz,
-       .speed = osbdm_speed,
-       .speed_div = osbdm_speed_div,
-

        .init = osbdm_init,
        .quit = osbdm_quit
 };
        .init = osbdm_init,
        .quit = osbdm_quit
 };