Skip to content

L
linux
Commit b0ea8461 authored by Neil Munro's avatar Neil Munro Committed by Greg Kroah-Hartman
Browse files
Options

Staging: RT2860: Fixed all warnings and errors in the iface directory 

I have cleaned both files inside the iface directory (fileo rtmp_pci.h
and rtmp_usb.h). I am not sure about some of the changes I have made
however my adjustments have solved all errors.  There were also a few
issues on my machine with ap.h on my machine, however I have since
cleaned that too.
Signed-off-by: default avatarNeil Munro <neilmunro@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 39831861
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 78 deletions
drivers/staging/rt2860/ap.h
View file @ b0ea8461
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
* * * *
************************************************************************* *************************************************************************
Module Name: Module Name:
ap.h ap.h
Abstract: Abstract:
Miniport generic portion header file Miniport generic portion header file
Revision History: Revision History:
Who When What Who When What
-------- ---------- ---------------------------------------------- -------- ---------- ----------------------------------------------
Paul Lin 08-01-2002 created Paul Lin 08-01-2002 created
James Tan 09-06-2002 modified (Revise NTCRegTable) James Tan 09-06-2002 modified (Revise NTCRegTable)
John Chang 12-22-2004 modified for RT2561/2661. merge with STA driver John Chang 12-22-2004 modified for RT2561/2661. merge with STA driver
*/ */
#ifndef __AP_H__ #ifndef __AP_H__
#define __AP_H__ #define __AP_H__
......
drivers/staging/rt2860/iface/rtmp_pci.h
View file @ b0ea8461
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
((struct os_cookie *)handle)->pci_dev = dev_p; ((struct os_cookie *)handle)->pci_dev = dev_p;
#ifdef LINUX #ifdef LINUX
// set driver data /* set driver data */
#define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev); #define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev);
#define RT28XX_PUT_DEVICE(dev_p) #define RT28XX_PUT_DEVICE(dev_p)
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
#ifdef PCI_MSI_SUPPORT #ifdef PCI_MSI_SUPPORT
#define RTMP_MSI_ENABLE(_pAd) \ #define RTMP_MSI_ENABLE(_pAd) \
{ struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \ { struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \
(_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) == 0 ? TRUE : FALSE; \ (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) \
== 0 ? TRUE : FALSE; \
} }
#define RTMP_MSI_DISABLE(_pAd) \ #define RTMP_MSI_DISABLE(_pAd) \
...@@ -52,27 +53,28 @@ ...@@ -52,27 +53,28 @@
_pAd->HaveMsi = FALSE; \ _pAd->HaveMsi = FALSE; \
} }
#else #else
#define RTMP_MSI_ENABLE(_pAd) do{}while(0) #define RTMP_MSI_ENABLE(_pAd) do {} while (0)
#define RTMP_MSI_DISABLE(_pAd) do{}while(0) #define RTMP_MSI_DISABLE(_pAd) do {} while (0)
#endif // PCI_MSI_SUPPORT // #endif /* PCI_MSI_SUPPORT */
#define RTMP_PCI_DEV_UNMAP() \ #define RTMP_PCI_DEV_UNMAP() \
{ if (net_dev->base_addr) { \ { if (net_dev->base_addr) { \
iounmap((void *)(net_dev->base_addr)); \ iounmap((void *)(net_dev->base_addr)); \
release_mem_region(pci_resource_start(dev_p, 0), \ release_mem_region(pci_resource_start(dev_p, 0), \
pci_resource_len(dev_p, 0)); } \ pci_resource_len(dev_p, 0)); } \
if (net_dev->irq) pci_release_regions(dev_p); } if (net_dev->irq) \
pci_release_regions(dev_p); }
#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) \ #define PCI_REG_READ_WORD(pci_dev, offset, Configuration) {\
if (pci_read_config_word(pci_dev, offset, &reg16) == 0) \ if (pci_read_config_word(pci_dev, offset, &reg16) == 0) \
Configuration = le2cpu16(reg16); \ Configuration = le2cpu16(reg16); \
else \ else \
Configuration = 0; Configuration = 0; }
#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) \ #define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) {\
reg16 = cpu2le16(Configuration); \ reg16 = cpu2le16(Configuration); \
pci_write_config_word(pci_dev, offset, reg16); pci_write_config_word(pci_dev, offset, reg16); }
#endif // LINUX // #endif /* LINUX */
#endif // __RTMP_PCI_H__ // #endif /* __RTMP_PCI_H__ */
drivers/staging/rt2860/iface/rtmp_usb.h
View file @ b0ea8461
...@@ -32,41 +32,40 @@ ...@@ -32,41 +32,40 @@
#ifdef LINUX #ifdef LINUX
#include <linux/usb.h> #include <linux/usb.h>
#endif // LINUX // #endif /* LINUX */
extern u8 EpToQueue[6]; extern u8 EpToQueue[6];
#define RXBULKAGGRE_ZISE 12 #define RXBULKAGGRE_ZISE 12
#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) #define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1))
#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) #define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE)
#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) #define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE)
#define MAX_MLME_HANDLER_MEMORY 20 #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_DATA_NULL 0x00000001
#define fRTUSB_BULK_OUT_RTS 0x00000002 #define fRTUSB_BULK_OUT_RTS 0x00000002
#define fRTUSB_BULK_OUT_MLME 0x00000004 #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 0x00000020
#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 #define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040
#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 #define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080
#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 #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_2 0x00020000
#define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000 #define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000
#define fRTUSB_BULK_OUT_DATA_NORMAL_4 0x00080000 #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) \ #define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \
{ \ { \
if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition) \ if ((_txContext)->ENextBulkOutPosition == \
{ \ (_txContext)->CurWritePosition) {\
(_txContext)->bRingEmpty = TRUE; \ (_txContext)->bRingEmpty = TRUE; \
} \ } \
/*NdisInterlockedDecrement(&(_p)->TxCount); */\ /*NdisInterlockedDecrement(&(_p)->TxCount); */\
} }
...@@ -77,16 +76,32 @@ extern u8 EpToQueue[6]; ...@@ -77,16 +76,32 @@ extern u8 EpToQueue[6];
******************************************************************************/ ******************************************************************************/
#ifdef LINUX #ifdef LINUX
#define BULKAGGRE_ZISE 100 #define BULKAGGRE_ZISE 100
#define RT28XX_PUT_DEVICE usb_put_dev #define RT28XX_PUT_DEVICE usb_put_dev
#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC)
#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, \
#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) GFP_ATOMIC)
#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) #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) #define RTUSB_FREE_URB(pUrb) usb_free_urb(pUrb)
// unlink urb /* unlink urb */
#define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb) #define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb)
extern void dump_urb(struct urb *purb); extern void dump_urb(struct urb *purb);
...@@ -97,9 +112,9 @@ extern void dump_urb(struct urb *purb); ...@@ -97,9 +112,9 @@ extern void dump_urb(struct urb *purb);
#define NdisInterlockedDecrement atomic_dec #define NdisInterlockedDecrement atomic_dec
#define InterlockedExchange atomic_set #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_OUT 0
#define USBD_TRANSFER_DIRECTION_IN 0 #define USBD_TRANSFER_DIRECTION_IN 0
...@@ -112,8 +127,8 @@ extern void dump_urb(struct urb *purb); ...@@ -112,8 +127,8 @@ extern void dump_urb(struct urb *purb);
#define USB_ST_NOERROR 0 #define USB_ST_NOERROR 0
#endif #endif
// vendor-specific control operations /* vendor-specific control operations */
#define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000) #define CONTROL_TIMEOUT_JIFFIES ((100 * OS_HZ) / 1000)
#define UNLINK_TIMEOUT_MS 3 #define UNLINK_TIMEOUT_MS 3
void RTUSBBulkOutDataPacketComplete(struct urb *purb, struct pt_regs *pt_regs); void RTUSBBulkOutDataPacketComplete(struct urb *purb, struct pt_regs *pt_regs);
...@@ -125,50 +140,49 @@ void RTUSBBulkRxComplete(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 #ifdef KTHREAD_SUPPORT
#define RTUSBMlmeUp(pAd) \ #define RTUSBMlmeUp(pAd) \
do{ \ do { \
struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\
if (_pTask->kthread_task) \ if (_pTask->kthread_task) {\
{ \
_pTask->kthread_running = TRUE; \ _pTask->kthread_running = TRUE; \
wake_up(&_pTask->kthread_q); \ wake_up(&_pTask->kthread_q); \
} \ } \
}while(0) } while (0)
#else #else
#define RTUSBMlmeUp(pAd) \ #define RTUSBMlmeUp(pAd) \
do{ \ do { \
struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\
CHECK_PID_LEGALITY(_pTask->taskPID) \ CHECK_PID_LEGALITY(_pTask->taskPID) \
{ \ { \
RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \
}\ } \
}while(0) } while (0)
#endif #endif
#ifdef KTHREAD_SUPPORT #ifdef KTHREAD_SUPPORT
#define RTUSBCMDUp(pAd) \ #define RTUSBCMDUp(pAd) \
do{ \ do { \
struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \
{ \ { \
_pTask->kthread_running = TRUE; \ _pTask->kthread_running = TRUE; \
wake_up(&_pTask->kthread_q); \ wake_up(&_pTask->kthread_q); \
} \ } \
}while(0) } while (0)
#else #else
#define RTUSBCMDUp(pAd) \ #define RTUSBCMDUp(pAd) \
do{ \ do { \
struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \
CHECK_PID_LEGALITY(_pTask->taskPID) \ CHECK_PID_LEGALITY(_pTask->taskPID) \
{\ {\
RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \
}\ } \
}while(0) } while (0)
#endif #endif
#define DEVICE_VENDOR_REQUEST_OUT 0x40 #define DEVICE_VENDOR_REQUEST_OUT 0x40
#define DEVICE_VENDOR_REQUEST_IN 0xc0 #define DEVICE_VENDOR_REQUEST_IN 0xc0
//#define INTERFACE_VENDOR_REQUEST_OUT 0x41 /*#define INTERFACE_VENDOR_REQUEST_OUT 0x41*/
//#define INTERFACE_VENDOR_REQUEST_IN 0xc1 /*#define INTERFACE_VENDOR_REQUEST_IN 0xc1*/
#define BULKOUT_MGMT_RESET_FLAG 0x80 #define BULKOUT_MGMT_RESET_FLAG 0x80
...@@ -176,7 +190,7 @@ void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); ...@@ -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_CLEAR_BULK_FLAG(_M, _F) ((_M)->BulkFlags &= ~(_F))
#define RTUSB_TEST_BULK_FLAG(_M, _F) (((_M)->BulkFlags & (_F)) != 0) #define RTUSB_TEST_BULK_FLAG(_M, _F) (((_M)->BulkFlags & (_F)) != 0)
#define RTMP_IRQ_REQUEST(net_dev) do{}while(0) #define RTMP_IRQ_REQUEST(net_dev) do {} while (0)
#define RTMP_IRQ_RELEASE(net_dev) do{}while(0) #define RTMP_IRQ_RELEASE(net_dev) do {} while (0)
#endif // __RTMP_USB_H__ // #endif /* __RTMP_USB_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7