From d1bd234f7e1b1ff4168b8f605e2038e87a0e361f Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 21 Jul 2011 22:34:12 -0600 Subject: [PATCH] Fix #64 use of reserved identifiers throughout libusb --- libusb/core.c | 2 +- libusb/io.c | 18 ++--- libusb/libusb.h | 4 +- libusb/libusbi.h | 14 ++-- libusb/os/darwin_usb.c | 40 +++++------ libusb/os/darwin_usb.h | 2 +- libusb/os/linux_usbfs.c | 88 +++++++++++------------ libusb/os/linux_usbfs.h | 4 +- libusb/os/poll_posix.h | 6 +- libusb/os/threads_posix.h | 6 +- libusb/os/threads_windows.h | 6 +- libusb/os/windows_usb.c | 170 ++++++++++++++++++++++---------------------- libusb/os/windows_usb.h | 52 +++++++------- 13 files changed, 206 insertions(+), 206 deletions(-) diff --git a/libusb/core.c b/libusb/core.c index 5309218..f1c515c 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -1032,7 +1032,7 @@ static void do_close(struct libusb_context *ctx, /* safe iteration because transfers may be being deleted */ list_for_each_entry_safe(itransfer, tmp, &ctx->flying_transfers, list, struct usbi_transfer) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); if (transfer->dev_handle != dev_handle) continue; diff --git a/libusb/io.c b/libusb/io.c index d0112a1..71008bf 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -1085,7 +1085,7 @@ static int calculate_timeout(struct usbi_transfer *transfer) int r; struct timespec current_time; unsigned int timeout = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout; + USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout; if (!timeout) return 0; @@ -1198,7 +1198,7 @@ struct libusb_transfer * LIBUSB_CALL libusb_alloc_transfer( memset(itransfer, 0, alloc_size); itransfer->num_iso_packets = iso_packets; usbi_mutex_init(&itransfer->lock, NULL); - return __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + return USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); } /** \ingroup asyncio @@ -1227,7 +1227,7 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer) if (transfer->flags & LIBUSB_TRANSFER_FREE_BUFFER && transfer->buffer) free(transfer->buffer); - itransfer = __LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); usbi_mutex_destroy(&itransfer->lock); free(itransfer); } @@ -1246,7 +1246,7 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) { struct libusb_context *ctx = TRANSFER_CTX(transfer); struct usbi_transfer *itransfer = - __LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); int r; int first; @@ -1303,7 +1303,7 @@ out: int API_EXPORTED libusb_cancel_transfer(struct libusb_transfer *transfer) { struct usbi_transfer *itransfer = - __LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); int r; usbi_dbg(""); @@ -1360,7 +1360,7 @@ static int arm_timerfd_for_next_timeout(struct libusb_context *ctx) int r; const struct itimerspec it = { {0, 0}, { cur_tv->tv_sec, cur_tv->tv_usec * 1000 } }; - usbi_dbg("next timeout originally %dms", __USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout); + usbi_dbg("next timeout originally %dms", USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout); r = timerfd_settime(ctx->timerfd, TFD_TIMER_ABSTIME, &it, NULL); if (r < 0) return LIBUSB_ERROR_OTHER; @@ -1393,7 +1393,7 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, enum libusb_transfer_status status) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = TRANSFER_CTX(transfer); uint8_t flags; int r; @@ -1709,7 +1709,7 @@ int API_EXPORTED libusb_wait_for_event(libusb_context *ctx, struct timeval *tv) static void handle_timeout(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); int r; itransfer->flags |= USBI_TRANSFER_TIMED_OUT; @@ -2320,7 +2320,7 @@ void usbi_handle_disconnect(struct libusb_device_handle *handle) usbi_mutex_lock(&HANDLE_CTX(handle)->flying_transfers_lock); to_cancel = NULL; list_for_each_entry(cur, &HANDLE_CTX(handle)->flying_transfers, list, struct usbi_transfer) - if (__USBI_TRANSFER_TO_LIBUSB_TRANSFER(cur)->dev_handle == handle) { + if (USBI_TRANSFER_TO_LIBUSB_TRANSFER(cur)->dev_handle == handle) { to_cancel = cur; break; } diff --git a/libusb/libusb.h b/libusb/libusb.h index 619a65a..425ad0e 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSB_H__ -#define __LIBUSB_H__ +#ifndef LIBUSB_H +#define LIBUSB_H #ifdef _MSC_VER /* on MS environments, the inline keyword is available in C++ only */ diff --git a/libusb/libusbi.h b/libusb/libusbi.h index 564ee3e..f1b12d0 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSBI_H__ -#define __LIBUSBI_H__ +#ifndef LIBUSBI_H +#define LIBUSBI_H #include @@ -109,8 +109,8 @@ static inline void list_del(struct list_head *entry) } #define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) + const typeof( ((type *)0)->member ) *mptr = (ptr); \ + (type *)( (char *)mptr - offsetof(type,member) );}) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) @@ -186,7 +186,7 @@ static inline void usbi_dbg(const char *format, ...) #define HANDLE_CTX(handle) (DEVICE_CTX((handle)->dev)) #define TRANSFER_CTX(transfer) (HANDLE_CTX((transfer)->dev_handle)) #define ITRANSFER_CTX(transfer) \ - (TRANSFER_CTX(__USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer))) + (TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer))) /* Internal abstractions for thread synchronization and poll */ #if defined(THREADS_POSIX) @@ -342,10 +342,10 @@ enum usbi_transfer_flags { USBI_TRANSFER_DEVICE_DISAPPEARED = 1 << 3, }; -#define __USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \ +#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \ ((struct libusb_transfer *)(((unsigned char *)(transfer)) \ + sizeof(struct usbi_transfer))) -#define __LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \ +#define LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \ ((struct usbi_transfer *)(((unsigned char *)(transfer)) \ - sizeof(struct usbi_transfer))) diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index b021649..e1cddc5 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -122,7 +122,7 @@ static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, ui struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv; /* current interface */ - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; int8_t i, iface; @@ -948,7 +948,7 @@ static int get_endpoints (struct libusb_device_handle *dev_handle, int iface) { struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv; /* current interface */ - struct __darwin_interface *cInterface = &priv->interfaces[iface]; + struct darwin_interface *cInterface = &priv->interfaces[iface]; kern_return_t kresult; @@ -996,7 +996,7 @@ static int darwin_claim_interface(struct libusb_device_handle *dev_handle, int i SInt32 score; /* current interface */ - struct __darwin_interface *cInterface = &priv->interfaces[iface]; + struct darwin_interface *cInterface = &priv->interfaces[iface]; kresult = darwin_get_interface (dpriv->device, iface, &usbInterface); if (kresult != kIOReturnSuccess) @@ -1094,7 +1094,7 @@ static int darwin_release_interface(struct libusb_device_handle *dev_handle, int IOReturn kresult; /* current interface */ - struct __darwin_interface *cInterface = &priv->interfaces[iface]; + struct darwin_interface *cInterface = &priv->interfaces[iface]; /* Check to see if an interface is open */ if (!cInterface->interface) @@ -1127,7 +1127,7 @@ static int darwin_set_interface_altsetting(struct libusb_device_handle *dev_hand IOReturn kresult; /* current interface */ - struct __darwin_interface *cInterface = &priv->interfaces[iface]; + struct darwin_interface *cInterface = &priv->interfaces[iface]; if (!cInterface->interface) return LIBUSB_ERROR_NO_DEVICE; @@ -1152,7 +1152,7 @@ static int darwin_clear_halt(struct libusb_device_handle *dev_handle, unsigned c struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv; /* current interface */ - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; uint8_t pipeRef, iface; IOReturn kresult; @@ -1227,7 +1227,7 @@ static void darwin_destroy_device(struct libusb_device *dev) { } static int submit_bulk_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; IOReturn ret; @@ -1237,7 +1237,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) { uint8_t direction, number, interval, pipeRef, iface; uint16_t maxPacketSize; - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; /* are we reading or writing? */ is_read = transfer->endpoint & LIBUSB_ENDPOINT_IN; @@ -1283,7 +1283,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) { } static int submit_iso_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; @@ -1294,7 +1294,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) { AbsoluteTime atTime; int i; - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; /* are we reading or writing? */ is_read = transfer->endpoint & LIBUSB_ENDPOINT_IN; @@ -1364,7 +1364,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) { } static int submit_control_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_control_setup *setup = (struct libusb_control_setup *) transfer->buffer; struct darwin_device_priv *dpriv = (struct darwin_device_priv *)transfer->dev_handle->dev->os_priv; struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; @@ -1391,7 +1391,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { /* all transfers in libusb-1.0 are async */ if (transfer->endpoint) { - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; uint8_t pipeRef, iface; if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { @@ -1414,7 +1414,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { } static int darwin_submit_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -1431,7 +1431,7 @@ static int darwin_submit_transfer(struct usbi_transfer *itransfer) { } static int cancel_control_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_device_priv *dpriv = (struct darwin_device_priv *)transfer->dev_handle->dev->os_priv; IOReturn kresult; @@ -1443,9 +1443,9 @@ static int cancel_control_transfer(struct usbi_transfer *itransfer) { } static int darwin_abort_transfers (struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; - struct __darwin_interface *cInterface; + struct darwin_interface *cInterface; uint8_t pipeRef, iface; IOReturn kresult; @@ -1476,7 +1476,7 @@ static int darwin_abort_transfers (struct usbi_transfer *itransfer) { } static int darwin_cancel_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -1492,7 +1492,7 @@ static int darwin_cancel_transfer(struct usbi_transfer *itransfer) { } static void darwin_clear_transfer_priv (struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); if (transfer->type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS && tpriv->isoc_framelist) { @@ -1503,7 +1503,7 @@ static void darwin_clear_transfer_priv (struct usbi_transfer *itransfer) { static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0) { struct usbi_transfer *itransfer = (struct usbi_transfer *)refcon; - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; UInt32 message; @@ -1544,7 +1544,7 @@ static int darwin_transfer_status (struct usbi_transfer *itransfer, kern_return_ } static void darwin_handle_callback (struct usbi_transfer *itransfer, kern_return_t result, UInt32 io_size) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); int isIsoc = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS == transfer->type; int isBulk = LIBUSB_TRANSFER_TYPE_BULK == transfer->type; diff --git a/libusb/os/darwin_usb.h b/libusb/os/darwin_usb.h index 9ffd6df..59d0a69 100644 --- a/libusb/os/darwin_usb.h +++ b/libusb/os/darwin_usb.h @@ -135,7 +135,7 @@ struct darwin_device_handle_priv { CFRunLoopSourceRef cfSource; int fds[2]; - struct __darwin_interface { + struct darwin_interface { usb_interface_t **interface; uint8_t num_endpoints; CFRunLoopSourceRef cfSource; diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index 575ecf0..7ebbfc0 100644 --- a/libusb/os/linux_usbfs.c +++ b/libusb/os/linux_usbfs.c @@ -140,18 +140,18 @@ struct linux_transfer_priv { int iso_packet_offset; }; -static void __get_usbfs_path(struct libusb_device *dev, char *path) +static void _get_usbfs_path(struct libusb_device *dev, char *path) { snprintf(path, PATH_MAX, "%s/%03d/%03d", usbfs_path, dev->bus_number, dev->device_address); } -static struct linux_device_priv *__device_priv(struct libusb_device *dev) +static struct linux_device_priv *_device_priv(struct libusb_device *dev) { return (struct linux_device_priv *) dev->os_priv; } -static struct linux_device_handle_priv *__device_handle_priv( +static struct linux_device_handle_priv *_device_handle_priv( struct libusb_device_handle *handle) { return (struct linux_device_handle_priv *) handle->os_priv; @@ -358,16 +358,16 @@ static int op_init(struct libusb_context *ctx) static int usbfs_get_device_descriptor(struct libusb_device *dev, unsigned char *buffer) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); /* return cached copy */ memcpy(buffer, priv->dev_descriptor, DEVICE_DESC_LENGTH); return 0; } -static int __open_sysfs_attr(struct libusb_device *dev, const char *attr) +static int _open_sysfs_attr(struct libusb_device *dev, const char *attr) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); char filename[PATH_MAX]; int fd; @@ -427,7 +427,7 @@ static int sysfs_get_device_descriptor(struct libusb_device *dev, /* sysfs provides access to an in-memory copy of the device descriptor, * so we use that rather than keeping our own copy */ - fd = __open_sysfs_attr(dev, "descriptors"); + fd = _open_sysfs_attr(dev, "descriptors"); if (fd < 0) return fd; @@ -458,7 +458,7 @@ static int op_get_device_descriptor(struct libusb_device *dev, static int usbfs_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); if (!priv->config_descriptor) return LIBUSB_ERROR_NOT_FOUND; /* device is unconfigured */ @@ -476,7 +476,7 @@ static int sysfs_get_active_config(struct libusb_device *dev, int *config) int fd; ssize_t r; - fd = __open_sysfs_attr(dev, "bConfigurationValue"); + fd = _open_sysfs_attr(dev, "bConfigurationValue"); if (fd < 0) return fd; @@ -562,7 +562,7 @@ static int sysfs_get_active_config_descriptor(struct libusb_device *dev, /* sysfs provides access to an in-memory copy of the device descriptor, * so we use that rather than keeping our own copy */ - fd = __open_sysfs_attr(dev, "descriptors"); + fd = _open_sysfs_attr(dev, "descriptors"); if (fd < 0) return fd; @@ -696,7 +696,7 @@ static int op_get_config_descriptor(struct libusb_device *dev, * in the descriptors file. but its kinda hard to detect if the kernel * is sufficiently new. */ - __get_usbfs_path(dev, filename); + _get_usbfs_path(dev, filename); fd = open(filename, O_RDONLY); if (fd < 0) { usbi_err(DEVICE_CTX(dev), @@ -715,7 +715,7 @@ static int op_get_config_descriptor(struct libusb_device *dev, static int cache_active_config(struct libusb_device *dev, int fd, int active_config) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); struct libusb_config_descriptor config; unsigned char tmp[8]; unsigned char *buf; @@ -789,7 +789,7 @@ static int usbfs_get_active_config(struct libusb_device *dev, int fd) static int initialize_device(struct libusb_device *dev, uint8_t busnum, uint8_t devaddr, const char *sysfs_dir) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); unsigned char *dev_buf; char path[PATH_MAX]; int fd, speed; @@ -838,7 +838,7 @@ static int initialize_device(struct libusb_device *dev, uint8_t busnum, device_configured = 0; } - __get_usbfs_path(dev, path); + _get_usbfs_path(dev, path); fd = open(path, O_RDWR); if (fd < 0 && errno == EACCES) { fd = open(path, O_RDONLY); @@ -1137,10 +1137,10 @@ static int op_get_device_list(struct libusb_context *ctx, static int op_open(struct libusb_device_handle *handle) { - struct linux_device_handle_priv *hpriv = __device_handle_priv(handle); + struct linux_device_handle_priv *hpriv = _device_handle_priv(handle); char filename[PATH_MAX]; - __get_usbfs_path(handle->dev, filename); + _get_usbfs_path(handle->dev, filename); hpriv->fd = open(filename, O_RDWR); if (hpriv->fd < 0) { if (errno == EACCES) { @@ -1163,7 +1163,7 @@ static int op_open(struct libusb_device_handle *handle) static void op_close(struct libusb_device_handle *dev_handle) { - int fd = __device_handle_priv(dev_handle)->fd; + int fd = _device_handle_priv(dev_handle)->fd; usbi_remove_pollfd(HANDLE_CTX(dev_handle), fd); close(fd); } @@ -1187,8 +1187,8 @@ static int op_get_configuration(struct libusb_device_handle *handle, static int op_set_configuration(struct libusb_device_handle *handle, int config) { - struct linux_device_priv *priv = __device_priv(handle->dev); - int fd = __device_handle_priv(handle)->fd; + struct linux_device_priv *priv = _device_priv(handle->dev); + int fd = _device_handle_priv(handle)->fd; int r = ioctl(fd, IOCTL_USBFS_SETCONFIG, &config); if (r) { if (errno == EINVAL) @@ -1222,7 +1222,7 @@ static int op_set_configuration(struct libusb_device_handle *handle, int config) static int op_claim_interface(struct libusb_device_handle *handle, int iface) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; int r = ioctl(fd, IOCTL_USBFS_CLAIMINTF, &iface); if (r) { if (errno == ENOENT) @@ -1241,7 +1241,7 @@ static int op_claim_interface(struct libusb_device_handle *handle, int iface) static int op_release_interface(struct libusb_device_handle *handle, int iface) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; int r = ioctl(fd, IOCTL_USBFS_RELEASEINTF, &iface); if (r) { if (errno == ENODEV) @@ -1257,7 +1257,7 @@ static int op_release_interface(struct libusb_device_handle *handle, int iface) static int op_set_interface(struct libusb_device_handle *handle, int iface, int altsetting) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; struct usbfs_setinterface setintf; int r; @@ -1281,7 +1281,7 @@ static int op_set_interface(struct libusb_device_handle *handle, int iface, static int op_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; unsigned int _endpoint = endpoint; int r = ioctl(fd, IOCTL_USBFS_CLEAR_HALT, &_endpoint); if (r) { @@ -1300,7 +1300,7 @@ static int op_clear_halt(struct libusb_device_handle *handle, static int op_reset_device(struct libusb_device_handle *handle) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; int i, r, ret = 0; /* Doing a device reset will cause the usbfs driver to get unbound @@ -1347,7 +1347,7 @@ out: static int op_kernel_driver_active(struct libusb_device_handle *handle, int interface) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; struct usbfs_getdriver getdrv; int r; @@ -1370,7 +1370,7 @@ static int op_kernel_driver_active(struct libusb_device_handle *handle, static int op_detach_kernel_driver(struct libusb_device_handle *handle, int interface) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; struct usbfs_ioctl command; int r; @@ -1398,7 +1398,7 @@ static int op_detach_kernel_driver(struct libusb_device_handle *handle, static int op_attach_kernel_driver(struct libusb_device_handle *handle, int interface) { - int fd = __device_handle_priv(handle)->fd; + int fd = _device_handle_priv(handle)->fd; struct usbfs_ioctl command; int r; @@ -1429,7 +1429,7 @@ static int op_attach_kernel_driver(struct libusb_device_handle *handle, static void op_destroy_device(struct libusb_device *dev) { - struct linux_device_priv *priv = __device_priv(dev); + struct linux_device_priv *priv = _device_priv(dev); if (!sysfs_has_descriptors) { if (priv->dev_descriptor) free(priv->dev_descriptor); @@ -1444,11 +1444,11 @@ static void op_destroy_device(struct libusb_device *dev) static int discard_urbs(struct usbi_transfer *itransfer, int first, int last_plus_one) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct linux_device_handle_priv *dpriv = - __device_handle_priv(transfer->dev_handle); + _device_handle_priv(transfer->dev_handle); int i, ret = 0; struct usbfs_urb *urb; @@ -1494,10 +1494,10 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, unsigned char urb_type) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct linux_device_handle_priv *dpriv = - __device_handle_priv(transfer->dev_handle); + _device_handle_priv(transfer->dev_handle); struct usbfs_urb *urbs; int is_out = (transfer->endpoint & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT; @@ -1611,10 +1611,10 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, static int submit_iso_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct linux_device_handle_priv *dpriv = - __device_handle_priv(transfer->dev_handle); + _device_handle_priv(transfer->dev_handle); struct usbfs_urb **urbs; size_t alloc_size; int num_packets = transfer->num_iso_packets; @@ -1762,9 +1762,9 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_device_handle_priv *dpriv = - __device_handle_priv(transfer->dev_handle); + _device_handle_priv(transfer->dev_handle); struct usbfs_urb *urb; int r; @@ -1805,7 +1805,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) static int op_submit_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -1827,7 +1827,7 @@ static int op_cancel_transfer(struct usbi_transfer *itransfer) { struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_BULK: @@ -1854,7 +1854,7 @@ static int op_cancel_transfer(struct usbi_transfer *itransfer) static void op_clear_transfer_priv(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); switch (transfer->type) { @@ -1877,7 +1877,7 @@ static int handle_bulk_completion(struct usbi_transfer *itransfer, struct usbfs_urb *urb) { struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); int urb_idx = urb - tpriv->urbs; usbi_mutex_lock(&itransfer->lock); @@ -2010,7 +2010,7 @@ static int handle_iso_completion(struct usbi_transfer *itransfer, struct usbfs_urb *urb) { struct libusb_transfer *transfer = - __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); int num_urbs = tpriv->num_urbs; int urb_idx = 0; @@ -2157,7 +2157,7 @@ static int handle_control_completion(struct usbi_transfer *itransfer, static int reap_for_handle(struct libusb_device_handle *handle) { - struct linux_device_handle_priv *hpriv = __device_handle_priv(handle); + struct linux_device_handle_priv *hpriv = _device_handle_priv(handle); int r; struct usbfs_urb *urb; struct usbi_transfer *itransfer; @@ -2176,7 +2176,7 @@ static int reap_for_handle(struct libusb_device_handle *handle) } itransfer = urb->usercontext; - transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); usbi_dbg("urb type=%d status=%d transferred=%d", urb->type, urb->status, urb->actual_length); @@ -2213,7 +2213,7 @@ static int op_handle_events(struct libusb_context *ctx, num_ready--; list_for_each_entry(handle, &ctx->open_devs, list, struct libusb_device_handle) { - hpriv = __device_handle_priv(handle); + hpriv = _device_handle_priv(handle); if (hpriv->fd == pollfd->fd) break; } diff --git a/libusb/os/linux_usbfs.h b/libusb/os/linux_usbfs.h index bd02edc..93e7f31 100644 --- a/libusb/os/linux_usbfs.h +++ b/libusb/os/linux_usbfs.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSB_USBFS_H__ -#define __LIBUSB_USBFS_H__ +#ifndef LIBUSB_USBFS_H +#define LIBUSB_USBFS_H #define SYSFS_DEVICE_PATH "/sys/bus/usb/devices" diff --git a/libusb/os/poll_posix.h b/libusb/os/poll_posix.h index f8c9e21..0e5e7f5 100644 --- a/libusb/os/poll_posix.h +++ b/libusb/os/poll_posix.h @@ -1,5 +1,5 @@ -#ifndef __LIBUSB_POLL_POSIX_H__ -#define __LIBUSB_POLL_POSIX_H__ +#ifndef LIBUSB_POLL_POSIX_H +#define LIBUSB_POLL_POSIX_H #define usbi_write write #define usbi_read read @@ -7,4 +7,4 @@ #define usbi_pipe pipe #define usbi_poll poll -#endif /* __LIBUSB_POLL_POSIX_H__ */ +#endif /* LIBUSB_POLL_POSIX_H */ diff --git a/libusb/os/threads_posix.h b/libusb/os/threads_posix.h index b9a902e..9752208 100644 --- a/libusb/os/threads_posix.h +++ b/libusb/os/threads_posix.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSB_THREADS_POSIX_H__ -#define __LIBUSB_THREADS_POSIX_H__ +#ifndef LIBUSB_THREADS_POSIX_H +#define LIBUSB_THREADS_POSIX_H #include @@ -45,4 +45,4 @@ extern int usbi_mutex_init_recursive(pthread_mutex_t *mutex, pthread_mutexattr_t *attr); -#endif /* __LIBUSB_THREADS_POSIX_H__ */ +#endif /* LIBUSB_THREADS_POSIX_H */ diff --git a/libusb/os/threads_windows.h b/libusb/os/threads_windows.h index 34ae64c..7bb144a 100644 --- a/libusb/os/threads_windows.h +++ b/libusb/os/threads_windows.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSB_THREADS_WINDOWS_H__ -#define __LIBUSB_THREADS_WINDOWS_H__ +#ifndef LIBUSB_THREADS_WINDOWS_H +#define LIBUSB_THREADS_WINDOWS_H #define usbi_mutex_static_t volatile LONG #define USBI_MUTEX_INITIALIZER 0 @@ -82,5 +82,5 @@ int usbi_cond_timedwait(usbi_cond_t *cond, int usbi_cond_broadcast(usbi_cond_t *cond); int usbi_cond_signal(usbi_cond_t *cond); -#endif /* __LIBUSB_THREADS_WINDOWS_H__ */ +#endif /* LIBUSB_THREADS_WINDOWS_H */ diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 7f10f87..5e7beb6 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -559,7 +559,7 @@ static unsigned long get_ancestor_session_id(DWORD devinst, unsigned level) static int windows_assign_endpoints(struct libusb_device_handle *dev_handle, int iface, int altsetting) { int i, r; - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); struct libusb_config_descriptor *conf_desc; const struct libusb_interface_descriptor *if_desc; struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); @@ -631,9 +631,9 @@ bool is_api_driver(char* driver, uint8_t api) static int auto_claim(struct libusb_transfer *transfer, int *interface_number, int api_type) { struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv( + struct windows_device_handle_priv *handle_priv = _device_handle_priv( transfer->dev_handle); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int current_interface = *interface_number; int r = LIBUSB_SUCCESS; @@ -673,9 +673,9 @@ static int auto_claim(struct libusb_transfer *transfer, int *interface_number, i static void auto_release(struct usbi_transfer *itransfer) { struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); libusb_device_handle *dev_handle = transfer->dev_handle; - struct windows_device_handle_priv* handle_priv = __device_handle_priv(dev_handle); + struct windows_device_handle_priv* handle_priv = _device_handle_priv(dev_handle); int r; usbi_mutex_lock(&autoclaim_lock); @@ -845,7 +845,7 @@ init_exit: // Holds semaphore here. */ static int force_hcd_device_descriptor(struct libusb_device *dev) { - struct windows_device_priv *parent_priv, *priv = __device_priv(dev); + struct windows_device_priv *parent_priv, *priv = _device_priv(dev); struct libusb_context *ctx = DEVICE_CTX(dev); int vid, pid; @@ -859,7 +859,7 @@ static int force_hcd_device_descriptor(struct libusb_device *dev) usbi_err(ctx, "program assertion failed - HCD hub has no parent"); return LIBUSB_ERROR_NO_DEVICE; } - parent_priv = __device_priv(priv->parent_dev); + parent_priv = _device_priv(priv->parent_dev); if (sscanf(parent_priv->path, "\\\\.\\PCI#VEN_%04x&DEV_%04x%*s", &vid, &pid) == 2) { priv->dev_descriptor.idVendor = (uint16_t)vid; priv->dev_descriptor.idProduct = (uint16_t)pid; @@ -878,7 +878,7 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle { DWORD size, ret_size; struct libusb_context *ctx = DEVICE_CTX(dev); - struct windows_device_priv *priv = __device_priv(dev); + struct windows_device_priv *priv = _device_priv(dev); int r; uint8_t i; @@ -989,8 +989,8 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d if ((dev == NULL) || (parent_dev == NULL)) { return LIBUSB_ERROR_NOT_FOUND; } - priv = __device_priv(dev); - parent_priv = __device_priv(parent_dev); + priv = _device_priv(dev); + parent_priv = _device_priv(parent_dev); if (parent_priv->apib->id != USB_API_HUB) { usbi_warn(ctx, "parent for device '%s' is not a hub", device_id); return LIBUSB_ERROR_NOT_FOUND; @@ -1137,7 +1137,7 @@ static int set_composite_interface(struct libusb_context* ctx, struct libusb_dev char* dev_interface_path, char* device_id, uint8_t api) { unsigned i; - struct windows_device_priv *priv = __device_priv(dev); + struct windows_device_priv *priv = _device_priv(dev); int interface_number; if (priv->apib->id != USB_API_COMPOSITE) { @@ -1385,7 +1385,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered usbi_dbg("unlisted ancestor for '%s' (newly connected, etc.) - ignoring", dev_id_path); continue; } - parent_priv = __device_priv(parent_dev); + parent_priv = _device_priv(parent_dev); // virtual USB devices are also listed during GEN - don't process these yet if ( (pass == GEN_PASS) && (parent_priv->apib->id != USB_API_HUB) ) { continue; @@ -1424,7 +1424,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered usbi_dbg("found existing device for session [%X] (%d.%d)", session_id, dev->bus_number, dev->device_address); } - priv = __device_priv(dev); + priv = _device_priv(dev); } // Setup device @@ -1575,7 +1575,7 @@ static void windows_exit(void) static int windows_get_device_descriptor(struct libusb_device *dev, unsigned char *buffer, int *host_endian) { - struct windows_device_priv *priv = __device_priv(dev); + struct windows_device_priv *priv = _device_priv(dev); memcpy(buffer, &(priv->dev_descriptor), DEVICE_DESC_LENGTH); *host_endian = 0; @@ -1585,7 +1585,7 @@ static int windows_get_device_descriptor(struct libusb_device *dev, unsigned cha static int windows_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian) { - struct windows_device_priv *priv = __device_priv(dev); + struct windows_device_priv *priv = _device_priv(dev); PUSB_CONFIGURATION_DESCRIPTOR config_header; size_t size; @@ -1609,7 +1609,7 @@ static int windows_get_config_descriptor(struct libusb_device *dev, uint8_t conf */ static int windows_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len, int *host_endian) { - struct windows_device_priv *priv = __device_priv(dev); + struct windows_device_priv *priv = _device_priv(dev); if (priv->active_config == 0) return LIBUSB_ERROR_NOT_FOUND; @@ -1620,7 +1620,7 @@ static int windows_get_active_config_descriptor(struct libusb_device *dev, unsig static int windows_open(struct libusb_device_handle *dev_handle) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); if (priv->apib == NULL) { @@ -1633,14 +1633,14 @@ static int windows_open(struct libusb_device_handle *dev_handle) static void windows_close(struct libusb_device_handle *dev_handle) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); priv->apib->close(dev_handle); } static int windows_get_configuration(struct libusb_device_handle *dev_handle, int *config) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); if (priv->active_config == 0) { *config = 0; @@ -1658,7 +1658,7 @@ static int windows_get_configuration(struct libusb_device_handle *dev_handle, in */ static int windows_set_configuration(struct libusb_device_handle *dev_handle, int config) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); int r = LIBUSB_SUCCESS; if (config >= USB_MAXCONFIG) @@ -1678,7 +1678,7 @@ static int windows_set_configuration(struct libusb_device_handle *dev_handle, in static int windows_claim_interface(struct libusb_device_handle *dev_handle, int iface) { int r = LIBUSB_SUCCESS; - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); if (iface >= USB_MAXINTERFACES) return LIBUSB_ERROR_INVALID_PARAM; @@ -1698,7 +1698,7 @@ static int windows_claim_interface(struct libusb_device_handle *dev_handle, int static int windows_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting) { int r = LIBUSB_SUCCESS; - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); safe_free(priv->usb_interface[iface].endpoint); priv->usb_interface[iface].nb_endpoints= 0; @@ -1714,7 +1714,7 @@ static int windows_set_interface_altsetting(struct libusb_device_handle *dev_han static int windows_release_interface(struct libusb_device_handle *dev_handle, int iface) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); windows_set_interface_altsetting(dev_handle, iface, 0); return priv->apib->release_interface(dev_handle, iface); @@ -1722,13 +1722,13 @@ static int windows_release_interface(struct libusb_device_handle *dev_handle, in static int windows_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); return priv->apib->clear_halt(dev_handle, endpoint); } static int windows_reset_device(struct libusb_device_handle *dev_handle) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); return priv->apib->reset_device(dev_handle); } @@ -1766,10 +1766,10 @@ static void windows_clear_transfer_priv(struct usbi_transfer *itransfer) static int submit_bulk_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int r; r = priv->apib->submit_bulk_transfer(itransfer); @@ -1788,10 +1788,10 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) static int submit_iso_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int r; r = priv->apib->submit_iso_transfer(itransfer); @@ -1810,10 +1810,10 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) static int submit_control_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int r; r = priv->apib->submit_control_transfer(itransfer); @@ -1832,7 +1832,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) static int windows_submit_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -1850,23 +1850,23 @@ static int windows_submit_transfer(struct usbi_transfer *itransfer) static int windows_abort_control(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); return priv->apib->abort_control(itransfer); } static int windows_abort_transfers(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); return priv->apib->abort_transfers(itransfer); } static int windows_cancel_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); #if defined(FORCE_INSTANT_TIMEOUTS) struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer); @@ -1890,8 +1890,8 @@ static int windows_cancel_transfer(struct usbi_transfer *itransfer) static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int status; usbi_dbg("handling I/O completion with errcode %d", io_result); @@ -1928,7 +1928,7 @@ static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t static void windows_handle_callback (struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -2340,8 +2340,8 @@ static int winusb_exit(void) static int winusb_open(struct libusb_device_handle *dev_handle) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); HANDLE file_handle; int i; @@ -2374,8 +2374,8 @@ static int winusb_open(struct libusb_device_handle *dev_handle) static void winusb_close(struct libusb_device_handle *dev_handle) { - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); HANDLE file_handle; int i; @@ -2394,8 +2394,8 @@ static void winusb_close(struct libusb_device_handle *dev_handle) static int winusb_configure_endpoints(struct libusb_device_handle *dev_handle, int iface) { - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); HANDLE winusb_handle = handle_priv->interface_handle[iface].api_handle; UCHAR policy; ULONG timeout = 0; @@ -2439,8 +2439,8 @@ static int winusb_configure_endpoints(struct libusb_device_handle *dev_handle, i static int winusb_claim_interface(struct libusb_device_handle *dev_handle, int iface) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); bool is_using_usbccgp = (priv->apib->id == USB_API_COMPOSITE); HANDLE file_handle, winusb_handle; @@ -2513,7 +2513,7 @@ static int winusb_claim_interface(struct libusb_device_handle *dev_handle, int i static int winusb_release_interface(struct libusb_device_handle *dev_handle, int iface) { - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); HANDLE winusb_handle; CHECK_WINUSB_AVAILABLE; @@ -2534,7 +2534,7 @@ static int winusb_release_interface(struct libusb_device_handle *dev_handle, int */ static int winusb_get_valid_interface(struct libusb_device_handle *dev_handle) { - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); int i; for (i=0; idev_handle->dev); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct windows_device_handle_priv *handle_priv = __device_handle_priv( + struct windows_device_handle_priv *handle_priv = _device_handle_priv( transfer->dev_handle); WINUSB_SETUP_PACKET *setup = (WINUSB_SETUP_PACKET *) transfer->buffer; ULONG size; @@ -2647,7 +2647,7 @@ static int winusb_submit_control_transfer(struct usbi_transfer *itransfer) static int winusb_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); HANDLE winusb_handle; CHECK_WINUSB_AVAILABLE; @@ -2672,11 +2672,11 @@ static int winusb_set_interface_altsetting(struct libusb_device_handle *dev_hand static int winusb_submit_bulk_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(transfer->dev_handle); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); HANDLE winusb_handle; bool direction_in, ret; int current_interface; @@ -2730,8 +2730,8 @@ static int winusb_submit_bulk_transfer(struct usbi_transfer *itransfer) static int winusb_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); HANDLE winusb_handle; int current_interface; @@ -2768,9 +2768,9 @@ static int winusb_abort_control(struct usbi_transfer *itransfer) static int winusb_abort_transfers(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(transfer->dev_handle); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle); struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer); HANDLE winusb_handle; int current_interface; @@ -2806,8 +2806,8 @@ static int winusb_abort_transfers(struct usbi_transfer *itransfer) static int winusb_reset_device(struct libusb_device_handle *dev_handle) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); struct winfd wfd; HANDLE winusb_handle; int i, j; @@ -2871,7 +2871,7 @@ static int composite_exit(void) static int composite_open(struct libusb_device_handle *dev_handle) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); unsigned api; int r; uint8_t flag = 1<dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); unsigned api; uint8_t flag = 1<dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); return priv->usb_interface[iface].apib->claim_interface(dev_handle, iface); } static int composite_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); return priv->usb_interface[iface].apib->set_interface_altsetting(dev_handle, iface, altsetting); } static int composite_release_interface(struct libusb_device_handle *dev_handle, int iface) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); return priv->usb_interface[iface].apib->release_interface(dev_handle, iface); } static int composite_submit_control_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int i; for (i=0; idev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(transfer->dev_handle); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int current_interface; current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint); @@ -2955,10 +2955,10 @@ static int composite_submit_bulk_transfer(struct usbi_transfer *itransfer) { } static int composite_submit_iso_transfer(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(transfer->dev_handle); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); int current_interface; current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint); @@ -2973,8 +2973,8 @@ static int composite_submit_iso_transfer(struct usbi_transfer *itransfer) { static int composite_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint) { struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev); - struct windows_device_handle_priv *handle_priv = __device_handle_priv(dev_handle); - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); int current_interface; current_interface = interface_by_endpoint(priv, handle_priv, endpoint); @@ -2988,25 +2988,25 @@ static int composite_clear_halt(struct libusb_device_handle *dev_handle, unsigne static int composite_abort_control(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); return priv->usb_interface[transfer_priv->interface_number].apib->abort_control(itransfer); } static int composite_abort_transfers(struct usbi_transfer *itransfer) { - struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer); - struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); return priv->usb_interface[transfer_priv->interface_number].apib->abort_transfers(itransfer); } static int composite_reset_device(struct libusb_device_handle *dev_handle) { - struct windows_device_priv *priv = __device_priv(dev_handle->dev); + struct windows_device_priv *priv = _device_priv(dev_handle->dev); unsigned api; int r; uint8_t flag = 1<dev_handle->dev); + struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev); return priv->usb_interface[transfer_priv->interface_number].apib->copy_transfer_data(itransfer, io_size); } diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h index 608f369..b629d18 100644 --- a/libusb/os/windows_usb.h +++ b/libusb/os/windows_usb.h @@ -170,12 +170,12 @@ struct windows_device_priv { unsigned char **config_descriptor; // list of pointers to the cached config descriptors }; -static inline struct windows_device_priv *__device_priv(struct libusb_device *dev) { +static inline struct windows_device_priv *_device_priv(struct libusb_device *dev) { return (struct windows_device_priv *)dev->os_priv; } static inline void windows_device_priv_init(libusb_device* dev) { - struct windows_device_priv* p = __device_priv(dev); + struct windows_device_priv* p = _device_priv(dev); int i; p->depth = 0; p->port = 0; @@ -195,7 +195,7 @@ static inline void windows_device_priv_init(libusb_device* dev) { } static inline void windows_device_priv_release(libusb_device* dev) { - struct windows_device_priv* p = __device_priv(dev); + struct windows_device_priv* p = _device_priv(dev); int i; safe_free(p->path); if ((dev->num_configurations > 0) && (p->config_descriptor != NULL)) { @@ -222,7 +222,7 @@ struct windows_device_handle_priv { #endif }; -static inline struct windows_device_handle_priv *__device_handle_priv( +static inline struct windows_device_handle_priv *_device_handle_priv( struct libusb_device_handle *handle) { return (struct windows_device_handle_priv *) handle->os_priv; @@ -345,7 +345,7 @@ typedef RETURN_TYPE CONFIGRET; ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) #endif -typedef enum _USB_CONNECTION_STATUS { +typedef enum USB_CONNECTION_STATUS { NoDeviceConnected, DeviceConnected, DeviceFailedEnumeration, @@ -357,7 +357,7 @@ typedef enum _USB_CONNECTION_STATUS { DeviceInLegacyHub } USB_CONNECTION_STATUS, *PUSB_CONNECTION_STATUS; -typedef enum _USB_HUB_NODE { +typedef enum USB_HUB_NODE { UsbHub, UsbMIParent } USB_HUB_NODE; @@ -395,7 +395,7 @@ DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Device_IDA, (DEVINST, PCHAR, ULONG, ULONG) // Most of the structures below need to be packed #pragma pack(push, 1) -typedef struct _USB_INTERFACE_DESCRIPTOR { +typedef struct USB_INTERFACE_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; UCHAR bInterfaceNumber; @@ -407,7 +407,7 @@ typedef struct _USB_INTERFACE_DESCRIPTOR { UCHAR iInterface; } USB_INTERFACE_DESCRIPTOR, *PUSB_INTERFACE_DESCRIPTOR; -typedef struct _USB_CONFIGURATION_DESCRIPTOR { +typedef struct USB_CONFIGURATION_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; USHORT wTotalLength; @@ -418,7 +418,7 @@ typedef struct _USB_CONFIGURATION_DESCRIPTOR { UCHAR MaxPower; } USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR; -typedef struct _USB_CONFIGURATION_DESCRIPTOR_SHORT { +typedef struct USB_CONFIGURATION_DESCRIPTOR_SHORT { struct { ULONG ConnectionIndex; struct { @@ -432,7 +432,7 @@ typedef struct _USB_CONFIGURATION_DESCRIPTOR_SHORT { USB_CONFIGURATION_DESCRIPTOR data; } USB_CONFIGURATION_DESCRIPTOR_SHORT; -typedef struct _USB_ENDPOINT_DESCRIPTOR { +typedef struct USB_ENDPOINT_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; UCHAR bEndpointAddress; @@ -441,7 +441,7 @@ typedef struct _USB_ENDPOINT_DESCRIPTOR { UCHAR bInterval; } USB_ENDPOINT_DESCRIPTOR, *PUSB_ENDPOINT_DESCRIPTOR; -typedef struct _USB_DESCRIPTOR_REQUEST { +typedef struct USB_DESCRIPTOR_REQUEST { ULONG ConnectionIndex; struct { UCHAR bmRequest; @@ -453,7 +453,7 @@ typedef struct _USB_DESCRIPTOR_REQUEST { // UCHAR Data[0]; } USB_DESCRIPTOR_REQUEST, *PUSB_DESCRIPTOR_REQUEST; -typedef struct _USB_HUB_DESCRIPTOR { +typedef struct USB_HUB_DESCRIPTOR { UCHAR bDescriptorLength; UCHAR bDescriptorType; UCHAR bNumberOfPorts; @@ -463,45 +463,45 @@ typedef struct _USB_HUB_DESCRIPTOR { UCHAR bRemoveAndPowerMask[64]; } USB_HUB_DESCRIPTOR, *PUSB_HUB_DESCRIPTOR; -typedef struct _USB_ROOT_HUB_NAME { +typedef struct USB_ROOT_HUB_NAME { ULONG ActualLength; WCHAR RootHubName[1]; } USB_ROOT_HUB_NAME, *PUSB_ROOT_HUB_NAME; -typedef struct _USB_ROOT_HUB_NAME_FIXED { +typedef struct USB_ROOT_HUB_NAME_FIXED { ULONG ActualLength; WCHAR RootHubName[MAX_PATH_LENGTH]; } USB_ROOT_HUB_NAME_FIXED; -typedef struct _USB_NODE_CONNECTION_NAME { +typedef struct USB_NODE_CONNECTION_NAME { ULONG ConnectionIndex; ULONG ActualLength; WCHAR NodeName[1]; } USB_NODE_CONNECTION_NAME, *PUSB_NODE_CONNECTION_NAME; -typedef struct _USB_NODE_CONNECTION_NAME_FIXED { +typedef struct USB_NODE_CONNECTION_NAME_FIXED { ULONG ConnectionIndex; ULONG ActualLength; WCHAR NodeName[MAX_PATH_LENGTH]; } USB_NODE_CONNECTION_NAME_FIXED; -typedef struct _USB_HUB_NAME_FIXED { +typedef struct USB_HUB_NAME_FIXED { union { USB_ROOT_HUB_NAME_FIXED root; USB_NODE_CONNECTION_NAME_FIXED node; } u; } USB_HUB_NAME_FIXED; -typedef struct _USB_HUB_INFORMATION { +typedef struct USB_HUB_INFORMATION { USB_HUB_DESCRIPTOR HubDescriptor; BOOLEAN HubIsBusPowered; } USB_HUB_INFORMATION, *PUSB_HUB_INFORMATION; -typedef struct _USB_MI_PARENT_INFORMATION { +typedef struct USB_MI_PARENT_INFORMATION { ULONG NumberOfInterfaces; } USB_MI_PARENT_INFORMATION, *PUSB_MI_PARENT_INFORMATION; -typedef struct _USB_NODE_INFORMATION { +typedef struct USB_NODE_INFORMATION { USB_HUB_NODE NodeType; union { USB_HUB_INFORMATION HubInformation; @@ -509,12 +509,12 @@ typedef struct _USB_NODE_INFORMATION { } u; } USB_NODE_INFORMATION, *PUSB_NODE_INFORMATION; -typedef struct _USB_PIPE_INFO { +typedef struct USB_PIPE_INFO { USB_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG ScheduleOffset; } USB_PIPE_INFO, *PUSB_PIPE_INFO; -typedef struct _USB_NODE_CONNECTION_INFORMATION_EX { +typedef struct USB_NODE_CONNECTION_INFORMATION_EX { ULONG ConnectionIndex; USB_DEVICE_DESCRIPTOR DeviceDescriptor; UCHAR CurrentConfigurationValue; @@ -526,7 +526,7 @@ typedef struct _USB_NODE_CONNECTION_INFORMATION_EX { // USB_PIPE_INFO PipeList[0]; } USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX; -typedef struct _USB_HUB_CAP_FLAGS { +typedef struct USB_HUB_CAP_FLAGS { ULONG HubIsHighSpeedCapable:1; ULONG HubIsHighSpeed:1; ULONG HubIsMultiTtCapable:1; @@ -536,11 +536,11 @@ typedef struct _USB_HUB_CAP_FLAGS { ULONG ReservedMBZ:26; } USB_HUB_CAP_FLAGS, *PUSB_HUB_CAP_FLAGS; -typedef struct _USB_HUB_CAPABILITIES { +typedef struct USB_HUB_CAPABILITIES { ULONG HubIs2xCapable : 1; } USB_HUB_CAPABILITIES, *PUSB_HUB_CAPABILITIES; -typedef struct _USB_HUB_CAPABILITIES_EX { +typedef struct USB_HUB_CAPABILITIES_EX { USB_HUB_CAP_FLAGS CapabilityFlags; } USB_HUB_CAPABILITIES_EX, *PUSB_HUB_CAPABILITIES_EX; @@ -563,7 +563,7 @@ typedef struct _USB_HUB_CAPABILITIES_EX { #define FullSpeed 0x02 #define HighSpeed 0x03 -typedef enum _USBD_PIPE_TYPE { +typedef enum USBD_PIPE_TYPE { UsbdPipeTypeControl, UsbdPipeTypeIsochronous, UsbdPipeTypeBulk, -- 2.7.4