diff options
| -rw-r--r-- | examples/dpfp.c | 8 | ||||
| -rw-r--r-- | libusb/core.c | 8 | ||||
| -rw-r--r-- | libusb/libusb.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/examples/dpfp.c b/examples/dpfp.c index 84c4905..eb81cff 100644 --- a/examples/dpfp.c +++ b/examples/dpfp.c @@ -486,14 +486,14 @@ int main(void) } printf("found device\n"); - devh = libusb_devh_open(dev); + devh = libusb_open(dev); if (!devh) { fprintf(stderr, "Could not open device\n"); goto out; } printf("opened device\n"); - r = libusb_devh_claim_intf(devh, 0); + r = libusb_claim_interface(devh, 0); if (r < 0) { fprintf(stderr, "usb_claim_interface error %d %s\n", r, strerror(-r)); goto out; @@ -548,9 +548,9 @@ out_deinit: set_mode(0); set_hwstat(0x80); out_release: - libusb_devh_release_intf(devh, 0); + libusb_release_interface(devh, 0); out: - libusb_devh_close(devh); + libusb_close(devh); libusb_exit(); return r >= 0 ? r : -r; } diff --git a/libusb/core.c b/libusb/core.c index e9fd94f..6b2f126 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -216,7 +216,7 @@ API_EXPORTED struct libusb_config_descriptor *libusb_dev_get_config( return dev->config; } -API_EXPORTED struct libusb_dev_handle *libusb_devh_open(struct libusb_dev *dev) +API_EXPORTED struct libusb_dev_handle *libusb_open(struct libusb_dev *dev) { struct libusb_dev_handle *devh; int fd; @@ -245,7 +245,7 @@ static void do_close(struct libusb_dev_handle *devh) close(devh->fd); } -API_EXPORTED void libusb_devh_close(struct libusb_dev_handle *devh) +API_EXPORTED void libusb_close(struct libusb_dev_handle *devh) { if (!devh) return; @@ -261,7 +261,7 @@ API_EXPORTED struct libusb_dev *libusb_devh_get_dev(struct libusb_dev_handle *de return devh->dev; } -API_EXPORTED int libusb_devh_claim_intf(struct libusb_dev_handle *dev, +API_EXPORTED int libusb_claim_interface(struct libusb_dev_handle *dev, int iface) { int r; @@ -273,7 +273,7 @@ API_EXPORTED int libusb_devh_claim_intf(struct libusb_dev_handle *dev, return r; } -API_EXPORTED int libusb_devh_release_intf(struct libusb_dev_handle *dev, +API_EXPORTED int libusb_release_interface(struct libusb_dev_handle *dev, int iface) { int r; diff --git a/libusb/libusb.h b/libusb/libusb.h index 7d0bf92..99e2651 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -223,11 +223,11 @@ struct libusb_dev_descriptor *libusb_dev_get_descriptor(libusb_dev *dev); struct libusb_config_descriptor *libusb_dev_get_config(libusb_dev *dev); libusb_dev *libusb_dev_next(libusb_dev *dev); -libusb_dev_handle *libusb_devh_open(libusb_dev *dev); -void libusb_devh_close(libusb_dev_handle *devh); +libusb_dev_handle *libusb_open(libusb_dev *dev); +void libusb_close(libusb_dev_handle *devh); struct libusb_dev *libusb_devh_get_dev(libusb_dev_handle *devh); -int libusb_devh_claim_intf(libusb_dev_handle *dev, int iface); -int libusb_devh_release_intf(libusb_dev_handle *dev, int iface); +int libusb_claim_interface(libusb_dev_handle *dev, int iface); +int libusb_release_interface(libusb_dev_handle *dev, int iface); /* async I/O */ |