From c3c991544f897f5b863955bc84dcbc96b3c63351 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 16 Oct 2017 19:51:31 -0500 Subject: [PATCH] rtl8723ds: Remove WINDOWS code Signed-off-by: Larry Finger --- core/rtw_io.c | 4 - core/rtw_ioctl_query.c | 150 ----------- core/rtw_ioctl_set.c | 78 ------ core/rtw_mp.c | 58 ----- core/rtw_pwrctrl.c | 6 - core/rtw_recv.c | 7 - core/rtw_sta_mgt.c | 7 - core/rtw_xmit.c | 5 - hal/btc/Mp_Precomp.h | 2 - hal/btc/halbtc8723d1ant.c | 27 -- hal/btc/halbtc8723d2ant.c | 19 -- hal/phydm/halhwimg.h | 43 ---- hal/phydm/rtl8723d/halphyrf_8723d.c | 385 ---------------------------- include/basic_types.h | 39 --- include/byteorder/generic.h | 13 +- include/byteorder/swab.h | 2 +- include/drv_conf.h | 6 - include/drv_types.h | 36 --- include/ieee80211.h | 151 ----------- include/ieee80211_ext.h | 161 ------------ include/mlme_osdep.h | 4 - include/osdep_service.h | 28 -- include/rtw_debug.h | 51 +--- include/rtw_io.h | 3 - include/rtw_ioctl.h | 135 +--------- include/rtw_ioctl_query.h | 6 - include/rtw_ioctl_set.h | 14 - include/rtw_mp.h | 40 --- include/rtw_recv.h | 22 -- include/rtw_security.h | 3 - include/sdio_ops.h | 19 -- include/wifi.h | 69 ----- include/wlan_bssdef.h | 13 - include/xmit_osdep.h | 26 -- os_dep/linux/os_intfs.c | 7 - os_dep/osdep_service.c | 231 ----------------- 36 files changed, 16 insertions(+), 1854 deletions(-) diff --git a/core/rtw_io.c b/core/rtw_io.c index 683da16..89e2587 100644 --- a/core/rtw_io.c +++ b/core/rtw_io.c @@ -52,10 +52,6 @@ jackson@realtek.com.tw #include #include -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - #error "Shall be Linux or Windows, but not both!\n" -#endif - #ifdef CONFIG_SDIO_HCI #define rtw_le16_to_cpu(val) val #define rtw_le32_to_cpu(val) val diff --git a/core/rtw_ioctl_query.c b/core/rtw_ioctl_query.c index 4f8232d..50b6ffa 100644 --- a/core/rtw_ioctl_query.c +++ b/core/rtw_ioctl_query.c @@ -19,153 +19,3 @@ ******************************************************************************/ #define _RTW_IOCTL_QUERY_C_ -#include - - -#ifdef PLATFORM_WINDOWS -/* - * Added for WPA2-PSK, by Annie, 2005-09-20. - * */ -u8 -query_802_11_capability( - _adapter *Adapter, - u8 *pucBuf, - u32 *pulOutLen -) -{ - static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] = { - {Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled}, - {Ndis802_11AuthModeOpen, Ndis802_11Encryption1Enabled}, - {Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled}, - {Ndis802_11AuthModeShared, Ndis802_11Encryption1Enabled}, - {Ndis802_11AuthModeWPA, Ndis802_11Encryption2Enabled}, - {Ndis802_11AuthModeWPA, Ndis802_11Encryption3Enabled}, - {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption2Enabled}, - {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption3Enabled}, - {Ndis802_11AuthModeWPANone, Ndis802_11Encryption2Enabled}, - {Ndis802_11AuthModeWPANone, Ndis802_11Encryption3Enabled}, - {Ndis802_11AuthModeWPA2, Ndis802_11Encryption2Enabled}, - {Ndis802_11AuthModeWPA2, Ndis802_11Encryption3Enabled}, - {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption2Enabled}, - {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption3Enabled} - }; - static ULONG ulNumOfPairSupported = sizeof(szAuthEnc) / sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION); - NDIS_802_11_CAPABILITY *pCap = (NDIS_802_11_CAPABILITY *)pucBuf; - u8 *pucAuthEncryptionSupported = (u8 *) pCap->AuthenticationEncryptionSupported; - - - pCap->Length = sizeof(NDIS_802_11_CAPABILITY); - if (ulNumOfPairSupported > 1) - pCap->Length += (ulNumOfPairSupported - 1) * sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION); - - pCap->Version = 2; - pCap->NoOfPMKIDs = NUM_PMKID_CACHE; - pCap->NoOfAuthEncryptPairsSupported = ulNumOfPairSupported; - - if (sizeof(szAuthEnc) <= 240) /* 240 = 256 - 4*4 */ { /* SecurityInfo.szCapability: only 256 bytes in size. */ - _rtw_memcpy(pucAuthEncryptionSupported, (u8 *)szAuthEnc, sizeof(szAuthEnc)); - *pulOutLen = pCap->Length; - return _TRUE; - } else { - *pulOutLen = 0; - return _FALSE; - } -} - -u8 query_802_11_association_information(_adapter *padapter, PNDIS_802_11_ASSOCIATION_INFORMATION pAssocInfo) -{ - struct wlan_network *tgt_network; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct security_priv *psecuritypriv = &(padapter->securitypriv); - WLAN_BSSID_EX *psecnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; - u8 *pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); - unsigned char i, *auth_ie, *supp_ie; - - /* NdisZeroMemory(pAssocInfo, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); */ - _rtw_memset(pAssocInfo, 0, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); - /* pAssocInfo->Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); */ - - /* ------------------------------------------------------ */ - /* Association Request related information */ - /* ------------------------------------------------------ */ - /* Req_1. AvailableRequestFixedIEs */ - if (psecnetwork != NULL) { - - pAssocInfo->AvailableRequestFixedIEs |= NDIS_802_11_AI_REQFI_CAPABILITIES | NDIS_802_11_AI_REQFI_CURRENTAPADDRESS; - pAssocInfo->RequestFixedIEs.Capabilities = (unsigned short) *&psecnetwork->IEs[10]; - _rtw_memcpy(pAssocInfo->RequestFixedIEs.CurrentAPAddress, - &psecnetwork->MacAddress, 6); - - pAssocInfo->OffsetRequestIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); - - if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING | _FW_LINKED) == _TRUE) { - - if (psecuritypriv->ndisauthtype >= Ndis802_11AuthModeWPA2) - pDest[0] = 48; /* RSN Information Element */ - else - pDest[0] = 221; /* WPA(SSN) Information Element */ - - supp_ie = &psecuritypriv->supplicant_ie[0]; - - i = 13; /* 0~11 is fixed information element */ - while ((i < supp_ie[0]) && (i < 256)) { - if ((unsigned char)supp_ie[i] == pDest[0]) { - _rtw_memcpy((u8 *)(pDest), - &supp_ie[i], - supp_ie[1 + i] + 2); - - break; - } - - i = i + supp_ie[i + 1] + 2; - if (supp_ie[1 + i] == 0) - i = i + 1; - - } - - - pAssocInfo->RequestIELength += (2 + supp_ie[1 + i]); /* (2 + psecnetwork->IEs[1+i]+4); */ - - } - - - - } - - - /* ------------------------------------------------------ */ - /* Association Response related information */ - /* ------------------------------------------------------ */ - - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { - tgt_network = &(pmlmepriv->cur_network); - if (tgt_network != NULL) { - pAssocInfo->AvailableResponseFixedIEs = - NDIS_802_11_AI_RESFI_CAPABILITIES - | NDIS_802_11_AI_RESFI_ASSOCIATIONID - ; - - pAssocInfo->ResponseFixedIEs.Capabilities = (unsigned short) *&tgt_network->network.IEs[10]; - pAssocInfo->ResponseFixedIEs.StatusCode = 0; - pAssocInfo->ResponseFixedIEs.AssociationId = (unsigned short) tgt_network->aid; - - pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength; - auth_ie = &psecuritypriv->authenticator_ie[0]; - - - i = auth_ie[0] - 12; - if (i > 0) { - _rtw_memcpy((u8 *)&pDest[0], &auth_ie[1], i); - pAssocInfo->ResponseIELength = i; - } - - - pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength; - - - } - } - - return _TRUE; -} -#endif diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index 934dc95..8f64f84 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -192,84 +192,6 @@ exit: return ret; } -#ifdef PLATFORM_WINDOWS -u8 rtw_pnp_set_power_wakeup(_adapter *padapter) -{ - u8 res = _SUCCESS; - - - - res = rtw_setstandby_cmd(padapter, 0); - - - - return res; -} - -u8 rtw_pnp_set_power_sleep(_adapter *padapter) -{ - u8 res = _SUCCESS; - - - /* DbgPrint("+rtw_pnp_set_power_sleep\n"); */ - - res = rtw_setstandby_cmd(padapter, 1); - - - - return res; -} - -u8 rtw_set_802_11_reload_defaults(_adapter *padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults) -{ - - - - /* SecClearAllKeys(Adapter); */ - /* 8711 CAM was not for En/Decrypt only */ - /* so, we can't clear all keys. */ - /* should we disable WPAcfg (ox0088) bit 1-2, instead of clear all CAM */ - - /* TO DO... */ - - - return _TRUE; -} - -u8 set_802_11_test(_adapter *padapter, NDIS_802_11_TEST *test) -{ - u8 ret = _TRUE; - - - switch (test->Type) { - case 1: - NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->AuthenticationEvent, test->Length - 8); - NdisMIndicateStatusComplete(padapter->hndis_adapter); - break; - - case 2: - NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->RssiTrigger, sizeof(NDIS_802_11_RSSI)); - NdisMIndicateStatusComplete(padapter->hndis_adapter); - break; - - default: - ret = _FALSE; - break; - } - - - return ret; -} - -u8 rtw_set_802_11_pmkid(_adapter *padapter, NDIS_802_11_PMKID *pmkid) -{ - u8 ret = _SUCCESS; - - return ret; -} - -#endif - u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid) { _irqL irqL; diff --git a/core/rtw_mp.c b/core/rtw_mp.c index b341921..2e41ccb 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -166,64 +166,6 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv) } -#ifdef PLATFORM_WINDOWS -#if 0 -void mp_wi_callback( - IN NDIS_WORK_ITEM *pwk_item, - IN PVOID cntx -) -{ - _adapter *padapter = (_adapter *)cntx; - struct mp_priv *pmppriv = &padapter->mppriv; - struct mp_wi_cntx *pmp_wi_cntx = &pmppriv->wi_cntx; - - /* Execute specified action. */ - if (pmp_wi_cntx->curractfunc != NULL) { - LARGE_INTEGER cur_time; - ULONGLONG start_time, end_time; - NdisGetCurrentSystemTime(&cur_time); /* driver version */ - start_time = cur_time.QuadPart / 10; /* The return value is in microsecond */ - - pmp_wi_cntx->curractfunc(padapter); - - NdisGetCurrentSystemTime(&cur_time); /* driver version */ - end_time = cur_time.QuadPart / 10; /* The return value is in microsecond */ - - } - - NdisAcquireSpinLock(&(pmp_wi_cntx->mp_wi_lock)); - pmp_wi_cntx->bmp_wi_progress = _FALSE; - NdisReleaseSpinLock(&(pmp_wi_cntx->mp_wi_lock)); - - if (pmp_wi_cntx->bmpdrv_unload) - NdisSetEvent(&(pmp_wi_cntx->mp_wi_evt)); - -} -#endif - -static int init_mp_priv_by_os(struct mp_priv *pmp_priv) -{ - struct mp_wi_cntx *pmp_wi_cntx; - - if (pmp_priv == NULL) - return _FAIL; - - pmp_priv->rx_testcnt = 0; - pmp_priv->rx_testcnt1 = 0; - pmp_priv->rx_testcnt2 = 0; - - pmp_priv->tx_testcnt = 0; - pmp_priv->tx_testcnt1 = 0; - - pmp_wi_cntx = &pmp_priv->wi_cntx - pmp_wi_cntx->bmpdrv_unload = _FALSE; - pmp_wi_cntx->bmp_wi_progress = _FALSE; - pmp_wi_cntx->curractfunc = NULL; - - return _SUCCESS; -} -#endif - #ifdef PLATFORM_LINUX static int init_mp_priv_by_os(struct mp_priv *pmp_priv) { diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index eb893a0..03c8a37 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -1888,12 +1888,6 @@ void rtw_init_pwrctrl_priv(PADAPTER padapter) if (padapter->adapter_type != PRIMARY_ADAPTER) return; #endif - - -#ifdef PLATFORM_WINDOWS - pwrctrlpriv->pnp_current_pwr_state = NdisDeviceStateD0; -#endif - _init_pwrlock(&pwrctrlpriv->lock); _init_pwrlock(&pwrctrlpriv->check_32k_lock); pwrctrlpriv->rf_pwrstate = rf_on; diff --git a/core/rtw_recv.c b/core/rtw_recv.c index d707125..6e59bc5 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -22,13 +22,6 @@ #include #include -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - - #error "Shall be Linux or Windows, but not both!\n" - -#endif - - #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 26926ff..f931724 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -21,13 +21,6 @@ #include -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - - #error "Shall be Linux or Windows, but not both!\n" - -#endif - - bool test_st_match_rule(_adapter *adapter, u8 *local_naddr, u8 *local_port, u8 *remote_naddr, u8 *remote_port) { if (ntohs(*((u16 *)local_port)) == 5001 || ntohs(*((u16 *)remote_port)) == 5001) diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index b33e8be..b13db72 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -22,11 +22,6 @@ #include #include -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - #error "Shall be Linux or Windows, but not both!\n" -#endif - - static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 }; static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; diff --git a/hal/btc/Mp_Precomp.h b/hal/btc/Mp_Precomp.h index 0299b2c..1542565 100644 --- a/hal/btc/Mp_Precomp.h +++ b/hal/btc/Mp_Precomp.h @@ -27,8 +27,6 @@ #ifdef PLATFORM_LINUX #define rsprintf snprintf -#elif defined(PLATFORM_WINDOWS) -#define rsprintf sprintf_s #endif #define DCMD_Printf DBG_BT_INFO diff --git a/hal/btc/halbtc8723d1ant.c b/hal/btc/halbtc8723d1ant.c index d14fbe6..df0f4e9 100644 --- a/hal/btc/halbtc8723d1ant.c +++ b/hal/btc/halbtc8723d1ant.c @@ -3850,9 +3850,6 @@ static void halbtc8723d1ant_psd_showdata(IN struct btc_coexist *btcoexist) } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static void halbtc8723d1ant_psd_maxholddata(IN struct btc_coexist *btcoexist, IN u32 gen_count) { @@ -3884,9 +3881,6 @@ static void halbtc8723d1ant_psd_maxholddata(IN struct btc_coexist *btcoexist, psd_scan->psd_loop_max_value[gen_count - 1] = loop_val_max; } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static u32 halbtc8723d1ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) { /* reg 0x808[9:0]: FFT data x */ @@ -3918,9 +3912,6 @@ static u32 halbtc8723d1ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 return psd_report; } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d1ant_psd_sweep_point(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN s32 offset, IN u32 span, IN u32 points, IN u32 avgnum, IN u32 loopcnt) @@ -4250,9 +4241,6 @@ static boolean halbtc8723d1ant_psd_sweep_point(IN struct btc_coexist *btcoexist, } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d1ant_psd_antenna_detection(IN struct btc_coexist *btcoexist) { @@ -4634,9 +4622,6 @@ static boolean halbtc8723d1ant_psd_antenna_detection(IN struct btc_coexist } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d1ant_psd_antenna_detection_check(IN struct btc_coexist *btcoexist) { @@ -6045,15 +6030,6 @@ void ex_halbtc8723d1ant_periodical(IN struct btc_coexist *btcoexist) board_info->antdetval = psd_scan->ant_det_psd_scan_peak_val/100; value = board_info->antdetval; - -#ifdef PLATFORM_WINDOWS - { - PWCHAR registryName; - - registryName = L"antdetval"; - PlatformWriteCommonDwordRegistry(registryName, &value); - } -#endif } } @@ -6086,9 +6062,6 @@ void ex_halbtc8723d1ant_set_antenna_notify(IN struct btc_coexist *btcoexist, } } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif void ex_halbtc8723d1ant_antenna_detection(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds) { diff --git a/hal/btc/halbtc8723d2ant.c b/hal/btc/halbtc8723d2ant.c index 6afc5ed..b4d122f 100644 --- a/hal/btc/halbtc8723d2ant.c +++ b/hal/btc/halbtc8723d2ant.c @@ -4431,9 +4431,6 @@ static void halbtc8723d2ant_psd_showdata(IN struct btc_coexist *btcoexist) } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static void halbtc8723d2ant_psd_maxholddata(IN struct btc_coexist *btcoexist, IN u32 gen_count) { @@ -4466,10 +4463,6 @@ static void halbtc8723d2ant_psd_maxholddata(IN struct btc_coexist *btcoexist, } - -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static u32 halbtc8723d2ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) { /* reg 0x808[9:0]: FFT data x */ @@ -4501,9 +4494,6 @@ static u32 halbtc8723d2ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 return psd_report; } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d2ant_psd_sweep_point(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN s32 offset, IN u32 span, IN u32 points, IN u32 avgnum, IN u32 loopcnt) @@ -4833,9 +4823,6 @@ static boolean halbtc8723d2ant_psd_sweep_point(IN struct btc_coexist *btcoexist, } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d2ant_psd_antenna_detection(IN struct btc_coexist *btcoexist) { @@ -5216,9 +5203,6 @@ static boolean halbtc8723d2ant_psd_antenna_detection(IN struct btc_coexist } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif static boolean halbtc8723d2ant_psd_antenna_detection_check(IN struct btc_coexist *btcoexist) { @@ -6664,9 +6648,6 @@ void ex_halbtc8723d2ant_set_antenna_notify(IN struct btc_coexist *btcoexist, } } -#ifdef PLATFORM_WINDOWS -#pragma optimize("", off) -#endif void ex_halbtc8723d2ant_antenna_detection(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds) { diff --git a/hal/phydm/halhwimg.h b/hal/phydm/halhwimg.h index 108f715..1b679e4 100644 --- a/hal/phydm/halhwimg.h +++ b/hal/phydm/halhwimg.h @@ -77,47 +77,4 @@ #define RTL8188ES_HWIMG_SUPPORT 0 #endif -#else // PLATFORM_WINDOWS & MacOSX - -//For 92C -#define RTL8192CE_HWIMG_SUPPORT 1 -#define RTL8192CE_TEST_HWIMG_SUPPORT 1 -#define RTL8192CU_HWIMG_SUPPORT 1 -#define RTL8192CU_TEST_HWIMG_SUPPORT 1 - -// For 92D -#define RTL8192DE_HWIMG_SUPPORT 1 -#define RTL8192DE_TEST_HWIMG_SUPPORT 1 -#define RTL8192DU_HWIMG_SUPPORT 1 -#define RTL8192DU_TEST_HWIMG_SUPPORT 1 - - #if defined(UNDER_CE) - // For 8723 - #define RTL8723E_HWIMG_SUPPORT 0 - #define RTL8723U_HWIMG_SUPPORT 0 - #define RTL8723S_HWIMG_SUPPORT 1 - - // For 88E - #define RTL8188EE_HWIMG_SUPPORT 0 - #define RTL8188EU_HWIMG_SUPPORT 0 - #define RTL8188ES_HWIMG_SUPPORT 0 - - #else - - // For 8723 - #define RTL8723E_HWIMG_SUPPORT 1 - //#define RTL_8723E_TEST_HWIMG_SUPPORT 1 - #define RTL8723U_HWIMG_SUPPORT 1 - //#define RTL_8723U_TEST_HWIMG_SUPPORT 1 - #define RTL8723S_HWIMG_SUPPORT 1 - //#define RTL_8723S_TEST_HWIMG_SUPPORT 1 - - //For 88E - #define RTL8188EE_HWIMG_SUPPORT 1 - #define RTL8188EU_HWIMG_SUPPORT 1 - #define RTL8188ES_HWIMG_SUPPORT 1 - #endif - -#endif - #endif //__INC_HW_IMG_H diff --git a/hal/phydm/rtl8723d/halphyrf_8723d.c b/hal/phydm/rtl8723d/halphyrf_8723d.c index 59a0cae..ad17af8 100644 --- a/hal/phydm/rtl8723d/halphyrf_8723d.c +++ b/hal/phydm/rtl8723d/halphyrf_8723d.c @@ -3567,391 +3567,6 @@ phy_DigitalPredistortion_8723D( IN BOOLEAN is2T ) { -#if (RT_PLATFORM == PLATFORM_WINDOWS) -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - #if (DM_ODM_SUPPORT_TYPE == ODM_CE) - PDM_ODM_T pDM_Odm = &pHalData->odmpriv; - #endif - #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) - PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; - #endif -#endif - - u4Byte tmpReg, tmpReg2, index, i; - u1Byte path, pathbound = PATH_NUM; - u4Byte AFE_backup[IQK_ADDA_REG_NUM]; - u4Byte AFE_REG[IQK_ADDA_REG_NUM] = { - rFPGA0_XCD_SwitchControl, rBlue_Tooth, - rRx_Wait_CCA, rTx_CCK_RFON, - rTx_CCK_BBON, rTx_OFDM_RFON, - rTx_OFDM_BBON, rTx_To_Rx, - rTx_To_Tx, rRx_CCK, - rRx_OFDM, rRx_Wait_RIFS, - rRx_TO_Rx, rStandby, - rSleep, rPMPD_ANAEN }; - - u4Byte BB_backup[DP_BB_REG_NUM]; - u4Byte BB_REG[DP_BB_REG_NUM] = { - rOFDM0_TRxPathEnable, rFPGA0_RFMOD, - rOFDM0_TRMuxPar, rFPGA0_XCD_RFInterfaceSW, - rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE, - rFPGA0_XB_RFInterfaceOE}; - u4Byte BB_settings[DP_BB_REG_NUM] = { - 0x00a05430, 0x02040000, 0x000800e4, 0x22208000, - 0x0, 0x0, 0x0}; - - u4Byte RF_backup[DP_PATH_NUM][DP_RF_REG_NUM]; - u4Byte RF_REG[DP_RF_REG_NUM] = { - RF_TXBIAS_A}; - - u4Byte MAC_backup[IQK_MAC_REG_NUM]; - u4Byte MAC_REG[IQK_MAC_REG_NUM] = { - REG_TXPAUSE, REG_BCN_CTRL, - REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; - - u4Byte Tx_AGC[DP_DPK_NUM][DP_DPK_VALUE_NUM] = { - {0x1e1e1e1e, 0x03901e1e}, - {0x18181818, 0x03901818}, - {0x0e0e0e0e, 0x03900e0e} - }; - - u4Byte AFE_on_off[PATH_NUM] = { - 0x04db25a4, 0x0b1b25a4}; - - u1Byte RetryCount = 0; - - - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("==>phy_DigitalPredistortion_8723D()\n")); - - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("phy_DigitalPredistortion_8723D for %s\n", (is2T ? "2T2R" : "1T1R"))); - - - for (index = 0; index < DP_BB_REG_NUM; index++) - BB_backup[index] = ODM_GetBBReg(pDM_Odm, BB_REG[index], bMaskDWord); - - -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - _PHY_SaveMACRegisters_8723D(pAdapter, BB_REG, MAC_backup); -#else - _PHY_SaveMACRegisters_8723D(pDM_Odm, BB_REG, MAC_backup); -#endif - - - for (path = 0; path < DP_PATH_NUM; path++) { - for (index = 0; index < DP_RF_REG_NUM; index++) -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - RF_backup[path][index] = PHY_QueryRFReg(pAdapter, path, RF_REG[index], bMaskDWord); -#else - RF_backup[path][index] = ODM_GetRFReg(pAdapter, path, RF_REG[index], bMaskDWord); -#endif - } - - -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - _PHY_SaveADDARegisters_8723D(pAdapter, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); -#else - _PHY_SaveADDARegisters_8723D(pDM_Odm, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); -#endif - - - for (index = 0; index < IQK_ADDA_REG_NUM ; index++) - ODM_SetBBReg(pDM_Odm, AFE_REG[index], bMaskDWord, 0x6fdb25a4); - - - for (index = 0; index < DP_BB_REG_NUM; index++) { - if (index < 4) - ODM_SetBBReg(pDM_Odm, BB_REG[index], bMaskDWord, BB_settings[index]); - else if (index == 4) - ODM_SetBBReg(pDM_Odm,BB_REG[index], bMaskDWord, BB_backup[index]|BIT10|BIT26); - else - ODM_SetBBReg(pDM_Odm, BB_REG[index], BIT10, 0x00); - } - - -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - _PHY_MACSettingCalibration_8723D(pAdapter, MAC_REG, MAC_backup); -#else - _PHY_MACSettingCalibration_8723D(pDM_Odm, MAC_REG, MAC_backup); -#endif - - - ODM_SetBBReg(pDM_Odm, rTx_IQK_Tone_A, bMaskDWord, 0x01008c00); - ODM_SetBBReg(pDM_Odm, rRx_IQK_Tone_A, bMaskDWord, 0x01008c00); - ODM_SetBBReg(pDM_Odm, rTx_IQK_Tone_B, bMaskDWord, 0x01008c00); - ODM_SetBBReg(pDM_Odm, rRx_IQK_Tone_B, bMaskDWord, 0x01008c00); - - - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_B, RF_AC, bMaskDWord, 0x10000); - - - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x400000); - ODM_SetBBReg(pDM_Odm, 0xbc0, bMaskDWord, 0x0005361f); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - - - for (i = 0; i < 3; i++) { - - for (index = 0; index < 3; index++) - ODM_SetBBReg(pDM_Odm, 0xe00+index*4, bMaskDWord, Tx_AGC[i][0]); - ODM_SetBBReg(pDM_Odm,0xe00+index*4, bMaskDWord, Tx_AGC[i][1]); - for (index = 0; index < 4; index++) - ODM_SetBBReg(pDM_Odm, 0xe10+index*4, bMaskDWord, Tx_AGC[i][0]); - - - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x02097098); - ODM_SetBBReg(pDM_Odm, rPdp_AntA_4, bMaskDWord, 0xf76d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00880000); - - - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x80047788); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x00047788); - ODM_delay_ms(50); - } - - - for (index = 0; index < 3; index++) - ODM_SetBBReg(pDM_Odm, 0xe00+index*4, bMaskDWord, 0x34343434); - ODM_SetBBReg(pDM_Odm, 0xe08+index*4, bMaskDWord, 0x03903434); - for (index = 0; index < 4; index++) - ODM_SetBBReg(pDM_Odm, 0xe10+index*4, bMaskDWord, 0x34343434); - - - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x02017098); - ODM_SetBBReg(pDM_Odm, rPdp_AntA_4, bMaskDWord, 0xf76d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00880000); - - - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, 0x0c, bMaskDWord, 0x8992b); - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, 0x0d, bMaskDWord, 0x0e52c); - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, 0x00, bMaskDWord, 0x5205a ); - - - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x800477c0); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x000477c0); - ODM_delay_ms(50); - - while(RetryCount < DP_RETRY_LIMIT && !pDM_Odm->RFCalibrateInfo.bDPPathAOK) - { - - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x0c297018); - tmpReg = ODM_GetBBReg(pDM_Odm, 0xbe0, bMaskDWord); - ODM_delay_ms(10); - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x0c29701f); - tmpReg2 = ODM_GetBBReg(pDM_Odm, 0xbe8, bMaskDWord); - ODM_delay_ms(10); - - tmpReg = (tmpReg & bMaskHWord) >> 16; - tmpReg2 = (tmpReg2 & bMaskHWord) >> 16; - if (tmpReg < 0xf0 || tmpReg > 0x105 || tmpReg2 > 0xff) { - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x02017098); - - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x800000); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x800477c0); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x000477c0); - ODM_delay_ms(50); - RetryCount++; - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path S1 DPK RetryCount %d 0xbe0[31:16] %x 0xbe8[31:16] %x\n", RetryCount, tmpReg, tmpReg2)); - } else { - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path S1 DPK Success\n")); - pDM_Odm->RFCalibrateInfo.bDPPathAOK = TRUE; - break; - } - } - RetryCount = 0; - - - if (pDM_Odm->RFCalibrateInfo.bDPPathAOK) { - - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x01017098); - ODM_SetBBReg(pDM_Odm, rPdp_AntA_4, bMaskDWord, 0x776d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntA, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00880000); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x400000); - - for (i = rPdp_AntA; i <= 0xb3c; i += 4) { - ODM_SetBBReg(pDM_Odm, i, bMaskDWord, 0x40004000); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path S1 ofsset = 0x%x\n", i)); - } - - - ODM_SetBBReg(pDM_Odm, 0xb40, bMaskDWord, 0x40404040); - ODM_SetBBReg(pDM_Odm, 0xb44, bMaskDWord, 0x28324040); - ODM_SetBBReg(pDM_Odm, 0xb48, bMaskDWord, 0x10141920); - - for (i = 0xb4c; i <= 0xb5c; i += 4) { - ODM_SetBBReg(pDM_Odm, i, bMaskDWord, 0x0c0c0c0c); - } - - - ODM_SetBBReg(pDM_Odm, 0xbc0, bMaskDWord, 0x0005361f); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - } else { - ODM_SetBBReg(pDM_Odm, rPdp_AntA, bMaskDWord, 0x00000000); - ODM_SetBBReg(pDM_Odm, rPdp_AntA_4, bMaskDWord, 0x00000000); - } - - - if (is2T) { - - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, RF_AC, bMaskDWord, 0x10000); - - - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x400000); - ODM_SetBBReg(pDM_Odm, 0xbc4, bMaskDWord, 0x0005361f); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - - - for (i = 0; i < 3; i++) { - - for(index = 0; index < 4; index++) - ODM_SetBBReg(pDM_Odm, 0x830+index*4, bMaskDWord, Tx_AGC[i][0]); - for(index = 0; index < 2; index++) - ODM_SetBBReg(pDM_Odm, 0x848+index*4, bMaskDWord, Tx_AGC[i][0]); - for(index = 0; index < 2; index++) - ODM_SetBBReg(pDM_Odm, 0x868+index*4, bMaskDWord, Tx_AGC[i][0]); - - - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x02097098); - ODM_SetBBReg(pDM_Odm, rPdp_AntB_4, bMaskDWord, 0xf76d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntB, bMaskDWord, 0x00880000); - - - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x80047788); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x00047788); - ODM_delay_ms(50); - } - - - for (index = 0; index < 4; index++) - ODM_SetBBReg(pDM_Odm, 0x830+index*4, bMaskDWord, 0x34343434); - for (index = 0; index < 2; index++) - ODM_SetBBReg(pDM_Odm, 0x848+index*4, bMaskDWord, 0x34343434); - for (index = 0; index < 2; index++) - ODM_SetBBReg(pDM_Odm, 0x868+index*4, bMaskDWord, 0x34343434); - - - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x02017098); - ODM_SetBBReg(pDM_Odm, rPdp_AntB_4, bMaskDWord, 0xf76d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntB, bMaskDWord, 0x00880000); - - - ODM_SetBBReg(pDM_Odm, 0x840, bMaskDWord, 0x0101000f); - ODM_SetBBReg(pDM_Odm, 0x840, bMaskDWord, 0x01120103); - - - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_B, 0x0c, bMaskDWord, 0x8992b); - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_B, 0x0d, bMaskDWord, 0x0e52c); - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_B, RF_AC, bMaskDWord, 0x5205a); - - - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x800477c0); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x000477c0); - ODM_delay_ms(50); - - while(RetryCount < DP_RETRY_LIMIT && !pDM_Odm->RFCalibrateInfo.bDPPathBOK) - { - - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x0c297018); - tmpReg = ODM_GetBBReg(pDM_Odm, 0xbf0, bMaskDWord); - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x0c29701f); - tmpReg2 = ODM_GetBBReg(pDM_Odm, 0xbf8, bMaskDWord); - - tmpReg = (tmpReg & bMaskHWord) >> 16; - tmpReg2 = (tmpReg2 & bMaskHWord) >> 16; - - if (tmpReg < 0xf0 || tmpReg > 0x105 || tmpReg2 > 0xff) { - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x02017098); - - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x800000); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x800477c0); - ODM_delay_ms(1); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x000477c0); - ODM_delay_ms(50); - RetryCount++; - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("path B DPK RetryCount %d 0xbf0[31:16] %x, 0xbf8[31:16] %x\n", RetryCount , tmpReg, tmpReg2)); - } else { - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("path B DPK Success\n")); - pDM_Odm->RFCalibrateInfo.bDPPathBOK = TRUE; - break; - } - } - - - if (pDM_Odm->RFCalibrateInfo.bDPPathBOK) { - - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x01017098); - ODM_SetBBReg(pDM_Odm, rPdp_AntB_4, bMaskDWord, 0x776d9f84); - ODM_SetBBReg(pDM_Odm, rConfig_Pmpd_AntB, bMaskDWord, 0x0004ab87); - ODM_SetBBReg(pDM_Odm, rConfig_AntB, bMaskDWord, 0x00880000); - - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x400000); - for (i = 0xb60; i <= 0xb9c; i += 4) { - ODM_SetBBReg(pDM_Odm, i, bMaskDWord, 0x40004000); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("path B ofsset = 0x%x\n", i)); - } - - - ODM_SetBBReg(pDM_Odm, 0xba0, bMaskDWord, 0x40404040); - ODM_SetBBReg(pDM_Odm, 0xba4, bMaskDWord, 0x28324050); - ODM_SetBBReg(pDM_Odm, 0xba8, bMaskDWord, 0x0c141920); - - for (i = 0xbac; i <= 0xbbc; i += 4) { - ODM_SetBBReg(pDM_Odm, i, bMaskDWord, 0x0c0c0c0c); - } - - - ODM_SetBBReg(pDM_Odm, 0xbc4, bMaskDWord, 0x0005361f); - ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x000000); - - } else { - ODM_SetBBReg(pDM_Odm, rPdp_AntB, bMaskDWord, 0x00000000); - ODM_SetBBReg(pDM_Odm, rPdp_AntB_4, bMaskDWord, 0x00000000); - } - } - - - for (index = 0; index < DP_BB_REG_NUM; index++) - ODM_SetBBReg(pDM_Odm, BB_REG[index], bMaskDWord, BB_backup[index]); - - - for (path = 0; path < DP_PATH_NUM; path++) { - for (i = 0 ; i < DP_RF_REG_NUM ; i++) { - ODM_SetRFReg(pDM_Odm, path, RF_REG[i], bMaskDWord, RF_backup[path][i]); - } - } - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, RF_MODE1, bMaskDWord, 0x1000f); - ODM_SetRFReg(pDM_Odm, ODM_RF_PATH_A, RF_MODE2, bMaskDWord, 0x20101); - - -#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - _PHY_ReloadADDARegisters_8723D(pAdapter, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); - - - _PHY_ReloadMACRegisters_8723D(pAdapter, MAC_REG, MAC_backup); -#else - _PHY_ReloadADDARegisters_8723D(pDM_Odm, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); - - - _PHY_ReloadMACRegisters_8723D(pDM_Odm, MAC_REG, MAC_backup); -#endif - - pDM_Odm->RFCalibrateInfo.bDPdone = TRUE; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("<==phy_DigitalPredistortion_8723D()\n")); -#endif } VOID diff --git a/include/basic_types.h b/include/basic_types.h index c903c4a..2cb1a0d 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -36,45 +36,6 @@ #define _FALSE FALSE #endif -#ifdef PLATFORM_WINDOWS - - typedef signed char s8; - typedef unsigned char u8; - - typedef signed short s16; - typedef unsigned short u16; - - typedef signed long s32; - typedef unsigned long u32; - - typedef unsigned int uint; - typedef signed int sint; - - - typedef signed long long s64; - typedef unsigned long long u64; - - #ifdef NDIS50_MINIPORT - - #define NDIS_MAJOR_VERSION 5 - #define NDIS_MINOR_VERSION 0 - - #endif - - #ifdef NDIS51_MINIPORT - - #define NDIS_MAJOR_VERSION 5 - #define NDIS_MINOR_VERSION 1 - - #endif - - typedef NDIS_PROC proc_t; - - typedef LONG atomic_t; - -#endif - - #ifdef PLATFORM_LINUX #include #include diff --git a/include/byteorder/generic.h b/include/byteorder/generic.h index 02cf675..0b82bdf 100644 --- a/include/byteorder/generic.h +++ b/include/byteorder/generic.h @@ -98,7 +98,7 @@ */ -#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) || defined(PLATFORM_FREEBSD) +#if defined(PLATFORM_LINUX) /* * inside the kernel, we can use nicknames; * outside of it, we must avoid POSIX namespace pollution... @@ -198,15 +198,4 @@ #endif /* OPTIMIZE */ - -#if defined(PLATFORM_WINDOWS) - - #define htonl(x) __cpu_to_be32(x) - #define ntohl(x) __be32_to_cpu(x) - #define htons(x) __cpu_to_be16(x) - #define ntohs(x) __be16_to_cpu(x) - - -#endif - #endif /* _LINUX_BYTEORDER_GENERIC_H */ diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h index d6d81b5..90e8ebc 100644 --- a/include/byteorder/swab.h +++ b/include/byteorder/swab.h @@ -126,7 +126,7 @@ __inline static __u64 __arch__swab64(__u64 x) return __arch__swab32(x); } -#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) +#if defined(PLATFORM_LINUX) #define swab16 __swab16 #define swab32 __swab32 #define swab64 __swab64 diff --git a/include/drv_conf.h b/include/drv_conf.h index 28bbdec..a5f6d82 100644 --- a/include/drv_conf.h +++ b/include/drv_conf.h @@ -22,12 +22,6 @@ #include "autoconf.h" #include "hal_ic_cfg.h" -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - - #error "Shall be Linux or Windows, but not both!\n" - -#endif - #if defined(CONFIG_MCC_MODE) && (!defined(CONFIG_CONCURRENT_MODE)) #error "Enable CONCURRENT_MODE before enable MCC MODE\n" diff --git a/include/drv_types.h b/include/drv_types.h index 61a05f3..5b81f35 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -976,31 +976,6 @@ struct dvobj_priv { u8 *usb_vendor_req_buf; #endif -#ifdef PLATFORM_WINDOWS - /* related device objects */ - PDEVICE_OBJECT pphysdevobj;/* pPhysDevObj; */ - PDEVICE_OBJECT pfuncdevobj;/* pFuncDevObj; */ - PDEVICE_OBJECT pnextdevobj;/* pNextDevObj; */ - - u8 nextdevstacksz;/* unsigned char NextDeviceStackSize; */ /* = (CHAR)CEdevice->pUsbDevObj->StackSize + 1; */ - - /* urb for control diescriptor request */ - -#ifdef PLATFORM_OS_XP - struct _URB_CONTROL_DESCRIPTOR_REQUEST descriptor_urb; - PUSB_CONFIGURATION_DESCRIPTOR pconfig_descriptor;/* UsbConfigurationDescriptor; */ -#endif - -#ifdef PLATFORM_OS_CE - WCHAR active_path[MAX_ACTIVE_REG_PATH]; /* adapter regpath */ - USB_EXTENSION usb_extension; - - _nic_hdl pipehdls_r8192c[0x10]; -#endif - - u32 config_descriptor_len;/* ULONG UsbConfigurationDescriptorLength; */ -#endif/* PLATFORM_WINDOWS */ - #ifdef PLATFORM_LINUX struct usb_interface *pusbintf; struct usb_device *pusbdev; @@ -1313,17 +1288,6 @@ struct _ADAPTER { void (*intf_start)(_adapter *adapter); void (*intf_stop)(_adapter *adapter); -#ifdef PLATFORM_WINDOWS - _nic_hdl hndis_adapter;/* hNdisAdapter(NDISMiniportAdapterHandle); */ - _nic_hdl hndis_config;/* hNdisConfiguration; */ - NDIS_STRING fw_img; - - u32 NdisPacketFilter; - u8 MCList[MAX_MCAST_LIST_NUM][6]; - u32 MCAddrCount; -#endif /* end of PLATFORM_WINDOWS */ - - #ifdef PLATFORM_LINUX _nic_hdl pnetdev; char old_ifname[IFNAMSIZ]; diff --git a/include/ieee80211.h b/include/ieee80211.h index c759130..131840e 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -395,54 +395,6 @@ struct eapol { #endif - - -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) -struct rtw_ieee80211_hdr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u8 addr4[ETH_ALEN]; -}; - -struct rtw_ieee80211_hdr_3addr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; -}; - - -struct rtw_ieee80211_hdr_qos { - struct rtw_ieee80211_hdr wlan_hdr; - u16 qc; -}; - -struct rtw_ieee80211_hdr_3addr_qos { - struct rtw_ieee80211_hdr_3addr wlan_hdr; - u16 qc; -}; - -struct eapol { - u8 snap[6]; - u16 ethertype; - u8 version; - u8 type; - u16 length; -}; -#pragma pack() - -#endif - - - enum eap_type { EAP_PACKET = 0, EAPOL_START, @@ -564,22 +516,6 @@ struct ieee80211_snap_hdr { #endif -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) -struct ieee80211_snap_hdr { - - u8 dsap; /* always 0xAA */ - u8 ssap; /* always 0xAA */ - u8 ctrl; /* always 0x03 */ - u8 oui[P80211_OUI_LEN]; /* organizational universal id */ - -}; -#pragma pack() - -#endif - - #define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) #define WLAN_FC_GET_TYPE(fc) ((fc) & RTW_IEEE80211_FCTL_FTYPE) @@ -1123,24 +1059,6 @@ struct ieee80211_security { #endif -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) -struct ieee80211_security { - u16 active_key:2, - enabled:1, - auth_mode:2, - auth_algo:4, - unicast_uses_group:1; - u8 key_sizes[WEP_KEYS]; - u8 keys[WEP_KEYS][WEP_KEY_LEN]; - u8 level; - u16 flags; -} ; -#pragma pack() - -#endif - /* 802.11 data frame from AP @@ -1195,24 +1113,6 @@ struct ieee80211_info_element { } __attribute__((packed)); #endif -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) -struct ieee80211_info_element_hdr { - u8 id; - u8 len; -} ; - -struct ieee80211_info_element { - u8 id; - u8 len; - u8 data[0]; -} ; -#pragma pack() - -#endif - - /* * These are the data types that can make up management packets * @@ -1276,57 +1176,6 @@ struct ieee80211_assoc_response_frame { } __attribute__((packed)); #endif - - -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) - -struct ieee80211_authentication { - struct ieee80211_header_data header; - u16 algorithm; - u16 transaction; - u16 status; - /* struct ieee80211_info_element_hdr info_element; */ -} ; - - -struct ieee80211_probe_response { - struct ieee80211_header_data header; - u32 time_stamp[2]; - u16 beacon_interval; - u16 capability; - struct ieee80211_info_element info_element; -} ; - -struct ieee80211_probe_request { - struct ieee80211_header_data header; - /*struct ieee80211_info_element info_element;*/ -} ; - -struct ieee80211_assoc_request_frame { - struct rtw_ieee80211_hdr_3addr header; - u16 capability; - u16 listen_interval; - /* u8 current_ap[ETH_ALEN]; */ - struct ieee80211_info_element_hdr info_element; -} ; - -struct ieee80211_assoc_response_frame { - struct rtw_ieee80211_hdr_3addr header; - u16 capability; - u16 status; - u16 aid; - /* struct ieee80211_info_element info_element; supported rates */ -}; - -#pragma pack() - -#endif - - - - struct ieee80211_txb { u8 nr_frags; u8 encrypted; diff --git a/include/ieee80211_ext.h b/include/ieee80211_ext.h index 03cc330..a680802 100644 --- a/include/ieee80211_ext.h +++ b/include/ieee80211_ext.h @@ -105,27 +105,6 @@ struct wme_parameter_element { #endif -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) - -struct wpa_ie_hdr { - u8 elem_id; - u8 len; - u8 oui[4]; /* 24-bit OUI followed by 8-bit OUI type */ - u8 version[2]; /* little endian */ -}; - -struct rsn_ie_hdr { - u8 elem_id; /* WLAN_EID_RSN */ - u8 len; - u8 version[2]; /* little endian */ -}; - -#pragma pack() - -#endif - #define WPA_PUT_LE16(a, val) \ do { \ (a)[1] = ((u16) (val)) >> 8; \ @@ -330,147 +309,7 @@ struct ieee80211_mgmt { #endif - -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) - -struct ieee80211_mgmt { - u16 frame_control; - u16 duration; - u8 da[6]; - u8 sa[6]; - u8 bssid[6]; - u16 seq_ctrl; - union { - struct { - u16 auth_alg; - u16 auth_transaction; - u16 status_code; - /* possibly followed by Challenge text */ - u8 variable[0]; - } auth; - struct { - u16 reason_code; - } deauth; - struct { - u16 capab_info; - u16 listen_interval; - /* followed by SSID and Supported rates */ - u8 variable[0]; - } assoc_req; - struct { - u16 capab_info; - u16 status_code; - u16 aid; - /* followed by Supported rates */ - u8 variable[0]; - } assoc_resp, reassoc_resp; - struct { - u16 capab_info; - u16 listen_interval; - u8 current_ap[6]; - /* followed by SSID and Supported rates */ - u8 variable[0]; - } reassoc_req; - struct { - u16 reason_code; - } disassoc; -#if 0 - struct { - __le64 timestamp; - u16 beacon_int; - u16 capab_info; - /* followed by some of SSID, Supported rates, - * FH Params, DS Params, CF Params, IBSS Params, TIM */ - u8 variable[0]; - } beacon; - struct { - /* only variable items: SSID, Supported rates */ - u8 variable[0]; - } probe_req; - - struct { - __le64 timestamp; - u16 beacon_int; - u16 capab_info; - /* followed by some of SSID, Supported rates, - * FH Params, DS Params, CF Params, IBSS Params */ - u8 variable[0]; - } probe_resp; -#endif - struct { - u8 category; - union { - struct { - u8 action_code; - u8 dialog_token; - u8 status_code; - u8 variable[0]; - } wme_action; - #if 0 - struct{ - u8 action_code; - u8 element_id; - u8 length; - struct ieee80211_channel_sw_ie sw_elem; - } chan_switch; - struct{ - u8 action_code; - u8 dialog_token; - u8 element_id; - u8 length; - struct ieee80211_msrment_ie msr_elem; - } measurement; - #endif - struct { - u8 action_code; - u8 dialog_token; - u16 capab; - u16 timeout; - u16 start_seq_num; - } addba_req; - struct { - u8 action_code; - u8 dialog_token; - u16 status; - u16 capab; - u16 timeout; - } addba_resp; - struct { - u8 action_code; - u16 params; - u16 reason_code; - } delba; - struct { - u8 action_code; - /* capab_info for open and confirm, - * reason for close - */ - u16 aux; - /* Followed in plink_confirm by status - * code, AID and supported rates, - * and directly by supported rates in - * plink_open and plink_close - */ - u8 variable[0]; - } plink_action; - struct { - u8 action_code; - u8 variable[0]; - } mesh_action; - } u; - } action; - } u; -} ; - -#pragma pack() - -#endif - /* mgmt header + 1 byte category code */ #define IEEE80211_MIN_ACTION_SIZE FIELD_OFFSET(struct ieee80211_mgmt, u.action.u) - - #endif diff --git a/include/mlme_osdep.h b/include/mlme_osdep.h index 8dcc589..d89b738 100644 --- a/include/mlme_osdep.h +++ b/include/mlme_osdep.h @@ -21,10 +21,6 @@ #define __MLME_OSDEP_H_ -#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) - extern int time_after(u32 now, u32 old); -#endif - extern void rtw_init_mlme_timer(_adapter *padapter); extern void rtw_os_indicate_disconnect(_adapter *adapter, u16 reason, u8 locally_generated); extern void rtw_os_indicate_connect(_adapter *adapter); diff --git a/include/osdep_service.h b/include/osdep_service.h index eabf404..f464218 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -351,13 +351,6 @@ __inline static unsigned char _cancel_timer_ex(_timer *ptimer) _cancel_timer(ptimer, 0); return 0; #endif -#ifdef PLATFORM_WINDOWS - u8 bcancelled; - - _cancel_timer(ptimer, &bcancelled); - - return bcancelled; -#endif } static __inline void thread_enter(char *name) @@ -387,16 +380,6 @@ __inline static _OS_STATUS res_to_status(sint res) #if defined(PLATFORM_LINUX) || defined (PLATFORM_MPIXEL) || defined (PLATFORM_FREEBSD) return res; #endif - -#ifdef PLATFORM_WINDOWS - - if (res == _SUCCESS) - return NDIS_STATUS_SUCCESS; - else - return NDIS_STATUS_FAILURE; - -#endif - } __inline static void rtw_dump_stack(void) @@ -416,18 +399,7 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p { int ret = _TRUE; -#ifdef PLATFORM_WINDOWS - if (((uint)parg1) <= 0x7fffffff || - ((uint)parg2) <= 0x7fffffff || - ((uint)parg3) <= 0x7fffffff || - ((uint)parg4) <= 0x7fffffff) { - ret = _FALSE; - KeBugCheckEx(0x87110000, (ULONG_PTR)parg1, (ULONG_PTR)parg2, (ULONG_PTR)parg3, (ULONG_PTR)parg4); - } -#endif - return ret; - } #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) diff --git a/include/rtw_debug.h b/include/rtw_debug.h index b23fdfb..a06d43b 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -33,37 +33,18 @@ enum { #define DRIVER_PREFIX "RTW: " -#ifdef PLATFORM_OS_CE -extern void rtl871x_cedbg(const char *fmt, ...); -#endif - -#ifdef PLATFORM_WINDOWS - #define RTW_PRINT do {} while (0) - #define RTW_ERR do {} while (0) - #define RTW_WARN do {} while (0) - #define RTW_INFO do {} while (0) - #define RTW_DBG do {} while (0) - #define RTW_PRINT_SEL do {} while (0) - #define _RTW_PRINT do {} while (0) - #define _RTW_ERR do {} while (0) - #define _RTW_WARN do {} while (0) - #define _RTW_INFO do {} while (0) - #define _RTW_DBG do {} while (0) - #define _RTW_PRINT_SEL do {} while (0) -#else - #define RTW_PRINT(x, ...) do {} while (0) - #define RTW_ERR(x, ...) do {} while (0) - #define RTW_WARN(x,...) do {} while (0) - #define RTW_INFO(x,...) do {} while (0) - #define RTW_DBG(x,...) do {} while (0) - #define RTW_PRINT_SEL(x,...) do {} while (0) - #define _RTW_PRINT(x, ...) do {} while (0) - #define _RTW_ERR(x, ...) do {} while (0) - #define _RTW_WARN(x,...) do {} while (0) - #define _RTW_INFO(x,...) do {} while (0) - #define _RTW_DBG(x,...) do {} while (0) - #define _RTW_PRINT_SEL(x,...) do {} while (0) -#endif +#define RTW_PRINT(x, ...) do {} while (0) +#define RTW_ERR(x, ...) do {} while (0) +#define RTW_WARN(x,...) do {} while (0) +#define RTW_INFO(x,...) do {} while (0) +#define RTW_DBG(x,...) do {} while (0) +#define RTW_PRINT_SEL(x,...) do {} while (0) +#define _RTW_PRINT(x, ...) do {} while (0) +#define _RTW_ERR(x, ...) do {} while (0) +#define _RTW_WARN(x,...) do {} while (0) +#define _RTW_INFO(x,...) do {} while (0) +#define _RTW_DBG(x,...) do {} while (0) +#define _RTW_PRINT_SEL(x,...) do {} while (0) #define RTW_INFO_DUMP(_TitleString, _HexData, _HexDataLen) do {} while (0) #define RTW_DBG_DUMP(_TitleString, _HexData, _HexDataLen) do {} while (0) @@ -82,13 +63,7 @@ extern void rtl871x_cedbg(const char *fmt, ...); #undef _dbgdump #undef _seqdump -#if defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_XP) - #define _dbgdump DbgPrint - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_CE) - #define _dbgdump rtl871x_cedbg - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined PLATFORM_LINUX +#if defined PLATFORM_LINUX #define _dbgdump printk #define _seqdump seq_printf #elif defined PLATFORM_FREEBSD diff --git a/include/rtw_io.h b/include/rtw_io.h index 44a1749..fbcbe65 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -23,9 +23,6 @@ #define NUM_IOREQ 8 -#ifdef PLATFORM_WINDOWS - #define MAX_PROT_SZ 64 -#endif #ifdef PLATFORM_LINUX #define MAX_PROT_SZ (64-16) #endif diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index b981bf0..629fec2 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -20,7 +20,6 @@ #ifndef _RTW_IOCTL_H_ #define _RTW_IOCTL_H_ -#ifndef PLATFORM_WINDOWS /* 00 - Success * 11 - Error */ #define STATUS_SUCCESS (0x00000000L) @@ -80,7 +79,6 @@ #define NDIS_STATUS_INCOMPATABLE_QOS ((NDIS_STATUS)0xC0010027L) /* cause 49 */ #define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED ((NDIS_STATUS)0xC0010028L) /* cause 93 */ #define NDIS_STATUS_NO_ROUTE_TO_DESTINATION ((NDIS_STATUS)0xC0010029L) /* cause 3 */ -#endif /* #ifndef PLATFORM_WINDOWS */ #ifndef OID_802_11_CAPABILITY @@ -152,144 +150,13 @@ struct oid_obj_priv { NDIS_STATUS(*oidfuns)(struct oid_par_priv *poid_par_priv); }; -#if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_)) || \ - (defined(PLATFORM_WINDOWS) && defined(_RTW_IOCTL_RTL_C_)) +#if defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_) static NDIS_STATUS oid_null_function(struct oid_par_priv *poid_par_priv) { return NDIS_STATUS_SUCCESS; } #endif -#ifdef PLATFORM_WINDOWS - -int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE ndisPsMode); - -/* OID Handler for Segment 1 */ -NDIS_STATUS oid_gen_supported_list_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_hardware_status_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_media_supported_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_media_in_use_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_maximum_lookahead_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_maximum_frame_size_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_link_speed_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_transmit_buffer_space_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_receive_buffer_space_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_transmit_block_size_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_receive_block_size_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_vendor_id_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_vendor_description_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_current_packet_filter_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_current_lookahead_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_driver_version_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_maximum_total_size_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_protocol_options_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_mac_options_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_media_connect_status_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_maximum_send_packets_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_vendor_driver_version_hdl(struct oid_par_priv *poid_par_priv); - - -/* OID Handler for Segment 2 */ -NDIS_STATUS oid_gen_physical_medium_hdl(struct oid_par_priv *poid_par_priv); - -/* OID Handler for Segment 3 */ -NDIS_STATUS oid_gen_xmit_ok_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_rcv_ok_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_xmit_error_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_rcv_error_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_gen_rcv_no_buffer_hdl(struct oid_par_priv *poid_par_priv); - - -/* OID Handler for Segment 4 */ -NDIS_STATUS oid_802_3_permanent_address_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_current_address_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_multicast_list_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_maximum_list_size_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_mac_options_hdl(struct oid_par_priv *poid_par_priv); - - - -/* OID Handler for Segment 5 */ -NDIS_STATUS oid_802_3_rcv_error_alignment_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_one_collision_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_more_collisions_hdl(struct oid_par_priv *poid_par_priv); - - -/* OID Handler for Segment 6 */ -NDIS_STATUS oid_802_3_xmit_deferred_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_max_collisions_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_rcv_overrun_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_underrun_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_heartbeat_failure_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_times_crs_lost_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_3_xmit_late_collisions_hdl(struct oid_par_priv *poid_par_priv); - - - -/* OID Handler for Segment 7 */ -NDIS_STATUS oid_pnp_capabilities_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_set_power_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_query_power_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_add_wake_up_pattern_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_remove_wake_up_pattern_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_wake_up_pattern_list_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_pnp_enable_wake_up_hdl(struct oid_par_priv *poid_par_priv); - - - -/* OID Handler for Segment 8 */ -NDIS_STATUS oid_802_11_bssid_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_ssid_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_infrastructure_mode_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_add_wep_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_remove_wep_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_disassociate_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_authentication_mode_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_privacy_filter_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_bssid_list_scan_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_encryption_status_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_reload_defaults_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_add_key_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_remove_key_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_association_information_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_test_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_media_stream_mode_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_capability_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_pmkid_hdl(struct oid_par_priv *poid_par_priv); - - - - - -/* OID Handler for Segment 9 */ -NDIS_STATUS oid_802_11_network_types_supported_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_network_type_in_use_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_tx_power_level_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_rssi_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_rssi_trigger_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_fragmentation_threshold_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_rts_threshold_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_number_of_antennas_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_rx_antenna_selected_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_tx_antenna_selected_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_supported_rates_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_desired_rates_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_configuration_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_power_mode_hdl(struct oid_par_priv *poid_par_priv); -NDIS_STATUS oid_802_11_bssid_list_hdl(struct oid_par_priv *poid_par_priv); - - -/* OID Handler for Segment 10 */ -NDIS_STATUS oid_802_11_statistics_hdl(struct oid_par_priv *poid_par_priv); - - -/* OID Handler for Segment ED */ -NDIS_STATUS oid_rt_mh_vender_id_hdl(struct oid_par_priv *poid_par_priv); - -void Set_802_3_MULTICAST_LIST(ADAPTER *pAdapter, UCHAR *MCListbuf, ULONG MCListlen, BOOLEAN bAcceptAllMulticast); - -#endif/* end of PLATFORM_WINDOWS */ - #if defined(PLATFORM_LINUX) && defined(CONFIG_WIRELESS_EXT) extern struct iw_handler_def rtw_handlers_def; #endif diff --git a/include/rtw_ioctl_query.h b/include/rtw_ioctl_query.h index a74d13d..aa4ae90 100644 --- a/include/rtw_ioctl_query.h +++ b/include/rtw_ioctl_query.h @@ -21,10 +21,4 @@ #define _RTW_IOCTL_QUERY_H_ -#ifdef PLATFORM_WINDOWS -u8 query_802_11_capability(_adapter *padapter, u8 *pucBuf, u32 *pulOutLen); -u8 query_802_11_association_information(_adapter *padapter, PNDIS_802_11_ASSOCIATION_INFORMATION pAssocInfo); -#endif - - #endif diff --git a/include/rtw_ioctl_set.h b/include/rtw_ioctl_set.h index 1f87214..12a7cc7 100644 --- a/include/rtw_ioctl_set.h +++ b/include/rtw_ioctl_set.h @@ -37,20 +37,6 @@ typedef struct _NDIS_802_11_PMKID { } NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; #endif - -#ifdef PLATFORM_WINDOWS -u8 rtw_set_802_11_reload_defaults(_adapter *padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults); -u8 rtw_set_802_11_test(_adapter *padapter, NDIS_802_11_TEST *test); -u8 rtw_set_802_11_pmkid(_adapter *pdapter, NDIS_802_11_PMKID *pmkid); - -u8 rtw_pnp_set_power_sleep(_adapter *padapter); -u8 rtw_pnp_set_power_wakeup(_adapter *padapter); - -void rtw_pnp_resume_wk(void *context); -void rtw_pnp_sleep_wk(void *context); - -#endif - u8 rtw_set_802_11_add_key(_adapter *padapter, NDIS_802_11_KEY *key); u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid); diff --git a/include/rtw_mp.h b/include/rtw_mp.h index 7c0f627..4fd158b 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -71,21 +71,6 @@ struct mp_wiparam { typedef void(*wi_act_func)(void *padapter); -#ifdef PLATFORM_WINDOWS -struct mp_wi_cntx { - u8 bmpdrv_unload; - - /* Work Item */ - NDIS_WORK_ITEM mp_wi; - NDIS_EVENT mp_wi_evt; - _lock mp_wi_lock; - u8 bmp_wi_progress; - wi_act_func curractfunc; - /* Variable needed in each implementation of CurrActFunc. */ - struct mp_wiparam param; -}; -#endif - struct mp_tx { u8 stop; u32 count, sended; @@ -401,31 +386,6 @@ struct mp_priv { struct wlan_network mp_network; NDIS_802_11_MAC_ADDRESS network_macaddr; -#ifdef PLATFORM_WINDOWS - u32 rx_testcnt; - u32 rx_testcnt1; - u32 rx_testcnt2; - u32 tx_testcnt; - u32 tx_testcnt1; - - struct mp_wi_cntx wi_cntx; - - u8 h2c_result; - u8 h2c_seqnum; - u16 h2c_cmdcode; - u8 h2c_resp_parambuf[512]; - _lock h2c_lock; - _lock wkitm_lock; - u32 h2c_cmdcnt; - NDIS_EVENT h2c_cmd_evt; - NDIS_EVENT c2h_set; - NDIS_EVENT h2c_clr; - NDIS_EVENT cpwm_int; - - NDIS_EVENT scsir_full_evt; - NDIS_EVENT scsiw_empty_evt; -#endif - u8 *pallocated_mp_xmitframe_buf; u8 *pmp_xmtframe_buf; _queue free_mp_xmitqueue; diff --git a/include/rtw_recv.h b/include/rtw_recv.h index bb81494..716216a 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -388,17 +388,6 @@ struct recv_priv { _adapter *adapter; -#ifdef PLATFORM_WINDOWS - _nic_hdl RxPktPoolHdl; - _nic_hdl RxBufPoolHdl; - -#ifdef PLATFORM_OS_XP - PMDL pbytecnt_mdl; -#endif - uint counter; /* record the number that up-layer will return to drv; only when counter==0 can we release recv_priv */ - NDIS_EVENT recv_resource_evt ; -#endif - u32 bIsAnyNonBEPkts; u64 rx_bytes; u64 rx_pkts; @@ -801,10 +790,6 @@ __inline static _buffer *get_rxbuf_desc(union recv_frame *precvframe) if (precvframe == NULL) return NULL; -#ifdef PLATFORM_WINDOWS - NdisQueryPacket(precvframe->u.hdr.pkt, NULL, NULL, &buf_desc, NULL); -#endif - return buf_desc; } @@ -824,13 +809,6 @@ __inline static union recv_frame *pkt_to_recvframe(_pkt *pkt) u8 *buf_star; union recv_frame *precv_frame; -#ifdef PLATFORM_WINDOWS - _buffer *buf_desc; - uint len; - - NdisQueryPacket(pkt, NULL, NULL, &buf_desc, &len); - NdisQueryBufferSafe(buf_desc, &buf_star, &len, HighPagePriority); -#endif precv_frame = rxmem_to_recvframe((unsigned char *)buf_star); return precv_frame; diff --git a/include/rtw_security.h b/include/rtw_security.h index df1a973..83c06a5 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -191,9 +191,6 @@ struct security_priv { u32 ndisencryptstatus; /* NDIS_802_11_ENCRYPTION_STATUS */ NDIS_802_11_WEP ndiswep; -#ifdef PLATFORM_WINDOWS - u8 KeyMaterial[16];/* variable length depending on above field. */ -#endif u8 assoc_info[600]; u8 szofcapability[256]; /* for wpa2 usage */ diff --git a/include/sdio_ops.h b/include/sdio_ops.h index 827c725..fb1aaa5 100644 --- a/include/sdio_ops.h +++ b/include/sdio_ops.h @@ -30,25 +30,6 @@ #include #endif -#ifdef PLATFORM_WINDOWS - -#ifdef PLATFORM_OS_XP -#include -struct async_context { - PMDL pmdl; - PSDBUS_REQUEST_PACKET sdrp; - unsigned char *r_buf; - unsigned char *padapter; -}; -#endif - -#ifdef PLATFORM_OS_CE -#include -#endif - -#endif /* PLATFORM_WINDOWS */ - - extern void sdio_set_intf_ops(_adapter *padapter, struct _io_ops *pops); #if 0 diff --git a/include/wifi.h b/include/wifi.h index a7a2fa0..244767e 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -859,75 +859,6 @@ struct ADDBA_request { unsigned short BA_starting_seqctrl; } __attribute__((packed)); - - -#endif - - -#ifdef PLATFORM_WINDOWS - -#pragma pack(1) - -struct rtw_ieee80211_ht_cap { - unsigned short cap_info; - unsigned char ampdu_params_info; - unsigned char supp_mcs_set[16]; - unsigned short extended_ht_cap_info; - unsigned int tx_BF_cap_info; - unsigned char antenna_selection_info; -}; - - -struct ieee80211_ht_addt_info { - unsigned char control_chan; - unsigned char ht_param; - unsigned short operation_mode; - unsigned short stbc_param; - unsigned char basic_set[16]; -}; - -struct HT_caps_element { - union { - struct { - unsigned short HT_caps_info; - unsigned char AMPDU_para; - unsigned char MCS_rate[16]; - unsigned short HT_ext_caps; - unsigned int Beamforming_caps; - unsigned char ASEL_caps; - } HT_cap_element; - unsigned char HT_cap[26]; - }; -}; - -struct HT_info_element { - unsigned char primary_channel; - unsigned char infos[5]; - unsigned char MCS_rate[16]; -}; - -struct AC_param { - unsigned char ACI_AIFSN; - unsigned char CW; - unsigned short TXOP_limit; -}; - -struct WMM_para_element { - unsigned char QoS_info; - unsigned char reserved; - struct AC_param ac_param[4]; -}; - -struct ADDBA_request { - unsigned char dialog_token; - unsigned short BA_para_set; - unsigned short BA_timeout_value; - unsigned short BA_starting_seqctrl; -}; - - -#pragma pack() - #endif typedef enum _HT_CAP_AMPDU_FACTOR { diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h index dd39e0c..042966e 100644 --- a/include/wlan_bssdef.h +++ b/include/wlan_bssdef.h @@ -545,10 +545,6 @@ typedef struct _WLAN_BCN_INFO { /* temporally add #pragma pack for structure alignment issue of * WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz() */ -#ifdef PLATFORM_WINDOWS -#pragma pack(push) -#pragma pack(1) -#endif typedef struct _WLAN_BSSID_EX { ULONG Length; NDIS_802_11_MAC_ADDRESS MacAddress; @@ -564,13 +560,8 @@ typedef struct _WLAN_BSSID_EX { ULONG IELength; UCHAR IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability information) */ } -#ifndef PLATFORM_WINDOWS __attribute__((packed)) -#endif WLAN_BSSID_EX, *PWLAN_BSSID_EX; -#ifdef PLATFORM_WINDOWS -#pragma pack(pop) -#endif #define BSS_EX_IES(bss_ex) ((bss_ex)->IEs) #define BSS_EX_IES_LEN(bss_ex) ((bss_ex)->IELength) @@ -613,10 +604,6 @@ struct wlan_network { int join_res; WLAN_BSSID_EX network; /* must be the last item */ WLAN_BCN_INFO BcnInfo; -#ifdef PLATFORM_WINDOWS - unsigned char iebuf[MAX_IE_SZ]; -#endif - }; enum VRTL_CARRIER_SENSE { diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index ea5725d..21515b2 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -30,32 +30,6 @@ struct pkt_file { SIZE_T buf_len; }; -#ifdef PLATFORM_WINDOWS - -#ifdef PLATFORM_OS_XP -#ifdef CONFIG_USB_HCI -#include -#include -#include -#endif -#endif - -#ifdef CONFIG_GSPI_HCI - #define NR_XMITFRAME 64 -#else - #define NR_XMITFRAME 128 -#endif - -#define ETH_ALEN 6 - -extern NDIS_STATUS rtw_xmit_entry( - IN _nic_hdl cnxt, - IN NDIS_PACKET *pkt, - IN UINT flags -); - -#endif /* PLATFORM_WINDOWS */ - #ifdef PLATFORM_FREEBSD #define NR_XMITFRAME 256 extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 557fcb6..e11d462 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -22,13 +22,6 @@ #include #include -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - - #error "Shall be Linux or Windows, but not both!\n" - -#endif - - MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); MODULE_AUTHOR("Realtek Semiconductor Corp."); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 73eefb6..d885f1b 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -88,10 +88,6 @@ inline u8 *_rtw_vmalloc(u32 sz) pbuf = malloc(sz, M_DEVBUF, M_NOWAIT); #endif -#ifdef PLATFORM_WINDOWS - NdisAllocateMemoryWithTag(&pbuf, sz, RT_TAG); -#endif - #ifdef DBG_MEMORY_LEAK #ifdef PLATFORM_LINUX if (pbuf != NULL) { @@ -115,12 +111,6 @@ inline u8 *_rtw_zvmalloc(u32 sz) #ifdef PLATFORM_FREEBSD pbuf = malloc(sz, M_DEVBUF, M_ZERO | M_NOWAIT); #endif -#ifdef PLATFORM_WINDOWS - NdisAllocateMemoryWithTag(&pbuf, sz, RT_TAG); - if (pbuf != NULL) - NdisFillMemory(pbuf, sz, 0); -#endif - return pbuf; } @@ -132,10 +122,6 @@ inline void _rtw_vmfree(u8 *pbuf, u32 sz) #ifdef PLATFORM_FREEBSD free(pbuf, M_DEVBUF); #endif -#ifdef PLATFORM_WINDOWS - NdisFreeMemory(pbuf, sz, 0); -#endif - #ifdef DBG_MEMORY_LEAK #ifdef PLATFORM_LINUX atomic_dec(&_malloc_cnt); @@ -161,12 +147,6 @@ u8 *_rtw_malloc(u32 sz) #ifdef PLATFORM_FREEBSD pbuf = malloc(sz, M_DEVBUF, M_NOWAIT); #endif -#ifdef PLATFORM_WINDOWS - - NdisAllocateMemoryWithTag(&pbuf, sz, RT_TAG); - -#endif - #ifdef DBG_MEMORY_LEAK #ifdef PLATFORM_LINUX if (pbuf != NULL) { @@ -193,11 +173,6 @@ u8 *_rtw_zmalloc(u32 sz) #ifdef PLATFORM_LINUX memset(pbuf, 0, sz); #endif - -#ifdef PLATFORM_WINDOWS - NdisFillMemory(pbuf, sz, 0); -#endif - } return pbuf; @@ -219,12 +194,6 @@ void _rtw_mfree(u8 *pbuf, u32 sz) #ifdef PLATFORM_FREEBSD free(pbuf, M_DEVBUF); #endif -#ifdef PLATFORM_WINDOWS - - NdisFreeMemory(pbuf, sz, 0); - -#endif - #ifdef DBG_MEMORY_LEAK #ifdef PLATFORM_LINUX atomic_dec(&_malloc_cnt); @@ -892,13 +861,6 @@ void _rtw_memcpy(void *dst, const void *src, u32 sz) memcpy(dst, src, sz); #endif - -#ifdef PLATFORM_WINDOWS - - NdisMoveMemory(dst, src, sz); - -#endif - } inline void _rtw_memmove(void *dst, const void *src, u32 sz) @@ -921,20 +883,6 @@ int _rtw_memcmp(const void *dst, const void *src, u32 sz) else return _FALSE; #endif - - -#ifdef PLATFORM_WINDOWS - /* under Windows, the return value of NdisEqualMemory for two same mem. chunk is 1 */ - - if (NdisEqualMemory(dst, src, sz)) - return _TRUE; - else - return _FALSE; - -#endif - - - } void _rtw_memset(void *pbuf, int c, u32 sz) @@ -945,17 +893,6 @@ void _rtw_memset(void *pbuf, int c, u32 sz) memset(pbuf, c, sz); #endif - -#ifdef PLATFORM_WINDOWS -#if 0 - NdisZeroMemory(pbuf, sz); - if (c != 0) - memset(pbuf, c, sz); -#else - NdisFillMemory(pbuf, sz, c); -#endif -#endif - } #ifdef PLATFORM_FREEBSD @@ -982,12 +919,6 @@ void _rtw_init_listhead(_list *list) list->next = list; list->prev = list; #endif -#ifdef PLATFORM_WINDOWS - - NdisInitializeListHead(list); - -#endif - } @@ -1015,18 +946,6 @@ u32 rtw_is_list_empty(_list *phead) return _FALSE; #endif - - -#ifdef PLATFORM_WINDOWS - - if (IsListEmpty(phead)) - return _TRUE; - else - return _FALSE; - -#endif - - } void rtw_list_insert_head(_list *plist, _list *phead) @@ -1039,10 +958,6 @@ void rtw_list_insert_head(_list *plist, _list *phead) #ifdef PLATFORM_FREEBSD __list_add(plist, phead, phead->next); #endif - -#ifdef PLATFORM_WINDOWS - InsertHeadList(phead, plist); -#endif } void rtw_list_insert_tail(_list *plist, _list *phead) @@ -1058,12 +973,6 @@ void rtw_list_insert_tail(_list *plist, _list *phead) __list_add(plist, phead->prev, phead); #endif -#ifdef PLATFORM_WINDOWS - - InsertTailList(phead, plist); - -#endif - } void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc) @@ -1076,9 +985,6 @@ void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc) #ifdef PLATFORM_FREEBSD _init_timer(ptimer, adapter->pifp, pfunc, adapter->mlmepriv.nic_hdl); #endif -#ifdef PLATFORM_WINDOWS - _init_timer(ptimer, adapter->hndis_adapter, pfunc, adapter->mlmepriv.nic_hdl); -#endif } /* @@ -1239,12 +1145,6 @@ void _rtw_spinlock_init(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_init(plock, "", NULL, MTX_DEF | MTX_RECURSE); #endif -#ifdef PLATFORM_WINDOWS - - NdisAllocateSpinLock(plock); - -#endif - } void _rtw_spinlock_free(_lock *plock) @@ -1252,13 +1152,6 @@ void _rtw_spinlock_free(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_destroy(plock); #endif - -#ifdef PLATFORM_WINDOWS - - NdisFreeSpinLock(plock); - -#endif - } #ifdef PLATFORM_FREEBSD extern PADAPTER prtw_lock; @@ -1292,12 +1185,6 @@ void _rtw_spinlock(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_lock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisAcquireSpinLock(plock); - -#endif - } void _rtw_spinunlock(_lock *plock) @@ -1311,11 +1198,6 @@ void _rtw_spinunlock(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_unlock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisReleaseSpinLock(plock); - -#endif } @@ -1330,12 +1212,6 @@ void _rtw_spinlock_ex(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_lock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisDprAcquireSpinLock(plock); - -#endif - } void _rtw_spinunlock_ex(_lock *plock) @@ -1349,15 +1225,8 @@ void _rtw_spinunlock_ex(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_unlock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisDprReleaseSpinLock(plock); - -#endif } - - void _rtw_init_queue(_queue *pqueue) { _rtw_init_listhead(&(pqueue->queue)); @@ -1395,11 +1264,6 @@ u32 rtw_get_current_time(void) getmicrotime(&tvp); return tvp.tv_sec; #endif -#ifdef PLATFORM_WINDOWS - LARGE_INTEGER SystemTime; - NdisGetCurrentSystemTime(&SystemTime); - return (u32)(SystemTime.LowPart);/* count of 100-nanosecond intervals */ -#endif } inline u32 rtw_systime_to_ms(u32 systime) @@ -1410,9 +1274,6 @@ inline u32 rtw_systime_to_ms(u32 systime) #ifdef PLATFORM_FREEBSD return systime * 1000; #endif -#ifdef PLATFORM_WINDOWS - return systime / 10000 ; -#endif } inline u32 rtw_ms_to_systime(u32 ms) @@ -1423,9 +1284,6 @@ inline u32 rtw_ms_to_systime(u32 ms) #ifdef PLATFORM_FREEBSD return ms / 1000; #endif -#ifdef PLATFORM_WINDOWS - return ms * 10000 ; -#endif } /* the input parameter start use the same unit as returned by rtw_get_current_time */ @@ -1437,11 +1295,6 @@ inline s32 rtw_get_passing_time_ms(u32 start) #ifdef PLATFORM_FREEBSD return rtw_systime_to_ms(rtw_get_current_time()); #endif -#ifdef PLATFORM_WINDOWS - LARGE_INTEGER SystemTime; - NdisGetCurrentSystemTime(&SystemTime); - return rtw_systime_to_ms((u32)(SystemTime.LowPart) - start) ; -#endif } inline s32 rtw_get_time_interval_ms(u32 start, u32 end) @@ -1452,12 +1305,8 @@ inline s32 rtw_get_time_interval_ms(u32 start, u32 end) #ifdef PLATFORM_FREEBSD return rtw_systime_to_ms(rtw_get_current_time()); #endif -#ifdef PLATFORM_WINDOWS - return rtw_systime_to_ms(end - start); -#endif } - void rtw_sleep_schedulable(int ms) { @@ -1479,13 +1328,6 @@ void rtw_sleep_schedulable(int ms) DELAY(ms * 1000); return ; #endif - -#ifdef PLATFORM_WINDOWS - - NdisMSleep(ms * 1000); /* (us)*1000=(ms) */ - -#endif - } @@ -1507,13 +1349,6 @@ void rtw_msleep_os(int ms) DELAY(ms * 1000); return ; #endif -#ifdef PLATFORM_WINDOWS - - NdisMSleep(ms * 1000); /* (us)*1000=(ms) */ - -#endif - - } void rtw_usleep_os(int us) { @@ -1536,37 +1371,17 @@ void rtw_usleep_os(int us) return ; #endif -#ifdef PLATFORM_WINDOWS - - NdisMSleep(us); /* (us) */ - -#endif - - } - #ifdef DBG_DELAY_OS void _rtw_mdelay_os(int ms, const char *func, const int line) { -#if 0 - if (ms > 10) - RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); - rtw_msleep_os(ms); - return; -#endif - - RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); #if defined(PLATFORM_LINUX) mdelay((unsigned long)ms); -#elif defined(PLATFORM_WINDOWS) - - NdisStallExecution(ms * 1000); /* (us)*1000=(ms) */ - #endif @@ -1590,10 +1405,6 @@ void _rtw_udelay_os(int us, const char *func, const int line) udelay((unsigned long)us); -#elif defined(PLATFORM_WINDOWS) - - NdisStallExecution(us); /* (us) */ - #endif } @@ -1610,13 +1421,6 @@ void rtw_mdelay_os(int ms) DELAY(ms * 1000); return ; #endif -#ifdef PLATFORM_WINDOWS - - NdisStallExecution(ms * 1000); /* (us)*1000=(ms) */ - -#endif - - } void rtw_udelay_os(int us) { @@ -1631,12 +1435,6 @@ void rtw_udelay_os(int us) DELAY(us); return ; #endif -#ifdef PLATFORM_WINDOWS - - NdisStallExecution(us); /* (us) */ - -#endif - } #endif @@ -1648,9 +1446,6 @@ void rtw_yield_os(void) #ifdef PLATFORM_FREEBSD yield(); #endif -#ifdef PLATFORM_WINDOWS - SwitchToThread(); -#endif } #define RTW_SUSPEND_LOCK_NAME "rtw_wifi" @@ -1831,8 +1626,6 @@ inline void ATOMIC_SET(ATOMIC_T *v, int i) { #ifdef PLATFORM_LINUX atomic_set(v, i); -#elif defined(PLATFORM_WINDOWS) - *v = i; /* other choice???? */ #elif defined(PLATFORM_FREEBSD) atomic_set_int(v, i); #endif @@ -1842,8 +1635,6 @@ inline int ATOMIC_READ(ATOMIC_T *v) { #ifdef PLATFORM_LINUX return atomic_read(v); -#elif defined(PLATFORM_WINDOWS) - return *v; /* other choice???? */ #elif defined(PLATFORM_FREEBSD) return atomic_load_acq_32(v); #endif @@ -1853,8 +1644,6 @@ inline void ATOMIC_ADD(ATOMIC_T *v, int i) { #ifdef PLATFORM_LINUX atomic_add(i, v); -#elif defined(PLATFORM_WINDOWS) - InterlockedAdd(v, i); #elif defined(PLATFORM_FREEBSD) atomic_add_int(v, i); #endif @@ -1863,8 +1652,6 @@ inline void ATOMIC_SUB(ATOMIC_T *v, int i) { #ifdef PLATFORM_LINUX atomic_sub(i, v); -#elif defined(PLATFORM_WINDOWS) - InterlockedAdd(v, -i); #elif defined(PLATFORM_FREEBSD) atomic_subtract_int(v, i); #endif @@ -1874,8 +1661,6 @@ inline void ATOMIC_INC(ATOMIC_T *v) { #ifdef PLATFORM_LINUX atomic_inc(v); -#elif defined(PLATFORM_WINDOWS) - InterlockedIncrement(v); #elif defined(PLATFORM_FREEBSD) atomic_add_int(v, 1); #endif @@ -1885,8 +1670,6 @@ inline void ATOMIC_DEC(ATOMIC_T *v) { #ifdef PLATFORM_LINUX atomic_dec(v); -#elif defined(PLATFORM_WINDOWS) - InterlockedDecrement(v); #elif defined(PLATFORM_FREEBSD) atomic_subtract_int(v, 1); #endif @@ -1896,8 +1679,6 @@ inline int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i) { #ifdef PLATFORM_LINUX return atomic_add_return(i, v); -#elif defined(PLATFORM_WINDOWS) - return InterlockedAdd(v, i); #elif defined(PLATFORM_FREEBSD) atomic_add_int(v, i); return atomic_load_acq_32(v); @@ -1908,8 +1689,6 @@ inline int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i) { #ifdef PLATFORM_LINUX return atomic_sub_return(i, v); -#elif defined(PLATFORM_WINDOWS) - return InterlockedAdd(v, -i); #elif defined(PLATFORM_FREEBSD) atomic_subtract_int(v, i); return atomic_load_acq_32(v); @@ -1920,8 +1699,6 @@ inline int ATOMIC_INC_RETURN(ATOMIC_T *v) { #ifdef PLATFORM_LINUX return atomic_inc_return(v); -#elif defined(PLATFORM_WINDOWS) - return InterlockedIncrement(v); #elif defined(PLATFORM_FREEBSD) atomic_add_int(v, 1); return atomic_load_acq_32(v); @@ -1932,8 +1709,6 @@ inline int ATOMIC_DEC_RETURN(ATOMIC_T *v) { #ifdef PLATFORM_LINUX return atomic_dec_return(v); -#elif defined(PLATFORM_WINDOWS) - return InterlockedDecrement(v); #elif defined(PLATFORM_FREEBSD) atomic_subtract_int(v, 1); return atomic_load_acq_32(v); @@ -2420,8 +2195,6 @@ u64 rtw_modular64(u64 x, u64 y) { #ifdef PLATFORM_LINUX return do_div(x, y); -#elif defined(PLATFORM_WINDOWS) - return x % y; #elif defined(PLATFORM_FREEBSD) return x % y; #endif @@ -2432,8 +2205,6 @@ u64 rtw_division64(u64 x, u64 y) #ifdef PLATFORM_LINUX do_div(x, y); return x; -#elif defined(PLATFORM_WINDOWS) - return x / y; #elif defined(PLATFORM_FREEBSD) return x / y; #endif @@ -2451,8 +2222,6 @@ inline u32 rtw_random32(void) #else return random32(); #endif -#elif defined(PLATFORM_WINDOWS) -#error "to be implemented\n" #elif defined(PLATFORM_FREEBSD) #error "to be implemented\n" #endif