drivers: libusb1_common code cleanup 33/5433/3
authorMarc Schink <dev@zapb.de>
Wed, 5 Feb 2020 14:50:31 +0000 (15:50 +0100)
committerOleksij Rempel <linux@rempel-privat.de>
Tue, 3 Mar 2020 07:24:33 +0000 (07:24 +0000)
Remove unncessary wrapper functions and 'jtag_' prefixes.

Change-Id: I0fd866ff1e1cf7386c4d58a808dfda2c1c0a1518
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5433
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
12 files changed:
src/jtag/aice/aice_usb.c
src/jtag/aice/aice_usb.h
src/jtag/drivers/ft232r.c
src/jtag/drivers/kitprog.c
src/jtag/drivers/libusb1_common.c
src/jtag/drivers/libusb1_common.h
src/jtag/drivers/opendous.c
src/jtag/drivers/openjtag.c
src/jtag/drivers/osbdm.c
src/jtag/drivers/stlink_usb.c
src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
src/jtag/drivers/usb_blaster/ublast_access.h

index 9e474134239d9db42d022d60abbfb0b773dcd000..8c3a629a037a1064b541eeef19d805d5b30b9fa1 100644 (file)
@@ -349,8 +349,8 @@ static void aice_unpack_dthmb(uint8_t *cmd_ack_code, uint8_t *target_id,
 /* calls the given usb_bulk_* function, allowing for the data to
  * trickle in with some timeouts  */
 static int usb_bulk_with_retries(
-                       int (*f)(jtag_libusb_device_handle *, int, char *, int, int, int *),
-                       jtag_libusb_device_handle *dev, int ep,
+                       int (*f)(libusb_device_handle *, int, char *, int, int, int *),
+                       libusb_device_handle *dev, int ep,
                        char *bytes, int size, int timeout, int *transferred)
 {
        int tries = 3, count = 0;
@@ -369,7 +369,7 @@ static int usb_bulk_with_retries(
        return ERROR_OK;
 }
 
-static int wrap_usb_bulk_write(jtag_libusb_device_handle *dev, int ep,
+static int wrap_usb_bulk_write(libusb_device_handle *dev, int ep,
                char *buff, int size, int timeout, int *transferred)
 {
 
@@ -379,7 +379,7 @@ static int wrap_usb_bulk_write(jtag_libusb_device_handle *dev, int ep,
        return 0;
 }
 
-static inline int usb_bulk_write_ex(jtag_libusb_device_handle *dev, int ep,
+static inline int usb_bulk_write_ex(libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout)
 {
        int tr = 0;
@@ -389,7 +389,7 @@ static inline int usb_bulk_write_ex(jtag_libusb_device_handle *dev, int ep,
        return tr;
 }
 
-static inline int usb_bulk_read_ex(jtag_libusb_device_handle *dev, int ep,
+static inline int usb_bulk_read_ex(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout)
 {
        int tr = 0;
@@ -2107,7 +2107,7 @@ static int aice_usb_open(struct aice_port_param_s *param)
 {
        const uint16_t vids[] = { param->vid, 0 };
        const uint16_t pids[] = { param->pid, 0 };
-       struct jtag_libusb_device_handle *devh;
+       struct libusb_device_handle *devh;
 
        if (jtag_libusb_open(vids, pids, NULL, &devh) != ERROR_OK)
                return ERROR_FAIL;
@@ -2125,7 +2125,7 @@ static int aice_usb_open(struct aice_port_param_s *param)
 
 #if IS_WIN32 == 0
 
-       jtag_libusb_reset_device(devh);
+       libusb_reset_device(devh);
 
 #if IS_DARWIN == 0
 
@@ -2146,8 +2146,8 @@ static int aice_usb_open(struct aice_port_param_s *param)
 #endif
 
        /* usb_set_configuration required under win32 */
-       jtag_libusb_set_configuration(devh, 0);
-       jtag_libusb_claim_interface(devh, 0);
+       libusb_set_configuration(devh, 0);
+       libusb_claim_interface(devh, 0);
 
        unsigned int aice_read_ep;
        unsigned int aice_write_ep;
index 15cc1f60d2b3280839ec45f7f2663965ec3f97b5..04021de3b22dd377215f7309126d93e5454b1a37 100644 (file)
@@ -93,7 +93,7 @@
 struct aice_usb_handler_s {
        unsigned int usb_read_ep;
        unsigned int usb_write_ep;
-       struct jtag_libusb_device_handle *usb_handle;
+       struct libusb_device_handle *usb_handle;
 };
 
 struct cache_info {
index c20367fc00f8360f3de1bc8485f668174d3b5681..8fe63bb35c0c821f3f60a9b5bc68b19817f83796 100644 (file)
@@ -71,7 +71,7 @@
 static char *ft232r_serial_desc;
 static uint16_t ft232r_vid = 0x0403; /* FTDI */
 static uint16_t ft232r_pid = 0x6001; /* FT232R */
-static jtag_libusb_device_handle *adapter;
+static struct libusb_device_handle *adapter;
 
 static uint8_t *ft232r_output;
 static size_t ft232r_output_len;
@@ -268,7 +268,7 @@ static int ft232r_init(void)
        else /* serial port will be restored after jtag: */
                libusb_set_auto_detach_kernel_driver(adapter, 1); /* 1: DONT_DETACH_SIO_MODULE */
 
-       if (jtag_libusb_claim_interface(adapter, 0)) {
+       if (libusb_claim_interface(adapter, 0)) {
                LOG_ERROR("unable to claim interface");
                return ERROR_JTAG_INIT_FAILED;
        }
@@ -330,7 +330,7 @@ static int ft232r_quit(void)
                }
        }
 
-       if (jtag_libusb_release_interface(adapter, 0) != 0)
+       if (libusb_release_interface(adapter, 0) != 0)
                LOG_ERROR("usb release interface failed");
 
        jtag_libusb_close(adapter);
index 7b339aa0baef715f6b88e7396d47d2f691352370..e26f5aa9248ab420d88815566658501ba2a40383 100644 (file)
@@ -95,7 +95,7 @@
 
 struct kitprog {
        hid_device *hid_handle;
-       struct jtag_libusb_device_handle *usb_handle;
+       struct libusb_device_handle *usb_handle;
        uint16_t packet_size;
        uint16_t packet_index;
        uint8_t *packet_buffer;
@@ -311,7 +311,7 @@ static int kitprog_usb_open(void)
        }
 
        /* Claim the KitProg Programmer (bulk transfer) interface */
-       if (jtag_libusb_claim_interface(kitprog_handle->usb_handle, 1) != ERROR_OK) {
+       if (libusb_claim_interface(kitprog_handle->usb_handle, 1) != ERROR_OK) {
                LOG_ERROR("Failed to claim KitProg Programmer (bulk transfer) interface");
                return ERROR_FAIL;
        }
index 0d4bcbab68072ddf586b5aa188d14719fc7a9695..607b6d4aa907b14359c51c1537d7d0461f8b9633 100644 (file)
@@ -125,12 +125,12 @@ static bool string_descriptor_equal(libusb_device_handle *device, uint8_t str_in
 
 int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
                const char *serial,
-               struct jtag_libusb_device_handle **out)
+               struct libusb_device_handle **out)
 {
        int cnt, idx, errCode;
        int retval = ERROR_FAIL;
        bool serial_mismatch = false;
-       struct jtag_libusb_device_handle *libusb_handle = NULL;
+       struct libusb_device_handle *libusb_handle = NULL;
 
        if (libusb_init(&jtag_libusb_context) < 0)
                return ERROR_FAIL;
@@ -180,7 +180,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
        return retval;
 }
 
-void jtag_libusb_close(jtag_libusb_device_handle *dev)
+void jtag_libusb_close(struct libusb_device_handle *dev)
 {
        /* Close device */
        libusb_close(dev);
@@ -188,7 +188,7 @@ void jtag_libusb_close(jtag_libusb_device_handle *dev)
        libusb_exit(jtag_libusb_context);
 }
 
-int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t requestType,
+int jtag_libusb_control_transfer(struct libusb_device_handle *dev, uint8_t requestType,
                uint8_t request, uint16_t wValue, uint16_t wIndex, char *bytes,
                uint16_t size, unsigned int timeout)
 {
@@ -203,7 +203,7 @@ int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t request
        return transferred;
 }
 
-int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
+int jtag_libusb_bulk_write(struct libusb_device_handle *dev, int ep, char *bytes,
                           int size, int timeout, int *transferred)
 {
        int ret;
@@ -220,7 +220,7 @@ int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
        return ERROR_OK;
 }
 
-int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
+int jtag_libusb_bulk_read(struct libusb_device_handle *dev, int ep, char *bytes,
                          int size, int timeout, int *transferred)
 {
        int ret;
@@ -237,10 +237,10 @@ int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
        return ERROR_OK;
 }
 
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
+int jtag_libusb_set_configuration(struct libusb_device_handle *devh,
                int configuration)
 {
-       struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
+       struct libusb_device *udev = libusb_get_device(devh);
        int retCode = -99;
 
        struct libusb_config_descriptor *config = NULL;
@@ -265,12 +265,12 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
        return retCode;
 }
 
-int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
+int jtag_libusb_choose_interface(struct libusb_device_handle *devh,
                unsigned int *usb_read_ep,
                unsigned int *usb_write_ep,
                int bclass, int subclass, int protocol, int trans_type)
 {
-       struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
+       struct libusb_device *udev = libusb_get_device(devh);
        const struct libusb_interface *inter;
        const struct libusb_interface_descriptor *interdesc;
        const struct libusb_endpoint_descriptor *epdesc;
@@ -317,7 +317,7 @@ int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
        return ERROR_FAIL;
 }
 
-int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
+int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid)
 {
        struct libusb_device_descriptor dev_desc;
 
index 34be691f530cb8170a1b674ccde3886015344068..b132e26ae6ca5a1b38882c139284e19bc2945ad9 100644 (file)
 
 #include <libusb.h>
 
-#define jtag_libusb_device                     libusb_device
-#define jtag_libusb_device_handle              libusb_device_handle
-#define jtag_libusb_device_descriptor          libusb_device_descriptor
-#define jtag_libusb_interface                  libusb_interface
-#define jtag_libusb_interface_descriptor       libusb_interface_descriptor
-#define jtag_libusb_endpoint_descriptor                libusb_endpoint_descriptor
-#define jtag_libusb_config_descriptor          libusb_config_descriptor
-
-#define jtag_libusb_reset_device(dev)          libusb_reset_device(dev)
-#define jtag_libusb_get_device(devh)           libusb_get_device(devh)
-
-static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
-               int iface)
-{
-       return libusb_claim_interface(devh, iface);
-};
-
-static inline int jtag_libusb_release_interface(jtag_libusb_device_handle *devh,
-               int iface)
-{
-       return libusb_release_interface(devh, iface);
-}
-
 int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
                const char *serial,
-               struct jtag_libusb_device_handle **out);
-void jtag_libusb_close(jtag_libusb_device_handle *dev);
-int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev,
+               struct libusb_device_handle **out);
+void jtag_libusb_close(struct libusb_device_handle *dev);
+int jtag_libusb_control_transfer(struct libusb_device_handle *dev,
                uint8_t requestType, uint8_t request, uint16_t wValue,
                uint16_t wIndex, char *bytes,   uint16_t size, unsigned int timeout);
-int jtag_libusb_bulk_write(struct jtag_libusb_device_handle *dev, int ep,
+int jtag_libusb_bulk_write(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_bulk_read(struct jtag_libusb_device_handle *dev, int ep,
+int jtag_libusb_bulk_read(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
+int jtag_libusb_set_configuration(struct libusb_device_handle *devh,
                int configuration);
 /**
  * Find the first interface optionally matching class, subclass and
@@ -72,10 +49,10 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
  * @param trans_type `bmAttributes Bits 0..1 Transfer type` to match, or -1 to ignore this field.
  * @returns Returns ERROR_OK on success, ERROR_FAIL otherwise.
  */
-int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
+int jtag_libusb_choose_interface(struct libusb_device_handle *devh,
                unsigned int *usb_read_ep,
                unsigned int *usb_write_ep,
                int bclass, int subclass, int protocol, int trans_type);
-int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid);
+int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid);
 
 #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB1_COMMON_H */
index d5c279b08c2465152ec8fbf23687ce59c250d692..18d9543083baa2a18bc655edfc6448a477fccc89 100644 (file)
@@ -134,7 +134,7 @@ static void opendous_tap_append_scan(int length, uint8_t *buffer, struct scan_co
 
 /* opendous lowlevel functions */
 struct opendous_jtag {
-       struct jtag_libusb_device_handle *usb_handle;
+       struct libusb_device_handle *usb_handle;
 };
 
 static struct opendous_jtag *opendous_usb_open(void);
@@ -714,12 +714,12 @@ struct opendous_jtag *opendous_usb_open(void)
 {
        struct opendous_jtag *result;
 
-       struct jtag_libusb_device_handle *devh;
+       struct libusb_device_handle *devh;
        if (jtag_libusb_open(opendous_probe->VID, opendous_probe->PID, NULL, &devh) != ERROR_OK)
                return NULL;
 
        jtag_libusb_set_configuration(devh, 0);
-       jtag_libusb_claim_interface(devh, 0);
+       libusb_claim_interface(devh, 0);
 
        result = malloc(sizeof(*result));
        result->usb_handle = devh;
index c42b620bbf54897c464d0d4d54c8bc7847b6d036..3bfcccf6eb485a20f4a3a8314ff34e380ed96bfc 100644 (file)
@@ -111,7 +111,7 @@ static uint8_t usb_rx_buf[OPENJTAG_BUFFER_SIZE];
 static struct openjtag_scan_result openjtag_scan_result_buffer[OPENJTAG_MAX_PENDING_RESULTS];
 static int openjtag_scan_result_count;
 
-static jtag_libusb_device_handle *usbh;
+static struct libusb_device_handle *usbh;
 
 /* CY7C65215 model only */
 #define CY7C65215_JTAG_REQUEST  0x40  /* bmRequestType: vendor host-to-device */
index 3323557b7547f684179f3ec578cb9e2765beabe2..30c46234e7caf88fc51dd98bb572fe309fccbd6e 100644 (file)
@@ -132,7 +132,7 @@ 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 libusb_device_handle *devh; /* USB handle */
        uint8_t buffer[OSBDM_USB_BUFSIZE]; /* Data to send and receive */
        int count; /* Count data to send and to read */
 };
@@ -377,7 +377,7 @@ static int osbdm_open(struct osbdm *osbdm)
        if (jtag_libusb_open(osbdm_vid, osbdm_pid, NULL, &osbdm->devh) != ERROR_OK)
                return ERROR_FAIL;
 
-       if (jtag_libusb_claim_interface(osbdm->devh, 0) != ERROR_OK)
+       if (libusb_claim_interface(osbdm->devh, 0) != ERROR_OK)
                return ERROR_FAIL;
 
        return ERROR_OK;
index da1d1b56492c8d9eb0c7d518b7e5f976d3586247..a186dfdef414951aeb1b7b6b3ec6c2c2d686d8e5 100644 (file)
@@ -111,7 +111,7 @@ struct stlink_usb_version {
 /** */
 struct stlink_usb_handle_s {
        /** */
-       struct jtag_libusb_device_handle *fd;
+       struct libusb_device_handle *fd;
        /** */
        struct libusb_transfer *trans;
        /** */
@@ -451,7 +451,7 @@ struct jtag_xfer {
 };
 
 static int jtag_libusb_bulk_transfer_n(
-               jtag_libusb_device_handle * dev_handle,
+               struct libusb_device_handle *dev_handle,
                struct jtag_xfer *transfers,
                size_t n_transfers,
                int timeout)
@@ -2785,7 +2785,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 
                jtag_libusb_set_configuration(h->fd, 0);
 
-               if (jtag_libusb_claim_interface(h->fd, 0) != ERROR_OK) {
+               if (libusb_claim_interface(h->fd, 0) != ERROR_OK) {
                        LOG_DEBUG("claim interface failed");
                        goto error_open;
                }
@@ -2794,7 +2794,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
                h->rx_ep = STLINK_RX_EP;
 
                uint16_t pid;
-               if (jtag_libusb_get_pid(jtag_libusb_get_device(h->fd), &pid) != ERROR_OK) {
+               if (jtag_libusb_get_pid(libusb_get_device(h->fd), &pid) != ERROR_OK) {
                        LOG_DEBUG("libusb_get_pid failed");
                        goto error_open;
                }
@@ -2838,13 +2838,13 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
                        LOG_ERROR("read version failed");
                        goto error_open;
                } else {
-                       err = jtag_libusb_release_interface(h->fd, 0);
+                       err = libusb_release_interface(h->fd, 0);
                        if (err != ERROR_OK) {
                                LOG_ERROR("release interface failed");
                                goto error_open;
                        }
 
-                       err = jtag_libusb_reset_device(h->fd);
+                       err = libusb_reset_device(h->fd);
                        if (err != ERROR_OK) {
                                LOG_ERROR("reset device failed");
                                goto error_open;
index fb1e4440a5a4aa89ba23daa05e38d6f18b8fad23..34fbb89525c68eafa6a410f28f8fb30744fcf32a 100644 (file)
@@ -72,7 +72,7 @@ static int ublast2_libusb_write(struct ublast_lowlevel *low, uint8_t *buf,
 
 }
 
-static int ublast2_write_firmware_section(struct jtag_libusb_device_handle *libusb_dev,
+static int ublast2_write_firmware_section(struct libusb_device_handle *libusb_dev,
                                   struct image *firmware_image, int section_index)
 {
        uint16_t chunk_size;
@@ -123,7 +123,7 @@ static int ublast2_write_firmware_section(struct jtag_libusb_device_handle *libu
        return ERROR_OK;
 }
 
-static int load_usb_blaster_firmware(struct jtag_libusb_device_handle *libusb_dev,
+static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
                                     struct ublast_lowlevel *low)
 {
        struct image ublast2_firmware_image;
@@ -191,7 +191,7 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 {
        const uint16_t vids[] = { low->ublast_vid_uninit, 0 };
        const uint16_t pids[] = { low->ublast_pid_uninit, 0 };
-       struct jtag_libusb_device_handle *temp;
+       struct libusb_device_handle *temp;
        bool renumeration = false;
        int ret;
 
index 252f003a964fc41ae7537ff6d6a0b6d7f5bdc0d4..5178ae10bac0caa37d93af86a7a57b6f925554ea 100644 (file)
@@ -39,7 +39,7 @@ struct ublast_lowlevel {
        uint16_t ublast_vid_uninit;
        uint16_t ublast_pid_uninit;
        char *ublast_device_desc;
-       struct jtag_libusb_device_handle *libusb_dev;
+       struct libusb_device_handle *libusb_dev;
        char *firmware_path;
 
        int (*write)(struct ublast_lowlevel *low, uint8_t *buf, int size,

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)