diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-01-14 00:58:30 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-01-14 00:58:30 +0000 |
| commit | aa118f2c0215b910eda914392a5585c434a92288 (patch) | |
| tree | 789d87c82cf8002d5559143733b00996b5ad879c /libusb/libusb.h | |
| parent | ed8c467fcab8861d67d926a1b5bf33c84b74f247 (diff) | |
| download | libusb-aa118f2c0215b910eda914392a5585c434a92288.tar.gz | |
svn r4: revert back to using interface for variable names as in master branch
Diffstat (limited to 'libusb/libusb.h')
| -rw-r--r-- | libusb/libusb.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h index 4dbbed9..2dbb9a5 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -491,7 +491,7 @@ struct libusb_config_descriptor { /** Array of interfaces supported by this configuration. The length of * this array is determined by the bNumInterfaces field. */ - const struct libusb_interface *iface; + const struct libusb_interface *interface; /** Extra descriptors. If libusb encounters unknown configuration * descriptors, it will store them here, should you wish to parse them. */ @@ -795,8 +795,8 @@ void libusb_close(libusb_device_handle *dev_handle); libusb_device *libusb_get_device(libusb_device_handle *dev_handle); int libusb_set_configuration(libusb_device_handle *dev, int configuration); -int libusb_claim_interface(libusb_device_handle *dev, int interface_number); -int libusb_release_interface(libusb_device_handle *dev, int interface_number); +int libusb_claim_interface(libusb_device_handle *dev, int iface); +int libusb_release_interface(libusb_device_handle *dev, int iface); libusb_device_handle *libusb_open_device_with_vid_pid(libusb_context *ctx, uint16_t vendor_id, uint16_t product_id); @@ -806,9 +806,9 @@ int libusb_set_interface_alt_setting(libusb_device_handle *dev, int libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint); int libusb_reset_device(libusb_device_handle *dev); -int libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number); -int libusb_detach_kernel_driver(libusb_device_handle *dev, int interface_number); -int libusb_attach_kernel_driver(libusb_device_handle *dev, int interface_number); +int libusb_kernel_driver_active(libusb_device_handle *dev, int interface); +int libusb_detach_kernel_driver(libusb_device_handle *dev, int interface); +int libusb_attach_kernel_driver(libusb_device_handle *dev, int interface); /* async I/O */ |