rtl8723au: Remove dead code associated with CONFIG_GSPI_HCI

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/core/rtw_ap.c b/core/rtw_ap.c
index 03508e9..523dcc2 100644 (file)
--- a/core/rtw_ap.c
+++ b/core/rtw_ap.c
@@ -166,7 +166,7 @@ static void update_BCNTIM(_adapter *padapter)
        pnetwork_mlmeext->IELength = offset + remainder_ielen;
 
 #ifndef CONFIG_INTERRUPT_BASED_TXBCN
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
        set_tx_beacon_cmd(padapter);
 #endif
 #endif /* CONFIG_INTERRUPT_BASED_TXBCN */
@@ -1112,7 +1112,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
                update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
 
 #ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will  tx beacon when bcn interrupt coming in. */
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
                /* issue beacon frame */
                if(send_beacon(padapter)==_FAIL)
                {
@@ -1873,7 +1873,7 @@ void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
        spin_unlock_bh(&pmlmepriv->bcn_update_lock);
 
 #ifndef CONFIG_INTERRUPT_BASED_TXBCN
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
        if(tx)
        {
                set_tx_beacon_cmd(padapter);

diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index cdfc772..7da805c 100644 (file)
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -112,18 +112,6 @@ _func_enter_;
                }
        pevtpriv->evt_buf = pevtpriv->evt_allocated_buf  +  4 - ((unsigned int)(pevtpriv->evt_allocated_buf) & 3);
 
-#if defined(CONFIG_GSPI_HCI)
-       pevtpriv->allocated_c2h_mem = rtw_zmalloc(C2H_MEM_SZ +4);
-
-       if (pevtpriv->allocated_c2h_mem == NULL){
-               res= _FAIL;
-               goto exit;
-       }
-
-       pevtpriv->c2h_mem = pevtpriv->allocated_c2h_mem +  4\
-       - ( (u32)(pevtpriv->allocated_c2h_mem) & 3);
-#endif
-
        _rtw_init_queue(&(pevtpriv->evt_queue));
 
 exit:

diff --git a/core/rtw_io.c b/core/rtw_io.c
index 479d92b..dca13a4 100644 (file)
--- a/core/rtw_io.c
+++ b/core/rtw_io.c
@@ -48,10 +48,6 @@ jackson@realtek.com.tw
 #include <rtw_io.h>
 #include <osdep_intf.h>
 
-#ifdef CONFIG_GSPI_HCI
-#include <gspi_ops.h>
-#endif
-
 #ifdef CONFIG_USB_HCI
 #include <usb_ops.h>
 #endif

diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c
index d939716..55fb4e1 100644 (file)
--- a/core/rtw_ioctl_set.c
+++ b/core/rtw_ioctl_set.c
@@ -29,9 +29,6 @@
 #include <usb_osintf.h>
 #include <usb_ops.h>
 #endif
-#ifdef CONFIG_GSPI_HCI
-#include <gspi_osintf.h>
-#endif
 
 extern void indicate_wx_scan_complete_event(_adapter *padapter);
 

diff --git a/core/rtw_led.c b/core/rtw_led.c
index e899dcc..11f3995 100644 (file)
--- a/core/rtw_led.c
+++ b/core/rtw_led.c
@@ -115,7 +115,7 @@ DeInitLed871x(
        PLED_871x                       pLed
        )
 {
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
        _cancel_workitem_sync(&(pLed->BlinkWorkItem));
 #endif
        _cancel_timer_ex(&(pLed->BlinkTimer));
@@ -127,7 +127,7 @@ DeInitLed871x(
 /*             Implementation of LED blinking behavior. */
 /*             It toggle off LED and schedule corresponding timer if necessary. */
 /*  */
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 
 void SwLedOn(_adapter *padapter, PLED_871x pLed);
 void SwLedOff(_adapter *padapter, PLED_871x    pLed);

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index c2190f0..fa4e599 100644 (file)
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -8255,7 +8255,7 @@ unsigned int send_beacon(_adapter *padapter)
        /* struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); */
 /* endif */
 
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
        u32 start = rtw_get_current_time();
 
        rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
@@ -11153,11 +11153,6 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
 
                        /* spin_unlock_bh(&psta_bmc->sleep_q.lock); */
                        spin_unlock_bh(&pxmitpriv->lock);
-
-#if defined(CONFIG_GSPI_HCI)
-                       rtw_chk_hi_queue_cmd(padapter);
-#endif
-
                }
 
        }

diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c
index 602cc5f..d4b1422 100644 (file)
--- a/core/rtw_pwrctrl.c
+++ b/core/rtw_pwrctrl.c
@@ -1393,7 +1393,7 @@ _func_exit_;
 }
 
 #ifdef CONFIG_RESUME_IN_WORKQUEUE
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 extern int rtw_resume_process(_adapter *padapter);
 #endif
 static void resume_workitem_callback(struct work_struct *work)
@@ -1403,7 +1403,7 @@ static void resume_workitem_callback(struct work_struct *work)
 
        DBG_8723A("%s\n",__FUNCTION__);
 
-       #if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+       #if defined(CONFIG_USB_HCI)
        rtw_resume_process(adapter);
        #endif
 }
@@ -1439,7 +1439,7 @@ inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable)
 #endif
 
 #ifdef CONFIG_HAS_EARLYSUSPEND
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 extern int rtw_resume_process(_adapter *padapter);
 #endif
 static void rtw_early_suspend(struct early_suspend *h)
@@ -1457,7 +1457,7 @@ static void rtw_late_resume(struct early_suspend *h)
 
        DBG_8723A("%s\n",__FUNCTION__);
        if(pwrpriv->do_late_resume) {
-               #if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+               #if defined(CONFIG_USB_HCI)
                rtw_set_do_late_resume(pwrpriv, _FALSE);
                rtw_resume_process(adapter);
                #endif
@@ -1490,7 +1490,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
 #endif /* CONFIG_HAS_EARLYSUSPEND */
 
 #ifdef CONFIG_ANDROID_POWER
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 extern int rtw_resume_process(PADAPTER padapter);
 #endif
 static void rtw_early_suspend(android_early_suspend_t *h)
@@ -1508,7 +1508,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
 
        DBG_8723A("%s\n",__FUNCTION__);
        if(pwrpriv->do_late_resume) {
-               #if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+               #if defined(CONFIG_USB_HCI)
                rtw_set_do_late_resume(pwrpriv, _FALSE);
                rtw_resume_process(adapter);
                #endif

diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 7e2d9d7..2ddfafa 100644 (file)
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2104,60 +2104,6 @@ _func_exit_;
        return ret;
 }
 
-#if defined(CONFIG_GSPI_HCI)
-static void recvframe_expand_pkt(
-       PADAPTER padapter,
-       union recv_frame *prframe)
-{
-       struct recv_frame_hdr *pfhdr;
-       _pkt *ppkt;
-       u8 shift_sz;
-       u32 alloc_sz;
-
-       pfhdr = &prframe->u.hdr;
-
-       /*      6 is for IP header 8 bytes alignment in QoS packet case. */
-       if (pfhdr->attrib.qos)
-               shift_sz = 6;
-       else
-               shift_sz = 0;
-
-       /*  for first fragment packet, need to allocate */
-       /*  (1536 + RXDESC_SIZE + drvinfo_sz) to reassemble packet */
-       /*      8 is for skb->data 8 bytes alignment. */
-/*     alloc_sz = _RND(1536 + RXDESC_SIZE + pfhdr->attrib.drvinfosize + shift_sz + 8, 128); */
-       alloc_sz = 1664; /*  round (1536 + 24 + 32 + shift_sz + 8) to 128 bytes alignment */
-
-       /* 3 1. alloc new skb */
-       /*  prepare extra space for 4 bytes alignment */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) /*  http:www.mail-archive.com/netdev@vger.kernel.org/msg17214.html */
-       ppkt = dev_alloc_skb(alloc_sz);
-       if (ppkt) ppkt->dev = padapter->pnetdev;
-#else
-       ppkt = netdev_alloc_skb(padapter->pnetdev, alloc_sz);
-#endif
-       if (!ppkt) return; /*  no way to expand */
-
-       /* 3 2. Prepare new skb to replace & release old skb */
-       /*  force ppkt->data at 8-byte alignment address */
-       skb_reserve(ppkt, 8 - ((unsigned long)ppkt->data & 7));
-       /*  force ip_hdr at 8-byte alignment address according to shift_sz */
-       skb_reserve(ppkt, shift_sz);
-
-       /*  copy data to new pkt */
-       memcpy(skb_put(ppkt, pfhdr->len), pfhdr->rx_data, pfhdr->len);
-
-       dev_kfree_skb_any(pfhdr->pkt);
-
-       /*  attach new pkt to recvframe */
-       pfhdr->pkt = ppkt;
-       pfhdr->rx_head = ppkt->head;
-       pfhdr->rx_data = ppkt->data;
-       pfhdr->rx_tail = skb_tail_pointer(ppkt);
-       pfhdr->rx_end = skb_end_pointer(ppkt);
-}
-#endif
-
 /* perform defrag */
 union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q);
 union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q)
@@ -2190,12 +2136,6 @@ _func_enter_;
                return NULL;
        }
 
-#if defined(CONFIG_GSPI_HCI)
-#ifndef CONFIG_SDIO_RX_COPY
-       recvframe_expand_pkt(adapter, prframe);
-#endif
-#endif
-
        curfragnum++;
 
        plist= get_list_head(defrag_q);

diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index 3e0ed2d..2380c32 100644 (file)
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -170,13 +170,6 @@ _func_enter_;
                        }
                }
 
-#if defined(CONFIG_GSPI_HCI)
-               pxmitbuf->phead = pxmitbuf->pbuf;
-               pxmitbuf->pend = pxmitbuf->pbuf + MAX_XMITBUF_SZ;
-               pxmitbuf->len = 0;
-               pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead;
-#endif
-
                pxmitbuf->flags = XMIT_VO_QUEUE;
 
                rtw_list_insert_tail(&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue));
@@ -262,13 +255,6 @@ _func_enter_;
                        goto exit;
                }
 
-#if defined(CONFIG_GSPI_HCI)
-               pxmitbuf->phead = pxmitbuf->pbuf;
-               pxmitbuf->pend = pxmitbuf->pbuf + max_xmit_extbuf_size;
-               pxmitbuf->len = 0;
-               pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead;
-#endif
-
                rtw_list_insert_tail(&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue));
                #ifdef DBG_XMIT_BUF_EXT
                pxmitbuf->no=i;
@@ -1925,7 +1911,7 @@ void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz
        if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG)
        {
                pxmitpriv->tx_bytes += sz;
-#if defined(CONFIG_USB_TX_AGGREGATION) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_TX_AGGREGATION)
                pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pxmitframe->agg_num;
 #else
                pmlmepriv->LinkDetectInfo.NumTxOkInPeriod++;
@@ -1935,7 +1921,7 @@ void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz
                if (psta)
                {
                        pstats = &psta->sta_stats;
-#if defined(CONFIG_USB_TX_AGGREGATION) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_TX_AGGREGATION)
                        pstats->tx_pkts += pxmitframe->agg_num;
 #else
                        pstats->tx_pkts++;
@@ -1979,10 +1965,6 @@ _func_enter_;
                pxmitbuf->priv_data = NULL;
                /* pxmitbuf->ext_tag = _TRUE; */
 
-#if defined(CONFIG_GSPI_HCI)
-               pxmitbuf->len = 0;
-               pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead;
-#endif
                if (pxmitbuf->sctx) {
                        DBG_8723A("%s pxmitbuf->sctx is not NULL\n", __func__);
                        rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
@@ -2061,13 +2043,6 @@ _func_enter_;
                /* DBG_8723A("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); */
 
                pxmitbuf->priv_data = NULL;
-               /* pxmitbuf->ext_tag = _FALSE; */
-#if defined(CONFIG_GSPI_HCI)
-               pxmitbuf->len = 0;
-               pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead;
-               pxmitbuf->agg_num = 0;
-               pxmitbuf->pg_num = 0;
-#endif
                if (pxmitbuf->sctx) {
                        DBG_8723A("%s pxmitbuf->sctx is not NULL\n", __func__);
                        rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
@@ -2153,11 +2128,6 @@ void rtw_init_xmitframe(struct xmit_frame *pxframe)
 
 #endif /* ifdef CONFIG_USB_HCI */
 
-#if defined(CONFIG_GSPI_HCI)
-               pxframe->pg_num = 1;
-               pxframe->agg_num = 1;
-#endif
-
 #ifdef CONFIG_XMIT_ACK
                pxframe->ack_report = 0;
 #endif

diff --git a/hal/HalPwrSeqCmd.c b/hal/HalPwrSeqCmd.c
index faf7ffe..62899d3 100644 (file)
--- a/hal/HalPwrSeqCmd.c
+++ b/hal/HalPwrSeqCmd.c
@@ -34,9 +34,6 @@ Major Change History:
 
 --*/
 #include <HalPwrSeqCmd.h>
-#if defined(CONFIG_GSPI_HCI)
-#include <gspi_ops.h>
-#endif
 
 //
 //     Description:
@@ -92,10 +89,6 @@ u8 HalPwrSeqCmdParsing(
                                        offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
 
                                        {
-#ifdef CONFIG_GSPI_HCI
-                                               if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
-                                                       offset = SPI_LOCAL_OFFSET | offset;
-#endif
                                                // Read the value from system register
                                                value = rtw_read8(padapter, offset);
 
@@ -112,10 +105,6 @@ u8 HalPwrSeqCmdParsing(
 
                                        bPollingBit = _FALSE;
                                        offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
-#ifdef CONFIG_GSPI_HCI
-                                       if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
-                                               offset = SPI_LOCAL_OFFSET | offset;
-#endif
                                        do {
                                                value = rtw_read8(padapter, offset);
 

diff --git a/hal/rtl8723a_hal_init.c b/hal/rtl8723a_hal_init.c
index 6992376..cb1ee1a 100644 (file)
--- a/hal/rtl8723a_hal_init.c
+++ b/hal/rtl8723a_hal_init.c
@@ -2377,7 +2377,7 @@ u8 GetEEPROMSize8723A(PADAPTER padapter)
        return size;
 }
 
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 //-------------------------------------------------------------------------
 //
 // LLT R/W/Init function
@@ -2476,7 +2476,7 @@ s32 InitLLTTable(PADAPTER padapter, u32 boundary)
 }
 #endif
 
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 void _DisableGPIO(PADAPTER     padapter)
 {
 /***************************************
@@ -3539,7 +3539,7 @@ void rtl8723a_fill_default_txdesc(
                                ptxdesc->data_short = 1;// DATA_SHORT
                        ptxdesc->datarate = MRateToHwRate(pmlmeext->tx_rate);
                }
-#if defined(CONFIG_USB_TX_AGGREGATION) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_TX_AGGREGATION)
                ptxdesc->usb_txagg_num = pxmitframe->agg_num;
 #endif
        }
@@ -4949,31 +4949,8 @@ void rtl8723a_clone_haldata(_adapter* dst_adapter, _adapter* src_adapter)
 
 void rtl8723a_start_thread(_adapter *padapter)
 {
-#if (defined CONFIG_GSPI_HCI)
-#ifndef CONFIG_SDIO_TX_TASKLET
-       HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(padapter);
-
-       pHalData->SdioXmitThread = kthread_run(rtl8723as_xmit_thread, padapter, "RTWHALXT");
-       if (IS_ERR(pHalData->SdioXmitThread))
-       {
-               RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8723as_xmit_thread FAIL!!\n", __FUNCTION__));
-       }
-#endif
-#endif
 }
 
 void rtl8723a_stop_thread(_adapter *padapter)
 {
-#if (defined CONFIG_GSPI_HCI)
-#ifndef CONFIG_SDIO_TX_TASKLET
-       HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(padapter);
-
-       // stop xmit_buf_thread
-       if (pHalData->SdioXmitThread ) {
-               up(&pHalData->SdioXmitSema);
-               down(&pHalData->SdioXmitTerminateSema);
-               pHalData->SdioXmitThread = 0;
-       }
-#endif
-#endif
 }

diff --git a/include/drv_types.h b/include/drv_types.h
index f5826da..984389a 100644 (file)
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -219,11 +219,6 @@ struct registry_priv
 
 #define MAX_CONTINUAL_URB_ERR 4
 
-#if defined(CONFIG_GSPI_HCI)
-#include <drv_types_gspi.h>
-#define INTF_DATA GSPI_DATA
-#endif
-
 #define GET_PRIMARY_ADAPTER(padapter) (((_adapter *)padapter)->dvobj->if1)
 
 #define GET_IFACE_NUMS(padapter) (((_adapter *)padapter)->dvobj->iface_nums)
@@ -313,9 +308,6 @@ static struct device *dvobj_to_dev(struct dvobj_priv *dvobj)
 #ifdef CONFIG_USB_HCI
        return &dvobj->pusbintf->dev;
 #endif
-#ifdef CONFIG_GSPI_HCI
-       return &dvobj->intf_data.func->dev;
-#endif
 }
 
 enum _IFACE_TYPE {

diff --git a/include/odm_types.h b/include/odm_types.h
index a18fe75..d4548d0 100644 (file)
--- a/include/odm_types.h
+++ b/include/odm_types.h
@@ -205,8 +205,6 @@ typedef enum _RT_SPINLOCK_TYPE{
 #endif
        #ifdef CONFIG_USB_HCI
                #define DEV_BUS_TYPE    RT_USB_INTERFACE
-        #elif defined(CONFIG_GSPI_HCI)
-               #define DEV_BUS_TYPE    RT_SDIO_INTERFACE
        #endif
 
        typedef struct timer_list               RT_TIMER, *PRT_TIMER;

diff --git a/include/rtl8192c_recv.h b/include/rtl8192c_recv.h
index 1adafab..2ced4ac 100644 (file)
--- a/include/rtl8192c_recv.h
+++ b/include/rtl8192c_recv.h
@@ -25,19 +25,14 @@
 #include <drv_types.h>
 
 
-#if defined(CONFIG_GSPI_HCI)
-#define NR_RECVBUFF (32)
-#else
 #ifdef CONFIG_SINGLE_RECV_BUF
 #define NR_RECVBUFF (1)
 #else
 #define NR_RECVBUFF (4)
 #endif //CONFIG_SINGLE_RECV_BUF
-#endif
 
 #define NR_PREALLOC_RECV_SKB (8)
 
-
 #define RECV_BLK_SZ 512
 #define RECV_BLK_CNT 16
 #define RECV_BLK_TH RECV_BLK_CNT

diff --git a/include/rtl8723a_hal.h b/include/rtl8723a_hal.h
index 36cc70e..a495b7b 100644 (file)
--- a/include/rtl8723a_hal.h
+++ b/include/rtl8723a_hal.h
@@ -556,40 +556,9 @@ typedef struct hal_data_8723a
        // Auto FSM to Turn On, include clock, isolation, power control for MAC only
        u8                      bMacPwrCtrlOn;
 
-#if defined(CONFIG_GSPI_HCI)
-       //
-       // SDIO ISR Related
-       //
-//     u32                     IntrMask[1];
-//     u32                     IntrMaskToSet[1];
-//     LOG_INTERRUPT           InterruptLog;
-       u32                     sdio_himr;
-       u32                     sdio_hisr;
-
-       //
-       // SDIO Tx FIFO related.
-       //
-       // HIQ, MID, LOW, PUB free pages; padapter->xmitpriv.free_txpg
-       u8                      SdioTxFIFOFreePage[SDIO_TX_FREE_PG_QUEUE];
-       spinlock_t      SdioTxFIFOFreePageLock;
-       _thread_hdl_    SdioXmitThread;
-       struct semaphore                SdioXmitSema;
-       struct semaphore                SdioXmitTerminateSema;
-
-       //
-       // SDIO Rx FIFO related.
-       //
-       u8                      SdioRxFIFOCnt;
-       u16                     SdioRxFIFOSize;
-#endif
 } HAL_DATA_8723A, *PHAL_DATA_8723A;
 
-#if 0
-#define HAL_DATA_TYPE HAL_DATA_8723A
-#define PHAL_DATA_TYPE PHAL_DATA_8723A
-#else
 typedef struct hal_data_8723a HAL_DATA_TYPE, *PHAL_DATA_TYPE;
-#endif
 
 #define GET_HAL_DATA(__pAdapter)       ((HAL_DATA_TYPE *)((__pAdapter)->HalData))
 #define GET_RF_TYPE(priv)                      (GET_HAL_DATA(priv)->rf_type)

diff --git a/include/rtl8723a_led.h b/include/rtl8723a_led.h
index 2e50493..e648fe1 100644 (file)
--- a/include/rtl8723a_led.h
+++ b/include/rtl8723a_led.h
@@ -32,9 +32,5 @@
 void rtl8723au_InitSwLeds(PADAPTER padapter);
 void rtl8723au_DeInitSwLeds(PADAPTER padapter);
 #endif
-#ifdef CONFIG_GSPI_HCI
-void rtl8723as_InitSwLeds(PADAPTER padapter);
-void rtl8723as_DeInitSwLeds(PADAPTER padapter);
-#endif
 
 #endif

diff --git a/include/rtl8723a_recv.h b/include/rtl8723a_recv.h
index fd97e4c..918453a 100644 (file)
--- a/include/rtl8723a_recv.h
+++ b/include/rtl8723a_recv.h
@@ -22,15 +22,6 @@
 
 #include <rtl8192c_recv.h>
 
-
-#if defined(CONFIG_GSPI_HCI)
-#ifdef CONFIG_DIRECT_RECV
-void rtl8723as_recv(PADAPTER padapter, struct recv_buf *precvbuf);
-#endif
-s32 rtl8723as_init_recv_priv(PADAPTER padapter);
-void rtl8723as_free_recv_priv(PADAPTER padapter);
-#endif
-
 void rtl8192c_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat);
 void rtl8192c_process_phy_info(PADAPTER padapter, void *prframe);
 #ifdef CONFIG_USB_HCI

diff --git a/include/rtl8723a_xmit.h b/include/rtl8723a_xmit.h
index 113aedb..9c2b73a 100644 (file)
--- a/include/rtl8723a_xmit.h
+++ b/include/rtl8723a_xmit.h
@@ -218,17 +218,6 @@ void handle_txrpt_ccx_8723a(_adapter *adapter, void *buf);
 void rtl8723a_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem);
 void rtl8723a_fill_fake_txdesc(PADAPTER padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);
 
-#if defined(CONFIG_GSPI_HCI)
-s32 rtl8723as_init_xmit_priv(PADAPTER padapter);
-void rtl8723as_free_xmit_priv(PADAPTER padapter);
-s32 rtl8723as_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe);
-s32 rtl8723as_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe);
-s32    rtl8723as_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
-s32 rtl8723as_xmit_buf_handler(PADAPTER padapter);
-thread_return rtl8723as_xmit_thread(thread_context context);
-#define hal_xmit_handler rtl8723as_xmit_buf_handler
-#endif
-
 #ifdef CONFIG_USB_HCI
 s32    rtl8723au_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
 s32 rtl8723au_xmit_buf_handler(PADAPTER padapter);

diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h
index 36f9d98..2b6d663 100644 (file)
--- a/include/rtw_cmd.h
+++ b/include/rtw_cmd.h
@@ -105,11 +105,6 @@
                u8      *evt_buf;       //shall be non-paged, and 4 bytes aligned
                u8      *evt_allocated_buf;
                u32     evt_done_cnt;
-#if defined(CONFIG_GSPI_HCI)
-               u8      *c2h_mem;
-               u8      *allocated_c2h_mem;
-#endif
-
        };
 
 #define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \

diff --git a/include/rtw_led.h b/include/rtw_led.h
index 4253af5..6e0bdaa 100644 (file)
--- a/include/rtw_led.h
+++ b/include/rtw_led.h
@@ -119,7 +119,7 @@ typedef struct _LED_871x{
 
        _timer                          BlinkTimer; // Timer object for led blinking.
 
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
        u8                                      bSWLedCtrl;
 
        // ALPHA, added by chiyoko, 20090106
@@ -129,11 +129,11 @@ typedef struct _LED_871x{
        u8                                      bLedScanBlinkInProgress;
 
        _workitem                       BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED.
-#endif //defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#endif //defined(CONFIG_USB_HCI)
 
 } LED_871x, *PLED_871x;
 
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#if defined(CONFIG_USB_HCI)
 
 #define IS_LED_WPS_BLINKING(_LED_871x) (((PLED_871x)_LED_871x)->CurrLedState==LED_BLINK_WPS \
                                        || ((PLED_871x)_LED_871x)->CurrLedState==LED_BLINK_WPS_STOP \
@@ -163,7 +163,7 @@ LedControl871x(
        _adapter                                *padapter,
        LED_CTL_MODE            LedAction
        );
-#endif //defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
+#endif //defined(CONFIG_USB_HCI)
 
 struct led_priv{
        /* add for led controll */

diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h
index cbca9ae..f180827 100644 (file)
--- a/include/rtw_mlme_ext.h
+++ b/include/rtw_mlme_ext.h
@@ -44,20 +44,7 @@
 #define REASSOC_LIMIT  (4)
 #define READDBA_LIMIT  (2)
 
-#ifdef CONFIG_GSPI_HCI
-       #define ROAMING_LIMIT   5
-#else
-       #define ROAMING_LIMIT   8
-#endif
-//#define      IOCMD_REG0              0x10250370
-//#define      IOCMD_REG1              0x10250374
-//#define      IOCMD_REG2              0x10250378
-
-//#define      FW_DYNAMIC_FUN_SWITCH   0x10250364
-
-//#define      WRITE_BB_CMD            0xF0000001
-//#define      SET_CHANNEL_CMD 0xF3000000
-//#define      UPDATE_RA_CMD   0xFD0000A2
+#define ROAMING_LIMIT  8
 
 #define        DYNAMIC_FUNC_DISABLE                    (0x0)
 

diff --git a/include/rtw_recv.h b/include/rtw_recv.h
index 9756e29..fc82a22 100644 (file)
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -276,10 +276,6 @@ struct recv_priv
        _queue  free_recv_buf_queue;
        u32     free_recv_buf_queue_cnt;
 
-#if defined(CONFIG_GSPI_HCI)
-       _queue  recv_buf_pending_queue;
-#endif
-
        //For display the phy informatiom
        u8 is_signal_dbg;       // for debug
        u8 signal_strength_dbg; // for debug

diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index a62c6f1..e9f9563 100644 (file)
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -24,18 +24,7 @@
 #include <osdep_service.h>
 #include <drv_types.h>
 
-#if defined(CONFIG_GSPI_HCI)
-#ifdef CONFIG_TX_AGGREGATION
-#define MAX_XMITBUF_SZ (20480) // 20k
-#else
-#define MAX_XMITBUF_SZ (12288)  //12k 1536*8
-#endif
-
-#if defined(CONFIG_GSPI_HCI)
-#define NR_XMITBUFF    (128)
-#endif
-
-#elif defined (CONFIG_USB_HCI)
+#if defined (CONFIG_USB_HCI)
 
 #ifdef CONFIG_USB_TX_AGGREGATION
 #define MAX_XMITBUF_SZ (20480) // 20k
@@ -120,11 +109,6 @@ do{\
 #endif
 
 
-#if defined(CONFIG_GSPI_HCI)
-#define TXDESC_OFFSET TXDESC_SIZE
-
-#endif
-
 #ifdef CONFIG_USB_HCI
 #define PACKET_OFFSET_SZ (8)
 #define TXDESC_OFFSET (TXDESC_SIZE + PACKET_OFFSET_SZ)
@@ -291,16 +275,6 @@ struct xmit_buf
 
 #endif
 
-#if defined(CONFIG_GSPI_HCI)
-       u8 *phead;
-       u8 *pdata;
-       u8 *ptail;
-       u8 *pend;
-       u32 ff_hwaddr;
-       u8      pg_num;
-       u8      agg_num;
-#endif
-
 #if defined(DBG_XMIT_BUF )|| defined(DBG_XMIT_BUF_EXT)
        u8 no;
 #endif
@@ -324,11 +298,6 @@ struct xmit_frame
 
        struct xmit_buf *pxmitbuf;
 
-#if defined(CONFIG_GSPI_HCI)
-       u8      pg_num;
-       u8      agg_num;
-#endif
-
 #ifdef CONFIG_USB_HCI
 #ifdef CONFIG_USB_TX_AGGREGATION
        u8      agg_num;

diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index b95cf17..18dfde5 100644 (file)
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -48,9 +48,6 @@
 #ifdef CONFIG_RTL8188E
 #include <rtl8188e_hal.h>
 #endif
-#ifdef CONFIG_GSPI_HCI
-#include <gspi_ops.h>
-#endif
 
 #ifdef CONFIG_RTL8723A
 //extern u8 _InitPowerOn(PADAPTER padapter);

diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c
index 329b514..4b99634 100644 (file)
--- a/os_dep/recv_linux.c
+++ b/os_dep/recv_linux.c
@@ -434,12 +434,8 @@ void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf)
 
 
 #endif
-#if defined(CONFIG_GSPI_HCI)
-               precvbuf->pskb = NULL;
-#endif
-
 }
-void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext);
+
 void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext)
 {
        struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext;

diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c
index c19c63c..ac349e5 100644 (file)
--- a/os_dep/xmit_linux.c
+++ b/os_dep/xmit_linux.c
@@ -233,21 +233,6 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
 void rtw_os_xmit_schedule(_adapter *padapter)
 {
        _adapter *pri_adapter = padapter;
-
-#if defined(CONFIG_GSPI_HCI)
-       if(!padapter)
-               return;
-
-#ifdef CONFIG_CONCURRENT_MODE
-       if(padapter->adapter_type > PRIMARY_ADAPTER)
-               pri_adapter = padapter->pbuddy_adapter;
-#endif
-
-       if (_rtw_queue_empty(&pri_adapter->xmitpriv.pending_xmitbuf_queue) == _FALSE)
-               up(&pri_adapter->xmitpriv.xmit_sema);
-
-
-#else
        _irqL  irqL;
        struct xmit_priv *pxmitpriv;
 
@@ -264,7 +249,6 @@ void rtw_os_xmit_schedule(_adapter *padapter)
        }
 
        spin_unlock_bh(&pxmitpriv->lock);
-#endif
 }
 
 static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)