From 1c52ca63a3287f000b64a7d5615f3dd6b1438a35 Mon Sep 17 00:00:00 2001 From: Chris Pinkham Date: Wed, 19 Sep 2001 00:56:25 +0000 Subject: 2001-09-18 Chris Pinkham * camlibs/canon/psa50.c camlibs/canon/serial.c libgphoto2_port/include/gphoto2-port.h libgphoto2_port/libgphoto2_port/gp_port.c libgphoto2_port/usb/libusb.c: changed *usb_msg_read* and *usb_msg_write* functions to allow passing in of request and index values. * MAINTAINERS configure.in camlibs/jamcam/Makefile.am camlibs/jamcam/jamcam.c camlibs/jamcam/library.c camlibs/jamcam/library.h: added camera library for KBGear JamCam v3.0 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2282 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/usb/libusb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libgphoto2_port/usb') diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 30057ac47..3fbcd8233 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -44,8 +44,10 @@ int gp_port_usb_read(gp_port * dev, char *bytes, int size); int gp_port_usb_update(gp_port * dev); int gp_port_usb_clear_halt_lib(gp_port * dev, int ep); -int gp_port_usb_msg_read_lib(gp_port * dev, int value, char *bytes, int size); -int gp_port_usb_msg_write_lib(gp_port * dev, int value, char *bytes, int size); +int gp_port_usb_msg_read_lib(gp_port * dev, int request, int value, int index, + char *bytes, int size); +int gp_port_usb_msg_write_lib(gp_port * dev, int request, int value, int index, + char *bytes, int size); int gp_port_usb_find_device_lib(gp_port *dev, int idvendor, int idproduct); /* Dynamic library functions @@ -231,18 +233,20 @@ int gp_port_usb_read(gp_port * dev, char *bytes, int size) return ret; } -int gp_port_usb_msg_write_lib(gp_port * dev, int value, char *bytes, int size) +int gp_port_usb_msg_write_lib(gp_port * dev, int request, int value, int index, + char *bytes, int size) { return usb_control_msg(dev->device_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE, - size > 1 ? 0x04 : 0x0c, value, 0, bytes, size, dev->timeout); + request, value, index, bytes, size, dev->timeout); } -int gp_port_usb_msg_read_lib(gp_port * dev, int value, char *bytes, int size) +int gp_port_usb_msg_read_lib(gp_port * dev, int request, int value, int index, + char *bytes, int size) { return usb_control_msg(dev->device_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | 0x80, - size > 1 ? 0x04 : 0x0c, value, 0, bytes, size, dev->timeout); + request, value, index, bytes, size, dev->timeout); } /* -- cgit v1.2.1