mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2025-01-09 10:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation for ARM

Browse Source
This commit is contained in:
astsam 2017-05-14 12:27:25 +03:00
parent 75a7771de8
commit dfe012d487
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1031,13 +1031,13 @@ endif
ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y) ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
ifeq ($(CONFIG_PLATFORM_I386_PC), y) #ifeq ($(CONFIG_PLATFORM_I386_PC), y)
## For I386 X86 ToolChain use Hardware FLOATING ## For I386 X86 ToolChain use Hardware FLOATING
EXTRA_CFLAGS += -mhard-float #EXTRA_CFLAGS += -mhard-float
else #else
## For ARM ToolChain use Hardware FLOATING ## For ARM ToolChain use Hardware FLOATING
EXTRA_CFLAGS += -mfloat-abi=hard #EXTRA_CFLAGS += -mfloat-abi=hard
endif #endif
endif endif
ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y) ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y)

13
core/rtw_mp.c
View File

@ -33,6 +33,11 @@
#define CEILING_NEG(X) ((X - (int)(X)) < 0 ? (int)(X - 1) : (int)(X)) #define CEILING_NEG(X) ((X - (int)(X)) < 0 ? (int)(X - 1) : (int)(X))
#define ceil(X) (((X) > 0) ? CEILING_POS(X) : CEILING_NEG(X)) #define ceil(X) (((X) > 0) ? CEILING_POS(X) : CEILING_NEG(X))
static int rtfloor(float x) {
int xi = (int)x;
return x < xi ? xi - 1 : xi;
}
#if 0
int rtfloor(float x) int rtfloor(float x)
{ {
int i = x - 2; int i = x - 2;
@ -42,6 +47,7 @@ int rtfloor(float x)
return i; return i;
} }
#endif #endif
#endif
#ifdef CONFIG_MP_INCLUDED #ifdef CONFIG_MP_INCLUDED
u32 read_macreg(_adapter *padapter, u32 addr, u32 sz) u32 read_macreg(_adapter *padapter, u32 addr, u32 sz)
@ -2766,7 +2772,7 @@ void CRC16_generator(
} }
#if !defined(__arm__)
/*======================================== /*========================================
SFD SIGNAL SERVICE LENGTH CRC SFD SIGNAL SERVICE LENGTH CRC
16 bit 8 bit 8 bit 16 bit 16 bit 16 bit 8 bit 8 bit 16 bit 16 bit
@ -2846,7 +2852,7 @@ void CCK_generator(
ByteToBit(pPMacTxInfo->CRC16, crc16_out, 2); ByteToBit(pPMacTxInfo->CRC16, crc16_out, 2);
} }
#endif
void PMAC_Get_Pkt_Param( void PMAC_Get_Pkt_Param(
PRT_PMAC_TX_INFO pPMacTxInfo, PRT_PMAC_TX_INFO pPMacTxInfo,
@ -2919,7 +2925,7 @@ void PMAC_Get_Pkt_Param(
pPMacTxInfo->m_STBC = 1; pPMacTxInfo->m_STBC = 1;
} }
#if !defined(__arm__)
UINT LDPC_parameter_generator( UINT LDPC_parameter_generator(
UINT N_pld_int, UINT N_pld_int,
UINT N_CBPSS, UINT N_CBPSS,
@ -3265,6 +3271,7 @@ void L_SIG_generator(
_rtw_memset(pPMacTxInfo->LSIG, 0, 3); _rtw_memset(pPMacTxInfo->LSIG, 0, 3);
ByteToBit(pPMacTxInfo->LSIG, (bool *)sig_bi, 3); ByteToBit(pPMacTxInfo->LSIG, (bool *)sig_bi, 3);
} }
#endif
void CRC8_generator( void CRC8_generator(

3
include/rtw_mp.h
View File

@ -781,6 +781,7 @@ PMAC_Get_Pkt_Param(
PRT_PMAC_TX_INFO pPMacTxInfo, PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo PRT_PMAC_PKT_INFO pPMacPktInfo
); );
#if !defined(__arm__)
void void
CCK_generator( CCK_generator(
PRT_PMAC_TX_INFO pPMacTxInfo, PRT_PMAC_TX_INFO pPMacTxInfo,
@ -797,7 +798,7 @@ L_SIG_generator(
PRT_PMAC_TX_INFO pPMacTxInfo, PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo PRT_PMAC_PKT_INFO pPMacPktInfo
); );
#endif
void HT_SIG_generator( void HT_SIG_generator(
PRT_PMAC_TX_INFO pPMacTxInfo, PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo); PRT_PMAC_PKT_INFO pPMacPktInfo);

3
os_dep/linux/ioctl_mp.c
View File

@ -1597,7 +1597,7 @@ int rtw_mp_tx(struct net_device *dev,
_rtw_memset(pMptCtx->PMacTxInfo.MacAddress, 0xFF, ETH_ALEN); _rtw_memset(pMptCtx->PMacTxInfo.MacAddress, 0xFF, ETH_ALEN);
PMAC_Get_Pkt_Param(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo); PMAC_Get_Pkt_Param(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
#if !defined(__arm__)
if (MPT_IS_CCK_RATE(pMptCtx->PMacTxInfo.TX_RATE)) if (MPT_IS_CCK_RATE(pMptCtx->PMacTxInfo.TX_RATE))
CCK_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo); CCK_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
@ -1606,6 +1606,7 @@ int rtw_mp_tx(struct net_device *dev,
/* 24 BIT*/ /* 24 BIT*/
L_SIG_generator(pMptCtx->PMacPktInfo.N_sym, &pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo); L_SIG_generator(pMptCtx->PMacPktInfo.N_sym, &pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
} }
#endif
/* 48BIT*/ /* 48BIT*/
if (MPT_IS_HT_RATE(pMptCtx->PMacTxInfo.TX_RATE)) if (MPT_IS_HT_RATE(pMptCtx->PMacTxInfo.TX_RATE))
HT_SIG_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo); HT_SIG_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);