diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-02-14 19:47:30 -0600 |
|---|---|---|
| committer | Daniel Drake <dan@reactivated.net> | 2010-05-18 19:08:03 -0300 |
| commit | 8aceb5c99056aaed6e6f2db1b303817e37e9fe8c (patch) | |
| tree | 4318b3cef03697739ca4e19d531a362db4840ff1 /libusb/core.c | |
| parent | d7031ee8e1c449af23b2674fe18d9fc652c9bd80 (diff) | |
| download | libusbx-8aceb5c99056aaed6e6f2db1b303817e37e9fe8c.tar.gz | |
Rename all interface parameters to usb_interface or interface_number
Remove the use of the ambiguous "interface" where possible without
breaking the API.
'interface' is a preprocessor #define already associated with COM on Windows,
that can cause a conflict as soon as windows.h is included.
There are a few more places where interface is still used, which should
be changed for libusb-2.0
Diffstat (limited to 'libusb/core.c')
| -rw-r--r-- | libusb/core.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libusb/core.c b/libusb/core.c index 3cae35e..02ef427 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -1351,7 +1351,7 @@ API_EXPORTED int libusb_reset_device(libusb_device_handle *dev) * perform I/O. * * \param dev a device handle - * \param interface the interface to check + * \param interface_number the interface to check * \returns 0 if no kernel driver is active * \returns 1 if a kernel driver is active * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected @@ -1359,11 +1359,11 @@ API_EXPORTED int libusb_reset_device(libusb_device_handle *dev) * \see libusb_detach_kernel_driver() */ API_EXPORTED int libusb_kernel_driver_active(libusb_device_handle *dev, - int interface) + int interface_number) { - usbi_dbg("interface %d", interface); + usbi_dbg("interface %d", interface_number); if (usbi_backend->kernel_driver_active) - return usbi_backend->kernel_driver_active(dev, interface); + return usbi_backend->kernel_driver_active(dev, interface_number); else return LIBUSB_ERROR_NOT_SUPPORTED; } @@ -1373,7 +1373,7 @@ API_EXPORTED int libusb_kernel_driver_active(libusb_device_handle *dev, * able to claim the interface and perform I/O. * * \param dev a device handle - * \param interface the interface to detach the driver from + * \param interface_number the interface to detach the driver from * \returns 0 on success * \returns LIBUSB_ERROR_NOT_FOUND if no kernel driver was active * \returns LIBUSB_ERROR_INVALID_PARAM if the interface does not exist @@ -1382,11 +1382,11 @@ API_EXPORTED int libusb_kernel_driver_active(libusb_device_handle *dev, * \see libusb_kernel_driver_active() */ API_EXPORTED int libusb_detach_kernel_driver(libusb_device_handle *dev, - int interface) + int interface_number) { - usbi_dbg("interface %d", interface); + usbi_dbg("interface %d", interface_number); if (usbi_backend->detach_kernel_driver) - return usbi_backend->detach_kernel_driver(dev, interface); + return usbi_backend->detach_kernel_driver(dev, interface_number); else return LIBUSB_ERROR_NOT_SUPPORTED; } @@ -1396,7 +1396,7 @@ API_EXPORTED int libusb_detach_kernel_driver(libusb_device_handle *dev, * using libusb_detach_kernel_driver(). * * \param dev a device handle - * \param interface the interface to attach the driver from + * \param interface_number the interface to attach the driver from * \returns 0 on success * \returns LIBUSB_ERROR_NOT_FOUND if no kernel driver was active * \returns LIBUSB_ERROR_INVALID_PARAM if the interface does not exist @@ -1407,11 +1407,11 @@ API_EXPORTED int libusb_detach_kernel_driver(libusb_device_handle *dev, * \see libusb_kernel_driver_active() */ API_EXPORTED int libusb_attach_kernel_driver(libusb_device_handle *dev, - int interface) + int interface_number) { - usbi_dbg("interface %d", interface); + usbi_dbg("interface %d", interface_number); if (usbi_backend->attach_kernel_driver) - return usbi_backend->attach_kernel_driver(dev, interface); + return usbi_backend->attach_kernel_driver(dev, interface_number); else return LIBUSB_ERROR_NOT_SUPPORTED; } |