mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2024-11-26 15:14:02 +00:00
Minor cleanup. Finish merging code, for now.
This commit is contained in:
parent
e68310ce0d
commit
7240269e29
2
Makefile
2
Makefile
@ -25,6 +25,8 @@ CONFIG_RTL8821A = y
|
|||||||
CONFIG_RTL8814A = y
|
CONFIG_RTL8814A = y
|
||||||
######################### Interface ###########################
|
######################### Interface ###########################
|
||||||
CONFIG_USB_HCI = y
|
CONFIG_USB_HCI = y
|
||||||
|
########################### Android ###########################
|
||||||
|
CONFIG_SIGNAL_DISPLAY_DBM = y
|
||||||
########################## Features ###########################
|
########################## Features ###########################
|
||||||
CONFIG_NET_NS = y
|
CONFIG_NET_NS = y
|
||||||
CONFIG_MP_INCLUDED = y
|
CONFIG_MP_INCLUDED = y
|
||||||
|
@ -47,10 +47,6 @@ jackson@realtek.com.tw
|
|||||||
#include <drv_types.h>
|
#include <drv_types.h>
|
||||||
#include <hal_data.h>
|
#include <hal_data.h>
|
||||||
|
|
||||||
#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)
|
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_PLATFORM_RTL8197D)
|
||||||
#define rtw_le16_to_cpu(val) val
|
#define rtw_le16_to_cpu(val) val
|
||||||
#define rtw_le32_to_cpu(val) val
|
#define rtw_le32_to_cpu(val) val
|
||||||
|
@ -164,41 +164,7 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_WINDOWS
|
|
||||||
#if 0
|
#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)
|
static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
|
||||||
{
|
{
|
||||||
struct mp_wi_cntx *pmp_wi_cntx;
|
struct mp_wi_cntx *pmp_wi_cntx;
|
||||||
@ -741,15 +707,6 @@ MPT_DeInitAdapter(
|
|||||||
#if defined(CONFIG_RTL8723B)
|
#if defined(CONFIG_RTL8723B)
|
||||||
phy_set_bb_reg(pAdapter, 0xA01, BIT0, 1); /* /suggestion by jerry for MP Rx. */
|
phy_set_bb_reg(pAdapter, 0xA01, BIT0, 1); /* /suggestion by jerry for MP Rx. */
|
||||||
#endif
|
#endif
|
||||||
#if 0 /* for Windows */
|
|
||||||
PlatformFreeWorkItem(&(pMptCtx->MptWorkItem));
|
|
||||||
|
|
||||||
while (pMptCtx->bMptWorkItemInProgress) {
|
|
||||||
if (NdisWaitEvent(&(pMptCtx->MptWorkItemEvent), 50))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
NdisFreeSpinLock(&(pMptCtx->MptWorkItemSpinLock));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static u8 mpt_ProStartTest(PADAPTER padapter)
|
static u8 mpt_ProStartTest(PADAPTER padapter)
|
||||||
|
@ -23,10 +23,6 @@
|
|||||||
#error "CONFIG_USB_HCI shall be on!\n"
|
#error "CONFIG_USB_HCI shall be on!\n"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS)
|
|
||||||
#error "Shall be Linux or Windows, but not both!\n"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_80211N_HT
|
#ifdef CONFIG_80211N_HT
|
||||||
extern int rtw_ht_enable;
|
extern int rtw_ht_enable;
|
||||||
extern int rtw_bw_mode;
|
extern int rtw_bw_mode;
|
||||||
|
Loading…
Reference in New Issue
Block a user