diff --git a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c index b9a1770..4084377 100644 --- a/core/efuse/rtw_efuse.c +++ b/core/efuse/rtw_efuse.c @@ -2346,7 +2346,6 @@ u8 mac_hidden_wl_func_to_hal_wl_func(u8 func) return wl_func; } -#ifdef PLATFORM_LINUX #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE /* #include */ @@ -2608,5 +2607,3 @@ exit: return ret; } #endif /* CONFIG_EFUSE_CONFIG_FILE */ - -#endif /* PLATFORM_LINUX */ diff --git a/core/rtw_mp.c b/core/rtw_mp.c index c60f48d..51cfa4e 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -162,7 +162,6 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv) } -#ifdef PLATFORM_LINUX static int init_mp_priv_by_os(struct mp_priv *pmp_priv) { int i, res; @@ -203,7 +202,6 @@ _exit_init_mp_priv: return res; } -#endif static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter) { @@ -1757,11 +1755,9 @@ void SetPacketTx(PADAPTER padapter) rtw_mfree(pmp_priv->TXradomBuffer, 4096); /* 3 6. start thread */ -#ifdef PLATFORM_LINUX pmp_priv->tx.PktTxThread = kthread_run(mp_xmit_packet_thread, pmp_priv, "RTW_MP_THREAD"); if (IS_ERR(pmp_priv->tx.PktTxThread)) RTW_INFO("Create PktTx Thread Fail !!!!!\n"); -#endif Rtw_MPSetMacTxEDCA(padapter); exit: @@ -1909,11 +1905,9 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data) u32 psd_data = 0; -#ifdef PLATFORM_LINUX if (!netif_running(pAdapter->pnetdev)) { return 0; } -#endif if (check_fwstate(&pAdapter->mlmepriv, WIFI_MP_STATE) == _FALSE) { return 0; diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c index c9f564d..2e4076f 100644 --- a/core/rtw_mp_ioctl.c +++ b/core/rtw_mp_ioctl.c @@ -2325,11 +2325,9 @@ NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv) { u8 bpwrup; NDIS_STATUS status = NDIS_STATUS_SUCCESS; -#ifdef PLATFORM_LINUX #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); #endif -#endif if (poid_par_priv->type_of_oid != SET_OID) { @@ -2342,10 +2340,8 @@ NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv) bpwrup = *(u8 *)poid_par_priv->information_buf; /* CALL the power_down function */ -#ifdef PLATFORM_LINUX #if defined(CONFIG_RTL8712) /* Linux MP insmod unknown symbol */ dev_power_down(padapter, bpwrup); -#endif #endif _irqlevel_changed_(&oldirql, RAISE); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 246afbb..49b792d 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -2400,7 +2400,6 @@ exit: #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -#ifdef PLATFORM_LINUX static void recvframe_expand_pkt( PADAPTER padapter, union recv_frame *prframe) @@ -2456,7 +2455,6 @@ static void recvframe_expand_pkt( #else #warning "recvframe_expand_pkt not implement, defrag may crash system" #endif -#endif /* perform defrag */ union recv_frame *recvframe_defrag(_adapter *adapter, _queue *defrag_q); diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 6d241ca..434be7c 100644 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -264,7 +264,7 @@ void sreset_stop_adapter(_adapter *padapter) rtw_cancel_all_timer(padapter); /* TODO: OS and HCI independent */ -#if defined(PLATFORM_LINUX) && defined(CONFIG_USB_HCI) +#if defined(CONFIG_USB_HCI) tasklet_kill(&pxmitpriv->xmit_tasklet); #endif @@ -292,7 +292,7 @@ void sreset_start_adapter(_adapter *padapter) sreset_restore_network_status(padapter); /* TODO: OS and HCI independent */ -#if defined(PLATFORM_LINUX) && defined(CONFIG_USB_HCI) +#if defined(CONFIG_USB_HCI) tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); #endif diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index b13db72..7fc1fa6 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -4966,9 +4966,7 @@ void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms) { sctx->timeout_ms = timeout_ms; sctx->submit_time = rtw_get_current_time(); -#ifdef PLATFORM_LINUX /* TODO: add condition wating interface for other os */ init_completion(&sctx->done); -#endif sctx->status = RTW_SCTX_SUBMITTED; } @@ -4978,7 +4976,6 @@ int rtw_sctx_wait(struct submit_ctx *sctx, const char *msg) unsigned long expire; int status = 0; -#ifdef PLATFORM_LINUX expire = sctx->timeout_ms ? msecs_to_jiffies(sctx->timeout_ms) : MAX_SCHEDULE_TIMEOUT; if (!wait_for_completion_timeout(&sctx->done, expire)) { /* timeout, do something?? */ @@ -4986,7 +4983,6 @@ int rtw_sctx_wait(struct submit_ctx *sctx, const char *msg) RTW_INFO("%s timeout: %s\n", __func__, msg); } else status = sctx->status; -#endif if (status == RTW_SCTX_DONE_SUCCESS) ret = _SUCCESS; @@ -5015,9 +5011,7 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status) if (rtw_sctx_chk_waring_status(status)) RTW_INFO("%s status:%d\n", __func__, status); (*sctx)->status = status; -#ifdef PLATFORM_LINUX complete(&((*sctx)->done)); -#endif *sctx = NULL; } } diff --git a/hal/btc/Mp_Precomp.h b/hal/btc/Mp_Precomp.h index 1542565..566844e 100644 --- a/hal/btc/Mp_Precomp.h +++ b/hal/btc/Mp_Precomp.h @@ -25,9 +25,7 @@ #define BT_TMP_BUF_SIZE 100 -#ifdef PLATFORM_LINUX #define rsprintf snprintf -#endif #define DCMD_Printf DBG_BT_INFO diff --git a/hal/phydm/halhwimg.h b/hal/phydm/halhwimg.h index 1b679e4..d3f5a12 100644 --- a/hal/phydm/halhwimg.h +++ b/hal/phydm/halhwimg.h @@ -1,80 +1 @@ -#pragma once -#ifndef __INC_HW_IMG_H -#define __INC_HW_IMG_H -// -// 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 - -#endif //__INC_HW_IMG_H diff --git a/hal/phydm/phydm.c b/hal/phydm/phydm.c index 7233899..621bd23 100644 --- a/hal/phydm/phydm.c +++ b/hal/phydm/phydm.c @@ -2334,11 +2334,7 @@ GetPSDData( //Read PSD report, Reg8B4[15:0] psd_report = ODM_GetBBReg(pDM_Odm,0x8B4, bMaskDWord) & 0x0000FFFF; -#if 1//(DEV_BUS_TYPE == RT_PCI_INTERFACE) && ( (RT_PLATFORM == PLATFORM_LINUX) || (RT_PLATFORM == PLATFORM_MACOSX)) psd_report = (u4Byte) (odm_ConvertTo_dB(psd_report))+(u4Byte)(initial_gain_psd-0x1c); -#else - psd_report = (int) (20*log10((double)psd_report))+(int)(initial_gain_psd-0x1c); -#endif return psd_report; diff --git a/hal/phydm/phydm.h b/hal/phydm/phydm.h index 09d7619..a8d0d50 100644 --- a/hal/phydm/phydm.h +++ b/hal/phydm/phydm.h @@ -492,10 +492,6 @@ typedef enum _BASEBAND_CONFIG_PHY_REG_PG_VALUE_TYPE { /*2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration.*/ #if(DM_ODM_SUPPORT_TYPE & ODM_WIN) -#if (RT_PLATFORM != PLATFORM_LINUX) -typedef -#endif - struct DM_Out_Source_Dynamic_Mechanism_Structure #else/*for AP,ADSL,CE Team*/ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure @@ -927,11 +923,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure #if(DM_ODM_SUPPORT_TYPE & ODM_WIN) -#if (RT_PLATFORM != PLATFORM_LINUX) -} DM_ODM_T, *PDM_ODM_T; /*DM_Dynamic_Mechanism_Structure*/ -#else }; -#endif #else /*for AP,ADSL,CE Team*/ } DM_ODM_T, *PDM_ODM_T; /*DM_Dynamic_Mechanism_Structure*/ diff --git a/hal/rtl8723d/sdio/rtl8723ds_recv.c b/hal/rtl8723d/sdio/rtl8723ds_recv.c index 1c5e353..2ff8f5a 100644 --- a/hal/rtl8723d/sdio/rtl8723ds_recv.c +++ b/hal/rtl8723d/sdio/rtl8723ds_recv.c @@ -71,9 +71,7 @@ static void rtl8723ds_recv_tasklet(void *priv) /* The case of can't allocate recvframe should be temporary, */ /* schedule again and hope recvframe is available next time. */ -#ifdef PLATFORM_LINUX tasklet_schedule(&precvpriv->recv_tasklet); -#endif return; } @@ -207,9 +205,7 @@ static void rtl8723ds_recv_tasklet(void *priv) /* The case of can't allocate recvframe should be temporary, */ /* schedule again and hope recvframe is available next time. */ -#ifdef PLATFORM_LINUX tasklet_schedule(&precvpriv->recv_tasklet); -#endif return; } @@ -283,9 +279,7 @@ static void rtl8723ds_recv_tasklet(void *priv) /* The case of can't allocate skb is serious and may never be recovered, */ /* once bDriverStopped is enable, this task should be stopped. */ if (!rtw_is_drv_stopped(padapter)) { -#ifdef PLATFORM_LINUX tasklet_schedule(&precvpriv->recv_tasklet); -#endif } return; @@ -426,11 +420,9 @@ s32 rtl8723ds_init_recv_priv(PADAPTER padapter) goto initbuferror; /* 3 2. init tasklet */ -#ifdef PLATFORM_LINUX tasklet_init(&precvpriv->recv_tasklet, (void(*)(unsigned long))rtl8723ds_recv_tasklet, (unsigned long)padapter); -#endif goto exit; @@ -474,9 +466,7 @@ void rtl8723ds_free_recv_priv(PADAPTER padapter) precvpriv = &padapter->recvpriv; /* 3 1. kill tasklet */ -#ifdef PLATFORM_LINUX tasklet_kill(&precvpriv->recv_tasklet); -#endif /* 3 2. free all recv buffers */ precvbuf = (struct recv_buf *)precvpriv->precv_buf; diff --git a/hal/rtl8723d/sdio/sdio_ops.c b/hal/rtl8723d/sdio/sdio_ops.c index 8a40050..ad4b1bc 100644 --- a/hal/rtl8723d/sdio/sdio_ops.c +++ b/hal/rtl8723d/sdio/sdio_ops.c @@ -1452,9 +1452,7 @@ static void sd_rxhandler(PADAPTER padapter, struct recv_buf *precvbuf) rtw_enqueue_recvbuf(precvbuf, ppending_queue); /* 3 2. schedule tasklet */ -#ifdef PLATFORM_LINUX tasklet_schedule(&precvpriv->recv_tasklet); -#endif } void sd_int_dpc(PADAPTER padapter) diff --git a/include/autoconf.h b/include/autoconf.h index 4f98e83..9dd1a3e 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -30,9 +30,6 @@ #endif #define CONFIG_SDIO_HCI -#define PLATFORM_LINUX - - /* * Wi-Fi Functions Config */ diff --git a/include/basic_types.h b/include/basic_types.h index f13207d..a4a614f 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -36,43 +36,41 @@ #define _FALSE FALSE #endif -#ifdef PLATFORM_LINUX - #include - #include - #include - #include - #include - #include - #define IN - #define OUT - #define VOID void - #define NDIS_OID uint - #define NDIS_STATUS uint +#include +#include +#include +#include +#include +#include +#define IN +#define OUT +#define VOID void +#define NDIS_OID uint +#define NDIS_STATUS uint - typedef signed int sint; - - #ifndef PVOID - typedef void *PVOID; - /* #define PVOID (void *) */ - #endif - - #define UCHAR u8 - #define USHORT u16 - #define UINT u32 - #define ULONG u32 - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) - typedef _Bool bool; - #endif - - typedef void (*proc_t)(void *); - - typedef __kernel_size_t SIZE_T; - typedef __kernel_ssize_t SSIZE_T; - #define FIELD_OFFSET(s, field) ((SSIZE_T)&((s *)(0))->field) +typedef signed int sint; +#ifndef PVOID + typedef void *PVOID; + /* #define PVOID (void *) */ #endif +#define UCHAR u8 +#define USHORT u16 +#define UINT u32 +#define ULONG u32 + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) + typedef _Bool bool; +#endif + +typedef void (*proc_t)(void *); + +typedef __kernel_size_t SIZE_T; +typedef __kernel_ssize_t SSIZE_T; +#define FIELD_OFFSET(s, field) ((SSIZE_T)&((s *)(0))->field) + + #define MEM_ALIGNMENT_OFFSET (sizeof (SIZE_T)) #define MEM_ALIGNMENT_PADDING (sizeof(SIZE_T) - 1) diff --git a/include/byteorder/generic.h b/include/byteorder/generic.h index 0bdc44c..ea448e0 100644 --- a/include/byteorder/generic.h +++ b/include/byteorder/generic.h @@ -97,50 +97,46 @@ * */ - -#if defined(PLATFORM_LINUX) - /* - * 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 @@ -165,15 +161,10 @@ * Do the prototypes. Somebody might want to take the * address or some such sick thing.. */ -#if defined(PLATFORM_LINUX) || (defined(__GLIBC__) && __GLIBC__ >= 2) - extern __u32 ntohl(__u32); - extern __u32 htonl(__u32); -#else /* defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) */ - extern unsigned long int ntohl(unsigned long int); - extern unsigned long int htonl(unsigned long int); -#endif - extern unsigned short int ntohs(unsigned short int); - extern unsigned short int htons(unsigned short int); +extern __u32 ntohl(__u32); +extern __u32 htonl(__u32); +extern unsigned short int ntohs(unsigned short int); +extern unsigned short int htons(unsigned short int); #if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) || defined(PLATFORM_MPIXEL) @@ -182,13 +173,8 @@ #define ___ntohl(x) __be32_to_cpu(x) #define ___ntohs(x) __be16_to_cpu(x) - #if defined(PLATFORM_LINUX) || (defined(__GLIBC__) && __GLIBC__ >= 2) - #define htonl(x) ___htonl(x) - #define ntohl(x) ___ntohl(x) - #else - #define htonl(x) ((unsigned long)___htonl(x)) - #define ntohl(x) ((unsigned long)___ntohl(x)) - #endif + #define htonl(x) ___htonl(x) + #define ntohl(x) ___ntohl(x) #define htons(x) ___htons(x) #define ntohs(x) ___ntohs(x) diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h index 354e347..13488c4 100644 --- a/include/byteorder/swab.h +++ b/include/byteorder/swab.h @@ -118,16 +118,14 @@ __inline static const __u32 __fswab32(__u32 x) return __arch__swab32(x); } -#if defined(PLATFORM_LINUX) - #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/byteorder/swabb.h b/include/byteorder/swabb.h index ce33424..41a6ebf 100644 --- a/include/byteorder/swabb.h +++ b/include/byteorder/swabb.h @@ -144,13 +144,11 @@ __inline static__ void __swahb32s(__u32 *addr) */ #endif /* __BYTEORDER_HAS_U64__ */ -#if defined(PLATFORM_LINUX) - #define swahw32 __swahw32 - #define swahb32 __swahb32 - #define swahw32p __swahw32p - #define swahb32p __swahb32p - #define swahw32s __swahw32s - #define swahb32s __swahb32s -#endif +#define swahw32 __swahw32 +#define swahb32 __swahb32 +#define swahw32p __swahw32p +#define swahb32p __swahb32p +#define swahw32s __swahw32s +#define swahb32s __swahb32s #endif /* _LINUX_BYTEORDER_SWABB_H */ diff --git a/include/custom_gpio.h b/include/custom_gpio.h index 5cada97..58f28e0 100644 --- a/include/custom_gpio.h +++ b/include/custom_gpio.h @@ -3,10 +3,7 @@ #include #include - -#ifdef PLATFORM_LINUX - #include -#endif +#include typedef enum cust_gpio_modes { WLAN_PWDN_ON, diff --git a/include/drv_types.h b/include/drv_types.h index 3467b91..1de06fc 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -39,9 +39,7 @@ #include #endif -#ifdef PLATFORM_LINUX #include -#endif #ifndef is_compat_task #define is_compat_task() 0 @@ -968,10 +966,8 @@ struct dvobj_priv { u8 *usb_vendor_req_buf; #endif -#ifdef PLATFORM_LINUX struct usb_interface *pusbintf; struct usb_device *pusbdev; -#endif/* PLATFORM_LINUX */ #endif/* CONFIG_USB_HCI */ @@ -979,7 +975,6 @@ struct dvobj_priv { #ifdef CONFIG_PCI_HCI -#ifdef PLATFORM_LINUX struct pci_dev *ppcidev; /* PCI MEM map */ @@ -1020,7 +1015,6 @@ struct dvobj_priv { u8 b_support_aspm; /* If it supports ASPM, Offset[560h] = 0x40, otherwise Offset[560h] = 0x00. */ u8 b_support_backdoor; u8 bdma64; -#endif/* PLATFORM_LINUX */ #endif/* CONFIG_PCI_HCI */ @@ -1073,12 +1067,9 @@ static inline void dev_clr_drv_stopped(struct dvobj_priv *dvobj) #define dev_is_surprise_removed(dvobj) (ATOMIC_READ(&dvobj->bSurpriseRemoved) == _TRUE) #define dev_is_drv_stopped(dvobj) (ATOMIC_READ(&dvobj->bDriverStopped) == _TRUE) -#ifdef PLATFORM_LINUX static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) { /* todo: get interface type from dvobj and the return the dev accordingly */ -#ifdef RTW_DVOBJ_CHIP_HW_TYPE -#endif #ifdef CONFIG_USB_HCI return &dvobj->pusbintf->dev; @@ -1093,7 +1084,6 @@ static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) return &dvobj->ppcidev->dev; #endif } -#endif _adapter *dvobj_get_port0_adapter(struct dvobj_priv *dvobj); _adapter *dvobj_get_unregisterd_adapter(struct dvobj_priv *dvobj); @@ -1261,11 +1251,6 @@ struct _ADAPTER { _thread_hdl_ recvThread; u8 registered; -#ifndef PLATFORM_LINUX - NDIS_STATUS(*dvobj_init)(struct dvobj_priv *dvobj); - void (*dvobj_deinit)(struct dvobj_priv *dvobj); -#endif - u32(*intf_init)(struct dvobj_priv *dvobj); void (*intf_deinit)(struct dvobj_priv *dvobj); int (*intf_alloc_irq)(struct dvobj_priv *dvobj); @@ -1275,7 +1260,6 @@ struct _ADAPTER { void (*intf_start)(_adapter *adapter); void (*intf_stop)(_adapter *adapter); -#ifdef PLATFORM_LINUX _nic_hdl pnetdev; char old_ifname[IFNAMSIZ]; @@ -1308,8 +1292,6 @@ struct _ADAPTER { #endif /* CONFIG_IOCTL_CFG80211 */ -#endif /* PLATFORM_LINUX */ - u8 mac_addr[ETH_ALEN]; int net_closed; diff --git a/include/drv_types_gspi.h b/include/drv_types_gspi.h index f0efc8c..20c8ae1 100644 --- a/include/drv_types_gspi.h +++ b/include/drv_types_gspi.h @@ -21,7 +21,6 @@ #define __DRV_TYPES_GSPI_H__ /* SPI Header Files */ -#ifdef PLATFORM_LINUX #include #include #include @@ -33,7 +32,6 @@ #include #include #include -#endif typedef struct gspi_data { @@ -43,12 +41,10 @@ typedef struct gspi_data { u8 rx_block_mode; u32 block_transfer_len; -#ifdef PLATFORM_LINUX struct spi_device *func; struct workqueue_struct *priv_wq; struct delayed_work irq_work; -#endif } GSPI_DATA, *PGSPI_DATA; #endif /* #ifndef __DRV_TYPES_GSPI_H__ */ diff --git a/include/drv_types_pci.h b/include/drv_types_pci.h index c03657f..8d1e14d 100644 --- a/include/drv_types_pci.h +++ b/include/drv_types_pci.h @@ -21,9 +21,7 @@ #define __DRV_TYPES_PCI_H__ -#ifdef PLATFORM_LINUX - #include -#endif +#include #define INTEL_VENDOR_ID 0x8086 diff --git a/include/drv_types_sdio.h b/include/drv_types_sdio.h index 1595701..94fc70e 100644 --- a/include/drv_types_sdio.h +++ b/include/drv_types_sdio.h @@ -21,7 +21,6 @@ #define __DRV_TYPES_SDIO_H__ /* SDIO Header Files */ -#ifdef PLATFORM_LINUX #include #include #include @@ -31,7 +30,6 @@ #include #include #endif /* CONFIG_PLATFORM_SPRD */ -#endif typedef struct sdio_data { u8 func_number; @@ -40,12 +38,9 @@ typedef struct sdio_data { u8 rx_block_mode; u32 block_transfer_len; -#ifdef PLATFORM_LINUX struct sdio_func *func; _thread_hdl_ sys_sdio_irq_thd; unsigned int clock; -#endif - } SDIO_DATA, *PSDIO_DATA; #define dvobj_to_sdio_func(d) ((d)->intf_data.func) diff --git a/include/ieee80211.h b/include/ieee80211.h index d75066e..48963f5 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -333,8 +333,6 @@ struct ieee_ibss_seq { _list list; }; -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) - struct rtw_ieee80211_hdr { u16 frame_ctl; u16 duration_id; @@ -384,8 +382,6 @@ struct eapol { u16 length; } __attribute__((packed)); -#endif - enum eap_type { EAP_PACKET = 0, EAPOL_START, @@ -494,8 +490,6 @@ enum eap_type { #define P80211_OUI_LEN 3 -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) - struct ieee80211_snap_hdr { u8 dsap; /* always 0xAA */ @@ -505,8 +499,6 @@ struct ieee80211_snap_hdr { } __attribute__((packed)); -#endif - #define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) #define WLAN_FC_GET_TYPE(fc) ((fc) & RTW_IEEE80211_FCTL_FTYPE) @@ -1033,8 +1025,6 @@ struct ieee80211_softmac_stats { #define BIP_AAD_SIZE 20 #endif /* CONFIG_IEEE80211W */ -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) - struct ieee80211_security { u16 active_key:2, enabled:1, @@ -1047,8 +1037,6 @@ struct ieee80211_security { u16 flags; } __attribute__((packed)); -#endif - /* 802.11 data frame from AP @@ -1089,8 +1077,6 @@ struct ieee80211_header_data { #define MFIE_TYPE_RATES_EX 50 #define MFIE_TYPE_GENERIC 221 -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) - struct ieee80211_info_element_hdr { u8 id; u8 len; @@ -1101,7 +1087,6 @@ struct ieee80211_info_element { u8 len; u8 data[0]; } __attribute__((packed)); -#endif /* * These are the data types that can make up management packets @@ -1123,10 +1108,6 @@ struct ieee80211_info_element { #define IEEE80211_DEFAULT_TX_ESSID "Penguin" #define IEEE80211_DEFAULT_BASIC_RATE 10 - -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) - - struct ieee80211_authentication { struct ieee80211_header_data header; u16 algorithm; @@ -1135,7 +1116,6 @@ struct ieee80211_authentication { /* struct ieee80211_info_element_hdr info_element; */ } __attribute__((packed)); - struct ieee80211_probe_response { struct ieee80211_header_data header; u32 time_stamp[2]; @@ -1164,7 +1144,6 @@ struct ieee80211_assoc_response_frame { u16 aid; /* struct ieee80211_info_element info_element; supported rates */ } __attribute__((packed)); -#endif struct ieee80211_txb { u8 nr_frags; diff --git a/include/ieee80211_ext.h b/include/ieee80211_ext.h index a680802..8d0280c 100644 --- a/include/ieee80211_ext.h +++ b/include/ieee80211_ext.h @@ -48,7 +48,6 @@ #define PMKID_LEN 16 -#ifdef PLATFORM_LINUX struct wpa_ie_hdr { u8 elem_id; u8 len; @@ -103,8 +102,6 @@ struct wme_parameter_element { } __attribute__((packed)); -#endif - #define WPA_PUT_LE16(a, val) \ do { \ (a)[1] = ((u16) (val)) >> 8; \ @@ -179,8 +176,6 @@ enum ieee80211_back_parties { WLAN_BACK_TIMER = 2, }; -#ifdef PLATFORM_LINUX - struct ieee80211_mgmt { u16 frame_control; u16 duration; @@ -307,8 +302,6 @@ struct ieee80211_mgmt { } __attribute__((packed)) u; } __attribute__((packed)); -#endif - /* mgmt header + 1 byte category code */ #define IEEE80211_MIN_ACTION_SIZE FIELD_OFFSET(struct ieee80211_mgmt, u.action.u) diff --git a/include/ip.h b/include/ip.h index c78034d..5d7aade 100644 --- a/include/ip.h +++ b/include/ip.h @@ -90,8 +90,6 @@ #define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ #define IPOPT_TS_PRESPEC 3 /* specified modules only */ -#ifdef PLATFORM_LINUX - struct ip_options { __u32 faddr; /* Saved first hop address */ unsigned char optlen; @@ -113,7 +111,6 @@ struct ip_options { }; #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) -#endif struct iphdr { #if defined(__LITTLE_ENDIAN_BITFIELD) diff --git a/include/osdep_intf.h b/include/osdep_intf.h index 54ba03d..9e9a701 100644 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -48,7 +48,6 @@ struct intf_priv { _mutex ioctl_mutex; -#ifdef PLATFORM_LINUX #ifdef CONFIG_USB_HCI /* when in USB, IO is through interrupt in/out endpoints */ struct usb_device *udev; @@ -60,7 +59,6 @@ struct intf_priv { u8 bio_irp_timeout; u8 bio_timer_cancel; #endif -#endif }; @@ -86,7 +84,6 @@ void rtw_cancel_all_timer(_adapter *padapter); uint loadparam(_adapter *adapter); -#ifdef PLATFORM_LINUX int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); @@ -113,8 +110,6 @@ void rtw_ndev_notifier_unregister(void); #include "../os_dep/linux/ioctl_cfg80211.h" #endif /* CONFIG_IOCTL_CFG80211 */ -#endif /* PLATFORM_LINUX */ - void rtw_ips_dev_unload(_adapter *padapter); #ifdef CONFIG_IPS diff --git a/include/osdep_service.h b/include/osdep_service.h index b5bc245..5986475 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -32,10 +32,7 @@ #undef _FALSE #define _FALSE 0 - -#ifdef PLATFORM_LINUX - #include -#endif +#include #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) @@ -328,49 +325,34 @@ extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc); __inline static unsigned char _cancel_timer_ex(_timer *ptimer) { -#ifdef PLATFORM_LINUX return del_timer_sync(ptimer); -#endif } static __inline void thread_enter(char *name) { -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)) daemonize("%s", name); #endif allow_signal(SIGTERM); -#endif } __inline static void flush_signals_thread(void) { -#ifdef PLATFORM_LINUX if (signal_pending(current)) flush_signals(current); -#endif } __inline static _OS_STATUS res_to_status(sint res) { - -#if defined(PLATFORM_LINUX) || defined (PLATFORM_MPIXEL) return res; -#endif } __inline static void rtw_dump_stack(void) { -#ifdef PLATFORM_LINUX dump_stack(); -#endif } -#ifdef PLATFORM_LINUX #define rtw_warn_on(condition) WARN_ON(condition) -#else -#define rtw_warn_on(condition) do {} while (0) -#endif __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) { @@ -630,10 +612,6 @@ char alpha_to_upper(char c); /* * Write formatted output to sized buffer */ -#ifdef PLATFORM_LINUX #define rtw_sprintf(buf, size, format, arg...) snprintf(buf, size, format, ##arg) -#else /* !PLATFORM_LINUX */ -#error "NOT DEFINE \"rtw_sprintf\"!!" -#endif /* !PLATFORM_LINUX */ #endif diff --git a/include/recv_osdep.h b/include/recv_osdep.h index 6cb9184..ede8340 100644 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -57,12 +57,10 @@ void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf); void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); -#ifdef PLATFORM_LINUX #ifdef CONFIG_RTW_NAPI #include /* struct napi_struct */ int rtw_recv_napi_poll(struct napi_struct *, int budget); #endif /* CONFIG_RTW_NAPI */ -#endif /* PLATFORM_LINUX */ #endif /* */ diff --git a/include/rtw_debug.h b/include/rtw_debug.h index 83b2cdd..52eed62 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -63,10 +63,8 @@ enum { #undef _dbgdump #undef _seqdump -#if defined PLATFORM_LINUX - #define _dbgdump printk - #define _seqdump seq_printf -#endif +#define _dbgdump printk +#define _seqdump seq_printf #ifdef CONFIG_RTW_DEBUG diff --git a/include/rtw_eeprom.h b/include/rtw_eeprom.h index 9d9103f..bb4d12d 100644 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -110,12 +110,10 @@ extern void eeprom_read_sz(_adapter *padapter, u16 reg, u8 *data, u32 sz); extern void read_eeprom_content_by_attrib(_adapter *padapter); -#ifdef PLATFORM_LINUX #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE extern int isAdaptorInfoFileValid(void); extern int storeAdaptorInfoFile(char *path, u8 *efuse_data); extern int retriveAdaptorInfoFile(char *path, u8 *efuse_data); #endif /* CONFIG_ADAPTOR_INFO_CACHING_FILE */ -#endif /* PLATFORM_LINUX */ #endif /* __RTL871X_EEPROM_H__ */ diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 09025f2..31d783d 100644 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -233,12 +233,10 @@ extern const u8 _mac_hidden_proto_to_hal_proto_cap[]; u8 mac_hidden_wl_func_to_hal_wl_func(u8 func); -#ifdef PLATFORM_LINUX u8 rtw_efuse_file_read(PADAPTER padapter, u8 *filepatch, u8 *buf, u32 len); #ifdef CONFIG_EFUSE_CONFIG_FILE u32 rtw_read_efuse_from_file(const char *path, u8 *buf, int map_size); u32 rtw_read_macaddr_from_file(const char *path, u8 *buf); #endif /* CONFIG_EFUSE_CONFIG_FILE */ -#endif /* PLATFORM_LINUX */ #endif diff --git a/include/rtw_io.h b/include/rtw_io.h index 3cf55bb..abe0c14 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -23,9 +23,7 @@ #define NUM_IOREQ 8 -#ifdef PLATFORM_LINUX - #define MAX_PROT_SZ (64-16) -#endif +#define MAX_PROT_SZ (64-16) #define _IOREADY 0 #define _IO_WAIT_COMPLETE 1 diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index 629fec2..23dae91 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -157,7 +157,7 @@ static NDIS_STATUS oid_null_function(struct oid_par_priv *poid_par_priv) } #endif -#if defined(PLATFORM_LINUX) && defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_WIRELESS_EXT) extern struct iw_handler_def rtw_handlers_def; #endif diff --git a/include/rtw_mp.h b/include/rtw_mp.h index 524ec70..875bf74 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -44,9 +44,7 @@ struct mp_xmit_frame { u8 *mem_addr; u32 sz[8]; -#if defined(PLATFORM_LINUX) PURB pxmit_urb[8]; -#endif u8 bpending[8]; sint ac_tag[8]; sint last[8]; diff --git a/include/rtw_recv.h b/include/rtw_recv.h index a49b9d5..16765f6 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -390,15 +390,12 @@ struct recv_priv { ATOMIC_T rx_pending_cnt; #ifdef CONFIG_USB_INTERRUPT_IN_PIPE -#ifdef PLATFORM_LINUX PURB int_in_urb; -#endif u8 *int_in_buf; #endif /* CONFIG_USB_INTERRUPT_IN_PIPE */ #endif -#if defined(PLATFORM_LINUX) struct tasklet_struct irq_prepare_beacon_tasklet; struct tasklet_struct recv_tasklet; struct sk_buff_head free_recv_skb_queue; @@ -411,8 +408,6 @@ struct recv_priv { struct ifqueue rx_indicate_queue; #endif /* CONFIG_RX_INDICATE_QUEUE */ -#endif /* defined(PLATFORM_LINUX) */ - u8 *pallocated_recv_buf; u8 *precv_buf; /* 4 alignment */ _queue free_recv_buf_queue; @@ -500,20 +495,13 @@ struct recv_buf { #ifdef CONFIG_USB_HCI -#if defined(PLATFORM_LINUX) PURB purb; dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ u32 alloc_sz; -#endif - u8 irp_pending; int transfer_len; - #endif - -#ifdef PLATFORM_LINUX _pkt *pskb; -#endif }; diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index 2f27e4b..f34c533 100644 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -474,9 +474,7 @@ struct submit_ctx { u32 submit_time; /* */ u32 timeout_ms; /* <0: not synchronous, 0: wait forever, >0: up to ms waiting */ int status; /* status for operation */ -#ifdef PLATFORM_LINUX struct completion done; -#endif }; enum { @@ -529,10 +527,8 @@ struct xmit_buf { u8 bulkout_id; /* for halmac */ #endif /* RTW_HALMAC */ -#if defined(PLATFORM_LINUX) PURB pxmit_urb[8]; dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ -#endif u8 bpending[8]; @@ -715,9 +711,7 @@ struct xmit_priv { _sema tx_retevt;/* all tx return event; */ u8 txirp_cnt; -#ifdef PLATFORM_LINUX struct tasklet_struct xmit_tasklet; -#endif /* per AC pending irp */ int beq_cnt; int bkq_cnt; @@ -731,16 +725,12 @@ struct xmit_priv { struct rtw_tx_ring tx_ring[PCI_MAX_TX_QUEUE_COUNT]; int txringcount[PCI_MAX_TX_QUEUE_COUNT]; u8 beaconDMAing; /* flag of indicating beacon is transmiting to HW by DMA */ -#ifdef PLATFORM_LINUX struct tasklet_struct xmit_tasklet; #endif -#endif #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #ifdef CONFIG_SDIO_TX_TASKLET -#ifdef PLATFORM_LINUX struct tasklet_struct xmit_tasklet; -#endif /* PLATFORM_LINUX */ #else _thread_hdl_ SdioXmitThread; _sema SdioXmitSema; diff --git a/include/sdio_ops.h b/include/sdio_ops.h index fb1aaa5..1d22a14 100644 --- a/include/sdio_ops.h +++ b/include/sdio_ops.h @@ -26,9 +26,7 @@ #define SDIO_ERR_VAL16 0xFFFF #define SDIO_ERR_VAL32 0xFFFFFFFF -#ifdef PLATFORM_LINUX #include -#endif extern void sdio_set_intf_ops(_adapter *padapter, struct _io_ops *pops); diff --git a/include/usb_ops.h b/include/usb_ops.h index 350a675..15e9539 100644 --- a/include/usb_ops.h +++ b/include/usb_ops.h @@ -35,9 +35,7 @@ enum { #define MAX_VENDOR_REQ_CMD_SIZE 254 /* 8188cu SIE Support */ #define MAX_USB_IO_CTL_SIZE (MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT) -#ifdef PLATFORM_LINUX #include -#endif /* PLATFORM_LINUX */ #ifdef CONFIG_RTL8188E void rtl8188eu_set_hw_type(struct dvobj_priv *pdvobj); diff --git a/include/wifi.h b/include/wifi.h index 9a53060..8457b16 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -769,7 +769,6 @@ typedef enum _ELEMENT_ID { * This structure refers to "HT BlockAckReq" as * described in 802.11n draft section 7.2.1.7.1 */ -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) struct rtw_ieee80211_bar { unsigned short frame_control; unsigned short duration; @@ -778,17 +777,11 @@ struct rtw_ieee80211_bar { unsigned short control; unsigned short start_seq_num; } __attribute__((packed)); -#endif /* 802.11 BAR control masks */ #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 - -#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) - - - /** * struct rtw_ieee80211_ht_cap - HT capabilities * @@ -859,8 +852,6 @@ struct ADDBA_request { unsigned short BA_starting_seqctrl; } __attribute__((packed)); -#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 d8d1f5d..1e08800 100644 --- a/include/wlan_bssdef.h +++ b/include/wlan_bssdef.h @@ -23,9 +23,6 @@ #define MAX_IE_SZ 768 - -#ifdef PLATFORM_LINUX - #define NDIS_802_11_LENGTH_SSID 32 #define NDIS_802_11_LENGTH_RATES 8 #define NDIS_802_11_LENGTH_RATES_EX 16 @@ -270,9 +267,6 @@ typedef struct _NDIS_802_11_TEST { } tt; } NDIS_802_11_TEST, *PNDIS_802_11_TEST; - -#endif /* end of #ifdef PLATFORM_LINUX */ - #ifndef Ndis802_11APMode #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) #endif diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index 7f18186..91ed2a5 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -30,8 +30,6 @@ struct pkt_file { SIZE_T buf_len; }; -#ifdef PLATFORM_LINUX - #define NR_XMITFRAME 256 struct xmit_priv; @@ -43,8 +41,6 @@ struct xmit_buf; extern int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); -#endif /* PLATFORM_LINUX */ - void rtw_os_xmit_schedule(_adapter *padapter); int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz, u8 flag); diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c index 3f2c070..a6945ea 100644 --- a/os_dep/linux/recv_linux.c +++ b/os_dep/linux/recv_linux.c @@ -113,9 +113,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8 /* The case of can't allocate skb is serious and may never be recovered, once bDriverStopped is enable, this task should be stopped.*/ if (!rtw_is_drv_stopped(secondary_padapter)) -#ifdef PLATFORM_LINUX tasklet_schedule(&precvpriv->recv_tasklet); -#endif return ret; } diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 4fa1031..3415e3c 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -26,14 +26,10 @@ #define RT_TAG '1178' #ifdef DBG_MEMORY_LEAK -#ifdef PLATFORM_LINUX atomic_t _malloc_cnt = ATOMIC_INIT(0); atomic_t _malloc_size = ATOMIC_INIT(0); -#endif #endif /* DBG_MEMORY_LEAK */ - -#if defined(PLATFORM_LINUX) /* * Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE * @return: one of RTW_STATUS_CODE @@ -50,12 +46,6 @@ inline int RTW_STATUS_CODE(int error_code) return _FAIL; } } -#else -inline int RTW_STATUS_CODE(int error_code) -{ - return error_code; -} -#endif u32 rtw_atoi(u8 *s) { @@ -81,17 +71,13 @@ u32 rtw_atoi(u8 *s) inline u8 *_rtw_vmalloc(u32 sz) { u8 *pbuf; -#ifdef PLATFORM_LINUX pbuf = vmalloc(sz); -#endif #ifdef DBG_MEMORY_LEAK -#ifdef PLATFORM_LINUX if (pbuf != NULL) { atomic_inc(&_malloc_cnt); atomic_add(sz, &_malloc_size); } -#endif #endif /* DBG_MEMORY_LEAK */ return pbuf; @@ -100,24 +86,18 @@ inline u8 *_rtw_vmalloc(u32 sz) inline u8 *_rtw_zvmalloc(u32 sz) { u8 *pbuf; -#ifdef PLATFORM_LINUX pbuf = _rtw_vmalloc(sz); if (pbuf != NULL) memset(pbuf, 0, sz); -#endif return pbuf; } inline void _rtw_vmfree(u8 *pbuf, u32 sz) { -#ifdef PLATFORM_LINUX vfree(pbuf); -#endif #ifdef DBG_MEMORY_LEAK -#ifdef PLATFORM_LINUX atomic_dec(&_malloc_cnt); atomic_sub(sz, &_malloc_size); -#endif #endif /* DBG_MEMORY_LEAK */ } @@ -126,7 +106,6 @@ u8 *_rtw_malloc(u32 sz) u8 *pbuf = NULL; -#ifdef PLATFORM_LINUX #ifdef RTK_DMP_PLATFORM if (sz > 0x4000) pbuf = (u8 *)dvr_malloc(sz); @@ -134,14 +113,11 @@ u8 *_rtw_malloc(u32 sz) #endif pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -#endif #ifdef DBG_MEMORY_LEAK -#ifdef PLATFORM_LINUX if (pbuf != NULL) { atomic_inc(&_malloc_cnt); atomic_add(sz, &_malloc_size); } -#endif #endif /* DBG_MEMORY_LEAK */ return pbuf; @@ -154,10 +130,7 @@ u8 *_rtw_zmalloc(u32 sz) u8 *pbuf = _rtw_malloc(sz); if (pbuf != NULL) { - -#ifdef PLATFORM_LINUX memset(pbuf, 0, sz); -#endif } return pbuf; @@ -166,7 +139,6 @@ u8 *_rtw_zmalloc(u32 sz) void _rtw_mfree(u8 *pbuf, u32 sz) { -#ifdef PLATFORM_LINUX #ifdef RTK_DMP_PLATFORM if (sz > 0x4000) dvr_free(pbuf); @@ -174,21 +146,16 @@ void _rtw_mfree(u8 *pbuf, u32 sz) #endif kfree(pbuf); -#endif #ifdef DBG_MEMORY_LEAK -#ifdef PLATFORM_LINUX atomic_dec(&_malloc_cnt); atomic_sub(sz, &_malloc_size); -#endif #endif /* DBG_MEMORY_LEAK */ } inline struct sk_buff *_rtw_skb_alloc(u32 sz) { -#ifdef PLATFORM_LINUX return __dev_alloc_skb(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -#endif /* PLATFORM_LINUX */ } inline void _rtw_skb_free(struct sk_buff *skb) @@ -198,57 +165,39 @@ inline void _rtw_skb_free(struct sk_buff *skb) inline struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb) { -#ifdef PLATFORM_LINUX return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -#endif /* PLATFORM_LINUX */ } inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb) { -#ifdef PLATFORM_LINUX return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -#endif /* PLATFORM_LINUX */ } inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb) { -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) return pskb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); #else return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); #endif -#endif /* PLATFORM_LINUX */ } inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb) { -#if defined(PLATFORM_LINUX) skb->dev = ndev; return netif_rx(skb); -#endif } #ifdef CONFIG_RTW_NAPI inline int _rtw_netif_receive_skb(_nic_hdl ndev, struct sk_buff *skb) { -#if defined(PLATFORM_LINUX) skb->dev = ndev; return netif_receive_skb(skb); -#else - rtw_warn_on(1); - return -1; -#endif } #ifdef CONFIG_RTW_GRO inline gro_result_t _rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) { -#if defined(PLATFORM_LINUX) return napi_gro_receive(napi, skb); -#else - rtw_warn_on(1); - return -1; -#endif } #endif /* CONFIG_RTW_GRO */ #endif /* CONFIG_RTW_NAPI */ @@ -264,23 +213,19 @@ void _rtw_skb_queue_purge(struct sk_buff_head *list) #ifdef CONFIG_USB_HCI inline void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma) { -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) return usb_alloc_coherent(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma); #else return usb_buffer_alloc(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma); #endif -#endif /* PLATFORM_LINUX */ inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma) { -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) usb_free_coherent(dev, size, addr, dma); #else usb_buffer_free(dev, size, addr, dma); #endif -#endif /* PLATFORM_LINUX */ } #endif /* CONFIG_USB_HCI */ @@ -760,54 +705,33 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size) void _rtw_memcpy(void *dst, const void *src, u32 sz) { - -#if defined(PLATFORM_LINUX) - memcpy(dst, src, sz); - -#endif } inline void _rtw_memmove(void *dst, const void *src, u32 sz) { -#if defined(PLATFORM_LINUX) memmove(dst, src, sz); -#else - #warning "no implementation\n" -#endif } int _rtw_memcmp(const void *dst, const void *src, u32 sz) { -#if defined(PLATFORM_LINUX) /* under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 */ if (!(memcmp(dst, src, sz))) return _TRUE; else return _FALSE; -#endif } void _rtw_memset(void *pbuf, int c, u32 sz) { - -#if defined(PLATFORM_LINUX) - memset(pbuf, c, sz); - -#endif } void _rtw_init_listhead(_list *list) { - -#ifdef PLATFORM_LINUX - INIT_LIST_HEAD(list); - -#endif } /* @@ -817,42 +741,27 @@ Otherwise, there will be racing condition. */ u32 rtw_is_list_empty(_list *phead) { - -#ifdef PLATFORM_LINUX - if (list_empty(phead)) return _TRUE; else return _FALSE; - -#endif } void rtw_list_insert_head(_list *plist, _list *phead) { - -#ifdef PLATFORM_LINUX list_add(plist, phead); -#endif } void rtw_list_insert_tail(_list *plist, _list *phead) { - -#ifdef PLATFORM_LINUX - list_add_tail(plist, phead); - -#endif } void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc) { _adapter *adapter = (_adapter *)padapter; -#ifdef PLATFORM_LINUX _init_timer(ptimer, adapter->pnetdev, pfunc, adapter); -#endif } /* @@ -864,12 +773,7 @@ Caller must check if the list is empty before calling rtw_list_delete void _rtw_init_sema(_sema *sema, int init_val) { - -#ifdef PLATFORM_LINUX - sema_init(sema, init_val); - -#endif } void _rtw_free_sema(_sema *sema) @@ -878,62 +782,39 @@ void _rtw_free_sema(_sema *sema) void _rtw_up_sema(_sema *sema) { - -#ifdef PLATFORM_LINUX - up(sema); - -#endif } u32 _rtw_down_sema(_sema *sema) { - -#ifdef PLATFORM_LINUX - if (down_interruptible(sema)) return _FAIL; else return _SUCCESS; - -#endif } void _rtw_mutex_init(_mutex *pmutex) { -#ifdef PLATFORM_LINUX - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) mutex_init(pmutex); #else init_MUTEX(pmutex); #endif - -#endif } void _rtw_mutex_free(_mutex *pmutex); void _rtw_mutex_free(_mutex *pmutex) { -#ifdef PLATFORM_LINUX - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) mutex_destroy(pmutex); #endif - -#endif } void _rtw_spinlock_init(_lock *plock) { - -#ifdef PLATFORM_LINUX - spin_lock_init(plock); - -#endif } void _rtw_spinlock_free(_lock *plock) @@ -942,42 +823,22 @@ void _rtw_spinlock_free(_lock *plock) void _rtw_spinlock(_lock *plock) { - -#ifdef PLATFORM_LINUX - spin_lock(plock); - -#endif } void _rtw_spinunlock(_lock *plock) { - -#ifdef PLATFORM_LINUX - spin_unlock(plock); - -#endif } void _rtw_spinlock_ex(_lock *plock) { - -#ifdef PLATFORM_LINUX - spin_lock(plock); - -#endif } void _rtw_spinunlock_ex(_lock *plock) { - -#ifdef PLATFORM_LINUX - spin_unlock(plock); - -#endif } void _rtw_init_queue(_queue *pqueue) @@ -1008,46 +869,32 @@ u32 rtw_end_of_queue_search(_list *head, _list *plist) u32 rtw_get_current_time(void) { - -#ifdef PLATFORM_LINUX return jiffies; -#endif } inline u32 rtw_systime_to_ms(u32 systime) { -#ifdef PLATFORM_LINUX return systime * 1000 / HZ; -#endif } inline u32 rtw_ms_to_systime(u32 ms) { -#ifdef PLATFORM_LINUX return ms * HZ / 1000; -#endif } /* the input parameter start use the same unit as returned by rtw_get_current_time */ inline s32 rtw_get_passing_time_ms(u32 start) { -#ifdef PLATFORM_LINUX return rtw_systime_to_ms(jiffies - start); -#endif } inline s32 rtw_get_time_interval_ms(u32 start, u32 end) { -#ifdef PLATFORM_LINUX return rtw_systime_to_ms(end - start); -#endif } void rtw_sleep_schedulable(int ms) { - -#ifdef PLATFORM_LINUX - u32 delta; delta = (ms * HZ) / 1000; /* (ms) */ @@ -1058,15 +905,11 @@ void rtw_sleep_schedulable(int ms) if (schedule_timeout(delta) != 0) return ; return; - -#endif } void rtw_msleep_os(int ms) { - -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) if (ms < 20) { unsigned long us = ms * 1000UL; @@ -1074,13 +917,10 @@ void rtw_msleep_os(int ms) } else #endif msleep((unsigned int)ms); - -#endif } + void rtw_usleep_os(int us) { -#ifdef PLATFORM_LINUX - /* msleep((unsigned int)us); */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) usleep_range(us, us + 1); @@ -1090,70 +930,35 @@ void rtw_usleep_os(int us) else msleep((us / 1000) + 1); #endif -#endif } #ifdef DBG_DELAY_OS void _rtw_mdelay_os(int ms, const char *func, const int line) { RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); - -#if defined(PLATFORM_LINUX) - mdelay((unsigned long)ms); - -#endif - - } + void _rtw_udelay_os(int us, const char *func, const int line) { - -#if 0 - if (us > 1000) { - RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); - rtw_usleep_os(us); - return; - } -#endif - - RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); - - -#if defined(PLATFORM_LINUX) - udelay((unsigned long)us); - -#endif - } #else void rtw_mdelay_os(int ms) { - -#ifdef PLATFORM_LINUX - mdelay((unsigned long)ms); - -#endif } + void rtw_udelay_os(int us) { - -#ifdef PLATFORM_LINUX - udelay((unsigned long)us); - -#endif } #endif void rtw_yield_os(void) { -#ifdef PLATFORM_LINUX yield(); -#endif } #define RTW_SUSPEND_LOCK_NAME "rtw_wifi" @@ -1332,75 +1137,54 @@ inline void rtw_lock_resume_scan_timeout(u32 timeout_ms) inline void ATOMIC_SET(ATOMIC_T *v, int i) { -#ifdef PLATFORM_LINUX atomic_set(v, i); -#endif } inline int ATOMIC_READ(ATOMIC_T *v) { -#ifdef PLATFORM_LINUX return atomic_read(v); -#endif } inline void ATOMIC_ADD(ATOMIC_T *v, int i) { -#ifdef PLATFORM_LINUX atomic_add(i, v); -#endif } inline void ATOMIC_SUB(ATOMIC_T *v, int i) { -#ifdef PLATFORM_LINUX atomic_sub(i, v); -#endif } inline void ATOMIC_INC(ATOMIC_T *v) { -#ifdef PLATFORM_LINUX atomic_inc(v); -#endif } inline void ATOMIC_DEC(ATOMIC_T *v) { -#ifdef PLATFORM_LINUX atomic_dec(v); -#endif } inline int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i) { -#ifdef PLATFORM_LINUX return atomic_add_return(i, v); -#endif } inline int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i) { -#ifdef PLATFORM_LINUX return atomic_sub_return(i, v); -#endif } inline int ATOMIC_INC_RETURN(ATOMIC_T *v) { -#ifdef PLATFORM_LINUX return atomic_inc_return(v); -#endif } inline int ATOMIC_DEC_RETURN(ATOMIC_T *v) { -#ifdef PLATFORM_LINUX return atomic_dec_return(v); -#endif } -#ifdef PLATFORM_LINUX /* * Open a file with the specific @param path, @param flag, @param mode * @param fpp the pointer of struct file pointer to get struct file pointer while file opening is success @@ -1592,7 +1376,6 @@ static int storeToFile(const char *path, u8 *buf, u32 sz) } return ret; } -#endif /* PLATFORM_LINUX */ /* * Test if the specifi @param path is a file and readable @@ -1601,15 +1384,10 @@ static int storeToFile(const char *path, u8 *buf, u32 sz) */ int rtw_is_file_readable(const char *path) { -#ifdef PLATFORM_LINUX if (isFileReadable(path, NULL) == 0) return _TRUE; else return _FALSE; -#else - /* Todo... */ - return _FALSE; -#endif } /* @@ -1620,15 +1398,10 @@ int rtw_is_file_readable(const char *path) */ int rtw_is_file_readable_with_size(const char *path, u32 *sz) { -#ifdef PLATFORM_LINUX if (isFileReadable(path, sz) == 0) return _TRUE; else return _FALSE; -#else - /* Todo... */ - return _FALSE; -#endif } /* @@ -1640,13 +1413,8 @@ int rtw_is_file_readable_with_size(const char *path, u32 *sz) */ int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz) { -#ifdef PLATFORM_LINUX int ret = retriveFromFile(path, buf, sz); return ret >= 0 ? ret : 0; -#else - /* Todo... */ - return 0; -#endif } /* @@ -1658,16 +1426,10 @@ int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz) */ int rtw_store_to_file(const char *path, u8 *buf, u32 sz) { -#ifdef PLATFORM_LINUX int ret = storeToFile(path, buf, sz); return ret >= 0 ? ret : 0; -#else - /* Todo... */ - return 0; -#endif } -#ifdef PLATFORM_LINUX struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv) { struct net_device *pnetdev; @@ -1796,7 +1558,6 @@ error: return -1; } -#endif #ifdef CONFIG_PLATFORM_SPRD #ifdef do_div @@ -1807,22 +1568,17 @@ error: u64 rtw_modular64(u64 x, u64 y) { -#ifdef PLATFORM_LINUX return do_div(x, y); -#endif } u64 rtw_division64(u64 x, u64 y) { -#ifdef PLATFORM_LINUX do_div(x, y); return x; -#endif } inline u32 rtw_random32(void) { -#ifdef PLATFORM_LINUX #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) return prandom_u32(); #elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)) @@ -1832,7 +1588,6 @@ inline u32 rtw_random32(void) #else return random32(); #endif -#endif } void rtw_buf_free(u8 **buf, u32 *buf_len)