diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index 24a8d8770..50b74d087 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,9 @@ +2002-03-21 Marcus Meissner + + * usb/libusb.c: gp_port_usb_find_bulk no exists, replaced with _ep. + Also look for intep in class based matching. + Dump intep in debugoutput. + 2002-03-19 Marcus Meissner * configure.in, acconfig.h: Fixed some warnings newer autoconf diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index fdb3c7e52..ec270b7af 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -420,12 +420,14 @@ gp_port_usb_find_device_lib(GPPort *port, int idvendor, int idproduct) gp_log (GP_LOG_VERBOSE, "gphoto2-port-usb", "Detected defaults: config %d, " "interface %d, altsetting %d, " - "inep %02x, outep %02x", + "inep %02x, outep %02x, intep %02x", port->settings.usb.config, port->settings.usb.interface, port->settings.usb.altsetting, port->settings.usb.inep, - port->settings.usb.outep); + port->settings.usb.outep, + port->settings.usb.intep + ); } return GP_OK; @@ -521,17 +523,20 @@ gp_port_usb_find_device_by_class_lib(GPPort *port, int class, int subclass, int port->settings.usb.interface = dev->config[config].interface[interface].altsetting[altsetting].bInterfaceNumber; port->settings.usb.altsetting = dev->config[config].interface[interface].altsetting[altsetting].bAlternateSetting; - port->settings.usb.inep = gp_port_usb_find_bulk(dev, config, interface, altsetting, USB_ENDPOINT_IN); - port->settings.usb.outep = gp_port_usb_find_bulk(dev, config, interface, altsetting, USB_ENDPOINT_OUT); + port->settings.usb.inep = gp_port_usb_find_ep(dev, config, interface, altsetting, USB_ENDPOINT_IN, USB_ENDPOINT_TYPE_BULK); + port->settings.usb.outep = gp_port_usb_find_ep(dev, config, interface, altsetting, USB_ENDPOINT_OUT, USB_ENDPOINT_TYPE_BULK); + port->settings.usb.intep = gp_port_usb_find_ep(dev, config, interface, altsetting, USB_ENDPOINT_OUT, USB_ENDPOINT_TYPE_INTERRUPT); gp_log (GP_LOG_VERBOSE, "gphoto2-port-usb", "Detected defaults: config %d, " "interface %d, altsetting %d, " - "inep %02x, outep %02x", + "inep %02x, outep %02x, intep %02x", port->settings.usb.config, port->settings.usb.interface, port->settings.usb.altsetting, port->settings.usb.inep, - port->settings.usb.outep); + port->settings.usb.outep, + port->settings.usb.intep + ); } return GP_OK;