Greg:

This patch continues the update process for the cur_altsetting change.  
The drivers in usb/input were all in good shape and needed only minimal 
changes.

Alan Stern


===== drivers/usb/input/aiptek.c 1.30 vs edited =====
--- 1.30/drivers/usb/input/aiptek.c     Wed Mar 17 14:16:49 2004
+++ edited/drivers/usb/input/aiptek.c   Wed Mar 17 15:49:06 2004
@@ -265,7 +265,7 @@
             const struct usb_device_id *id)
 {
        struct usb_device *dev = interface_to_usbdev (intf);
-       struct usb_host_interface *interface = intf->altsetting + 0;
+       struct usb_host_interface *interface = intf->cur_altsetting;
        struct usb_endpoint_descriptor *endpoint;
        struct aiptek *aiptek;
        int err = -ENOMEM;
===== drivers/usb/input/powermate.c 1.27 vs edited =====
--- 1.27/drivers/usb/input/powermate.c  Wed Jan 21 13:25:08 2004
+++ edited/drivers/usb/input/powermate.c        Fri Mar 26 15:41:07 2004
@@ -305,7 +305,7 @@
        int pipe, maxp;
        char path[64];
 
-       interface = intf->altsetting + 0;
+       interface = intf->cur_altsetting;
        endpoint = &interface->endpoint[0].desc;
        if (!(endpoint->bEndpointAddress & 0x80))
                return -EIO;
===== drivers/usb/input/kbtab.c 1.14 vs edited =====
--- 1.14/drivers/usb/input/kbtab.c      Wed Mar 17 14:16:50 2004
+++ edited/drivers/usb/input/kbtab.c    Fri Mar 26 15:38:45 2004
@@ -182,7 +182,7 @@
        kbtab->dev.dev = &intf->dev;
        kbtab->usbdev = dev;
 
-       endpoint = &intf->altsetting[0].endpoint[0].desc;
+       endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
        usb_fill_int_urb(kbtab->irq, dev,
                         usb_rcvintpipe(dev, endpoint->bEndpointAddress),
===== drivers/usb/input/xpad.c 1.29 vs edited =====
--- 1.29/drivers/usb/input/xpad.c       Wed Jan 21 13:25:08 2004
+++ edited/drivers/usb/input/xpad.c     Fri Mar 26 15:44:59 2004
@@ -252,7 +252,7 @@
                return -ENOMEM;
         }
        
-       ep_irq_in = &intf->altsetting[0].endpoint[0].desc;
+       ep_irq_in = &intf->cur_altsetting->endpoint[0].desc;
        
        usb_fill_int_urb(xpad->irq_in, udev,
                         usb_rcvintpipe(udev, ep_irq_in->bEndpointAddress),
===== drivers/usb/input/wacom.c 1.44 vs edited =====
--- 1.44/drivers/usb/input/wacom.c      Wed Mar 17 14:18:16 2004
+++ edited/drivers/usb/input/wacom.c    Fri Mar 26 15:44:17 2004
@@ -698,7 +698,7 @@
        wacom->dev.dev = &intf->dev;
        wacom->usbdev = dev;
 
-       endpoint = &intf->altsetting[0].endpoint[0].desc;
+       endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
        if (wacom->features->pktlen > 10)
                BUG();



-------------------------------------------------------
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_id=1470&alloc_id=3638&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to