staging: rtl8723au: Disentangle chip_configure from HAL wrappers
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
db20a02baf
commit
82ccb59724
|
@ -22,12 +22,6 @@
|
||||||
#include <usb_hal.h>
|
#include <usb_hal.h>
|
||||||
#include <rtl8723a_hal.h>
|
#include <rtl8723a_hal.h>
|
||||||
|
|
||||||
void rtw_hal_chip_configure23a(struct rtw_adapter *padapter)
|
|
||||||
{
|
|
||||||
if (padapter->HalFunc.intf_chip_configure)
|
|
||||||
padapter->HalFunc.intf_chip_configure(padapter);
|
|
||||||
}
|
|
||||||
|
|
||||||
void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter)
|
void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter)
|
||||||
{
|
{
|
||||||
if (padapter->HalFunc.InitSwLeds)
|
if (padapter->HalFunc.InitSwLeds)
|
||||||
|
|
|
@ -82,7 +82,7 @@ static bool rtl8723au_set_queue_pipe_mapping(struct rtw_adapter *pAdapter,
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rtl8723au_interface_configure(struct rtw_adapter *padapter)
|
void rtl8723au_chip_configure(struct rtw_adapter *padapter)
|
||||||
{
|
{
|
||||||
struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
|
struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
|
||||||
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
|
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
|
||||||
|
@ -1745,7 +1745,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
|
||||||
pHalFunc->InitSwLeds = NULL;
|
pHalFunc->InitSwLeds = NULL;
|
||||||
pHalFunc->DeInitSwLeds = NULL;
|
pHalFunc->DeInitSwLeds = NULL;
|
||||||
|
|
||||||
pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;
|
|
||||||
pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
|
pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
|
||||||
pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;
|
pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;
|
||||||
pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;
|
pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;
|
||||||
|
|
|
@ -73,8 +73,6 @@ struct hal_ops {
|
||||||
void (*InitSwLeds)(struct rtw_adapter *padapter);
|
void (*InitSwLeds)(struct rtw_adapter *padapter);
|
||||||
void (*DeInitSwLeds)(struct rtw_adapter *padapter);
|
void (*DeInitSwLeds)(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
void (*intf_chip_configure)(struct rtw_adapter *padapter);
|
|
||||||
|
|
||||||
void (*enable_interrupt)(struct rtw_adapter *padapter);
|
void (*enable_interrupt)(struct rtw_adapter *padapter);
|
||||||
void (*disable_interrupt)(struct rtw_adapter *padapter);
|
void (*disable_interrupt)(struct rtw_adapter *padapter);
|
||||||
s32 (*interrupt_handler)(struct rtw_adapter *padapter);
|
s32 (*interrupt_handler)(struct rtw_adapter *padapter);
|
||||||
|
@ -179,8 +177,6 @@ uint rtw_hal_init23a(struct rtw_adapter *padapter);
|
||||||
uint rtw_hal_deinit23a(struct rtw_adapter *padapter);
|
uint rtw_hal_deinit23a(struct rtw_adapter *padapter);
|
||||||
void rtw_hal_stop(struct rtw_adapter *padapter);
|
void rtw_hal_stop(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
void rtw_hal_chip_configure23a(struct rtw_adapter *padapter);
|
|
||||||
|
|
||||||
u8 rtw_hal_set_def_var23a(struct rtw_adapter *padapter,
|
u8 rtw_hal_set_def_var23a(struct rtw_adapter *padapter,
|
||||||
enum hal_def_variable eVariable,
|
enum hal_def_variable eVariable,
|
||||||
void *pValue);
|
void *pValue);
|
||||||
|
|
|
@ -94,5 +94,6 @@ static inline u8 rtw_usb_bulk_size_boundary(struct rtw_adapter *padapter,
|
||||||
|
|
||||||
int rtl8723au_inirp_init(struct rtw_adapter *Adapter);
|
int rtl8723au_inirp_init(struct rtw_adapter *Adapter);
|
||||||
int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter);
|
int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter);
|
||||||
|
void rtl8723au_chip_configure(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
#endif /* __USB_OPS_H_ */
|
#endif /* __USB_OPS_H_ */
|
||||||
|
|
|
@ -629,7 +629,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
|
||||||
rtl8723a_read_chip_version(padapter);
|
rtl8723a_read_chip_version(padapter);
|
||||||
|
|
||||||
/* step usb endpoint mapping */
|
/* step usb endpoint mapping */
|
||||||
rtw_hal_chip_configure23a(padapter);
|
rtl8723au_chip_configure(padapter);
|
||||||
|
|
||||||
/* step read efuse/eeprom data and get mac_addr */
|
/* step read efuse/eeprom data and get mac_addr */
|
||||||
rtl8723a_read_adapter_info(padapter);
|
rtl8723a_read_adapter_info(padapter);
|
||||||
|
|
Loading…
Reference in a new issue