From 9d13b33a29a625714b42451bd0a19cd44cdd3a52 Mon Sep 17 00:00:00 2001 From: Carlos Garces Date: Thu, 14 Oct 2021 19:32:27 +0200 Subject: [PATCH] Remove code related to PLATFORM_WINDOWS --- Makefile | 1 - core/rtw_io.c | 4 - core/rtw_ioctl_query.c | 166 ----------------------------- core/rtw_ioctl_set.c | 78 -------------- core/rtw_mp.c | 58 ----------- core/rtw_pwrctrl.c | 4 - core/rtw_recv.c | 7 -- core/rtw_sta_mgt.c | 7 -- core/rtw_xmit.c | 4 - hal/btc/mp_precomp.h | 3 - hal/phydm/halhwimg.h | 162 +++++++++++------------------ include/basic_types.h | 39 ------- include/byteorder/generic.h | 95 +++++++---------- include/byteorder/swab.h | 20 ++-- include/drv_conf.h | 4 - include/drv_types.h | 35 ------- include/ieee80211.h | 151 --------------------------- include/osdep_service.h | 19 ---- include/rtw_debug.h | 49 +++------ include/rtw_io.h | 3 - include/rtw_ioctl.h | 201 ------------------------------------ include/rtw_ioctl_query.h | 25 ----- include/rtw_ioctl_set.h | 13 --- include/rtw_mp.h | 40 ------- include/rtw_recv.h | 12 --- include/rtw_security.h | 3 - include/sdio_ops.h | 18 ---- include/wifi.h | 66 ------------ include/wlan_bssdef.h | 13 --- include/xmit_osdep.h | 25 ----- os_dep/linux/os_intfs.c | 7 -- os_dep/linux/usb_intf.c | 4 - os_dep/osdep_service.c | 99 +----------------- 33 files changed, 121 insertions(+), 1314 deletions(-) delete mode 100644 core/rtw_ioctl_query.c delete mode 100644 include/rtw_ioctl_query.h diff --git a/Makefile b/Makefile index be53390..8ecdb72 100644 --- a/Makefile +++ b/Makefile @@ -2221,7 +2221,6 @@ rtk_core := core/rtw_cmd.o \ core/rtw_security.o \ core/rtw_debug.o \ core/rtw_io.o \ - core/rtw_ioctl_query.o \ core/rtw_ioctl_set.o \ core/rtw_ieee80211.o \ core/rtw_mlme.o \ diff --git a/core/rtw_io.c b/core/rtw_io.c index dc033a2..55ed7b1 100644 --- a/core/rtw_io.c +++ b/core/rtw_io.c @@ -47,10 +47,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 - #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_PLATFORM_RTL8197D) #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 deleted file mode 100644 index 3b04cc3..0000000 --- a/core/rtw_ioctl_query.c +++ /dev/null @@ -1,166 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2017 Realtek Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - *****************************************************************************/ -#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. */ - 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)); */ - 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]; - 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]) { - 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) { - 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 e48bfe1..e2e8aeb 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -190,84 +190,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 b782d56..af56483 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -124,64 +124,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 #if 0 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 7aeaf3a..b6309de 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -2108,10 +2108,6 @@ void rtw_init_pwrctrl_priv(PADAPTER padapter) #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 344968e..292646e 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -17,13 +17,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 static void rtw_signal_stat_timer_hdl(void *ctx); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 6cb3731..34cc6a1 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -16,13 +16,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 e53f5b8..158e679 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -17,10 +17,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 798d7df..e745ea9 100644 --- a/hal/btc/mp_precomp.h +++ b/hal/btc/mp_precomp.h @@ -23,10 +23,7 @@ #ifdef PLATFORM_LINUX #define rsprintf snprintf #define rstrncat(dst, src, src_size) strncat(dst, src, src_size) -#elif defined(PLATFORM_WINDOWS) -#define rsprintf sprintf_s #endif - #define DCMD_Printf DBG_BT_INFO #ifdef bEnable diff --git a/hal/phydm/halhwimg.h b/hal/phydm/halhwimg.h index 6d658b3..c64fdd5 100644 --- a/hal/phydm/halhwimg.h +++ b/hal/phydm/halhwimg.h @@ -19,119 +19,73 @@ /*@ * 2011/03/15 MH Add for different IC HW image file selection. code size consideration. * */ -#if RT_PLATFORM == PLATFORM_LINUX - - #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) - /* @For 92C */ - #define RTL8192CE_HWIMG_SUPPORT 1 - #define RTL8192CE_TEST_HWIMG_SUPPORT 0 - #define RTL8192CU_HWIMG_SUPPORT 0 - #define RTL8192CU_TEST_HWIMG_SUPPORT 0 - - /* @For 92D */ - #define RTL8192DE_HWIMG_SUPPORT 1 - #define RTL8192DE_TEST_HWIMG_SUPPORT 0 - #define RTL8192DU_HWIMG_SUPPORT 0 - #define RTL8192DU_TEST_HWIMG_SUPPORT 0 - - /* @For 8723 */ - #define RTL8723E_HWIMG_SUPPORT 1 - #define RTL8723U_HWIMG_SUPPORT 0 - #define RTL8723S_HWIMG_SUPPORT 0 - - /* @For 88E */ - #define RTL8188EE_HWIMG_SUPPORT 0 - #define RTL8188EU_HWIMG_SUPPORT 0 - #define RTL8188ES_HWIMG_SUPPORT 0 - - #elif (DEV_BUS_TYPE == RT_USB_INTERFACE) - /* @For 92C */ - #define RTL8192CE_HWIMG_SUPPORT 0 - #define RTL8192CE_TEST_HWIMG_SUPPORT 0 - #define RTL8192CU_HWIMG_SUPPORT 1 - #define RTL8192CU_TEST_HWIMG_SUPPORT 0 - - /* @For 92D */ - #define RTL8192DE_HWIMG_SUPPORT 0 - #define RTL8192DE_TEST_HWIMG_SUPPORT 0 - #define RTL8192DU_HWIMG_SUPPORT 1 - #define RTL8192DU_TEST_HWIMG_SUPPORT 0 - - /* @For 8723 */ - #define RTL8723E_HWIMG_SUPPORT 0 - #define RTL8723U_HWIMG_SUPPORT 1 - #define RTL8723S_HWIMG_SUPPORT 0 - - /* @For 88E */ - #define RTL8188EE_HWIMG_SUPPORT 0 - #define RTL8188EU_HWIMG_SUPPORT 0 - #define RTL8188ES_HWIMG_SUPPORT 0 - - #elif (DEV_BUS_TYPE == RT_SDIO_INTERFACE) - /* @For 92C */ - #define RTL8192CE_HWIMG_SUPPORT 0 - #define RTL8192CE_TEST_HWIMG_SUPPORT 0 - #define RTL8192CU_HWIMG_SUPPORT 1 - #define RTL8192CU_TEST_HWIMG_SUPPORT 0 - - /* @For 92D */ - #define RTL8192DE_HWIMG_SUPPORT 0 - #define RTL8192DE_TEST_HWIMG_SUPPORT 0 - #define RTL8192DU_HWIMG_SUPPORT 1 - #define RTL8192DU_TEST_HWIMG_SUPPORT 0 - - /* @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 - #endif - -#else /* PLATFORM_WINDOWS & MacOSX */ - +#if (DEV_BUS_TYPE == RT_PCI_INTERFACE) /* @For 92C */ - #define RTL8192CE_HWIMG_SUPPORT 1 - #define RTL8192CE_TEST_HWIMG_SUPPORT 1 - #define RTL8192CU_HWIMG_SUPPORT 1 - #define RTL8192CU_TEST_HWIMG_SUPPORT 1 + #define RTL8192CE_HWIMG_SUPPORT 1 + #define RTL8192CE_TEST_HWIMG_SUPPORT 0 + #define RTL8192CU_HWIMG_SUPPORT 0 + #define RTL8192CU_TEST_HWIMG_SUPPORT 0 /* @For 92D */ #define RTL8192DE_HWIMG_SUPPORT 1 - #define RTL8192DE_TEST_HWIMG_SUPPORT 1 - #define RTL8192DU_HWIMG_SUPPORT 1 - #define RTL8192DU_TEST_HWIMG_SUPPORT 1 + #define RTL8192DE_TEST_HWIMG_SUPPORT 0 + #define RTL8192DU_HWIMG_SUPPORT 0 + #define RTL8192DU_TEST_HWIMG_SUPPORT 0 - #if defined(UNDER_CE) - /* @For 8723 */ - #define RTL8723E_HWIMG_SUPPORT 0 - #define RTL8723U_HWIMG_SUPPORT 0 - #define RTL8723S_HWIMG_SUPPORT 1 + /* @For 8723 */ + #define RTL8723E_HWIMG_SUPPORT 1 + #define RTL8723U_HWIMG_SUPPORT 0 + #define RTL8723S_HWIMG_SUPPORT 0 - /* @For 88E */ - #define RTL8188EE_HWIMG_SUPPORT 0 - #define RTL8188EU_HWIMG_SUPPORT 0 - #define RTL8188ES_HWIMG_SUPPORT 0 + /* @For 88E */ + #define RTL8188EE_HWIMG_SUPPORT 0 + #define RTL8188EU_HWIMG_SUPPORT 0 + #define RTL8188ES_HWIMG_SUPPORT 0 - #else +#elif (DEV_BUS_TYPE == RT_USB_INTERFACE) + /* @For 92C */ + #define RTL8192CE_HWIMG_SUPPORT 0 + #define RTL8192CE_TEST_HWIMG_SUPPORT 0 + #define RTL8192CU_HWIMG_SUPPORT 1 + #define RTL8192CU_TEST_HWIMG_SUPPORT 0 - /* @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 92D */ + #define RTL8192DE_HWIMG_SUPPORT 0 + #define RTL8192DE_TEST_HWIMG_SUPPORT 0 + #define RTL8192DU_HWIMG_SUPPORT 1 + #define RTL8192DU_TEST_HWIMG_SUPPORT 0 - /* @For 88E */ - #define RTL8188EE_HWIMG_SUPPORT 1 - #define RTL8188EU_HWIMG_SUPPORT 1 - #define RTL8188ES_HWIMG_SUPPORT 1 - #endif + /* @For 8723 */ + #define RTL8723E_HWIMG_SUPPORT 0 + #define RTL8723U_HWIMG_SUPPORT 1 + #define RTL8723S_HWIMG_SUPPORT 0 -#endif + /* @For 88E */ + #define RTL8188EE_HWIMG_SUPPORT 0 + #define RTL8188EU_HWIMG_SUPPORT 0 + #define RTL8188ES_HWIMG_SUPPORT 0 + +#elif (DEV_BUS_TYPE == RT_SDIO_INTERFACE) + /* @For 92C */ + #define RTL8192CE_HWIMG_SUPPORT 0 + #define RTL8192CE_TEST_HWIMG_SUPPORT 0 + #define RTL8192CU_HWIMG_SUPPORT 1 + #define RTL8192CU_TEST_HWIMG_SUPPORT 0 + + /* @For 92D */ + #define RTL8192DE_HWIMG_SUPPORT 0 + #define RTL8192DE_TEST_HWIMG_SUPPORT 0 + #define RTL8192DU_HWIMG_SUPPORT 1 + #define RTL8192DU_TEST_HWIMG_SUPPORT 0 + + /* @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 #endif /* @__INC_HW_IMG_H */ diff --git a/include/basic_types.h b/include/basic_types.h index 20cf3ce..21b9126 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -31,45 +31,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 f85114b..30882e7 100644 --- a/include/byteorder/generic.h +++ b/include/byteorder/generic.h @@ -92,50 +92,46 @@ * */ - -#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) || defined(PLATFORM_FREEBSD) - /* - * inside the kernel, we can use nicknames; - * outside of it, we must avoid POSIX namespace pollution... - */ - #define cpu_to_le64 __cpu_to_le64 - #define le64_to_cpu __le64_to_cpu - #define cpu_to_le32 __cpu_to_le32 - #define le32_to_cpu __le32_to_cpu - #define cpu_to_le16 __cpu_to_le16 - #define le16_to_cpu __le16_to_cpu - #define cpu_to_be64 __cpu_to_be64 - #define be64_to_cpu __be64_to_cpu - #define cpu_to_be32 __cpu_to_be32 - #define be32_to_cpu __be32_to_cpu - #define cpu_to_be16 __cpu_to_be16 - #define be16_to_cpu __be16_to_cpu - #define cpu_to_le64p __cpu_to_le64p - #define le64_to_cpup __le64_to_cpup - #define cpu_to_le32p __cpu_to_le32p - #define le32_to_cpup __le32_to_cpup - #define cpu_to_le16p __cpu_to_le16p - #define le16_to_cpup __le16_to_cpup - #define cpu_to_be64p __cpu_to_be64p - #define be64_to_cpup __be64_to_cpup - #define cpu_to_be32p __cpu_to_be32p - #define be32_to_cpup __be32_to_cpup - #define cpu_to_be16p __cpu_to_be16p - #define be16_to_cpup __be16_to_cpup - #define cpu_to_le64s __cpu_to_le64s - #define le64_to_cpus __le64_to_cpus - #define cpu_to_le32s __cpu_to_le32s - #define le32_to_cpus __le32_to_cpus - #define cpu_to_le16s __cpu_to_le16s - #define le16_to_cpus __le16_to_cpus - #define cpu_to_be64s __cpu_to_be64s - #define be64_to_cpus __be64_to_cpus - #define cpu_to_be32s __cpu_to_be32s - #define be32_to_cpus __be32_to_cpus - #define cpu_to_be16s __cpu_to_be16s - #define be16_to_cpus __be16_to_cpus -#endif - +/* +* inside the kernel, we can use nicknames; +* outside of it, we must avoid POSIX namespace pollution... +*/ +#define cpu_to_le64 __cpu_to_le64 +#define le64_to_cpu __le64_to_cpu +#define cpu_to_le32 __cpu_to_le32 +#define le32_to_cpu __le32_to_cpu +#define cpu_to_le16 __cpu_to_le16 +#define le16_to_cpu __le16_to_cpu +#define cpu_to_be64 __cpu_to_be64 +#define be64_to_cpu __be64_to_cpu +#define cpu_to_be32 __cpu_to_be32 +#define be32_to_cpu __be32_to_cpu +#define cpu_to_be16 __cpu_to_be16 +#define be16_to_cpu __be16_to_cpu +#define cpu_to_le64p __cpu_to_le64p +#define le64_to_cpup __le64_to_cpup +#define cpu_to_le32p __cpu_to_le32p +#define le32_to_cpup __le32_to_cpup +#define cpu_to_le16p __cpu_to_le16p +#define le16_to_cpup __le16_to_cpup +#define cpu_to_be64p __cpu_to_be64p +#define be64_to_cpup __be64_to_cpup +#define cpu_to_be32p __cpu_to_be32p +#define be32_to_cpup __be32_to_cpup +#define cpu_to_be16p __cpu_to_be16p +#define be16_to_cpup __be16_to_cpup +#define cpu_to_le64s __cpu_to_le64s +#define le64_to_cpus __le64_to_cpus +#define cpu_to_le32s __cpu_to_le32s +#define le32_to_cpus __le32_to_cpus +#define cpu_to_le16s __cpu_to_le16s +#define le16_to_cpus __le16_to_cpus +#define cpu_to_be64s __cpu_to_be64s +#define be64_to_cpus __be64_to_cpus +#define cpu_to_be32s __cpu_to_be32s +#define be32_to_cpus __be32_to_cpus +#define cpu_to_be16s __cpu_to_be16s +#define be16_to_cpus __be16_to_cpus /* * Handle ntohl and suches. These have various compatibility @@ -193,15 +189,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 a8dd46b..9091d1d 100644 --- a/include/byteorder/swab.h +++ b/include/byteorder/swab.h @@ -121,16 +121,14 @@ __inline static __u64 __arch__swab64(__u64 x) return __arch__swab32(x); } -#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) - #define swab16 __swab16 - #define swab32 __swab32 - #define swab64 __swab64 - #define swab16p __swab16p - #define swab32p __swab32p - #define swab64p __swab64p - #define swab16s __swab16s - #define swab32s __swab32s - #define swab64s __swab64s -#endif +#define swab16 __swab16 +#define swab32 __swab32 +#define swab64 __swab64 +#define swab16p __swab16p +#define swab32p __swab32p +#define swab64p __swab64p +#define swab16s __swab16s +#define swab32s __swab32s +#define swab64s __swab64s #endif /* _LINUX_BYTEORDER_SWAB_H */ diff --git a/include/drv_conf.h b/include/drv_conf.h index 6e242e7..13ebc5a 100644 --- a/include/drv_conf.h +++ b/include/drv_conf.h @@ -16,11 +16,7 @@ #define __DRV_CONF_H__ #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 #define CONFIG_RSSI_PRIORITY #ifdef CONFIG_RTW_REPEATER_SON #ifndef CONFIG_AP diff --git a/include/drv_types.h b/include/drv_types.h index cb9e696..caecb95 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -87,7 +87,6 @@ typedef struct _ADAPTER _adapter, ADAPTER, *PADAPTER; #include #include #include -#include #include #include #include @@ -1146,30 +1145,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; @@ -1510,16 +1485,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; diff --git a/include/ieee80211.h b/include/ieee80211.h index ed2a765..62e983a 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -498,54 +498,6 @@ struct rtw_ieee80211s_hdr { } __attribute__((packed)); #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, @@ -667,22 +619,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) @@ -1147,24 +1083,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 @@ -1219,24 +1137,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 * @@ -1300,57 +1200,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/osdep_service.h b/include/osdep_service.h index f229280..93475bd 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -392,15 +392,6 @@ __inline static _OS_STATUS res_to_status(sint res) 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) @@ -420,16 +411,6 @@ __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; } diff --git a/include/rtw_debug.h b/include/rtw_debug.h index 754ded9..6f234e4 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -32,33 +32,18 @@ enum { 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) @@ -73,15 +58,7 @@ extern void rtl871x_cedbg(const char *fmt, ...); #undef _dbgdump #undef _seqdump -#if defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_XP) - #define _dbgdump DbgPrint - #define KERN_CONT - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_CE) - #define _dbgdump rtl871x_cedbg - #define KERN_CONT - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined PLATFORM_LINUX +#if defined PLATFORM_LINUX #define _dbgdump printk #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)) #define KERN_CONT diff --git a/include/rtw_io.h b/include/rtw_io.h index 1beec27..049af9f 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -18,9 +18,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 4924751..cba984f 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -15,69 +15,6 @@ #ifndef _RTW_IOCTL_H_ #define _RTW_IOCTL_H_ -#ifndef PLATFORM_WINDOWS -/* 00 - Success -* 11 - Error */ -#define STATUS_SUCCESS (0x00000000L) -#define STATUS_PENDING (0x00000103L) - -#define STATUS_UNSUCCESSFUL (0xC0000001L) -#define STATUS_INSUFFICIENT_RESOURCES (0xC000009AL) -#define STATUS_NOT_SUPPORTED (0xC00000BBL) - -#define NDIS_STATUS_SUCCESS ((NDIS_STATUS)STATUS_SUCCESS) -#define NDIS_STATUS_PENDING ((NDIS_STATUS)STATUS_PENDING) -#define NDIS_STATUS_NOT_RECOGNIZED ((NDIS_STATUS)0x00010001L) -#define NDIS_STATUS_NOT_COPIED ((NDIS_STATUS)0x00010002L) -#define NDIS_STATUS_NOT_ACCEPTED ((NDIS_STATUS)0x00010003L) -#define NDIS_STATUS_CALL_ACTIVE ((NDIS_STATUS)0x00010007L) - -#define NDIS_STATUS_FAILURE ((NDIS_STATUS)STATUS_UNSUCCESSFUL) -#define NDIS_STATUS_RESOURCES ((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES) -#define NDIS_STATUS_CLOSING ((NDIS_STATUS)0xC0010002L) -#define NDIS_STATUS_BAD_VERSION ((NDIS_STATUS)0xC0010004L) -#define NDIS_STATUS_BAD_CHARACTERISTICS ((NDIS_STATUS)0xC0010005L) -#define NDIS_STATUS_ADAPTER_NOT_FOUND ((NDIS_STATUS)0xC0010006L) -#define NDIS_STATUS_OPEN_FAILED ((NDIS_STATUS)0xC0010007L) -#define NDIS_STATUS_DEVICE_FAILED ((NDIS_STATUS)0xC0010008L) -#define NDIS_STATUS_MULTICAST_FULL ((NDIS_STATUS)0xC0010009L) -#define NDIS_STATUS_MULTICAST_EXISTS ((NDIS_STATUS)0xC001000AL) -#define NDIS_STATUS_MULTICAST_NOT_FOUND ((NDIS_STATUS)0xC001000BL) -#define NDIS_STATUS_REQUEST_ABORTED ((NDIS_STATUS)0xC001000CL) -#define NDIS_STATUS_RESET_IN_PROGRESS ((NDIS_STATUS)0xC001000DL) -#define NDIS_STATUS_CLOSING_INDICATING ((NDIS_STATUS)0xC001000EL) -#define NDIS_STATUS_NOT_SUPPORTED ((NDIS_STATUS)STATUS_NOT_SUPPORTED) -#define NDIS_STATUS_INVALID_PACKET ((NDIS_STATUS)0xC001000FL) -#define NDIS_STATUS_OPEN_LIST_FULL ((NDIS_STATUS)0xC0010010L) -#define NDIS_STATUS_ADAPTER_NOT_READY ((NDIS_STATUS)0xC0010011L) -#define NDIS_STATUS_ADAPTER_NOT_OPEN ((NDIS_STATUS)0xC0010012L) -#define NDIS_STATUS_NOT_INDICATING ((NDIS_STATUS)0xC0010013L) -#define NDIS_STATUS_INVALID_LENGTH ((NDIS_STATUS)0xC0010014L) -#define NDIS_STATUS_INVALID_DATA ((NDIS_STATUS)0xC0010015L) -#define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L) -#define NDIS_STATUS_INVALID_OID ((NDIS_STATUS)0xC0010017L) -#define NDIS_STATUS_ADAPTER_REMOVED ((NDIS_STATUS)0xC0010018L) -#define NDIS_STATUS_UNSUPPORTED_MEDIA ((NDIS_STATUS)0xC0010019L) -#define NDIS_STATUS_GROUP_ADDRESS_IN_USE ((NDIS_STATUS)0xC001001AL) -#define NDIS_STATUS_FILE_NOT_FOUND ((NDIS_STATUS)0xC001001BL) -#define NDIS_STATUS_ERROR_READING_FILE ((NDIS_STATUS)0xC001001CL) -#define NDIS_STATUS_ALREADY_MAPPED ((NDIS_STATUS)0xC001001DL) -#define NDIS_STATUS_RESOURCE_CONFLICT ((NDIS_STATUS)0xC001001EL) -#define NDIS_STATUS_NO_CABLE ((NDIS_STATUS)0xC001001FL) - -#define NDIS_STATUS_INVALID_SAP ((NDIS_STATUS)0xC0010020L) -#define NDIS_STATUS_SAP_IN_USE ((NDIS_STATUS)0xC0010021L) -#define NDIS_STATUS_INVALID_ADDRESS ((NDIS_STATUS)0xC0010022L) -#define NDIS_STATUS_VC_NOT_ACTIVATED ((NDIS_STATUS)0xC0010023L) -#define NDIS_STATUS_DEST_OUT_OF_ORDER ((NDIS_STATUS)0xC0010024L) /* cause 27 */ -#define NDIS_STATUS_VC_NOT_AVAILABLE ((NDIS_STATUS)0xC0010025L) /* cause 35, 45 */ -#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE ((NDIS_STATUS)0xC0010026L) /* cause 37 */ -#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 #define OID_802_11_CAPABILITY 0x0d010122 #endif @@ -147,144 +84,6 @@ 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_)) -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 deleted file mode 100644 index cc7b557..0000000 --- a/include/rtw_ioctl_query.h +++ /dev/null @@ -1,25 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2017 Realtek Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - *****************************************************************************/ -#ifndef _RTW_IOCTL_QUERY_H_ -#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 2af4a54..c31a07f 100644 --- a/include/rtw_ioctl_set.h +++ b/include/rtw_ioctl_set.h @@ -33,19 +33,6 @@ typedef struct _NDIS_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_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid); u8 rtw_set_802_11_add_wep(_adapter *padapter, NDIS_802_11_WEP *wep); diff --git a/include/rtw_mp.h b/include/rtw_mp.h index da707c4..a4e8762 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -66,21 +66,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; @@ -383,31 +368,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 a7bd75c..5975d7c 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -354,18 +354,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 is_any_non_be_pkts; u64 rx_bytes; diff --git a/include/rtw_security.h b/include/rtw_security.h index c8a60a5..5d52d42 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -192,9 +192,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 613613d..f1531bd 100644 --- a/include/sdio_ops.h +++ b/include/sdio_ops.h @@ -25,24 +25,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); void dump_sdio_card_info(void *sel, struct dvobj_priv *dvobj); diff --git a/include/wifi.h b/include/wifi.h index f45a0df..2f22b2a 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -791,72 +791,6 @@ struct ADDBA_request { #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 { MAX_AMPDU_FACTOR_8K = 0, MAX_AMPDU_FACTOR_16K = 1, diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h index 167ae7f..48fc02c 100644 --- a/include/wlan_bssdef.h +++ b/include/wlan_bssdef.h @@ -553,10 +553,6 @@ enum bss_type { /* 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; @@ -573,13 +569,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) @@ -627,10 +618,6 @@ struct wlan_network { int aid; /* will only be valid when a BSS is joinned. */ int join_res; WLAN_BSSID_EX network; /* must be the last item */ -#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 70070a8..fa0200a 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -25,31 +25,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 diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 01612b3..dbabac2 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -17,13 +17,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/linux/usb_intf.c b/os_dep/linux/usb_intf.c index 87b9d56..de37244 100644 --- a/os_dep/linux/usb_intf.c +++ b/os_dep/linux/usb_intf.c @@ -23,10 +23,6 @@ #error "CONFIG_USB_HCI shall be on!\n" #endif -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -#error "Shall be Linux or Windows, but not both!\n" -#endif - #ifdef CONFIG_80211N_HT extern int rtw_ht_enable; extern int rtw_bw_mode; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index f0377a5..4f441d0 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -81,11 +81,6 @@ void *_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 @@ -114,10 +109,6 @@ void *_rtw_zmalloc(u32 sz) memset(pbuf, 0, sz); #endif -#ifdef PLATFORM_WINDOWS - NdisFillMemory(pbuf, sz, 0); -#endif - } return pbuf; @@ -139,11 +130,6 @@ void _rtw_mfree(void *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 @@ -804,19 +790,6 @@ int _rtw_memcmp(const void *dst, const void *src, u32 sz) 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 - - - } #ifdef PLATFORM_FREEBSD @@ -843,11 +816,6 @@ void _rtw_init_listhead(_list *list) list->next = list; list->prev = list; #endif -#ifdef PLATFORM_WINDOWS - - NdisInitializeListHead(list); - -#endif } @@ -877,17 +845,6 @@ u32 rtw_is_list_empty(_list *phead) #endif - -#ifdef PLATFORM_WINDOWS - - if (IsListEmpty(phead)) - return _TRUE; - else - return _FALSE; - -#endif - - } void rtw_list_insert_head(_list *plist, _list *phead) @@ -901,9 +858,6 @@ void rtw_list_insert_head(_list *plist, _list *phead) __list_add(plist, phead, phead->next); #endif -#ifdef PLATFORM_WINDOWS - InsertHeadList(phead, plist); -#endif } void rtw_list_insert_tail(_list *plist, _list *phead) @@ -918,11 +872,6 @@ void rtw_list_insert_tail(_list *plist, _list *phead) __list_add(plist, phead->prev, phead); -#endif -#ifdef PLATFORM_WINDOWS - - InsertTailList(phead, plist); - #endif } @@ -1014,9 +963,7 @@ void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc, void *ctx) #ifdef PLATFORM_FREEBSD _init_timer(ptimer, adapter->pifp, pfunc, ctx); #endif -#ifdef PLATFORM_WINDOWS - _init_timer(ptimer, adapter->hndis_adapter, pfunc, ctx); -#endif + } /* @@ -1213,11 +1160,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 } @@ -1253,11 +1195,6 @@ void _rtw_spinlock(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_lock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisAcquireSpinLock(plock); - -#endif } @@ -1272,11 +1209,7 @@ void _rtw_spinunlock(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_unlock(plock); #endif -#ifdef PLATFORM_WINDOWS - NdisReleaseSpinLock(plock); - -#endif } @@ -1291,11 +1224,6 @@ void _rtw_spinlock_ex(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_lock(plock); #endif -#ifdef PLATFORM_WINDOWS - - NdisDprAcquireSpinLock(plock); - -#endif } @@ -1310,11 +1238,7 @@ void _rtw_spinunlock_ex(_lock *plock) #ifdef PLATFORM_FREEBSD mtx_unlock(plock); #endif -#ifdef PLATFORM_WINDOWS - NdisDprReleaseSpinLock(plock); - -#endif } @@ -1355,11 +1279,6 @@ systime _rtw_get_current_time(void) getmicrotime(&tvp); return tvp.tv_sec; #endif -#ifdef PLATFORM_WINDOWS - LARGE_INTEGER SystemTime; - NdisGetCurrentSystemTime(&SystemTime); - return SystemTime.LowPart;/* count of 100-nanosecond intervals */ -#endif } inline u32 _rtw_systime_to_ms(systime stime) @@ -1370,9 +1289,6 @@ inline u32 _rtw_systime_to_ms(systime stime) #ifdef PLATFORM_FREEBSD return stime * 1000; #endif -#ifdef PLATFORM_WINDOWS - return stime / 10000 ; -#endif } inline systime _rtw_ms_to_systime(u32 ms) @@ -1383,9 +1299,6 @@ inline systime _rtw_ms_to_systime(u32 ms) #ifdef PLATFORM_FREEBSD return ms / 1000; #endif -#ifdef PLATFORM_WINDOWS - return ms * 10000 ; -#endif } inline systime _rtw_us_to_systime(u32 us) @@ -1443,12 +1356,6 @@ void rtw_usleep_os(int us) return ; #endif -#ifdef PLATFORM_WINDOWS - - NdisMSleep(us); /* (us) */ - -#endif - } @@ -2096,8 +2003,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 @@ -2115,8 +2020,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