Only in ADI_DRIVER: AdiUsbAdslDriver.o Only in ADI_DRIVER: adiusbadsl.o diff -ru ADI_DRIVER.orig/ADIUTIL/Buffers.h ADI_DRIVER/ADIUTIL/Buffers.h --- ADI_DRIVER.orig/ADIUTIL/Buffers.h 2003-05-02 21:35:29.000000000 +0200 +++ ADI_DRIVER/ADIUTIL/Buffers.h 2003-05-02 21:36:27.000000000 +0200 @@ -99,7 +99,7 @@ { GENERIC_BUFFER GB; void *pHw; - urb_t *urb; + struct urb *urb; } QUEUED_URB_BUFFER; /*********************************************************************************/ @@ -158,7 +158,7 @@ { GENERIC_BUFFER GB; void *pHw; - urb_t Urb; + struct urb Urb; } INCOMING_BUFFER; /************************************************************************************/ @@ -173,7 +173,7 @@ typedef struct { GENERIC_BUFFER GB; - urb_t Urb; + struct urb Urb; UInt32 TotalBytes; } OUTGOING_BUFFER; Only in ADI_DRIVER/ADIUTIL: Buffers.h~ Only in ADI_DRIVER/ADIUTIL: Crc.o Only in ADI_DRIVER/ADIUTIL: Dsp.o diff -ru ADI_DRIVER.orig/ADIUTIL/Hardware.h ADI_DRIVER/ADIUTIL/Hardware.h --- ADI_DRIVER.orig/ADIUTIL/Hardware.h 2003-05-02 21:35:29.000000000 +0200 +++ ADI_DRIVER/ADIUTIL/Hardware.h 2003-05-02 21:36:27.000000000 +0200 @@ -38,12 +38,12 @@ struct usb_device *usbdev; /*URBs allocated for this device*/ - urb_t urbInt; - urb_t urbIdma; - urb_t urbRead[INCOMING_Q_SIZE]; - urb_t urbWrite; - urb_t urbOAMWrite; - urb_t *pUrbReadIso[INCOMING_Q_SIZE]; + struct urb urbInt; + struct urb urbIdma; + struct urb urbRead[INCOMING_Q_SIZE]; + struct urb urbWrite; + struct urb urbOAMWrite; + struct urb *pUrbReadIso[INCOMING_Q_SIZE]; /*Info for when we're using ISO for receive*/ UInt32 IsoPipeSize; Only in ADI_DRIVER/ADIUTIL: Hardware.h~ Only in ADI_DRIVER/ADIUTIL: Me.o Only in ADI_DRIVER/ADIUTIL: Mpoa.o Only in ADI_DRIVER/ADIUTIL: Msg.o Only in ADI_DRIVER/ADIUTIL: Oam.o Only in ADI_DRIVER/ADIUTIL: Sar.o Only in ADI_DRIVER/ADIUTIL: Uni.o Only in ADI_DRIVER/ADIUTIL: Zaps.o diff -ru ADI_DRIVER.orig/Boot.c ADI_DRIVER/Boot.c --- ADI_DRIVER.orig/Boot.c 2003-05-02 21:35:29.000000000 +0200 +++ ADI_DRIVER/Boot.c 2003-05-02 21:36:27.000000000 +0200 @@ -434,7 +434,7 @@ static int IDMAWrite(Hardware *pHw, void *pData, UInt32 Size) { int ret = USB_ST_NOERROR; - urb_t *urb; + struct urb *urb; UInt8 *xfer_buf = GET_KBUFFER(Size); ZAP(DEBUG_BOOT, DEBUG_ENTRY, ("+++IDMAWrite\n")); Only in ADI_DRIVER: Boot.c~ Only in ADI_DRIVER: Boot.o Only in ADI_DRIVER: .depend diff -ru ADI_DRIVER.orig/Pipes.c ADI_DRIVER/Pipes.c --- ADI_DRIVER.orig/Pipes.c 2003-05-02 21:35:29.000000000 +0200 +++ ADI_DRIVER/Pipes.c 2003-05-02 21:36:27.000000000 +0200 @@ -76,7 +76,7 @@ for (i=0; ipUrbReadIso[i]; spin_lock_init(&pUrb->lock); Only in ADI_DRIVER: Pipes.c~ Only in ADI_DRIVER: Pipes.o Only in ADI_DRIVER/USER: adictrl Only in ADI_DRIVER/USER: Config.o Only in ADI_DRIVER/USER: .depend Only in ADI_DRIVER/USER: main.o diff -ru ADI_DRIVER.orig/Util.c ADI_DRIVER/Util.c --- ADI_DRIVER.orig/Util.c 2003-05-02 21:35:29.000000000 +0200 +++ ADI_DRIVER/Util.c 2003-05-02 21:46:01.000000000 +0200 @@ -30,7 +30,7 @@ /**********************************************************************************/ /* Local prototypes */ /**********************************************************************************/ -static void QueueControlUrb(Hardware *pHw, urb_t *urb); +static void QueueControlUrb(Hardware *pHw, struct urb *urb); static void CtrlUrbCompletion(struct urb *urb); static UInt8 htoi(UInt8 h); @@ -257,10 +257,10 @@ /**********************************************************************************/ void WriteDspMsg(Hardware *pHw, UInt16 Addr, UInt16 *pData) { - /*get space for data and devrequest struct*/ - UInt8 *xfer_buf = GET_KBUFFER((CMV_DATA_WORDS*2)+sizeof(devrequest)); - urb_t *urb; - devrequest *pdr; + /*get space for data and struct usb_ctrlrequest */ + UInt8 *xfer_buf = GET_KBUFFER((CMV_DATA_WORDS*2)+sizeof(struct usb_ctrlrequest)); + struct urb *urb; + struct usb_ctrlrequest * pdr; /***********************************************/ /*Modified by Anoosh on Dec19,2002 */ @@ -276,16 +276,16 @@ else { memcpy(xfer_buf, pData, CMV_DATA_WORDS*2); - pdr = (devrequest *)(xfer_buf+CMV_DATA_WORDS*2); + pdr = (struct usb_ctrlrequest *)(xfer_buf+CMV_DATA_WORDS*2); /*Get an URB and prepare it for submission*/ urb = usb_alloc_urb(0); - pdr->requesttype = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; - pdr->request = kCDC_REQ_SEND_ENCAPSULATED_COMMAND; - pdr->value = kADI_CMD_SET_BLOCK; - pdr->index = Addr | 0x4000; - pdr->length = CMV_DATA_WORDS*2; + pdr->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; + pdr->bRequest = kCDC_REQ_SEND_ENCAPSULATED_COMMAND; + pdr->wValue = kADI_CMD_SET_BLOCK; + pdr->wIndex = Addr | 0x4000; + pdr->wLength = CMV_DATA_WORDS*2; FILL_CONTROL_URB(urb, pHw->usbdev, usb_sndctrlpipe(pHw->usbdev,0), (UInt8 *)pdr, xfer_buf, CMV_DATA_WORDS*2, CtrlUrbCompletion, NULL); @@ -301,31 +301,31 @@ /**********************************************************************************/ int AdiCustomWrite(Hardware *pHw, UInt32 Cmd, UInt32 Index, UInt32 Count, UInt8 *pData) { - /*get space for data and devrequest struct*/ - UInt8 *xfer_buf = GET_KBUFFER(Count+sizeof(devrequest)); - urb_t *urb; - devrequest *pdr; + /*get space for data and struct usb_ctrlrequest*/ + UInt8 *xfer_buf = GET_KBUFFER(Count+sizeof(struct usb_ctrlrequest)); + struct urb *urb; + struct usb_ctrlrequest * pdr; int ret = USB_ST_NOERROR; if (!xfer_buf) { ZAP(DEBUG_BOOT, DEBUG_ERRORS, - (kTAB"kmalloc in AdiCustomWrite for %#X bytes failed\n", Count+sizeof(devrequest))); + (kTAB"kmalloc in AdiCustomWrite for %#X bytes failed\n", Count+sizeof(struct usb_ctrlrequest))); ret = -ENOMEM; goto custom_exit; } memcpy(xfer_buf, pData, Count); - pdr = (devrequest *)(xfer_buf+CMV_DATA_WORDS*2); + pdr = (struct usb_ctrlrequest *)(xfer_buf+CMV_DATA_WORDS*2); /*Get an URB and prepare it for submission*/ urb = usb_alloc_urb(0); - pdr->requesttype = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; - pdr->request = kCDC_REQ_SEND_ENCAPSULATED_COMMAND; - pdr->value = Cmd; - pdr->index = Index; - pdr->length = Count; + pdr->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; + pdr->bRequest = kCDC_REQ_SEND_ENCAPSULATED_COMMAND; + pdr->wValue = Cmd; + pdr->wIndex = Index; + pdr->wLength = Count; FILL_CONTROL_URB(urb, pHw->usbdev, usb_sndctrlpipe(pHw->usbdev,0), (UInt8 *)pdr, xfer_buf, Count, CtrlUrbCompletion, NULL); @@ -347,22 +347,22 @@ // control pipe. // void WriteDspMem(Hardware *pHw, UInt16 Addr, UInt8 *pData) // { // - // get space for data and devrequest struct // - UInt8 *xfer_buf = GET_KBUFFER(1+sizeof(devrequest)); // - urb_t *urb; // - devrequest *pdr; // + // get space for data and struct usb_ctrlrequest // + UInt8 *xfer_buf = GET_KBUFFER(1+sizeof(struct usb_ctrlrequest)); // + struct urb *urb; // + struct usb_ctrlrequest *pdr; // // *(UInt8 *)xfer_buf = *pData; // - pdr = (devrequest *)(xfer_buf+sizeof(UInt8)); // + pdr = (struct usb_ctrlrequest *)(xfer_buf+sizeof(UInt8)); // // // Get an URB and prepare it for submission // urb = usb_alloc_urb(0); // // - pdr->requesttype = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; // - pdr->request = 0; // - pdr->value = kADI_CMD_SET_2183_DATA; // - pdr->index = Addr; // - pdr->length = sizeof(UInt8); // + pdr->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE; // + pdr->bRequest = 0; // + pdr->wValue = kADI_CMD_SET_2183_DATA; // + pdr->wIndex = Addr; // + pdr->wLength = sizeof(UInt8); // // FILL_CONTROL_URB(urb, pHw->usbdev, usb_sndctrlpipe(pHw->usbdev,0), (UInt8 *)pdr, // xfer_buf, sizeof(UInt8), CtrlUrbCompletion, NULL); // @@ -375,22 +375,22 @@ // receive control pipe and then sleeps and waits for MemReadCompletion to wake it up // void ReadDspMem(Hardware *pHw, UInt16 Addr, UInt8 *pData) // { // - // get space for data and devrequest struct // - UInt8 *xfer_buf = GET_KBUFFER(1+sizeof(devrequest)); // - urb_t *urb; // - devrequest *pdr; // + // get space for data and struct usb_ctrlrequest // + UInt8 *xfer_buf = GET_KBUFFER(1+sizeof(struct usb_ctrlrequest)); // + struct urb *urb; // + struct usb_ctrlrequest * pdr; // // *(UInt8 *)xfer_buf = *pData; // - pdr = (devrequest *)(xfer_buf+sizeof(UInt8)); // + pdr = (struct usb_ctrlrequest *)(xfer_buf+sizeof(UInt8)); // // // Get an URB and prepare it for submission // urb = usb_alloc_urb(0); // // - pdr->requesttype = USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE; // - pdr->request = 0; // - pdr->value = kADI_CMD_GET_2183_DATA; // - pdr->index = Addr; // - pdr->length = sizeof(UInt8); // + pdr->bRequestType = USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE; // + pdr->bRequest = 0; // + pdr->wValue = kADI_CMD_GET_2183_DATA; // + pdr->wIndex = Addr; // + pdr->wLength = sizeof(UInt8); // // FILL_CONTROL_URB(urb, pHw->usbdev, usb_rcvctrlpipe(pHw->usbdev,0), (UInt8 *)pdr, // xfer_buf, sizeof(UInt8), MemReadCompletion, NULL); // @@ -429,7 +429,7 @@ /**********************************************************************************/ /* QueueControlUrb */ /**********************************************************************************/ -static void QueueControlUrb(Hardware *pHw, urb_t *urb) +static void QueueControlUrb(Hardware *pHw, struct urb *urb) { int ret; QUEUED_URB_BUFFER *qItem; Only in ADI_DRIVER: Util.c~ Only in ADI_DRIVER: Util.o