linux-2.4.20-rc1-isdn-hisax-USB.patch

   1 diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.19/drivers/isdn/hisax/st5481.h linux-2.4.20/drivers/isdn/hisax/st5481.h
   2 --- linux-2.4.19/drivers/isdn/hisax/st5481.h    2001-09-30 19:26:06.000000000 +0000
   3 +++ linux-2.4.20/drivers/isdn/hisax/st5481.h    2002-10-29 11:18:49.000000000 +0000
   4 @@ -309,7 +309,7 @@
   5  typedef void (*ctrl_complete_t)(void *);
   6
   7  typedef struct ctrl_msg {
   8 -       devrequest dr;
   9 +       struct usb_ctrlrequest dr;
  10         ctrl_complete_t complete;
  11         void *context;
  12  } ctrl_msg;
  13 @@ -478,7 +478,7 @@
  14    if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb)
  15
  16  static void __attribute__((unused))
  17 -dump_iso_packet(const char *name,urb_t *urb)
  18 +dump_iso_packet(const char *name,struct urb *urb)
  19  {
  20         int i,j;
  21         int len,ofs;
  22 diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.19/drivers/isdn/hisax/st5481_d.c linux-2.4.20/drivers/isdn/hisax/st5481_d.c
  23 --- linux-2.4.19/drivers/isdn/hisax/st5481_d.c  2001-12-21 17:41:54.000000000 +0000
  24 +++ linux-2.4.20/drivers/isdn/hisax/st5481_d.c  2002-10-29 11:18:40.000000000 +0000
  25 @@ -297,7 +297,7 @@
  26         unsigned int num_packets, packet_offset;
  27         int len, buf_size, bytes_sent;
  28         struct sk_buff *skb;
  29 -       iso_packet_descriptor_t *desc;
  30 +       struct iso_packet_descriptor *desc;
  31
  32         if (d_out->fsm.state != ST_DOUT_NORMAL)
  33                 return;
  34 diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.19/drivers/isdn/hisax/st5481_usb.c linux-2.4.20/drivers/isdn/hisax/st5481_usb.c
  35 --- linux-2.4.19/drivers/isdn/hisax/st5481_usb.c        2001-12-21 17:41:54.000000000 +0000
  36 +++ linux-2.4.20/drivers/isdn/hisax/st5481_usb.c        2002-10-29 11:18:48.000000000 +0000
  37 @@ -41,9 +41,9 @@
  38                 (unsigned char *)&ctrl->msg_fifo.data[r_index];
  39
  40         DBG(1,"request=0x%02x,value=0x%04x,index=%x",
  41 -           ((struct ctrl_msg *)urb->setup_packet)->dr.request,
  42 -           ((struct ctrl_msg *)urb->setup_packet)->dr.value,
  43 -           ((struct ctrl_msg *)urb->setup_packet)->dr.index);
  44 +           ((struct ctrl_msg *)urb->setup_packet)->dr.bRequest,
  45 +           ((struct ctrl_msg *)urb->setup_packet)->dr.wValue,
  46 +           ((struct ctrl_msg *)urb->setup_packet)->dr.wIndex);
  47
  48         // Prepare the URB
  49         urb->dev = adapter->usb_dev;
  50 @@ -69,11 +69,11 @@
  51         }
  52         ctrl_msg = &ctrl->msg_fifo.data[w_index];
  53
  54 -       ctrl_msg->dr.requesttype = requesttype;
  55 -       ctrl_msg->dr.request = request;
  56 -       ctrl_msg->dr.value = cpu_to_le16p(&value);
  57 -       ctrl_msg->dr.index = cpu_to_le16p(&index);
  58 -       ctrl_msg->dr.length = 0;
  59 +       ctrl_msg->dr.bRequestType = requesttype;
  60 +       ctrl_msg->dr.bRequest = request;
  61 +       ctrl_msg->dr.wValue = cpu_to_le16p(&value);
  62 +       ctrl_msg->dr.wIndex = cpu_to_le16p(&index);
  63 +       ctrl_msg->dr.wLength = 0;
  64         ctrl_msg->complete = complete;
  65         ctrl_msg->context = context;
  66
  67 @@ -140,17 +140,17 @@
  68
  69         ctrl_msg = (struct ctrl_msg *)urb->setup_packet;
  70
  71 -       if (ctrl_msg->dr.request == USB_REQ_CLEAR_FEATURE) {
  72 +       if (ctrl_msg->dr.bRequest == USB_REQ_CLEAR_FEATURE) {
  73                 /* Special case handling for pipe reset */
  74 -               le16_to_cpus(&ctrl_msg->dr.index);
  75 +               le16_to_cpus(&ctrl_msg->dr.wIndex);
  76                 usb_endpoint_running(adapter->usb_dev,
  77 -                                    ctrl_msg->dr.index & ~USB_DIR_IN,
  78 -                                    (ctrl_msg->dr.index & USB_DIR_IN) == 0);
  79 +                                    ctrl_msg->dr.wIndex & ~USB_DIR_IN,
  80 +                                    (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0);
  81
  82                 /* toggle is reset on clear */
  83                 usb_settoggle(adapter->usb_dev,
  84 -                             ctrl_msg->dr.index & ~USB_DIR_IN,
  85 -                             (ctrl_msg->dr.index & USB_DIR_IN) == 0,
  86 +                             ctrl_msg->dr.wIndex & ~USB_DIR_IN,
  87 +                             (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0,
  88                               0);
  89
  90
  91 @@ -235,7 +235,7 @@
  92         struct usb_interface_descriptor *altsetting;
  93         struct usb_endpoint_descriptor *endpoint;
  94         int status;
  95 -       urb_t *urb;
  96 +       struct urb *urb;
  97         u_char *buf;
  98
  99         DBG(1,"");
 100 @@ -560,7 +560,8 @@
 101   */
 102  int st5481_isoc_flatten(struct urb *urb)
 103  {
 104 -       piso_packet_descriptor_t pipd,pend;
 105 +       struct iso_packet_descriptor *pipd;
 106 +       struct iso_packet_descriptor *pend;
 107         unsigned char *src,*dst;
 108         unsigned int len;
 109