mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2024-11-22 05:25:03 +00:00
Merge pull request #222 from glebm/realtek-4.4.x-fix-gcc10
Fix build with gcc-10 (-Wrestrict) Close #221
This commit is contained in:
commit
7e8858e0df
@ -2418,6 +2418,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
|
|||||||
u32 psd_data = 0;
|
u32 psd_data = 0;
|
||||||
struct psd_init_regs regs = {};
|
struct psd_init_regs regs = {};
|
||||||
int psd_analysis = 0;
|
int psd_analysis = 0;
|
||||||
|
u8 *pdata = data;
|
||||||
|
|
||||||
#ifdef PLATFORM_LINUX
|
#ifdef PLATFORM_LINUX
|
||||||
if (!netif_running(pAdapter->pnetdev)) {
|
if (!netif_running(pAdapter->pnetdev)) {
|
||||||
@ -2449,7 +2450,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
|
|||||||
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
|
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
|
||||||
else
|
else
|
||||||
psd_data = rtw_GetPSDData(pAdapter, i);
|
psd_data = rtw_GetPSDData(pAdapter, i);
|
||||||
sprintf(data, "%s%x ", data, psd_data);
|
pdata += sprintf(pdata, "%x ", psd_data);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -604,19 +604,20 @@ int rtw_mp_txpower_index(struct net_device *dev,
|
|||||||
txpower_inx = mpt_ProQueryCalTxPower(padapter, rfpath);
|
txpower_inx = mpt_ProQueryCalTxPower(padapter, rfpath);
|
||||||
sprintf(extra, " %d", txpower_inx);
|
sprintf(extra, " %d", txpower_inx);
|
||||||
} else {
|
} else {
|
||||||
|
char *pextra = extra;
|
||||||
txpower_inx = mpt_ProQueryCalTxPower(padapter, 0);
|
txpower_inx = mpt_ProQueryCalTxPower(padapter, 0);
|
||||||
sprintf(extra, "patha=%d", txpower_inx);
|
pextra += sprintf(extra, "patha=%d", txpower_inx);
|
||||||
if (phal_data->rf_type > RF_1T2R) {
|
if (phal_data->rf_type > RF_1T2R) {
|
||||||
txpower_inx = mpt_ProQueryCalTxPower(padapter, 1);
|
txpower_inx = mpt_ProQueryCalTxPower(padapter, 1);
|
||||||
sprintf(extra, "%s,pathb=%d", extra, txpower_inx);
|
pextra += sprintf(pextra, ",pathb=%d", txpower_inx);
|
||||||
}
|
}
|
||||||
if (phal_data->rf_type > RF_2T4R) {
|
if (phal_data->rf_type > RF_2T4R) {
|
||||||
txpower_inx = mpt_ProQueryCalTxPower(padapter, 2);
|
txpower_inx = mpt_ProQueryCalTxPower(padapter, 2);
|
||||||
sprintf(extra, "%s,pathc=%d", extra, txpower_inx);
|
pextra += sprintf(pextra, ",pathc=%d", txpower_inx);
|
||||||
}
|
}
|
||||||
if (phal_data->rf_type > RF_3T4R) {
|
if (phal_data->rf_type > RF_3T4R) {
|
||||||
txpower_inx = mpt_ProQueryCalTxPower(padapter, 3);
|
txpower_inx = mpt_ProQueryCalTxPower(padapter, 3);
|
||||||
sprintf(extra, "%s,pathd=%d", extra, txpower_inx);
|
pextra += sprintf(pextra, ",pathd=%d", txpower_inx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wrqu->length = strlen(extra);
|
wrqu->length = strlen(extra);
|
||||||
@ -2254,6 +2255,7 @@ int rtw_efuse_mask_file(struct net_device *dev,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (strncmp(extra, "data,", 5) == 0) {
|
if (strncmp(extra, "data,", 5) == 0) {
|
||||||
|
char *pextra = extra;
|
||||||
u8 *pch;
|
u8 *pch;
|
||||||
char *ptmp, tmp;
|
char *ptmp, tmp;
|
||||||
u8 count = 0;
|
u8 count = 0;
|
||||||
@ -2284,11 +2286,11 @@ int rtw_efuse_mask_file(struct net_device *dev,
|
|||||||
} while (count < 64);
|
} while (count < 64);
|
||||||
|
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
sprintf(extra, "%s:%02x", extra, maskfileBuffer[i]);
|
pextra += sprintf(pextra, ":%02x", maskfileBuffer[i]);
|
||||||
|
|
||||||
padapter->registrypriv.bFileMaskEfuse = _TRUE;
|
padapter->registrypriv.bFileMaskEfuse = _TRUE;
|
||||||
|
|
||||||
sprintf(extra, "%s\nLoad Efuse Mask data %d hex ok\n", extra, count);
|
pextra += sprintf(pextra, "\nLoad Efuse Mask data %d hex ok\n", count);
|
||||||
wrqu->data.length = strlen(extra);
|
wrqu->data.length = strlen(extra);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -2711,16 +2713,18 @@ todo:
|
|||||||
mptbt_BtControlProcess(padapter, &BtReq);
|
mptbt_BtControlProcess(padapter, &BtReq);
|
||||||
|
|
||||||
if (readtherm == 0) {
|
if (readtherm == 0) {
|
||||||
sprintf(extra, "BT thermal=");
|
char *pextra = extra;
|
||||||
|
pextra += sprintf(pextra, "BT thermal=");
|
||||||
for (i = 4; i < pMptCtx->mptOutLen; i++) {
|
for (i = 4; i < pMptCtx->mptOutLen; i++) {
|
||||||
if ((pMptCtx->mptOutBuf[i] == 0x00) && (pMptCtx->mptOutBuf[i + 1] == 0x00))
|
if ((pMptCtx->mptOutBuf[i] == 0x00) && (pMptCtx->mptOutBuf[i + 1] == 0x00))
|
||||||
goto exit;
|
goto exit;
|
||||||
|
|
||||||
sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i] & 0x1f));
|
pextra += sprintf(pextra, " %d ", (pMptCtx->mptOutBuf[i] & 0x1f));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
char *pextra = extra + strlen(extra);
|
||||||
for (i = 4; i < pMptCtx->mptOutLen; i++)
|
for (i = 4; i < pMptCtx->mptOutLen; i++)
|
||||||
sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]);
|
pextra += sprintf(pextra, " 0x%x ", pMptCtx->mptOutBuf[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
|
Loading…
Reference in New Issue
Block a user