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

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