diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/bcm/InterfaceAdapter.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm/InterfaceAdapter.h')
-rw-r--r-- | drivers/staging/bcm/InterfaceAdapter.h | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h new file mode 100644 index 0000000..6397c20 --- /dev/null +++ b/drivers/staging/bcm/InterfaceAdapter.h @@ -0,0 +1,97 @@ +#ifndef _INTERFACE_ADAPTER_H +#define _INTERFACE_ADAPTER_H + +typedef struct _BULK_ENDP_IN +{ + PCHAR bulk_in_buffer; + size_t bulk_in_size; + UCHAR bulk_in_endpointAddr; + UINT bulk_in_pipe; +}BULK_ENDP_IN, *PBULK_ENDP_IN; + + +typedef struct _BULK_ENDP_OUT +{ + UCHAR bulk_out_buffer; + size_t bulk_out_size; + UCHAR bulk_out_endpointAddr; + UINT bulk_out_pipe; + //this is used when int out endpoint is used as bulk out end point + UCHAR int_out_interval; +}BULK_ENDP_OUT, *PBULK_ENDP_OUT; + +typedef struct _INTR_ENDP_IN +{ + PCHAR int_in_buffer; + size_t int_in_size; + UCHAR int_in_endpointAddr; + UCHAR int_in_interval; + UINT int_in_pipe; +}INTR_ENDP_IN, *PINTR_ENDP_IN; + +typedef struct _INTR_ENDP_OUT +{ + PCHAR int_out_buffer; + size_t int_out_size; + UCHAR int_out_endpointAddr; + UCHAR int_out_interval; + UINT int_out_pipe; +}INTR_ENDP_OUT, *PINTR_ENDP_OUT; + + +typedef struct _USB_TCB +{ + struct urb *urb; + PVOID psIntfAdapter; + BOOLEAN bUsed; +}USB_TCB, *PUSB_TCB; + + +typedef struct _USB_RCB +{ + struct urb *urb; + PVOID psIntfAdapter; + BOOLEAN bUsed; +}USB_RCB, *PUSB_RCB; + +/* +//This is the interface specific Sub-Adapter +//Structure. +*/ +typedef struct _S_INTERFACE_ADAPTER +{ + struct usb_device * udev; + struct usb_interface * interface; + + /* Bulk endpoint in info */ + BULK_ENDP_IN sBulkIn; + /* Bulk endpoint out info */ + BULK_ENDP_OUT sBulkOut; + /* Interrupt endpoint in info */ + INTR_ENDP_IN sIntrIn; + /* Interrupt endpoint out info */ + INTR_ENDP_OUT sIntrOut; + + + + ULONG ulInterruptData[2]; + + struct urb *psInterruptUrb; + + USB_TCB asUsbTcb[MAXIMUM_USB_TCB]; + USB_RCB asUsbRcb[MAXIMUM_USB_RCB]; + atomic_t uNumTcbUsed; + atomic_t uCurrTcb; + atomic_t uNumRcbUsed; + atomic_t uCurrRcb; + + PMINI_ADAPTER psAdapter; + BOOLEAN bFlashBoot; + BOOLEAN bHighSpeedDevice ; + + BOOLEAN bSuspended; + BOOLEAN bPreparingForBusSuspend; + struct work_struct usbSuspendWork; +}S_INTERFACE_ADAPTER,*PS_INTERFACE_ADAPTER; + +#endif |