diff options
| author | Daniel Drake <dsd@gentoo.org> | 2007-12-03 22:27:21 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2007-12-03 22:27:21 +0000 |
| commit | b5a7a411087b37a6bf56b4688a9e3290daaed153 (patch) | |
| tree | 14a430365d1b7b6210f005bb98cb61c28df34fef | |
| parent | eacf4505a473df0f521d1b69d5b45448f0709e2d (diff) | |
| download | libusbx-b5a7a411087b37a6bf56b4688a9e3290daaed153.tar.gz | |
Rename fpusb_device_handle functions to devh
Prevents confusion with functions that work on fpusb_dev structures.
| -rw-r--r-- | examples/dpfp.c | 8 | ||||
| -rw-r--r-- | libfpusb/core.c | 8 | ||||
| -rw-r--r-- | libfpusb/fpusb.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/examples/dpfp.c b/examples/dpfp.c index e5aed9f..bc883c6 100644 --- a/examples/dpfp.c +++ b/examples/dpfp.c @@ -485,14 +485,14 @@ int main(void) } printf("found device\n"); - devh = fpusb_dev_open(dev); + devh = fpusb_devh_open(dev); if (!devh) { fprintf(stderr, "Could not open device\n"); goto out; } printf("opened device\n"); - r = fpusb_dev_claim_intf(devh, 0); + r = fpusb_devh_claim_intf(devh, 0); if (r < 0) { fprintf(stderr, "usb_claim_interface error %d %s\n", r, strerror(-r)); goto out; @@ -547,9 +547,9 @@ out_deinit: set_mode(0); set_hwstat(0x80); out_release: - fpusb_dev_release_intf(devh, 0); + fpusb_devh_release_intf(devh, 0); out: - fpusb_dev_close(devh); + fpusb_devh_close(devh); fpusb_exit(); return r >= 0 ? r : -r; } diff --git a/libfpusb/core.c b/libfpusb/core.c index edb1de3..b2e8d18 100644 --- a/libfpusb/core.c +++ b/libfpusb/core.c @@ -177,7 +177,7 @@ API_EXPORTED struct usb_dev_descriptor *fpusb_dev_get_descriptor( return &dev->desc; } -API_EXPORTED struct fpusb_dev_handle *fpusb_dev_open(struct fpusb_dev *dev) +API_EXPORTED struct fpusb_dev_handle *fpusb_devh_open(struct fpusb_dev *dev) { struct fpusb_dev_handle *devh; int fd; @@ -206,7 +206,7 @@ static void do_close(struct fpusb_dev_handle *devh) close(devh->fd); } -API_EXPORTED void fpusb_dev_close(struct fpusb_dev_handle *devh) +API_EXPORTED void fpusb_devh_close(struct fpusb_dev_handle *devh) { if (!devh) return; @@ -217,7 +217,7 @@ API_EXPORTED void fpusb_dev_close(struct fpusb_dev_handle *devh) free(devh); } -API_EXPORTED int fpusb_dev_claim_intf(struct fpusb_dev_handle *dev, +API_EXPORTED int fpusb_devh_claim_intf(struct fpusb_dev_handle *dev, int iface) { int r; @@ -229,7 +229,7 @@ API_EXPORTED int fpusb_dev_claim_intf(struct fpusb_dev_handle *dev, return r; } -API_EXPORTED int fpusb_dev_release_intf(struct fpusb_dev_handle *dev, +API_EXPORTED int fpusb_devh_release_intf(struct fpusb_dev_handle *dev, int iface) { int r; diff --git a/libfpusb/fpusb.h b/libfpusb/fpusb.h index bc279c1..22f3536 100644 --- a/libfpusb/fpusb.h +++ b/libfpusb/fpusb.h @@ -162,10 +162,10 @@ fpusb_dev *fpusb_get_devices(void); struct usb_dev_descriptor *fpusb_dev_get_descriptor(fpusb_dev *dev); fpusb_dev *fpusb_dev_next(fpusb_dev *dev); -fpusb_dev_handle *fpusb_dev_open(fpusb_dev *dev); -void fpusb_dev_close(fpusb_dev_handle *devh); -int fpusb_dev_claim_intf(fpusb_dev_handle *dev, int iface); -int fpusb_dev_release_intf(fpusb_dev_handle *dev, int iface); +fpusb_dev_handle *fpusb_devh_open(fpusb_dev *dev); +void fpusb_devh_close(fpusb_dev_handle *devh); +int fpusb_devh_claim_intf(fpusb_dev_handle *dev, int iface); +int fpusb_devh_release_intf(fpusb_dev_handle *dev, int iface); /* async I/O */ |