diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | examples/lsusb.c | 3 | ||||
| -rw-r--r-- | libusb/core.c | 7 | ||||
| -rw-r--r-- | libusb/libusb.h | 8 | ||||
| -rw-r--r-- | libusb/libusbi.h | 2 |
5 files changed, 14 insertions, 10 deletions
@@ -7,16 +7,15 @@ thread safety abstraction for cross-platform-ness error codes fixme review +review functionality missing over 0.1 add some libusb_transfer flags: - treat short transfers as errors - unlink behaviour control - - setup packet prepends data (no copying needed) - update timeout with time remaining 1.0 API style/naming points to reconsider ========================================= -config struct/function naming typedef _cb or _cb_fn or _cb_t? typedef as-is or pointers? libusb_dev_t rather than libusb_dev *? @@ -25,3 +24,4 @@ for 1.1 or future optional timerfd support (runtime detection) notifications of hotplugged/unplugged devices use poll() rather than select()? +offer API to create/destroy handle_events thread diff --git a/examples/lsusb.c b/examples/lsusb.c index 7660b16..ca39bd9 100644 --- a/examples/lsusb.c +++ b/examples/lsusb.c @@ -27,7 +27,8 @@ void print_devs(libusb_device **devs) int i = 0; while ((dev = devs[i++]) != NULL) { - struct libusb_dev_descriptor *desc = libusb_device_get_descriptor(dev); + struct libusb_device_descriptor *desc = + libusb_get_device_descriptor(dev); printf("%04x:%04x\n", desc->idVendor, desc->idProduct); } } diff --git a/libusb/core.c b/libusb/core.c index b9f0b3f..98c6be3 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -452,13 +452,13 @@ API_EXPORTED void libusb_device_unref(struct libusb_device *dev) } } -API_EXPORTED struct libusb_dev_descriptor *libusb_device_get_descriptor( +API_EXPORTED struct libusb_device_descriptor *libusb_get_device_descriptor( struct libusb_device *dev) { return &dev->desc; } -API_EXPORTED struct libusb_config_descriptor *libusb_device_get_config( +API_EXPORTED struct libusb_config_descriptor *libusb_get_config_descriptor( struct libusb_device *dev) { return dev->config; @@ -506,7 +506,8 @@ API_EXPORTED struct libusb_device_handle *libusb_open_device_with_vid_pid( return NULL; while ((dev = devs[i++]) != NULL) { - struct libusb_dev_descriptor *desc = libusb_device_get_descriptor(dev); + struct libusb_device_descriptor *desc = + libusb_get_device_descriptor(dev); if (desc->idVendor == vendor_id && desc->idProduct == product_id) { found = dev; break; diff --git a/libusb/libusb.h b/libusb/libusb.h index c00e270..e9abd54 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -99,7 +99,7 @@ extern "C" { #define LIBUSB_RECIP_ENDPOINT 0x02 #define LIBUSB_RECIP_OTHER 0x03 -struct libusb_dev_descriptor { +struct libusb_device_descriptor { uint8_t bLength; uint8_t bDescriptorType; uint16_t bcdUSB; @@ -217,8 +217,10 @@ void libusb_exit(void); int libusb_get_device_list(libusb_device ***list); void libusb_free_device_list(libusb_device **list, int unref_devices); -struct libusb_dev_descriptor *libusb_device_get_descriptor(libusb_device *dev); -struct libusb_config_descriptor *libusb_device_get_config(libusb_device *dev); +struct libusb_device_descriptor *libusb_get_device_descriptor( + libusb_device *dev); +struct libusb_config_descriptor *libusb_get_config_descriptor( + libusb_device *dev); libusb_device *libusb_device_ref(libusb_device *dev); void libusb_device_unref(libusb_device *dev); diff --git a/libusb/libusbi.h b/libusb/libusbi.h index b6dc80f..2ef2573 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -147,7 +147,7 @@ struct libusb_device { int refcnt; unsigned long session_data; char *nodepath; - struct libusb_dev_descriptor desc; + struct libusb_device_descriptor desc; struct libusb_config_descriptor *config; }; |