Rename libusb_dev_handle to libusb_device_handle

diff --git a/TODO b/TODO
index fdc72e8..4957b0c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@ add some libusb_transfer flags:
 
 1.0 API style/naming points to reconsider
 =========================================
-devh in general
 config struct/function naming
 typedef _cb or _cb_fn or _cb_t?
 typedef as-is or pointers? libusb_dev_t rather than libusb_dev *?

diff --git a/examples/dpfp.c b/examples/dpfp.c
index 0c2806e..e8ff4c7 100644 (file)
--- a/examples/dpfp.c
+++ b/examples/dpfp.c
@@ -59,7 +59,7 @@ enum {
 };
 
 static int state = 0;
-static struct libusb_dev_handle *devh = NULL;
+static struct libusb_device_handle *devh = NULL;
 static unsigned char imgbuf[0x1b340];
 static unsigned char irqbuf[INTR_LENGTH];
 static struct libusb_transfer *img_transfer = NULL;

diff --git a/libusb/core.c b/libusb/core.c
index 8d68b9a..b9f0b3f 100644 (file)
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -464,9 +464,9 @@ API_EXPORTED struct libusb_config_descriptor *libusb_device_get_config(
        return dev->config;
 }
 
-API_EXPORTED struct libusb_dev_handle *libusb_open(struct libusb_device *dev)
+API_EXPORTED struct libusb_device_handle *libusb_open(struct libusb_device *dev)
 {
-       struct libusb_dev_handle *devh;
+       struct libusb_device_handle *devh;
        int fd;
        usbi_dbg("open %04x:%04x", dev->desc.idVendor, dev->desc.idProduct);
 
@@ -493,13 +493,13 @@ API_EXPORTED struct libusb_dev_handle *libusb_open(struct libusb_device *dev)
  * combination. has limitations and is hence not intended for use in "real
  * applications": if multiple devices have the same VID+PID it'll only
  * give you the first one, etc. */
-API_EXPORTED struct libusb_dev_handle *libusb_open_device_with_vid_pid(
+API_EXPORTED struct libusb_device_handle *libusb_open_device_with_vid_pid(
        uint16_t vendor_id, uint16_t product_id)
 {
        struct libusb_device **devs;
        struct libusb_device *found = NULL;
        struct libusb_device *dev;
-       struct libusb_dev_handle *devh;
+       struct libusb_device_handle *devh;
        size_t i = 0;
 
        if (libusb_get_device_list(&devs) < 0)
@@ -520,14 +520,14 @@ API_EXPORTED struct libusb_dev_handle *libusb_open_device_with_vid_pid(
        return devh;
 }
 
-static void do_close(struct libusb_dev_handle *devh)
+static void do_close(struct libusb_device_handle *devh)
 {
        usbi_remove_pollfd(devh->fd);
        close(devh->fd);
        libusb_device_unref(devh->dev);
 }
 
-API_EXPORTED void libusb_close(struct libusb_dev_handle *devh)
+API_EXPORTED void libusb_close(struct libusb_device_handle *devh)
 {
        if (!devh)
                return;
@@ -539,12 +539,12 @@ API_EXPORTED void libusb_close(struct libusb_dev_handle *devh)
 }
 
 API_EXPORTED struct libusb_device *libusb_devh_get_dev(
-       struct libusb_dev_handle *devh)
+       struct libusb_device_handle *devh)
 {
        return devh->dev;
 }
 
-API_EXPORTED int libusb_claim_interface(struct libusb_dev_handle *dev,
+API_EXPORTED int libusb_claim_interface(struct libusb_device_handle *dev,
        int iface)
 {
        int r;
@@ -556,7 +556,7 @@ API_EXPORTED int libusb_claim_interface(struct libusb_dev_handle *dev,
        return r;
 }
 
-API_EXPORTED int libusb_release_interface(struct libusb_dev_handle *dev,
+API_EXPORTED int libusb_release_interface(struct libusb_device_handle *dev,
        int iface)
 {
        int r;
@@ -585,7 +585,7 @@ API_EXPORTED int libusb_init(void)
 
 API_EXPORTED void libusb_exit(void)
 {
-       struct libusb_dev_handle *devh;
+       struct libusb_device_handle *devh;
        usbi_dbg("");
        if (!list_empty(&open_devs)) {
                usbi_dbg("naughty app left some devices open!\n");
@@ -596,7 +596,7 @@ API_EXPORTED void libusb_exit(void)
 
 API_EXPORTED size_t libusb_get_pollfds(struct libusb_pollfd **pollfds)
 {
-       struct libusb_dev_handle *devh;
+       struct libusb_device_handle *devh;
        struct libusb_pollfd *ret;
        size_t cnt = 0;
        size_t i = 0;

diff --git a/libusb/io.c b/libusb/io.c
index 522a010..bd362c7 100644 (file)
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -206,7 +206,7 @@ API_EXPORTED int libusb_submit_transfer(struct libusb_transfer *transfer)
        return submit_transfer(itransfer);
 }
 
-API_EXPORTED int libusb_cancel_transfer(struct libusb_dev_handle *devh,
+API_EXPORTED int libusb_cancel_transfer(struct libusb_device_handle *devh,
        struct libusb_transfer *transfer)
 {
        struct usbi_transfer *itransfer = TRANSFER_TO_PRIV(transfer);
@@ -219,7 +219,7 @@ API_EXPORTED int libusb_cancel_transfer(struct libusb_dev_handle *devh,
        return r;
 }
 
-API_EXPORTED int libusb_cancel_transfer_sync(struct libusb_dev_handle *devh,
+API_EXPORTED int libusb_cancel_transfer_sync(struct libusb_device_handle *devh,
        struct libusb_transfer *transfer)
 {
        struct usbi_transfer *itransfer = TRANSFER_TO_PRIV(transfer);
@@ -256,7 +256,7 @@ static void handle_transfer_completion(struct usbi_transfer *itransfer,
                transfer->callback(transfer);
 }
 
-static void handle_transfer_cancellation(struct libusb_dev_handle *devh,
+static void handle_transfer_cancellation(struct libusb_device_handle *devh,
        struct usbi_transfer *transfer)
 {
        /* if the URB is being cancelled synchronously, raise cancellation
@@ -281,7 +281,7 @@ static void handle_transfer_cancellation(struct libusb_dev_handle *devh,
        handle_transfer_completion(transfer, LIBUSB_TRANSFER_CANCELLED);
 }
 
-static int reap_for_devh(struct libusb_dev_handle *devh)
+static int reap_for_devh(struct libusb_device_handle *devh)
 {
        int r;
        struct usb_urb *urb;
@@ -406,7 +406,7 @@ static int handle_timeouts(void)
 
 static int poll_io(struct timeval *tv)
 {
-       struct libusb_dev_handle *devh;
+       struct libusb_device_handle *devh;
        int r;
        int maxfd = 0;
        fd_set writefds;

diff --git a/libusb/libusb.h b/libusb/libusb.h
index a7496f3..d9b5710 100644 (file)
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -183,8 +183,8 @@ struct libusb_control_setup {
 struct libusb_device;
 typedef struct libusb_device libusb_device;
 
-struct libusb_dev_handle;
-typedef struct libusb_dev_handle libusb_dev_handle;
+struct libusb_device_handle;
+typedef struct libusb_device_handle libusb_device_handle;
 
 enum libusb_transfer_status {
        LIBUSB_TRANSFER_SILENT_COMPLETION = 0,
@@ -198,7 +198,7 @@ struct libusb_transfer;
 typedef void (*libusb_transfer_cb_fn)(struct libusb_transfer *transfer);
 
 struct libusb_transfer {
-       libusb_dev_handle *dev_handle;
+       libusb_device_handle *dev_handle;
        unsigned char endpoint;
        unsigned char endpoint_type;
        unsigned int timeout;
@@ -222,13 +222,13 @@ struct libusb_config_descriptor *libusb_device_get_config(libusb_device *dev);
 libusb_device *libusb_device_ref(libusb_device *dev);
 void libusb_device_unref(libusb_device *dev);
 
-libusb_dev_handle *libusb_open(libusb_device *dev);
-void libusb_close(libusb_dev_handle *devh);
-libusb_device *libusb_devh_get_device(libusb_dev_handle *devh);
-int libusb_claim_interface(libusb_dev_handle *dev, int iface);
-int libusb_release_interface(libusb_dev_handle *dev, int iface);
+libusb_device_handle *libusb_open(libusb_device *dev);
+void libusb_close(libusb_device_handle *devh);
+libusb_device *libusb_devh_get_device(libusb_device_handle *devh);
+int libusb_claim_interface(libusb_device_handle *dev, int iface);
+int libusb_release_interface(libusb_device_handle *dev, int iface);
 
-libusb_dev_handle *libusb_open_device_with_vid_pid(uint16_t vendor_id,
+libusb_device_handle *libusb_open_device_with_vid_pid(uint16_t vendor_id,
        uint16_t product_id);
 
 /* async I/O */
@@ -262,14 +262,14 @@ void libusb_init_transfer(struct libusb_transfer *transfer);
 
 struct libusb_transfer *libusb_alloc_transfer(void);
 int libusb_submit_transfer(struct libusb_transfer *transfer);
-int libusb_cancel_transfer(libusb_dev_handle *devh,
+int libusb_cancel_transfer(libusb_device_handle *devh,
        struct libusb_transfer *transfer);
-int libusb_cancel_transfer_sync(libusb_dev_handle *devh,
+int libusb_cancel_transfer_sync(libusb_device_handle *devh,
        struct libusb_transfer *transfer);
 void libusb_free_transfer(struct libusb_transfer *transfer);
 
 static inline void libusb_fill_control_transfer(
-       struct libusb_transfer *transfer, libusb_dev_handle *dev_handle,
+       struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
        unsigned char *buffer, int length, libusb_transfer_cb_fn callback,
        void *user_data, unsigned int timeout)
 {
@@ -284,7 +284,7 @@ static inline void libusb_fill_control_transfer(
 }
 
 static inline void libusb_fill_bulk_transfer(struct libusb_transfer *transfer,
-       libusb_dev_handle *dev_handle, unsigned char endpoint,
+       libusb_device_handle *dev_handle, unsigned char endpoint,
        unsigned char *buffer, int length, libusb_transfer_cb_fn callback,
        void *user_data, unsigned int timeout)
 {
@@ -299,7 +299,7 @@ static inline void libusb_fill_bulk_transfer(struct libusb_transfer *transfer,
 }
 
 static inline void libusb_fill_interrupt_transfer(
-       struct libusb_transfer *transfer, libusb_dev_handle *dev_handle,
+       struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
        unsigned char endpoint, unsigned char *buffer, int length,
        libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout)
 {
@@ -315,14 +315,15 @@ static inline void libusb_fill_interrupt_transfer(
 
 /* sync I/O */
 
-int libusb_control_transfer(libusb_dev_handle *dev_handle,
+int libusb_control_transfer(libusb_device_handle *dev_handle,
        uint8_t request_type, uint8_t request, uint16_t value, uint16_t index,
        unsigned char *data, uint16_t length, unsigned int timeout);
 
-int libusb_bulk_transfer(libusb_dev_handle *dev_handle, unsigned char endpoint,
-       unsigned char *data, int length, int *actual_length, unsigned int timeout);
+int libusb_bulk_transfer(libusb_device_handle *dev_handle,
+       unsigned char endpoint, unsigned char *data, int length,
+       int *actual_length, unsigned int timeout);
 
-int libusb_interrupt_transfer(libusb_dev_handle *dev_handle,
+int libusb_interrupt_transfer(libusb_device_handle *dev_handle,
        unsigned char endpoint, unsigned char *data, int length,
        int *actual_length, unsigned int timeout);
 

diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index be0fa55..b6dc80f 100644 (file)
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -151,7 +151,7 @@ struct libusb_device {
        struct libusb_config_descriptor *config;
 };
 
-struct libusb_dev_handle {
+struct libusb_device_handle {
        struct list_head list;
        struct libusb_device *dev;
        int fd;

diff --git a/libusb/sync.c b/libusb/sync.c
index 2bcfc5b..720f6f9 100644 (file)
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -33,7 +33,7 @@ static void ctrl_transfer_cb(struct libusb_transfer *transfer)
        /* caller interprets result and frees transfer */
 }
 
-API_EXPORTED int libusb_control_transfer(libusb_dev_handle *dev_handle,
+API_EXPORTED int libusb_control_transfer(libusb_device_handle *dev_handle,
        uint8_t bRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
        unsigned char *data, uint16_t wLength, unsigned int timeout)
 {
@@ -102,7 +102,7 @@ static void bulk_transfer_cb(struct libusb_transfer *transfer)
        /* caller interprets results and frees transfer */
 }
 
-static int do_sync_bulk_transfer(struct libusb_dev_handle *dev_handle,
+static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
        unsigned char endpoint, unsigned char *buffer, int length,
        int *transferred, unsigned int timeout, unsigned char endpoint_type)
 {
@@ -150,7 +150,7 @@ static int do_sync_bulk_transfer(struct libusb_dev_handle *dev_handle,
 }
 
 /* FIXME: should transferred be the return value? */
-API_EXPORTED int libusb_bulk_transfer(struct libusb_dev_handle *dev_handle,
+API_EXPORTED int libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
        unsigned char endpoint, unsigned char *data, int length, int *transferred,
        unsigned int timeout)
 {
@@ -159,9 +159,9 @@ API_EXPORTED int libusb_bulk_transfer(struct libusb_dev_handle *dev_handle,
 }
 
 /* FIXME: do we need an interval param here? usbfs doesn't expose it? */
-API_EXPORTED int libusb_interrupt_transfer(struct libusb_dev_handle *dev_handle,
-       unsigned char endpoint, unsigned char *data, int length, int *transferred,
-       unsigned int timeout)
+API_EXPORTED int libusb_interrupt_transfer(
+       struct libusb_device_handle *dev_handle, unsigned char endpoint,
+       unsigned char *data, int length, int *transferred, unsigned int timeout)
 {
        return do_sync_bulk_transfer(dev_handle, endpoint, data, length,
                transferred, timeout, LIBUSB_ENDPOINT_TYPE_INTERRUPT);