projects / deliverable / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'staging/staging-next'
[deliverable/linux.git] / drivers / staging / rtl8188eu / hal / usb_halinit.c
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 363f3a34ddce48abb4ccac7c7a09edbe45107c48..cc27d641550b6baec0d10490b24fc84f807c5e5f 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -69,7 +69,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumInPip
        return result;
 }
 
-static void rtl8188eu_interface_configure(struct adapter *adapt)
+void rtw_hal_chip_configure(struct adapter *adapt)
 {
        struct hal_data_8188e   *haldata        = GET_HAL_DATA(adapt);
        struct dvobj_priv       *pdvobjpriv = adapter_to_dvobj(adapt);
@@ -94,7 +94,7 @@ static void rtl8188eu_interface_configure(struct adapter *adapt)
                                pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
 }
 
-static u32 rtl8188eu_InitPowerOn(struct adapter *adapt)
+u32 rtw_hal_power_on(struct adapter *adapt)
 {
        u16 value16;
        /*  HW Power on sequence */
@@ -672,7 +672,7 @@ enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt)
        return rfpowerstate;
 }      /*  HalDetectPwrDownMode */
 
-static u32 rtl8188eu_hal_init(struct adapter *Adapter)
+u32 rtl8188eu_hal_init(struct adapter *Adapter)
 {
        u8 value8 = 0;
        u16  value16;
@@ -702,7 +702,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
        }
 
        HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);
-       status = rtl8188eu_InitPowerOn(Adapter);
+       status = rtw_hal_power_on(Adapter);
        if (status == _FAIL) {
                RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n"));
                goto exit;
@@ -810,8 +810,8 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
        usb_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400);  /*  unit: 256us. 256ms */
 
        /* Keep RfRegChnlVal for later use. */
-       haldata->RfRegChnlVal[0] = phy_query_rf_reg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask);
-       haldata->RfRegChnlVal[1] = phy_query_rf_reg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask);
+       haldata->RfRegChnlVal[0] = rtw_hal_read_rfreg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask);
+       haldata->RfRegChnlVal[1] = rtw_hal_read_rfreg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask);
 
 HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK);
        _BBTurnOnBlock(Adapter);
@@ -972,7 +972,7 @@ static void rtl8192cu_hw_power_down(struct adapter *adapt)
        usb_write16(adapt, REG_APS_FSMCO, 0x8812);
 }
 
-static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
+u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
 {
        DBG_88E("==> %s\n", __func__);
 
@@ -994,7 +994,7 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
        return _SUCCESS;
 }
 
-static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
+u32 rtw_hal_inirp_init(struct adapter *Adapter)
 {
        u8 i;
        struct recv_buf *precvbuf;
@@ -1029,17 +1029,6 @@ exit:
        return status;
 }
 
-static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
-{
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n ===> usb_rx_deinit\n"));
-
-       usb_read_port_cancel(Adapter);
-
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n <=== usb_rx_deinit\n"));
-
-       return _SUCCESS;
-}
-
 /*  */
 /*  */
 /*     EEPROM/EFUSE Content Parsing */
@@ -1137,7 +1126,7 @@ static void _ReadRFType(struct adapter *Adapter)
        haldata->rf_chip = RF_6052;
 }
 
-static void _ReadAdapterInfo8188EU(struct adapter *Adapter)
+void rtw_hal_read_chip_info(struct adapter *Adapter)
 {
        unsigned long start = jiffies;
 
@@ -1276,7 +1265,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8 *val)
                usb_write8(Adapter, bcn_ctrl_reg, usb_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT)));
 }
 
-static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
+void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
 {
        struct hal_data_8188e   *haldata = GET_HAL_DATA(Adapter);
        struct dm_priv  *pdmpriv = &haldata->dmpriv;
@@ -1426,17 +1415,8 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                                /* enable update TSF */
                                usb_write8(Adapter, REG_BCN_CTRL, usb_read8(Adapter, REG_BCN_CTRL)&(~BIT(4)));
                        }
-                       if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
-                               usb_write32(Adapter, REG_RCR, usb_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN);
-                       } else {
-                               if (Adapter->in_cta_test) {
-                                       u32 v = usb_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       usb_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       usb_write32(Adapter, REG_RCR, usb_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN);
-                               }
-                       }
+
+                       usb_write32(Adapter, REG_RCR, usb_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN);
                }
                break;
        case HW_VAR_MLME_JOIN:
@@ -1449,13 +1429,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                                /* enable to rx data frame.Accept all data frame */
                                usb_write16(Adapter, REG_RXFLTMAP2, 0xFFFF);
 
-                               if (Adapter->in_cta_test) {
-                                       u32 v = usb_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       usb_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       usb_write32(Adapter, REG_RCR, usb_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN);
-                               }
+                               usb_write32(Adapter, REG_RCR, usb_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN);
 
                                if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
                                        RetryLimit = (haldata->CustomerID == RT_CID_CCX) ? 7 : 48;
@@ -1793,7 +1767,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
        }
 }
 
-static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
+void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
 {
        struct hal_data_8188e   *haldata = GET_HAL_DATA(Adapter);
        struct odm_dm_struct *podmpriv = &haldata->odmpriv;
@@ -1853,8 +1827,7 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 /*     Description: */
 /*             Query setting of specified variable. */
 /*  */
-static u8
-GetHalDefVar8188EUsb(
+u8 rtw_hal_get_def_var(
                struct adapter *Adapter,
                enum hal_def_variable eVariable,
                void *pValue
@@ -1948,7 +1921,7 @@ GetHalDefVar8188EUsb(
        return bResult;
 }
 
-static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)
+void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)
 {
        u8 init_rate = 0;
        u8 networkType, raid;
@@ -2011,7 +1984,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l
        psta->init_rate = init_rate;
 }
 
-static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)
+void rtw_hal_bcn_related_reg_setting(struct adapter *adapt)
 {
        u32 value32;
        struct mlme_ext_priv    *pmlmeext = &adapt->mlmeextpriv;
@@ -2045,7 +2018,7 @@ static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)
        usb_write8(adapt, bcn_ctrl_reg, usb_read8(adapt, bcn_ctrl_reg) | BIT(1));
 }
 
-static void rtl8188eu_init_default_value(struct adapter *adapt)
+void rtw_hal_def_value_init(struct adapter *adapt)
 {
        struct hal_data_8188e *haldata;
        struct pwrctrl_priv *pwrctrlpriv;
@@ -2070,40 +2043,7 @@ static void rtl8188eu_init_default_value(struct adapter *adapt)
 
 void rtl8188eu_set_hal_ops(struct adapter *adapt)
 {
-       struct hal_ops  *halfunc = &adapt->HalFunc;
-
-
        adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
        if (!adapt->HalData)
                DBG_88E("cant not alloc memory for HAL DATA\n");
-
-       halfunc->hal_power_on = rtl8188eu_InitPowerOn;
-       halfunc->hal_init = &rtl8188eu_hal_init;
-       halfunc->hal_deinit = &rtl8188eu_hal_deinit;
-
-       halfunc->inirp_init = &rtl8188eu_inirp_init;
-       halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
-
-       halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv;
-
-       halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
-       halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
-       halfunc->InitSwLeds = &rtl8188eu_InitSwLeds;
-       halfunc->DeInitSwLeds = &rtl8188eu_DeInitSwLeds;
-
-       halfunc->init_default_value = &rtl8188eu_init_default_value;
-       halfunc->intf_chip_configure = &rtl8188eu_interface_configure;
-       halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;
-
-       halfunc->SetHwRegHandler = &SetHwReg8188EU;
-       halfunc->GetHwRegHandler = &GetHwReg8188EU;
-       halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
-
-       halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;
-       halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;
-
-       halfunc->hal_xmit = &rtl8188eu_hal_xmit;
-       halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;
-
-       rtl8188e_set_hal_ops(halfunc);
 }
Linux kernel - Deliverables
This page took 0.026747 seconds and 5 git commands to generate.