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/rt2860/iface/rtmp_usb.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/rt2860/iface/rtmp_usb.h')
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_usb.h | 110 |
1 files changed, 62 insertions, 48 deletions
diff --git a/drivers/staging/rt2860/iface/rtmp_usb.h b/drivers/staging/rt2860/iface/rtmp_usb.h index 33479cc..5712896 100644 --- a/drivers/staging/rt2860/iface/rtmp_usb.h +++ b/drivers/staging/rt2860/iface/rtmp_usb.h @@ -32,41 +32,40 @@ #ifdef LINUX #include <linux/usb.h> -#endif // LINUX // +#endif /* LINUX */ extern u8 EpToQueue[6]; #define RXBULKAGGRE_ZISE 12 -#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) -#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) -#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) +#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) +#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) +#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) #define MAX_MLME_HANDLER_MEMORY 20 -// Flags for Bulkflags control for bulk out data -// +/* Flags for Bulkflags control for bulk out data */ #define fRTUSB_BULK_OUT_DATA_NULL 0x00000001 -#define fRTUSB_BULK_OUT_RTS 0x00000002 -#define fRTUSB_BULK_OUT_MLME 0x00000004 +#define fRTUSB_BULK_OUT_RTS 0x00000002 +#define fRTUSB_BULK_OUT_MLME 0x00000004 -#define fRTUSB_BULK_OUT_PSPOLL 0x00000010 +#define fRTUSB_BULK_OUT_PSPOLL 0x00000010 #define fRTUSB_BULK_OUT_DATA_FRAG 0x00000020 -#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 -#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 -#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 +#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 +#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 +#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 -#define fRTUSB_BULK_OUT_DATA_NORMAL 0x00010000 +#define fRTUSB_BULK_OUT_DATA_NORMAL 0x00010000 #define fRTUSB_BULK_OUT_DATA_NORMAL_2 0x00020000 #define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000 #define fRTUSB_BULK_OUT_DATA_NORMAL_4 0x00080000 -// TODO:move to ./ate/include/iface/ate_usb.h +/* TODO:move to ./ate/include/iface/ate_usb.h */ #define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \ -{ \ - if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition) \ - { \ +{ \ + if ((_txContext)->ENextBulkOutPosition == \ + (_txContext)->CurWritePosition) {\ (_txContext)->bRingEmpty = TRUE; \ - } \ + } \ /*NdisInterlockedDecrement(&(_p)->TxCount); */\ } @@ -77,16 +76,32 @@ extern u8 EpToQueue[6]; ******************************************************************************/ #ifdef LINUX -#define BULKAGGRE_ZISE 100 -#define RT28XX_PUT_DEVICE usb_put_dev -#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) -#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#define BULKAGGRE_ZISE 100 +#define RT28XX_PUT_DEVICE usb_put_dev +#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) +#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, \ + GFP_ATOMIC) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, \ + BufSize, \ + pDma_addr) \ + usb_alloc_coherent(\ + pUsb_Dev, \ + BufSize, \ + GFP_ATOMIC, \ + pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, \ + BufSize, \ + pTransferBuf, \ + Dma_addr) \ + usb_free_coherent( \ + pUsb_Dev, \ + BufSize, \ + pTransferBuf, \ + Dma_addr) #define RTUSB_FREE_URB(pUrb) usb_free_urb(pUrb) -// unlink urb +/* unlink urb */ #define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb) extern void dump_urb(struct urb *purb); @@ -97,9 +112,9 @@ extern void dump_urb(struct urb *purb); #define NdisInterlockedDecrement atomic_dec #define InterlockedExchange atomic_set -#endif // LINUX // +#endif /* LINUX */ -#define NT_SUCCESS(status) (((status) >=0) ? (TRUE):(FALSE)) +#define NT_SUCCESS(status) (((status) >= 0) ? (TRUE) : (FALSE)) #define USBD_TRANSFER_DIRECTION_OUT 0 #define USBD_TRANSFER_DIRECTION_IN 0 @@ -112,8 +127,8 @@ extern void dump_urb(struct urb *purb); #define USB_ST_NOERROR 0 #endif -// vendor-specific control operations -#define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000) +/* vendor-specific control operations */ +#define CONTROL_TIMEOUT_JIFFIES ((100 * OS_HZ) / 1000) #define UNLINK_TIMEOUT_MS 3 void RTUSBBulkOutDataPacketComplete(struct urb *purb, struct pt_regs *pt_regs); @@ -125,50 +140,49 @@ void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); #ifdef KTHREAD_SUPPORT #define RTUSBMlmeUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ - if (_pTask->kthread_task) \ - { \ + if (_pTask->kthread_task) {\ _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ + wake_up(&_pTask->kthread_q); \ } \ - }while(0) + } while (0) #else #define RTUSBMlmeUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ CHECK_PID_LEGALITY(_pTask->taskPID) \ { \ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - }\ - }while(0) + } \ + } while (0) #endif #ifdef KTHREAD_SUPPORT #define RTUSBCMDUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ { \ _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ + wake_up(&_pTask->kthread_q); \ } \ - }while(0) + } while (0) #else #define RTUSBCMDUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ CHECK_PID_LEGALITY(_pTask->taskPID) \ {\ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - }\ - }while(0) + } \ + } while (0) #endif #define DEVICE_VENDOR_REQUEST_OUT 0x40 #define DEVICE_VENDOR_REQUEST_IN 0xc0 -//#define INTERFACE_VENDOR_REQUEST_OUT 0x41 -//#define INTERFACE_VENDOR_REQUEST_IN 0xc1 +/*#define INTERFACE_VENDOR_REQUEST_OUT 0x41*/ +/*#define INTERFACE_VENDOR_REQUEST_IN 0xc1*/ #define BULKOUT_MGMT_RESET_FLAG 0x80 @@ -176,7 +190,7 @@ void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); #define RTUSB_CLEAR_BULK_FLAG(_M, _F) ((_M)->BulkFlags &= ~(_F)) #define RTUSB_TEST_BULK_FLAG(_M, _F) (((_M)->BulkFlags & (_F)) != 0) -#define RTMP_IRQ_REQUEST(net_dev) do{}while(0) -#define RTMP_IRQ_RELEASE(net_dev) do{}while(0) +#define RTMP_IRQ_REQUEST(net_dev) do {} while (0) +#define RTMP_IRQ_RELEASE(net_dev) do {} while (0) -#endif // __RTMP_USB_H__ // +#endif /* __RTMP_USB_H__ */ |