Staging: rt2860: prepare for rt28[67]0/*.[ch] merge

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 146 insertions, 5 deletions

diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index bfd9d062d09..85175c18243 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -43,6 +43,9 @@
 #include "rtmp_type.h"
 #include <linux/module.h>
 #include <linux/kernel.h>
+#if !defined(RT2860) && !defined(RT30xx)
+#include <linux/kthread.h>
+#endif
 
 #include <linux/spinlock.h>
 #include <linux/init.h>
@@ -64,6 +67,9 @@
 #include <linux/vmalloc.h>
 
 
+#ifdef RT30xx
+#include <linux/wireless.h>
+#endif
 #include <net/iw_handler.h>
 
 // load firmware
@@ -87,16 +93,31 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
 
 // add by kathy
 
+#ifdef RT2860
 #define STA_PROFILE_PATH                        "/etc/Wireless/RT2860STA/RT2860STA.dat"
 #define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin"
 #define STA_NIC_DEVICE_NAME                     "RT2860STA"
 #define STA_DRIVER_VERSION                      "1.8.1.1"
+#endif
+#ifdef RT2870
+#define STA_PROFILE_PATH                        "/etc/Wireless/RT2870STA/RT2870STA.dat"
+#define STA_RT2870_IMAGE_FILE_NAME  "/etc/Wireless/RT2870STA/rt2870.bin"
+#define STA_NIC_DEVICE_NAME                     "RT2870STA"
+#ifndef RT30xx
+#define STA_DRIVER_VERSION                      "1.4.0.0"
+#endif
+#ifdef RT30xx
+#define STA_DRIVER_VERSION                      "2.0.1.0"
+#endif
+#endif
 
+#ifdef RT2860
 #ifndef PCI_DEVICE
 #define PCI_DEVICE(vend,dev) \
         .vendor = (vend), .device = (dev), \
         .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 #endif // PCI_DEVICE //
+#endif
 
 #define RTMP_TIME_AFTER(a,b)            \
         (typecheck(unsigned long, (unsigned long)a) && \
@@ -143,12 +164,16 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
 #define NDIS_PACKET_TYPE_BROADCAST              2
 #define NDIS_PACKET_TYPE_ALL_MULTICAST  3
 
+#ifndef RT30xx
 typedef struct pid *    THREAD_PID;
+#ifdef RT2860
 #define THREAD_PID_INIT_VALUE   NULL
+#endif
 #define GET_PID(_v)     find_get_pid(_v)
 #define GET_PID_NUMBER(_v)      pid_nr(_v)
 #define CHECK_PID_LEGALITY(_pid)        if (pid_nr(_pid) >= 0)
 #define KILL_THREAD_PID(_A, _B, _C)     kill_pid(_A, _B, _C)
+#endif
 
 struct os_lock  {
         spinlock_t              lock;
@@ -157,10 +182,25 @@ struct os_lock  {
 
 
 struct os_cookie {
+#ifdef RT2860
         struct pci_dev                  *pci_dev;
         struct pci_dev                  *parent_pci_dev;
         dma_addr_t                              pAd_pa;
+#endif
+#ifdef RT2870
+        struct usb_device       *pUsb_Dev;
 
+#ifndef RT30xx
+        struct task_struct      *MLMEThr_task;
+        struct task_struct      *RTUSBCmdThr_task;
+        struct task_struct      *TimerQThr_task;
+#endif
+#ifdef RT30xx
+        struct pid      *MLMEThr_pid;
+        struct pid      *RTUSBCmdThr_pid;
+        struct pid      *TimerQThr_pid;
+#endif
+#endif // RT2870 //
 
         struct tasklet_struct   rx_done_task;
         struct tasklet_struct   mgmt_dma_done_task;
@@ -170,8 +210,14 @@ struct os_cookie {
         struct tasklet_struct   ac3_dma_done_task;
         struct tasklet_struct   hcca_dma_done_task;
         struct tasklet_struct   tbtt_task;
+#ifdef RT2860
         struct tasklet_struct   fifo_statistic_full_task;
-
+#endif
+#ifdef RT2870
+        struct tasklet_struct   null_frame_complete_task;
+        struct tasklet_struct   rts_frame_complete_task;
+        struct tasklet_struct   pspoll_frame_complete_task;
+#endif // RT2870 //
 
         unsigned long                   apd_pid; //802.1x daemon pid
         INT                                             ioctl_if_type;
@@ -219,6 +265,7 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
 
 #define RT2860_PCI_DEVICE_ID            0x0601
 
+#ifdef RT2860
 #define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \
         linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir)
 
@@ -233,7 +280,12 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
 
 #define DEV_ALLOC_SKB(_length) \
         dev_alloc_skb(_length)
+#endif
+#ifdef RT2870
+#define PCI_MAP_SINGLE(_handle, _ptr, _size, _dir) (ULONG)0
 
+#define PCI_UNMAP_SINGLE(_handle, _ptr, _size, _dir)
+#endif // RT2870 //
 
 
 #define BEACON_FRAME_DMA_CACHE_WBACK(_ptr, _size)       \
@@ -247,9 +299,20 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
 
 #define NdisMIndicateStatus(_w, _x, _y, _z)
 
-
 typedef struct timer_list       RTMP_OS_TIMER;
 
+#ifdef RT2870
+/* ----------------- Timer Related MARCO ---------------*/
+// In RT2870, we have a lot of timer functions and will read/write register, it's
+//      not allowed in Linux USB sub-system to do it ( because of sleep issue when submit
+//  to ctrl pipe). So we need a wrapper function to take care it.
+
+typedef VOID (*RT2870_TIMER_HANDLE)(
+        IN  PVOID   SystemSpecific1,
+        IN  PVOID   FunctionContext,
+        IN  PVOID   SystemSpecific2,
+        IN  PVOID   SystemSpecific3);
+#endif // RT2870 //
 
 
 typedef struct  _RALINK_TIMER_STRUCT    {
@@ -260,9 +323,42 @@ typedef struct  _RALINK_TIMER_STRUCT    {
     BOOLEAN             Repeat;         // True if periodic timer
     ULONG               TimerValue;     // Timer value in milliseconds
         ULONG                           cookie;                 // os specific object
+#ifdef RT2870
+        RT2870_TIMER_HANDLE     handle;
+        void                            *pAd;
+#endif // RT2870 //
 }   RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT;
 
 
+#ifdef RT2870
+
+typedef enum _RT2870_KERNEL_THREAD_STATUS_
+{
+        RT2870_THREAD_UNKNOWN = 0,
+        RT2870_THREAD_INITED = 1,
+        RT2870_THREAD_RUNNING = 2,
+        RT2870_THREAD_STOPED = 4,
+}RT2870_KERNEL_THREAD_STATUS;
+
+#define RT2870_THREAD_CAN_DO_INSERT             (RT2870_THREAD_INITED |RT2870_THREAD_RUNNING)
+
+typedef struct _RT2870_TIMER_ENTRY_
+{
+        RALINK_TIMER_STRUCT                     *pRaTimer;
+        struct _RT2870_TIMER_ENTRY_     *pNext;
+}RT2870_TIMER_ENTRY;
+
+
+#define TIMER_QUEUE_SIZE_MAX    128
+typedef struct _RT2870_TIMER_QUEUE_
+{
+        unsigned int            status;
+        UCHAR                           *pTimerQPoll;
+        RT2870_TIMER_ENTRY      *pQPollFreeList;
+        RT2870_TIMER_ENTRY      *pQHead;
+        RT2870_TIMER_ENTRY      *pQTail;
+}RT2870_TIMER_QUEUE;
+#endif // RT2870 //
 
 
 //#define DBG   1
@@ -352,6 +448,7 @@ extern ULONG    RTDebugLevel;
         spin_unlock_irqrestore((spinlock_t *)(__lock), ((unsigned long)__irqflag));     \
 }
 
+#ifdef RT2860
 #if defined(INF_TWINPASS) || defined(INF_DANUBE) || defined(IKANOS_VX_1X0)
 //Patch for ASIC turst read/write bug, needs to remove after metel fix
 #define RTMP_IO_READ32(_A, _R, _pV)                                                                     \
@@ -453,7 +550,32 @@ extern ULONG    RTDebugLevel;
         writew((_V), (PUSHORT)((_A)->CSRBaseAddress + (_R)));   \
 }
 #endif
+#endif /* RT2860 */
+#ifdef RT2870
+//Patch for ASIC turst read/write bug, needs to remove after metel fix
+#define RTMP_IO_READ32(_A, _R, _pV)                                                             \
+        RTUSBReadMACRegister(_A, _R, _pV)
+
+#define RTMP_IO_READ8(_A, _R, _pV)                                                              \
+{                                                                                                                               \
+}
 
+#define RTMP_IO_WRITE32(_A, _R, _V)                                                             \
+        RTUSBWriteMACRegister(_A, _R, _V)
+
+
+#define RTMP_IO_WRITE8(_A, _R, _V)                                                              \
+{                                                                                                                               \
+        USHORT  _Val = _V;                                                                                      \
+        RTUSBSingleWrite(_A, _R, _Val);                                                         \
+}
+
+
+#define RTMP_IO_WRITE16(_A, _R, _V)                                                             \
+{                                                                                                                               \
+        RTUSBSingleWrite(_A, _R, _V);                                                           \
+}
+#endif // RT2870 //
 
 #ifndef wait_event_interruptible_timeout
 #define __wait_event_interruptible_timeout(wq, condition, ret) \
@@ -496,7 +618,6 @@ do { \
                 wait_event_interruptible_timeout(_wait, 0, ONE_TICK); }
 
 
-/* Modified by Wu Xi-Kun 4/21/2006 */
 typedef void (*TIMER_FUNCTION)(unsigned long);
 
 #define COPY_MAC_ADDR(Addr1, Addr2)             memcpy((Addr1), (Addr2), MAC_ADDR_LEN)
@@ -504,6 +625,7 @@ typedef void (*TIMER_FUNCTION)(unsigned long);
 #define MlmeAllocateMemory(_pAd, _ppVA) os_alloc_mem(_pAd, _ppVA, MGMT_DMA_BUFFER_SIZE)
 #define MlmeFreeMemory(_pAd, _pVA)     os_free_mem(_pAd, _pVA)
 
+#ifdef RT2860
 #define BUILD_TIMER_FUNCTION(_func)                                                                                             \
 void linux_##_func(unsigned long data)                                                                                  \
 {                                                                                                                                                               \
@@ -513,7 +635,22 @@ void linux_##_func(unsigned long data)											\
         if (pTimer->Repeat)                                                                                                                     \
                 RTMP_OS_Add_Timer(&pTimer->TimerObj, pTimer->TimerValue);                               \
 }
-
+#endif
+#ifdef RT2870
+#define BUILD_TIMER_FUNCTION(_func)                                                                                                     \
+void linux_##_func(unsigned long data)                                                                                          \
+{                                                                                                                                                                       \
+        PRALINK_TIMER_STRUCT    _pTimer = (PRALINK_TIMER_STRUCT)data;                                   \
+        RT2870_TIMER_ENTRY              *_pQNode;                                                                                               \
+        RTMP_ADAPTER                    *_pAd;                                                                                                  \
+                                                                                                                                                                \
+        _pTimer->handle = _func;                                                                                                                        \
+        _pAd = (RTMP_ADAPTER *)_pTimer->pAd;                                                                                            \
+        _pQNode = RT2870_TimerQ_Insert(_pAd, _pTimer);                                                                  \
+        if ((_pQNode == NULL) && (_pAd->TimerQ.status & RT2870_THREAD_CAN_DO_INSERT))   \
+                RTMP_OS_Add_Timer(&_pTimer->TimerObj, HZ);                                                      \
+}
+#endif // RT2870 //
 
 
 #define DECLARE_TIMER_FUNCTION(_func)                   \
@@ -527,6 +664,9 @@ DECLARE_TIMER_FUNCTION(MlmeRssiReportExec);
 DECLARE_TIMER_FUNCTION(AsicRxAntEvalTimeout);
 DECLARE_TIMER_FUNCTION(APSDPeriodicExec);
 DECLARE_TIMER_FUNCTION(AsicRfTuningExec);
+#ifdef RT2870
+DECLARE_TIMER_FUNCTION(BeaconUpdateExec);
+#endif // RT2870 //
 
 DECLARE_TIMER_FUNCTION(BeaconTimeout);
 DECLARE_TIMER_FUNCTION(ScanTimeout);
@@ -849,6 +989,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb);
 
 void rtmp_os_thread_init(PUCHAR pThreadName, PVOID pNotify);
 
+#ifdef RT2860
 #if !defined(PCI_CAP_ID_EXP)
 #define PCI_CAP_ID_EXP                      0x10
 #endif
@@ -862,5 +1003,5 @@ void rtmp_os_thread_init(PUCHAR pThreadName, PVOID pNotify);
 #endif
 
 #define PCIBUS_INTEL_VENDOR         0x8086
-
+#endif