org.handhelds.familiar/packages/usrp/files/usb11.patch

   1 diff -ur usrp-0.8/firmware/include/fpga_regs_standard.h usrp-0.8-usb11/firmware/include/fpga_regs_standard.h
   2 --- usrp-0.8/firmware/include/fpga_regs_standard.h      2004-12-10 23:25:42.000000000 -0500
   3 +++ usrp-0.8-usb11/firmware/include/fpga_regs_standard.h        2005-04-18 15:48:58.000000000 -0400
   4 @@ -103,6 +103,7 @@
   5  //  3   chan 1 Q
   6
   7  #define        FR_TX_MUX               39
   8 +#define FR_USB_PACKET_SIZE     40
   9
  10  #endif /* INCLUDED_FPGA_REGS_STANDARD_H */
  11
  12 diff -ur usrp-0.8/firmware/src/common/usrp_common.c usrp-0.8-usb11/firmware/src/common/usrp_common.c
  13 --- usrp-0.8/firmware/src/common/usrp_common.c  2004-03-28 17:28:58.000000000 -0500
  14 +++ usrp-0.8-usb11/firmware/src/common/usrp_common.c    2005-04-17 12:10:26.000000000 -0400
  15 @@ -101,9 +101,13 @@
  16    // set autoin length for EP6
  17    // FIXME should be f(enumeration)
  18
  19 -  EP6AUTOINLENH = (512) >> 8;  SYNCDELAY;  // this is the length for high speed
  20 -  EP6AUTOINLENL = (512) & 0xff; SYNCDELAY;
  21 -
  22 +  if (USBCS & bmHSM) {
  23 +    EP6AUTOINLENH = (512) >> 8;        SYNCDELAY;  // this is the length for high speed
  24 +    EP6AUTOINLENL = (512) & 0xff; SYNCDELAY;
  25 +  } else {
  26 +    EP6AUTOINLENH = (64) >> 8; SYNCDELAY;  // this is the length for full speed
  27 +    EP6AUTOINLENL = (64) & 0xff; SYNCDELAY;
  28 +  }
  29    init_board ();
  30  }
  31
  32 diff -ur usrp-0.8/firmware/src/usrp2/usb_descriptors.a51 usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51
  33 --- usrp-0.8/firmware/src/usrp2/usb_descriptors.a51     2004-12-08 16:11:24.000000000 -0500
  34 +++ usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51       2005-04-14 11:51:07.000000000 -0400
  35 @@ -236,7 +236,7 @@
  36         .db     DSCR_CONFIG
  37         .db     <(_full_speed_config_descr_end - _full_speed_config_descr) ; LSB
  38         .db     >(_full_speed_config_descr_end - _full_speed_config_descr) ; MSB
  39 -       .db     1               ; bNumInterfaces
  40 +       .db     3               ; bNumInterfaces
  41         .db     1               ; bConfigurationValue
  42         .db     0               ; iConfiguration
  43         .db     0x80 | bmSELF_POWERED ; bmAttributes
  44 @@ -253,7 +253,53 @@
  45         .db     0xff            ; bInterfaceSubClass (vendor specific)
  46         .db     0xff            ; bInterfaceProtocol (vendor specific)
  47         .db     SI_COMMAND_AND_STATUS   ; iInterface (description)
  48 +
  49 +       ;; interface descriptor 1 (transmit path, ep2 OUT BULK)
  50 +
  51 +       .db     DSCR_INTRFC_LEN
  52 +       .db     DSCR_INTRFC
  53 +       .db     1               ; bInterfaceNumber (zero based)
  54 +       .db     0               ; bAlternateSetting
  55 +       .db     1               ; bNumEndpoints
  56 +       .db     0xff            ; bInterfaceClass (vendor specific)
  57 +       .db     0xff            ; bInterfaceSubClass (vendor specific)
  58 +       .db     0xff            ; bInterfaceProtocol (vendor specific)
  59 +       .db     SI_TX_PATH      ; iInterface (description)
  60 +
  61 +       ;; interface 1's end point
  62 +
  63 +       .db     DSCR_ENDPNT_LEN
  64 +       .db     DSCR_ENDPNT
  65 +       .db     0x02            ; bEndpointAddress (ep 2 OUT)
  66 +       .db     ET_BULK         ; bmAttributes
  67 +       .db     <64             ; wMaxPacketSize (LSB)
  68 +       .db     >64             ; wMaxPacketSize (MSB)
  69 +       .db     0               ; bInterval (iso only)
  70 +
  71 +       ;; interface descriptor 2 (receive path, ep6 IN BULK)
  72 +
  73 +       .db     DSCR_INTRFC_LEN
  74 +       .db     DSCR_INTRFC
  75 +       .db     2               ; bInterfaceNumber (zero based)
  76 +       .db     0               ; bAlternateSetting
  77 +       .db     1               ; bNumEndpoints
  78 +       .db     0xff            ; bInterfaceClass (vendor specific)
  79 +       .db     0xff            ; bInterfaceSubClass (vendor specific)
  80 +       .db     0xff            ; bInterfaceProtocol (vendor specific)
  81 +       .db     SI_RX_PATH      ; iInterface (description)
  82 +
  83 +       ;; interface 2's end point
  84 +
  85 +       .db     DSCR_ENDPNT_LEN
  86 +       .db     DSCR_ENDPNT
  87 +       .db     0x86            ; bEndpointAddress (ep 6 IN)
  88 +       .db     ET_BULK         ; bmAttributes
  89 +       .db     <64             ; wMaxPacketSize (LSB)
  90 +       .db     >64             ; wMaxPacketSize (MSB)
  91 +       .db     0               ; bInterval (iso only)
  92 +
  93
  94 +
  95  _full_speed_config_descr_end:
  96