mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-10 15:39:38 +00:00
rtl8188eu: Remove CONFIG_USB_RX_AGGREGATION
This symbol is always defined. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
3263fc1330
commit
5a7239faf3
5 changed files with 11 additions and 37 deletions
|
@ -128,13 +128,11 @@ static void rtl8188eu_interface_configure(struct adapter *padapter)
|
||||||
pHalData->UsbTxAggMode = 1;
|
pHalData->UsbTxAggMode = 1;
|
||||||
pHalData->UsbTxAggDescNum = 0x6; /* only 4 bits */
|
pHalData->UsbTxAggDescNum = 0x6; /* only 4 bits */
|
||||||
|
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
pHalData->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */
|
pHalData->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */
|
||||||
pHalData->UsbRxAggBlockCount = 8; /* unit : 512b */
|
pHalData->UsbRxAggBlockCount = 8; /* unit : 512b */
|
||||||
pHalData->UsbRxAggBlockTimeout = 0x6;
|
pHalData->UsbRxAggBlockTimeout = 0x6;
|
||||||
pHalData->UsbRxAggPageCount = 48; /* uint :128 b 0x0A; 10 = MAX_RX_DMA_BUFFER_SIZE/2/pHalData->UsbBulkOutSize */
|
pHalData->UsbRxAggPageCount = 48; /* uint :128 b 0x0A; 10 = MAX_RX_DMA_BUFFER_SIZE/2/pHalData->UsbBulkOutSize */
|
||||||
pHalData->UsbRxAggPageTimeout = 0x4; /* 6, absolute time = 34ms/(2^6) */
|
pHalData->UsbRxAggPageTimeout = 0x4; /* 6, absolute time = 34ms/(2^6) */
|
||||||
#endif
|
|
||||||
|
|
||||||
HalUsbSetQueuePipeMapping8188EUsb(padapter,
|
HalUsbSetQueuePipeMapping8188EUsb(padapter,
|
||||||
pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
|
pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
|
||||||
|
@ -873,7 +871,6 @@ usb_AggSettingRxUpdate(
|
||||||
IN struct adapter * Adapter
|
IN struct adapter * Adapter
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||||
/* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */
|
/* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */
|
||||||
u8 valueDMA;
|
u8 valueDMA;
|
||||||
|
@ -951,7 +948,6 @@ usb_AggSettingRxUpdate(
|
||||||
/* RT_ASSERT(FALSE, ("RX_PAGE_SIZE_REG_VALUE definition is incorrect!\n")); */
|
/* RT_ASSERT(FALSE, ("RX_PAGE_SIZE_REG_VALUE definition is incorrect!\n")); */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
} /* usb_AggSettingRxUpdate */
|
} /* usb_AggSettingRxUpdate */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2993,7 +2989,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case HW_VAR_RXDMA_AGG_PG_TH:
|
case HW_VAR_RXDMA_AGG_PG_TH:
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
{
|
{
|
||||||
u8 threshold = *((u8 *)val);
|
u8 threshold = *((u8 *)val);
|
||||||
if( threshold == 0)
|
if( threshold == 0)
|
||||||
|
@ -3002,7 +2997,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
||||||
}
|
}
|
||||||
rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold);
|
rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
case HW_VAR_SET_RPWM:
|
case HW_VAR_SET_RPWM:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -585,9 +585,7 @@ static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb)
|
||||||
recvframe_put(precvframe, skb_len);
|
recvframe_put(precvframe, skb_len);
|
||||||
/* recvframe_pull(precvframe, drvinfo_sz + RXDESC_SIZE); */
|
/* recvframe_pull(precvframe, drvinfo_sz + RXDESC_SIZE); */
|
||||||
|
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
switch(pHalData->UsbRxAggMode) {
|
||||||
switch(pHalData->UsbRxAggMode)
|
|
||||||
{
|
|
||||||
case USB_RX_AGG_DMA:
|
case USB_RX_AGG_DMA:
|
||||||
case USB_RX_AGG_MIX:
|
case USB_RX_AGG_MIX:
|
||||||
pkt_offset = (u16)_RND128(pkt_offset);
|
pkt_offset = (u16)_RND128(pkt_offset);
|
||||||
|
@ -599,7 +597,6 @@ static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb)
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (pattrib->pkt_rpt_type == NORMAL_RX)/* Normal rx packet */
|
if (pattrib->pkt_rpt_type == NORMAL_RX)/* Normal rx packet */
|
||||||
{
|
{
|
||||||
|
|
|
@ -85,8 +85,6 @@
|
||||||
* Interface Related Config
|
* Interface Related Config
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFIG_USB_RX_AGGREGATION
|
|
||||||
|
|
||||||
#define CONFIG_PREALLOC_RECV_SKB
|
#define CONFIG_PREALLOC_RECV_SKB
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -144,8 +144,6 @@ typedef struct _RT_8188E_FIRMWARE_HDR
|
||||||
#define DRIVER_EARLY_INT_TIME 0x05
|
#define DRIVER_EARLY_INT_TIME 0x05
|
||||||
#define BCN_DMA_ATIME_INT_TIME 0x02
|
#define BCN_DMA_ATIME_INT_TIME 0x02
|
||||||
|
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
|
|
||||||
typedef enum _USB_RX_AGG_MODE{
|
typedef enum _USB_RX_AGG_MODE{
|
||||||
USB_RX_AGG_DISABLE,
|
USB_RX_AGG_DISABLE,
|
||||||
USB_RX_AGG_DMA,
|
USB_RX_AGG_DMA,
|
||||||
|
@ -153,10 +151,6 @@ typedef enum _USB_RX_AGG_MODE{
|
||||||
USB_RX_AGG_MIX
|
USB_RX_AGG_MIX
|
||||||
}USB_RX_AGG_MODE;
|
}USB_RX_AGG_MODE;
|
||||||
|
|
||||||
//#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define MAX_RX_DMA_BUFFER_SIZE_88E 0x2400 //9k for 88E nornal chip , //MaxRxBuff=10k-max(TxReportSize(64*8), WOLPattern(16*24))
|
#define MAX_RX_DMA_BUFFER_SIZE_88E 0x2400 //9k for 88E nornal chip , //MaxRxBuff=10k-max(TxReportSize(64*8), WOLPattern(16*24))
|
||||||
|
|
||||||
|
@ -483,7 +477,6 @@ typedef struct hal_data_8188e
|
||||||
u8 C2hArray[16];
|
u8 C2hArray[16];
|
||||||
u8 UsbTxAggMode;
|
u8 UsbTxAggMode;
|
||||||
u8 UsbTxAggDescNum;
|
u8 UsbTxAggDescNum;
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
u16 HwRxPageSize; // Hardware setting
|
u16 HwRxPageSize; // Hardware setting
|
||||||
u32 MaxUsbRxAggBlock;
|
u32 MaxUsbRxAggBlock;
|
||||||
|
|
||||||
|
@ -492,7 +485,6 @@ typedef struct hal_data_8188e
|
||||||
u8 UsbRxAggBlockTimeout;
|
u8 UsbRxAggBlockTimeout;
|
||||||
u8 UsbRxAggPageCount; // 8192C DMA page count
|
u8 UsbRxAggPageCount; // 8192C DMA page count
|
||||||
u8 UsbRxAggPageTimeout;
|
u8 UsbRxAggPageTimeout;
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_TX_EARLY_MODE
|
#ifdef CONFIG_TX_EARLY_MODE
|
||||||
u8 bEarlyModeEnable;
|
u8 bEarlyModeEnable;
|
||||||
|
|
|
@ -181,8 +181,6 @@ typedef struct _RT_8192C_FIRMWARE_HDR {//8-byte alinment required
|
||||||
#define DRIVER_EARLY_INT_TIME 0x05
|
#define DRIVER_EARLY_INT_TIME 0x05
|
||||||
#define BCN_DMA_ATIME_INT_TIME 0x02
|
#define BCN_DMA_ATIME_INT_TIME 0x02
|
||||||
|
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
|
|
||||||
typedef enum _USB_RX_AGG_MODE{
|
typedef enum _USB_RX_AGG_MODE{
|
||||||
USB_RX_AGG_DISABLE,
|
USB_RX_AGG_DISABLE,
|
||||||
USB_RX_AGG_DMA,
|
USB_RX_AGG_DMA,
|
||||||
|
@ -192,9 +190,6 @@ typedef enum _USB_RX_AGG_MODE{
|
||||||
|
|
||||||
#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer
|
#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define TX_SELE_HQ BIT(0) // High Queue
|
#define TX_SELE_HQ BIT(0) // High Queue
|
||||||
#define TX_SELE_LQ BIT(1) // Low Queue
|
#define TX_SELE_LQ BIT(1) // Low Queue
|
||||||
#define TX_SELE_NQ BIT(2) // Normal Queue
|
#define TX_SELE_NQ BIT(2) // Normal Queue
|
||||||
|
@ -479,7 +474,6 @@ struct hal_data_8192cu
|
||||||
|
|
||||||
u8 UsbTxAggMode;
|
u8 UsbTxAggMode;
|
||||||
u8 UsbTxAggDescNum;
|
u8 UsbTxAggDescNum;
|
||||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
|
||||||
u16 HwRxPageSize; // Hardware setting
|
u16 HwRxPageSize; // Hardware setting
|
||||||
u32 MaxUsbRxAggBlock;
|
u32 MaxUsbRxAggBlock;
|
||||||
|
|
||||||
|
@ -488,7 +482,6 @@ struct hal_data_8192cu
|
||||||
u8 UsbRxAggBlockTimeout;
|
u8 UsbRxAggBlockTimeout;
|
||||||
u8 UsbRxAggPageCount; // 8192C DMA page count
|
u8 UsbRxAggPageCount; // 8192C DMA page count
|
||||||
u8 UsbRxAggPageTimeout;
|
u8 UsbRxAggPageTimeout;
|
||||||
#endif
|
|
||||||
|
|
||||||
// 2010/12/10 MH Add for USB aggreation mode dynamic shceme.
|
// 2010/12/10 MH Add for USB aggreation mode dynamic shceme.
|
||||||
BOOLEAN UsbRxHighSpeedMode;
|
BOOLEAN UsbRxHighSpeedMode;
|
||||||
|
|
Loading…
Reference in a new issue