mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-06 21:43:06 +00:00
rtl8188eu: Remove dead code for other than USB
The vendor code has pieces of code for PCI, SDIO, and GSPI. Remove it and CONFIG_USB_HCI. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
c5e461c221
commit
0e4009c999
46 changed files with 78 additions and 1448 deletions
|
@ -34,11 +34,6 @@ Major Change History:
|
|||
|
||||
--*/
|
||||
#include <HalPwrSeqCmd.h>
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#include <sdio_ops.h>
|
||||
#elif defined(CONFIG_GSPI_HCI)
|
||||
#include <gspi_ops.h>
|
||||
#endif
|
||||
|
||||
/* */
|
||||
/* Description: */
|
||||
|
@ -80,101 +75,61 @@ u8 HalPwrSeqCmdParsing(
|
|||
|
||||
/* 2 Only Handle the command whose FAB, CUT, and Interface are matched */
|
||||
if ((GET_PWR_CFG_FAB_MASK(PwrCfgCmd) & FabVersion) &&
|
||||
(GET_PWR_CFG_CUT_MASK(PwrCfgCmd) & CutVersion) &&
|
||||
(GET_PWR_CFG_INTF_MASK(PwrCfgCmd) & InterfaceType))
|
||||
{
|
||||
switch (GET_PWR_CFG_CMD(PwrCfgCmd))
|
||||
{
|
||||
case PWR_CMD_READ:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n"));
|
||||
break;
|
||||
(GET_PWR_CFG_CUT_MASK(PwrCfgCmd) & CutVersion) &&
|
||||
(GET_PWR_CFG_INTF_MASK(PwrCfgCmd) & InterfaceType)) {
|
||||
switch (GET_PWR_CFG_CMD(PwrCfgCmd)) {
|
||||
case PWR_CMD_READ:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n"));
|
||||
break;
|
||||
case PWR_CMD_WRITE:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n"));
|
||||
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
|
||||
|
||||
case PWR_CMD_WRITE:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n"));
|
||||
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
|
||||
/* Read the value from system register */
|
||||
value = rtw_read8(padapter, offset);
|
||||
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
/* */
|
||||
/* <Roger_Notes> We should deal with interface specific address mapping for some interfaces, e.g., SDIO interface */
|
||||
/* 2011.07.07. */
|
||||
/* */
|
||||
if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
|
||||
{
|
||||
/* Read Back SDIO Local value */
|
||||
value = SdioLocalCmd52Read1Byte(padapter, offset);
|
||||
value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
|
||||
value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
/* Write the value back to sytem register */
|
||||
rtw_write8(padapter, offset, value);
|
||||
break;
|
||||
case PWR_CMD_POLLING:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n"));
|
||||
|
||||
/* Write Back SDIO Local value */
|
||||
SdioLocalCmd52Write1Byte(padapter, offset, value);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#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 */
|
||||
bPollingBit = false;
|
||||
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
|
||||
do {
|
||||
value = rtw_read8(padapter, offset);
|
||||
|
||||
value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd));
|
||||
|
||||
/* Write the value back to sytem register */
|
||||
rtw_write8(padapter, offset, value);
|
||||
}
|
||||
break;
|
||||
|
||||
case PWR_CMD_POLLING:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n"));
|
||||
|
||||
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 {
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
|
||||
value = SdioLocalCmd52Read1Byte(padapter, offset);
|
||||
else
|
||||
#endif
|
||||
value = rtw_read8(padapter, offset);
|
||||
|
||||
value &= GET_PWR_CFG_MASK(PwrCfgCmd);
|
||||
if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd)))
|
||||
bPollingBit = true;
|
||||
else
|
||||
rtw_udelay_os(10);
|
||||
|
||||
if (pollingCount++ > maxPollingCnt) {
|
||||
DBG_88E("Fail to polling Offset[%#x]\n", offset);
|
||||
return false;
|
||||
}
|
||||
} while (!bPollingBit);
|
||||
|
||||
break;
|
||||
|
||||
case PWR_CMD_DELAY:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n"));
|
||||
if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US)
|
||||
rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd));
|
||||
value &= GET_PWR_CFG_MASK(PwrCfgCmd);
|
||||
if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd)))
|
||||
bPollingBit = true;
|
||||
else
|
||||
rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd)*1000);
|
||||
break;
|
||||
rtw_udelay_os(10);
|
||||
|
||||
case PWR_CMD_END:
|
||||
/* When this command is parsed, end the process */
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n"));
|
||||
return true;
|
||||
break;
|
||||
if (pollingCount++ > maxPollingCnt) {
|
||||
DBG_88E("Fail to polling Offset[%#x]\n", offset);
|
||||
return false;
|
||||
}
|
||||
} while (!bPollingBit);
|
||||
|
||||
default:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n"));
|
||||
break;
|
||||
break;
|
||||
case PWR_CMD_DELAY:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n"));
|
||||
if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US)
|
||||
rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd));
|
||||
else
|
||||
rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd)*1000);
|
||||
break;
|
||||
case PWR_CMD_END:
|
||||
/* When this command is parsed, end the process */
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n"));
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
RT_TRACE(_module_hal_init_c_ , _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -22,16 +22,8 @@
|
|||
#include <drv_conf.h>
|
||||
#include <osdep_service.h>
|
||||
#include <drv_types.h>
|
||||
|
||||
#include <hal_intf.h>
|
||||
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#include <sdio_hal.h>
|
||||
#elif defined(CONFIG_USB_HCI)
|
||||
#include <usb_hal.h>
|
||||
#elif defined(CONFIG_GSPI_HCI)
|
||||
#include <gspi_hal.h>
|
||||
#endif
|
||||
#include <usb_hal.h>
|
||||
|
||||
void rtw_hal_chip_configure(_adapter *padapter)
|
||||
{
|
||||
|
|
14
hal/odm.c
14
hal/odm.c
|
@ -3047,7 +3047,6 @@ odm_DynamicTxPowerInit(
|
|||
pdmpriv->bDynamicTxPowerEnable = false;
|
||||
|
||||
#if (RTL8192C_SUPPORT==1)
|
||||
#ifdef CONFIG_USB_HCI
|
||||
|
||||
#ifdef CONFIG_INTEL_PROXIM
|
||||
if ((pHalData->BoardType == BOARD_USB_High_PA)||(Adapter->proximity.proxim_support==true))
|
||||
|
@ -3060,9 +3059,6 @@ odm_DynamicTxPowerInit(
|
|||
pdmpriv->bDynamicTxPowerEnable = true;
|
||||
}
|
||||
else
|
||||
#else
|
||||
pdmpriv->bDynamicTxPowerEnable = false;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal;
|
||||
|
@ -6079,16 +6075,6 @@ odm_EdcaTurboCheckCE(
|
|||
edca_param = EDCAParam[HT_IOT_PEER_UNKNOWN][trafficIndex];
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PCI_HCI
|
||||
if (IS_92C_SERIAL(pHalData->VersionID))
|
||||
{
|
||||
edca_param = 0x60a42b;
|
||||
}
|
||||
else
|
||||
{
|
||||
edca_param = 0x6ea42b;
|
||||
}
|
||||
#endif
|
||||
rtw_write32(Adapter, REG_EDCA_BE_PARAM, edca_param);
|
||||
|
||||
pDM_Odm->DM_EDCA_Table.prv_traffic_idx = trafficIndex;
|
||||
|
|
|
@ -1007,14 +1007,7 @@ _func_enter_;
|
|||
pwowlan_parm.mode |=FW_WOWLAN_DEAUTH_WAKEUP;
|
||||
|
||||
/* DataPinWakeUp */
|
||||
#ifdef CONFIG_USB_HCI
|
||||
pwowlan_parm.gpio_index=0x0;
|
||||
#endif /* CONFIG_USB_HCI */
|
||||
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
pwowlan_parm.gpio_index=0x80;
|
||||
#endif /* CONFIG_SDIO_HCI */
|
||||
|
||||
DBG_88E_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode);
|
||||
DBG_88E_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__func__,pwowlan_parm.gpio_index);
|
||||
res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm);
|
||||
|
|
|
@ -62,7 +62,6 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
|
|||
if (!padapter->registrypriv.hw_wps_pbc)
|
||||
return;
|
||||
|
||||
#ifdef CONFIG_USB_HCI
|
||||
tmp1byte = rtw_read8(padapter, GPIO_IO_SEL);
|
||||
tmp1byte |= (HAL_8192C_HW_GPIO_WPS_BIT);
|
||||
rtw_write8(padapter, GPIO_IO_SEL, tmp1byte); /* enable GPIO[2] as output mode */
|
||||
|
@ -83,17 +82,6 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
|
|||
{
|
||||
bPbcPressed = true;
|
||||
}
|
||||
#else
|
||||
tmp1byte = rtw_read8(padapter, GPIO_IN);
|
||||
|
||||
if (tmp1byte == 0xff || padapter->init_adpt_in_progress)
|
||||
return ;
|
||||
|
||||
if ((tmp1byte&HAL_8192C_HW_GPIO_WPS_BIT)==0)
|
||||
{
|
||||
bPbcPressed = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
if ( true == bPbcPressed)
|
||||
{
|
||||
|
@ -110,69 +98,6 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PCI_HCI
|
||||
/* */
|
||||
/* Description: */
|
||||
/* Perform interrupt migration dynamically to reduce CPU utilization. */
|
||||
/* */
|
||||
/* Assumption: */
|
||||
/* 1. Do not enable migration under WIFI test. */
|
||||
/* */
|
||||
/* Created by Roger, 2010.03.05. */
|
||||
/* */
|
||||
void
|
||||
dm_InterruptMigration(
|
||||
PADAPTER Adapter
|
||||
)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
|
||||
bool bCurrentIntMt, bCurrentACIntDisable;
|
||||
bool IntMtToSet = false;
|
||||
bool ACIntToSet = false;
|
||||
|
||||
|
||||
/* Retrieve current interrupt migration and Tx four ACs IMR settings first. */
|
||||
bCurrentIntMt = pHalData->bInterruptMigration;
|
||||
bCurrentACIntDisable = pHalData->bDisableTxInt;
|
||||
|
||||
/* */
|
||||
/* <Roger_Notes> Currently we use busy traffic for reference instead of RxIntOK counts to prevent non-linear Rx statistics */
|
||||
/* when interrupt migration is set before. 2010.03.05. */
|
||||
/* */
|
||||
if (!Adapter->registrypriv.wifi_spec &&
|
||||
(check_fwstate(pmlmepriv, _FW_LINKED)== true) &&
|
||||
pmlmepriv->LinkDetectInfo.bHigherBusyTraffic)
|
||||
{
|
||||
IntMtToSet = true;
|
||||
|
||||
/* To check whether we should disable Tx interrupt or not. */
|
||||
if (pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic )
|
||||
ACIntToSet = true;
|
||||
}
|
||||
|
||||
/* Update current settings. */
|
||||
if ( bCurrentIntMt != IntMtToSet ){
|
||||
DBG_88E("%s(): Update interrrupt migration(%d)\n",__func__,IntMtToSet);
|
||||
if (IntMtToSet)
|
||||
{
|
||||
/* */
|
||||
/* <Roger_Notes> Set interrrupt migration timer and corresponging Tx/Rx counter. */
|
||||
/* timer 25ns*0xfa0=100us for 0xf packets. */
|
||||
/* 2010.03.05. */
|
||||
/* */
|
||||
rtw_write32(Adapter, REG_INT_MIG, 0xff000fa0);/* 0x306:Rx, 0x307:Tx */
|
||||
pHalData->bInterruptMigration = IntMtToSet;
|
||||
} else {
|
||||
/* Reset all interrupt migration settings. */
|
||||
rtw_write32(Adapter, REG_INT_MIG, 0);
|
||||
pHalData->bInterruptMigration = IntMtToSet;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* */
|
||||
/* Initialize GPIO setting registers */
|
||||
/* */
|
||||
|
@ -329,9 +254,7 @@ rtl8188e_InitHalDm(
|
|||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
u8 i;
|
||||
|
||||
#ifdef CONFIG_USB_HCI
|
||||
dm_InitGPIOSetting(Adapter);
|
||||
#endif
|
||||
|
||||
pdmpriv->DM_Type = DM_Type_ByDriver;
|
||||
pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE;
|
||||
|
@ -445,13 +368,6 @@ skip_dm:
|
|||
|
||||
/* Check GPIO to determine current RF on/off and Pbc status. */
|
||||
/* Check Hardware Radio ON/OFF or not */
|
||||
#ifdef CONFIG_PCI_HCI
|
||||
if (pHalData->bGpioHwWpsPbc)
|
||||
#endif
|
||||
{
|
||||
/* temp removed */
|
||||
/* dm_CheckPbcGPIO(Adapter); */
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -27,9 +27,8 @@
|
|||
#include <rtw_iol.h>
|
||||
|
||||
#if defined(CONFIG_IOL)
|
||||
#ifdef CONFIG_USB_HCI
|
||||
#include <usb_ops.h>
|
||||
#endif
|
||||
|
||||
static void iol_mode_enable(PADAPTER padapter, u8 enable)
|
||||
{
|
||||
u8 reg_0xf0 = 0;
|
||||
|
@ -2525,63 +2524,15 @@ static void rtl8188e_SetHalODMVar(
|
|||
|
||||
void rtl8188e_clone_haldata(_adapter* dst_adapter, _adapter* src_adapter)
|
||||
{
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(dst_adapter);
|
||||
#ifndef CONFIG_SDIO_TX_TASKLET
|
||||
_sema temp_SdioXmitSema;
|
||||
_sema temp_SdioXmitTerminateSema;
|
||||
#endif
|
||||
_lock temp_SdioTxFIFOFreePageLock;
|
||||
|
||||
#ifndef CONFIG_SDIO_TX_TASKLET
|
||||
_rtw_memcpy(&temp_SdioXmitSema, &(pHalData->SdioXmitSema), sizeof(_sema));
|
||||
_rtw_memcpy(&temp_SdioXmitTerminateSema, &(pHalData->SdioXmitTerminateSema), sizeof(_sema));
|
||||
#endif
|
||||
_rtw_memcpy(&temp_SdioTxFIFOFreePageLock, &(pHalData->SdioTxFIFOFreePageLock), sizeof(_lock));
|
||||
|
||||
_rtw_memcpy(dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz);
|
||||
|
||||
#ifndef CONFIG_SDIO_TX_TASKLET
|
||||
_rtw_memcpy(&(pHalData->SdioXmitSema), &temp_SdioXmitSema, sizeof(_sema));
|
||||
_rtw_memcpy(&(pHalData->SdioXmitTerminateSema), &temp_SdioXmitTerminateSema, sizeof(_sema));
|
||||
#endif
|
||||
_rtw_memcpy(&(pHalData->SdioTxFIFOFreePageLock), &temp_SdioTxFIFOFreePageLock, sizeof(_lock));
|
||||
|
||||
#else
|
||||
_rtw_memcpy(dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void rtl8188e_start_thread(_adapter *padapter)
|
||||
{
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#ifndef CONFIG_SDIO_TX_TASKLET
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
|
||||
pHalData->SdioXmitThread = kthread_run(rtl8188es_xmit_thread, padapter, "RTWHALXT");
|
||||
if (IS_ERR(pHalData->SdioXmitThread))
|
||||
{
|
||||
RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8188es_xmit_thread FAIL!!\n", __func__));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
void rtl8188e_stop_thread(_adapter *padapter)
|
||||
{
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#ifndef CONFIG_SDIO_TX_TASKLET
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
|
||||
/* stop xmit_buf_thread */
|
||||
if (pHalData->SdioXmitThread ) {
|
||||
_rtw_up_sema(&pHalData->SdioXmitSema);
|
||||
_rtw_down_sema(&pHalData->SdioXmitTerminateSema);
|
||||
pHalData->SdioXmitThread = 0;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
static void hal_notch_filter_8188e(_adapter *adapter, bool enable)
|
||||
|
@ -2673,7 +2624,6 @@ u8 GetEEPROMSize8188E(PADAPTER padapter)
|
|||
return size;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_PCI_HCI)
|
||||
/* */
|
||||
/* */
|
||||
/* LLT R/W/Init function */
|
||||
|
@ -2753,8 +2703,6 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
|
|||
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void
|
||||
Hal_InitPGData88E(PADAPTER padapter)
|
||||
|
@ -3052,9 +3000,7 @@ void Hal_ReadPowerSavingMode88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail
|
|||
|
||||
/* decide hw if support remote wakeup function */
|
||||
/* if hw supported, 8051 (SIE) will generate WeakUP signal( D+/D- toggle) when autoresume */
|
||||
#ifdef CONFIG_USB_HCI
|
||||
padapter->pwrctrlpriv.bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1)?true :false;
|
||||
#endif /* CONFIG_USB_HCI */
|
||||
|
||||
DBG_88E("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__,
|
||||
padapter->pwrctrlpriv.bHWPwrPindetect,padapter->pwrctrlpriv.bHWPowerdown ,padapter->pwrctrlpriv.bSupportRemoteWakeup);
|
||||
|
|
|
@ -1287,21 +1287,7 @@ PHY_BBConfig8188E(
|
|||
|
||||
rtw_write8(Adapter, REG_RF_CTRL, RF_EN|RF_RSTB|RF_SDMRSTB);
|
||||
|
||||
#ifdef CONFIG_USB_HCI
|
||||
rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | FEN_BB_GLB_RSTn | FEN_BBRSTB);
|
||||
#else
|
||||
rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_PPLL|FEN_PCIEA|FEN_DIO_PCIE|FEN_BB_GLB_RSTn|FEN_BBRSTB);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PCI_HCI
|
||||
/* Force use left antenna by default for 88C. */
|
||||
/* if (!IS_92C_SERIAL(pHalData->VersionID) || IS_92C_1T2R(pHalData->VersionID)) */
|
||||
if (Adapter->ledpriv.LedStrategy != SW_LED_MODE10)
|
||||
{
|
||||
RegVal = rtw_read32(Adapter, REG_LEDCFG0);
|
||||
rtw_write32(Adapter, REG_LEDCFG0, RegVal|BIT23);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* */
|
||||
/* Config BB and AGC */
|
||||
|
@ -1359,7 +1345,6 @@ rtl8188e_PHY_ConfigRFWithParaFile(
|
|||
static int PHY_ConfigRFExternalPA(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath)
|
||||
{
|
||||
int rtStatus = _SUCCESS;
|
||||
#ifdef CONFIG_USB_HCI
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
u16 i=0;
|
||||
|
||||
|
@ -1368,7 +1353,6 @@ static int PHY_ConfigRFExternalPA(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath)
|
|||
|
||||
/* 2010/10/19 MH According to Jenyu/EEChou 's opinion, we need not to execute the */
|
||||
/* same code as SU. It is already updated in radio_a_1T_HP.txt. */
|
||||
#endif
|
||||
return rtStatus;
|
||||
}
|
||||
/* */
|
||||
|
|
|
@ -190,11 +190,9 @@ rtl8188e_PHY_RF6052SetCckTxPower(
|
|||
TxAGC[idx1] =
|
||||
pPowerlevel[idx1] | (pPowerlevel[idx1]<<8) |
|
||||
(pPowerlevel[idx1]<<16) | (pPowerlevel[idx1]<<24);
|
||||
#ifdef CONFIG_USB_HCI
|
||||
/* 2010/10/18 MH For external PA module. We need to limit power index to be less than 0x20. */
|
||||
if (TxAGC[idx1] > 0x20 && pHalData->ExternalPA)
|
||||
TxAGC[idx1] = 0x20;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,7 +183,6 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
|
|||
rtw_write32(padapter,REG_TXDMA_STATUS,txdma_status);
|
||||
rtl8188e_silentreset_for_specific_platform(padapter);
|
||||
}
|
||||
#ifdef CONFIG_USB_HCI
|
||||
/* total xmit irp = 4 */
|
||||
current_time = rtw_get_current_time();
|
||||
if (0==pxmitpriv->free_xmitbuf_cnt)
|
||||
|
@ -203,7 +202,6 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_USB_HCI */
|
||||
}
|
||||
|
||||
void rtl8188e_sreset_linked_status_check(_adapter *padapter)
|
||||
|
|
|
@ -117,11 +117,9 @@ void rtl8188e_fill_fake_txdesc(
|
|||
/* offset 16 */
|
||||
ptxdesc->txdw4 |= cpu_to_le32(BIT(8));/* driver uses rate */
|
||||
|
||||
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI)
|
||||
/* USB interface drop packet if the checksum of descriptor isn't correct. */
|
||||
/* Using this checksum can let hardware recovery from packet bulk out error (e.g. Cancel URC, Bulk out error.). */
|
||||
rtl8188eu_cal_txdesc_chksum(ptxdesc);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void fill_txdesc_sectype(struct pkt_attrib *pattrib, struct tx_desc *ptxdesc)
|
||||
|
|
|
@ -31,12 +31,6 @@
|
|||
#include <rtw_iol.h>
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_USB_HCI
|
||||
|
||||
#error "CONFIG_USB_HCI shall be on!\n"
|
||||
|
||||
#endif
|
||||
|
||||
#include <usb_ops.h>
|
||||
#include <usb_hal.h>
|
||||
#include <usb_osintf.h>
|
||||
|
@ -2124,7 +2118,6 @@ readAdapterInfo_8188EU(
|
|||
PADAPTER padapter
|
||||
)
|
||||
{
|
||||
#if 1
|
||||
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
|
||||
|
||||
/* parse the eeprom/efuse content */
|
||||
|
@ -2150,28 +2143,9 @@ readAdapterInfo_8188EU(
|
|||
/* The following part initialize some vars by PG info. */
|
||||
/* */
|
||||
Hal_InitChannelPlan(padapter);
|
||||
#if defined(CONFIG_WOWLAN) && defined(CONFIG_SDIO_HCI)
|
||||
Hal_DetectWoWMode(padapter);
|
||||
#endif /* CONFIG_WOWLAN && CONFIG_SDIO_HCI */
|
||||
Hal_CustomizeByCustomerID_8188EU(padapter);
|
||||
|
||||
_ReadLEDSetting(padapter, pEEPROM->efuse_eeprom_data, pEEPROM->bautoload_fail_flag);
|
||||
|
||||
#else
|
||||
|
||||
#ifdef CONFIG_INTEL_PROXIM
|
||||
/* for intel proximity */
|
||||
if (pHalData->rf_type== RF_1T1R) {
|
||||
Adapter->proximity.proxim_support = true;
|
||||
} else if (pHalData->rf_type== RF_2T2R) {
|
||||
if ((pHalData->EEPROMPID == 0x8186) &&
|
||||
(pHalData->EEPROMVID== 0x0bda))
|
||||
Adapter->proximity.proxim_support = true;
|
||||
} else {
|
||||
Adapter->proximity.proxim_support = false;
|
||||
}
|
||||
#endif /* CONFIG_INTEL_PROXIM */
|
||||
#endif
|
||||
}
|
||||
|
||||
static void _ReadPROMContent(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue