ChangeSet 1.1608.84.2, 2004/03/08 11:11:32-08:00, [EMAIL PROTECTED]
merge fixups with irda usb code
drivers/net/irda/stir4200.c | 46 --------------------------------------------
1 files changed, 46 deletions(-)
diff -Nru a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
--- a/drivers/net/irda/stir4200.c Tue Mar 16 15:03:56 2004
+++ b/drivers/net/irda/stir4200.c Tue Mar 16 15:03:56 2004
@@ -1041,52 +1041,6 @@
}
/*
- * Parse the various endpoints and find the one we need.
- *
- * The endpoint are the pipes used to communicate with the USB device.
- * The spec defines 2 endpoints of type bulk transfer, one in, and one out.
- * These are used to pass frames back and forth with the dongle.
- */
-static int stir_setup_usb(struct stir_cb *stir, struct usb_interface *intf)
-{
- struct usb_device *usbdev = interface_to_usbdev(intf);
- const struct usb_host_interface *interface = intf->cur_altsetting;
- const struct usb_endpoint_descriptor *ep_in = NULL;
- const struct usb_endpoint_descriptor *ep_out = NULL;
- int i;
-
- if (interface->desc.bNumEndpoints != 2) {
- WARNING("%s: expected two endpoints\n", __FUNCTION__);
- return -ENODEV;
- }
-
- for(i = 0; i < interface->desc.bNumEndpoints; i++) {
- const struct usb_endpoint_descriptor *ep
- = &interface->endpoint[i].desc;
-
- if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
- == USB_ENDPOINT_XFER_BULK) {
- /* We need to find an IN and an OUT */
- if ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
USB_DIR_IN)
- ep_in = ep;
- else
- ep_out = ep;
- } else
- WARNING("%s: unknown endpoint type 0x%x\n",
- __FUNCTION__, ep->bmAttributes);
- }
-
- if (!ep_in || !ep_out)
- return -EIO;
-
- stir->tx_bulkpipe = usb_sndbulkpipe(usbdev,
- ep_out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
- stir->rx_intpipe = usb_rcvintpipe(usbdev,
- ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
- return 0;
-}
-
-/*
* This routine is called by the USB subsystem for each new device
* in the system. We need to check if the device is ours, and in
* this case start handling it.
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
