]> Pileus Git - ~andy/linux/blobdiff - drivers/staging/rt2860/usb_main_dev.c
Merge branch 'sony' into release
[~andy/linux] / drivers / staging / rt2860 / usb_main_dev.c
index 74529d11602cbfa83962da9b63bbb42c6ba0354b..925a236e104421214ec53e31ec571fb5107c9ab9 100644 (file)
@@ -143,17 +143,17 @@ struct usb_device_id rtusb_usb_id[] = {
        {}                      /* Terminating entry */
 };
 
-INT const rtusb_usb_id_len =
+int const rtusb_usb_id_len =
     sizeof(rtusb_usb_id) / sizeof(struct usb_device_id);
 
 MODULE_DEVICE_TABLE(usb, rtusb_usb_id);
 
-static void rt2870_disconnect(IN struct usb_device *dev, IN PRTMP_ADAPTER pAd);
+static void rt2870_disconnect(struct usb_device *dev, struct rt_rtmp_adapter *pAd);
 
 static int __devinit rt2870_probe(IN struct usb_interface *intf,
                                  IN struct usb_device *usb_dev,
                                  IN const struct usb_device_id *dev_id,
-                                 IN RTMP_ADAPTER ** ppAd);
+                                 struct rt_rtmp_adapter ** ppAd);
 
 #ifndef PF_NOFREEZE
 #define PF_NOFREEZE  0
@@ -164,7 +164,7 @@ extern int rt28xx_open(struct net_device *net_dev);
 
 static BOOLEAN USBDevConfigInit(IN struct usb_device *dev,
                                IN struct usb_interface *intf,
-                               IN RTMP_ADAPTER * pAd);
+                               struct rt_rtmp_adapter *pAd);
 
 /*
 ========================================================================
@@ -185,7 +185,7 @@ BOOLEAN RT28XXChipsetCheck(IN void *_dev_p)
 {
        struct usb_interface *intf = (struct usb_interface *)_dev_p;
        struct usb_device *dev_p = interface_to_usbdev(intf);
-       UINT32 i;
+       u32 i;
 
        for (i = 0; i < rtusb_usb_id_len; i++) {
                if (dev_p->descriptor.idVendor == rtusb_usb_id[i].idVendor &&
@@ -222,11 +222,11 @@ static void rtusb_disconnect(struct usb_interface *intf);
 
 static BOOLEAN USBDevConfigInit(IN struct usb_device *dev,
                                IN struct usb_interface *intf,
-                               IN RTMP_ADAPTER * pAd)
+                               struct rt_rtmp_adapter *pAd)
 {
        struct usb_host_interface *iface_desc;
-       ULONG BulkOutIdx;
-       UINT32 i;
+       unsigned long BulkOutIdx;
+       u32 i;
 
        /* get the active interface descriptor */
        iface_desc = intf->cur_altsetting;
@@ -299,7 +299,7 @@ static BOOLEAN USBDevConfigInit(IN struct usb_device *dev,
 static int rtusb_probe(struct usb_interface *intf,
                       const struct usb_device_id *id)
 {
-       RTMP_ADAPTER *pAd;
+       struct rt_rtmp_adapter *pAd;
        struct usb_device *dev;
        int rv;
 
@@ -316,7 +316,7 @@ static int rtusb_probe(struct usb_interface *intf,
 static void rtusb_disconnect(struct usb_interface *intf)
 {
        struct usb_device *dev = interface_to_usbdev(intf);
-       PRTMP_ADAPTER pAd;
+       struct rt_rtmp_adapter *pAd;
 
        pAd = usb_get_intfdata(intf);
        usb_set_intfdata(intf, NULL);
@@ -338,7 +338,7 @@ resume:rt2870_resume,
 
 #ifdef CONFIG_PM
 
-VOID RT2870RejectPendingPackets(IN PRTMP_ADAPTER pAd)
+void RT2870RejectPendingPackets(struct rt_rtmp_adapter *pAd)
 {
        /* clear PS packets */
        /* clear TxSw packets */
@@ -347,7 +347,7 @@ VOID RT2870RejectPendingPackets(IN PRTMP_ADAPTER pAd)
 static int rt2870_suspend(struct usb_interface *intf, pm_message_t state)
 {
        struct net_device *net_dev;
-       PRTMP_ADAPTER pAd = usb_get_intfdata(intf);
+       struct rt_rtmp_adapter *pAd = usb_get_intfdata(intf);
 
        DBGPRINT(RT_DEBUG_TRACE, ("===> rt2870_suspend()\n"));
        net_dev = pAd->net_dev;
@@ -365,7 +365,7 @@ static int rt2870_suspend(struct usb_interface *intf, pm_message_t state)
 static int rt2870_resume(struct usb_interface *intf)
 {
        struct net_device *net_dev;
-       PRTMP_ADAPTER pAd = usb_get_intfdata(intf);
+       struct rt_rtmp_adapter *pAd = usb_get_intfdata(intf);
 
        DBGPRINT(RT_DEBUG_TRACE, ("===> rt2870_resume()\n"));
 
@@ -382,14 +382,14 @@ static int rt2870_resume(struct usb_interface *intf)
 #endif /* CONFIG_PM // */
 
 /* Init driver module */
-INT __init rtusb_init(void)
+int __init rtusb_init(void)
 {
        printk("rtusb init --->\n");
        return usb_register(&rtusb_driver);
 }
 
 /* Deinit driver module */
-VOID __exit rtusb_exit(void)
+void __exit rtusb_exit(void)
 {
        usb_deregister(&rtusb_driver);
        printk("<--- rtusb exit\n");
@@ -416,15 +416,15 @@ Return Value:
 Note:
 ========================================================================
 */
-INT MlmeThread(IN void *Context)
+int MlmeThread(IN void *Context)
 {
-       RTMP_ADAPTER *pAd;
-       RTMP_OS_TASK *pTask;
+       struct rt_rtmp_adapter *pAd;
+       struct rt_rtmp_os_task *pTask;
        int status;
        status = 0;
 
-       pTask = (RTMP_OS_TASK *) Context;
-       pAd = (PRTMP_ADAPTER) pTask->priv;
+       pTask = (struct rt_rtmp_os_task *)Context;
+       pAd = (struct rt_rtmp_adapter *)pTask->priv;
 
        RtmpOSTaskCustomize(pTask);
 
@@ -485,15 +485,15 @@ Return Value:
 Note:
 ========================================================================
 */
-INT RTUSBCmdThread(IN void *Context)
+int RTUSBCmdThread(IN void *Context)
 {
-       RTMP_ADAPTER *pAd;
-       RTMP_OS_TASK *pTask;
+       struct rt_rtmp_adapter *pAd;
+       struct rt_rtmp_os_task *pTask;
        int status;
        status = 0;
 
-       pTask = (RTMP_OS_TASK *) Context;
-       pAd = (PRTMP_ADAPTER) pTask->priv;
+       pTask = (struct rt_rtmp_os_task *)Context;
+       pAd = (struct rt_rtmp_adapter *)pTask->priv;
 
        RtmpOSTaskCustomize(pTask);
 
@@ -522,7 +522,7 @@ INT RTUSBCmdThread(IN void *Context)
        }
 
        if (pAd && !pAd->PM_FlgSuspend) {       /* Clear the CmdQElements. */
-               CmdQElmt *pCmdQElmt = NULL;
+               struct rt_cmdqelmt *pCmdQElmt = NULL;
 
                NdisAcquireSpinLock(&pAd->CmdQLock);
                pAd->CmdQ.CmdQState = RTMP_TASK_STAT_STOPED;
@@ -533,13 +533,13 @@ INT RTUSBCmdThread(IN void *Context)
                                        if (pCmdQElmt->buffer != NULL)
                                                os_free_mem(pAd,
                                                            pCmdQElmt->buffer);
-                                       os_free_mem(pAd, (PUCHAR) pCmdQElmt);
+                                       os_free_mem(pAd, (u8 *)pCmdQElmt);
                                } else {
                                        if ((pCmdQElmt->buffer != NULL)
                                            && (pCmdQElmt->bufferlength != 0))
                                                os_free_mem(pAd,
                                                            pCmdQElmt->buffer);
-                                       os_free_mem(pAd, (PUCHAR) pCmdQElmt);
+                                       os_free_mem(pAd, (u8 *)pCmdQElmt);
                                }
                        }
                }
@@ -570,21 +570,21 @@ INT RTUSBCmdThread(IN void *Context)
 
 }
 
-VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
+void RTUSBWatchDog(struct rt_rtmp_adapter *pAd)
 {
-       PHT_TX_CONTEXT pHTTXContext;
+       struct rt_ht_tx_context *pHTTXContext;
        int idx;
-       ULONG irqFlags;
+       unsigned long irqFlags;
        PURB pUrb;
        BOOLEAN needDumpSeq = FALSE;
-       UINT32 MACValue;
-       UINT32 TxRxQ_Pcnt;
+       u32 MACValue;
+       u32 TxRxQ_Pcnt;
 
        idx = 0;
        RTMP_IO_READ32(pAd, TXRXQ_PCNT, &MACValue);
        if ((MACValue & 0xff) != 0) {
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("TX QUEUE 0 Not EMPTY(Value=0x%0x). !!!!!!!!!!!!!!!\n",
+                        ("TX QUEUE 0 Not EMPTY(Value=0x%0x)!\n",
                          MACValue));
                RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40012);
                while ((MACValue & 0xff) != 0 && (idx++ < 10)) {
@@ -621,7 +621,7 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
                RTMP_IRQ_LOCK(&pAd->BulkOutLock[idx], irqFlags);
                if ((pAd->BulkOutPending[idx] == TRUE)
                    && pAd->watchDogTxPendingCnt) {
-                       INT actual_length = 0, transfer_buffer_length = 0;
+                       int actual_length = 0, transfer_buffer_length = 0;
                        BOOLEAN isDataPacket = FALSE;
                        pAd->watchDogTxPendingCnt[idx]++;
 
@@ -635,7 +635,7 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
                            ) {
                                /* FIXME: Following code just support single bulk out. If you wanna support multiple bulk out. Modify it! */
                                pHTTXContext =
-                                   (PHT_TX_CONTEXT) (&pAd->TxContext[idx]);
+                                   (struct rt_ht_tx_context *)(&pAd->TxContext[idx]);
                                if (pHTTXContext->IRPPending) { /* Check TxContext. */
                                        pUrb = pHTTXContext->pUrb;
 
@@ -644,19 +644,19 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
                                            pUrb->transfer_buffer_length;
                                        isDataPacket = TRUE;
                                } else if (idx == MGMTPIPEIDX) {
-                                       PTX_CONTEXT pMLMEContext, pNULLContext,
-                                           pPsPollContext;
+                                       struct rt_tx_context *pMLMEContext, *pNULLContext,
+                                           *pPsPollContext;
 
                                        /*Check MgmtContext. */
                                        pMLMEContext =
-                                           (PTX_CONTEXT) (pAd->MgmtRing.
+                                           (struct rt_tx_context *)(pAd->MgmtRing.
                                                           Cell[pAd->MgmtRing.
                                                                TxDmaIdx].
                                                           AllocVa);
                                        pPsPollContext =
-                                           (PTX_CONTEXT) (&pAd->PsPollContext);
+                                           (struct rt_tx_context *)(&pAd->PsPollContext);
                                        pNULLContext =
-                                           (PTX_CONTEXT) (&pAd->NullContext);
+                                           (struct rt_tx_context *)(&pAd->NullContext);
 
                                        if (pMLMEContext->IRPPending) {
                                                ASSERT(pMLMEContext->
@@ -707,7 +707,7 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
                                        }
                                } else {
                                        DBGPRINT(RT_DEBUG_ERROR,
-                                                ("Unkonw bulkOut URB maybe hanged!!!!!!!!!!!!\n"));
+                                                ("Unknown bulkOut URB maybe hanged!\n"));
                                }
                        } else {
                                RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[idx],
@@ -723,9 +723,9 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER * pAd)
 
        /* For Sigma debug, dump the ba_reordering sequence. */
        if ((needDumpSeq == TRUE) && (pAd->CommonCfg.bDisableReordering == 0)) {
-               USHORT Idx;
-               PBA_REC_ENTRY pBAEntry = NULL;
-               UCHAR count = 0;
+               u16 Idx;
+               struct rt_ba_rec_entry *pBAEntry = NULL;
+               u8 count = 0;
                struct reordering_mpdu *mpdu_blk;
 
                Idx = pAd->MacTab.Content[BSSID_WCID].BARecWcidArray[0];
@@ -768,7 +768,7 @@ Return Value:
 Note:
 ========================================================================
 */
-static void rt2870_disconnect(struct usb_device *dev, PRTMP_ADAPTER pAd)
+static void rt2870_disconnect(struct usb_device *dev, struct rt_rtmp_adapter *pAd)
 {
        DBGPRINT(RT_DEBUG_ERROR,
                 ("rtusb_disconnect: unregister usbnet usb-%s-%s\n",
@@ -805,13 +805,13 @@ static void rt2870_disconnect(struct usb_device *dev, PRTMP_ADAPTER pAd)
 static int __devinit rt2870_probe(IN struct usb_interface *intf,
                                  IN struct usb_device *usb_dev,
                                  IN const struct usb_device_id *dev_id,
-                                 IN RTMP_ADAPTER ** ppAd)
+                                 struct rt_rtmp_adapter ** ppAd)
 {
        struct net_device *net_dev = NULL;
-       RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) NULL;
-       INT status, rv;
-       PVOID handle;
-       RTMP_OS_NETDEV_OP_HOOK netDevHook;
+       struct rt_rtmp_adapter *pAd = (struct rt_rtmp_adapter *)NULL;
+       int status, rv;
+       void *handle;
+       struct rt_rtmp_os_netdev_op_hook netDevHook;
 
        DBGPRINT(RT_DEBUG_TRACE, ("===>rt2870_probe()!\n"));
 
@@ -820,14 +820,14 @@ static int __devinit rt2870_probe(IN struct usb_interface *intf,
        /*      goto err_out; */
 
 /*RtmpDevInit============================================= */
-       /* Allocate RTMP_ADAPTER adapter structure */
+       /* Allocate struct rt_rtmp_adapter adapter structure */
        handle = kmalloc(sizeof(struct os_cookie), GFP_KERNEL);
        if (handle == NULL) {
                printk
                    ("rt2870_probe(): Allocate memory for os handle failed!\n");
                return -ENOMEM;
        }
-       ((POS_COOKIE) handle)->pUsb_Dev = usb_dev;
+       ((struct os_cookie *)handle)->pUsb_Dev = usb_dev;
 
        rv = RTMPAllocAdapterBlock(handle, &pAd);
        if (rv != NDIS_STATUS_SUCCESS) {