skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 22:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some of the sparse warnings

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-09 16:00:41 -05:00
parent d4fa4d178f
commit 300892ebfd
14 changed files with 686 additions and 767 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/rtw_cmd.c
View file

@ -2301,7 +2301,7 @@ _func_exit_;
#endif #endif
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime) static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime)); rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime));
} }
@ -2344,7 +2344,7 @@ _func_exit_;
#endif #endif
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
void antenna_select_wk_hdl(_adapter *padapter, u8 antenna) static void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna)); rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna));
} }
@ -2605,7 +2605,7 @@ exit:
return res; return res;
} }
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) static s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
u8 buf[16]; u8 buf[16];

18
core/rtw_debug.c
View file

@ -84,7 +84,7 @@ int proc_get_write_reg(char *page, char **start,
return 0; return 0;
} }
int proc_set_write_reg(struct file *file, const char *buffer, int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -168,7 +168,7 @@ int proc_get_read_reg(char *page, char **start,
} }
int proc_set_read_reg(struct file *file, const char *buffer, int proc_set_read_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char tmp[16]; char tmp[16];
@ -651,7 +651,7 @@ int proc_get_rx_signal(char *page, char **start,
return len; return len;
} }
int proc_set_rx_signal(struct file *file, const char *buffer, int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -709,7 +709,7 @@ int proc_get_ht_enable(char *page, char **start,
return len; return len;
} }
int proc_set_ht_enable(struct file *file, const char *buffer, int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -756,7 +756,7 @@ int proc_get_cbw40_enable(char *page, char **start,
return len; return len;
} }
int proc_set_cbw40_enable(struct file *file, const char *buffer, int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -805,7 +805,7 @@ int proc_get_ampdu_enable(char *page, char **start,
return len; return len;
} }
int proc_set_ampdu_enable(struct file *file, const char *buffer, int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -874,7 +874,7 @@ int proc_get_rx_stbc(char *page, char **start,
return len; return len;
} }
int proc_set_rx_stbc(struct file *file, const char *buffer, int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -911,7 +911,7 @@ int proc_get_rssi_disp(char *page, char **start,
return 0; return 0;
} }
int proc_set_rssi_disp(struct file *file, const char *buffer, int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
@ -1134,7 +1134,7 @@ int proc_get_btcoex_dbg(char *page, char **start,
return len; return len;
} }
int proc_set_btcoex_dbg(struct file *file, const char *buffer, int proc_set_btcoex_dbg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;

15
core/rtw_mlme_ext.c
View file

@ -32,7 +32,7 @@
#include <rtl8723a_hal.h> #include <rtl8723a_hal.h>
#endif #endif
struct mlme_handler mlme_sta_tbl[]={ static struct mlme_handler mlme_sta_tbl[]={
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
{WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp},
{WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq}, {WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq},
@ -76,7 +76,7 @@ struct mlme_handler mlme_ap_tbl[]={
}; };
#endif #endif
struct action_handler OnAction_tbl[]={ static struct action_handler OnAction_tbl[]={
{RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct}, {RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct},
{RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos}, {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos},
{RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls}, {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls},
@ -91,7 +91,7 @@ struct action_handler OnAction_tbl[]={
}; };
u8 null_addr[ETH_ALEN]= {0,0,0,0,0,0}; static u8 null_addr[ETH_ALEN]= {0,0,0,0,0,0};
/************************************************** /**************************************************
OUI definitions for the vendor specific IE OUI definitions for the vendor specific IE
@ -113,12 +113,7 @@ extern unsigned char REALTEK_96B_IE[];
/******************************************************** /********************************************************
MCS rate definitions MCS rate definitions
*********************************************************/ *********************************************************/
#ifdef CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_2R_MCS13TO15_OFF[16] = {0xff, 0x1f, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
#else //CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
#endif //CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
/******************************************************** /********************************************************
@ -759,7 +754,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
} }
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da) static u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da)
{ {
bool response = _TRUE; bool response = _TRUE;
@ -2437,7 +2432,7 @@ unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} }
unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len) static unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
{ {
unsigned int ret = _FAIL; unsigned int ret = _FAIL;
struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv;

6
core/rtw_mp.c
View file

@ -886,7 +886,7 @@ void SetTxPower(PADAPTER pAdapter)
Hal_SetTxPower(pAdapter); Hal_SetTxPower(pAdapter);
} }
void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
{ {
u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC; u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC;
@ -970,13 +970,13 @@ void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart)
Hal_SetCarrierSuppressionTx(pAdapter, bStart); Hal_SetCarrierSuppressionTx(pAdapter, bStart);
} }
void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) static void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetCCKContinuousTx(pAdapter,bStart); Hal_SetCCKContinuousTx(pAdapter,bStart);
} }
void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) static void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetOFDMContinuousTx( pAdapter, bStart); Hal_SetOFDMContinuousTx( pAdapter, bStart);

2
core/rtw_mp_ioctl.c
View file

@ -869,7 +869,7 @@ _func_enter_;
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
_irqlevel_changed_(&oldirql, LOWER); _irqlevel_changed_(&oldirql, LOWER);
rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, 0); rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_; _func_exit_;

10
hal/odm_RTL8188E.c
View file

@ -45,7 +45,7 @@ ODM_DIG_LowerBound_88E(
} }
#if (defined(CONFIG_HW_ANTENNA_DIVERSITY)) #if (defined(CONFIG_HW_ANTENNA_DIVERSITY))
VOID static VOID
odm_RX_HWAntDivInit( odm_RX_HWAntDivInit(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
@ -83,7 +83,7 @@ odm_RX_HWAntDivInit(
//ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv //ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv
} }
VOID static VOID
odm_TRX_HWAntDivInit( odm_TRX_HWAntDivInit(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
@ -134,7 +134,7 @@ odm_TRX_HWAntDivInit(
//ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv //ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv
} }
VOID static VOID
odm_FastAntTrainingInit( odm_FastAntTrainingInit(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
@ -316,7 +316,7 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant)
} }
VOID static VOID
odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId) odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId)
{ {
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
@ -407,7 +407,7 @@ ODM_AntselStatistics_88E(
} }
#define TX_BY_REG 0 #define TX_BY_REG 0
VOID static VOID
odm_HWAntDiv( odm_HWAntDiv(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )

14
hal/rtl8188eu_led.c
View file

@ -22,8 +22,8 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#include <rtl8188e_led.h>
//================================================================================
// LED object. // LED object.
//================================================================================ //================================================================================
@ -41,11 +41,7 @@
// Description: // Description:
// Turn on LED according to LedPin specified. // Turn on LED according to LedPin specified.
// //
void void SwLedOn(_adapter *padapter, PLED_871x pLed)
SwLedOn(
_adapter *padapter,
PLED_871x pLed
)
{ {
u8 LedCfg; u8 LedCfg;
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -78,11 +74,7 @@ SwLedOn(
// Description: // Description:
// Turn off LED according to LedPin specified. // Turn off LED according to LedPin specified.
// //
void void SwLedOff(_adapter *padapter, PLED_871x pLed)
SwLedOff(
_adapter *padapter,
PLED_871x pLed
)
{ {
u8 LedCfg; u8 LedCfg;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);

13
include/rtl8188e_led.h
View file

@ -28,19 +28,10 @@
//================================================================================ //================================================================================
// Interface to manipulate LED objects. // Interface to manipulate LED objects.
//================================================================================ //================================================================================
#ifdef CONFIG_USB_HCI
void rtl8188eu_InitSwLeds(PADAPTER padapter); void rtl8188eu_InitSwLeds(PADAPTER padapter);
void rtl8188eu_DeInitSwLeds(PADAPTER padapter); void rtl8188eu_DeInitSwLeds(PADAPTER padapter);
#endif void SwLedOn(_adapter *padapter, PLED_871x pLed);
#ifdef CONFIG_PCI_HCI void SwLedOff(_adapter *padapter, PLED_871x pLed);
void rtl8188ee_gen_RefreshLedState(PADAPTER Adapter);
void rtl8188ee_InitSwLeds(PADAPTER padapter);
void rtl8188ee_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_SDIO_HCI
void rtl8188es_InitSwLeds(PADAPTER padapter);
void rtl8188es_DeInitSwLeds(PADAPTER padapter);
#endif
#endif #endif

16
include/rtw_debug.h
View file

@ -290,14 +290,14 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_write_reg(struct file *file, const char *buffer, int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
int proc_get_read_reg(char *page, char **start, int proc_get_read_reg(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_read_reg(struct file *file, const char *buffer, int proc_set_read_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
@ -401,7 +401,7 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_rx_signal(struct file *file, const char *buffer, int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
@ -409,28 +409,28 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_ht_enable(struct file *file, const char *buffer, int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
int proc_get_cbw40_enable(char *page, char **start, int proc_get_cbw40_enable(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_cbw40_enable(struct file *file, const char *buffer, int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
int proc_get_ampdu_enable(char *page, char **start, int proc_get_ampdu_enable(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_ampdu_enable(struct file *file, const char *buffer, int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
int proc_get_rx_stbc(char *page, char **start, int proc_get_rx_stbc(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_rx_stbc(struct file *file, const char *buffer, int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
@ -442,7 +442,7 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count, off_t offset, int count,
int *eof, void *data); int *eof, void *data);
int proc_set_rssi_disp(struct file *file, const char *buffer, int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data); unsigned long count, void *data);
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST

11
include/rtw_mlme.h
View file

@ -577,6 +577,14 @@ extern void hostapd_mode_unload(_adapter *padapter);
#endif #endif
extern unsigned char WPA_TKIP_CIPHER[4];
extern unsigned char RSN_TKIP_CIPHER[4];
extern unsigned char REALTEK_96B_IE[];
extern unsigned char MCS_rate_2R[16];
extern unsigned char MCS_rate_1R[16];
extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf); extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf);
extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf);
@ -585,6 +593,9 @@ extern void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf);
void indicate_wx_scan_complete_event(_adapter *padapter);
void rtw_indicate_wx_assoc_event(_adapter *padapter);
void rtw_indicate_wx_disassoc_event(_adapter *padapter);
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
extern thread_return event_thread(void *context); extern thread_return event_thread(void *context);

45
include/rtw_mp_ioctl.h
View file

@ -204,7 +204,7 @@ NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv);
#ifdef _RTW_MP_IOCTL_C_ #ifdef _RTW_MP_IOCTL_C_
const struct oid_obj_priv oid_rtl_seg_81_80_00[] = static const struct oid_obj_priv oid_rtl_seg_81_80_00[] =
{ {
{1, &oid_null_function}, //0x00 OID_RT_PRO_RESET_DUT {1, &oid_null_function}, //0x00 OID_RT_PRO_RESET_DUT
{1, &oid_rt_pro_set_data_rate_hdl}, //0x01 {1, &oid_rt_pro_set_data_rate_hdl}, //0x01
@ -241,7 +241,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_00[] =
}; };
const struct oid_obj_priv oid_rtl_seg_81_80_20[] = static const struct oid_obj_priv oid_rtl_seg_81_80_20[] =
{ {
{1, &oid_null_function}, //0x20 OID_RT_PRO_READ_POWER_CONTROL {1, &oid_null_function}, //0x20 OID_RT_PRO_READ_POWER_CONTROL
{1, &oid_null_function}, //0x21 OID_RT_PRO_WRITE_EEPROM {1, &oid_null_function}, //0x21 OID_RT_PRO_WRITE_EEPROM
@ -262,7 +262,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_20[] =
}; };
const struct oid_obj_priv oid_rtl_seg_81_80_40[] = static const struct oid_obj_priv oid_rtl_seg_81_80_40[] =
{ {
{1, &oid_null_function}, //0x40 {1, &oid_null_function}, //0x40
{1, &oid_null_function}, //0x41 {1, &oid_null_function}, //0x41
@ -272,7 +272,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_40[] =
{1, &oid_null_function} //0x45 {1, &oid_null_function} //0x45
}; };
const struct oid_obj_priv oid_rtl_seg_81_80_80[] = static const struct oid_obj_priv oid_rtl_seg_81_80_80[] =
{ {
{1, &oid_null_function}, //0x80 OID_RT_DRIVER_OPTION {1, &oid_null_function}, //0x80 OID_RT_DRIVER_OPTION
{1, &oid_null_function}, //0x81 OID_RT_RF_OFF {1, &oid_null_function}, //0x81 OID_RT_RF_OFF
@ -280,12 +280,12 @@ const struct oid_obj_priv oid_rtl_seg_81_80_80[] =
}; };
const struct oid_obj_priv oid_rtl_seg_81_85[] = static const struct oid_obj_priv oid_rtl_seg_81_85[] =
{ {
{1, &oid_rt_wireless_mode_hdl} //0x00 OID_RT_WIRELESS_MODE {1, &oid_rt_wireless_mode_hdl} //0x00 OID_RT_WIRELESS_MODE
}; };
struct oid_obj_priv oid_rtl_seg_81_87[] = static struct oid_obj_priv oid_rtl_seg_81_87[] =
{ {
{1, &oid_null_function}, //0x80 OID_RT_PRO8187_WI_POLL {1, &oid_null_function}, //0x80 OID_RT_PRO8187_WI_POLL
{1, &oid_rt_pro_write_bb_reg_hdl}, //0x81 {1, &oid_rt_pro_write_bb_reg_hdl}, //0x81
@ -294,7 +294,7 @@ struct oid_obj_priv oid_rtl_seg_81_87[] =
{1, &oid_rt_pro_read_rf_reg_hdl} //0x83 {1, &oid_rt_pro_read_rf_reg_hdl} //0x83
}; };
struct oid_obj_priv oid_rtl_seg_87_11_00[] = static struct oid_obj_priv oid_rtl_seg_87_11_00[] =
{ {
{1, &oid_rt_pro8711_join_bss_hdl}, //0x00 //S {1, &oid_rt_pro8711_join_bss_hdl}, //0x00 //S
{1, &oid_rt_pro_read_register_hdl}, //0x01 {1, &oid_rt_pro_read_register_hdl}, //0x01
@ -330,7 +330,7 @@ struct oid_obj_priv oid_rtl_seg_87_11_00[] =
{1, &oid_rt_poll_rx_status_hdl} //0X1F {1, &oid_rt_poll_rx_status_hdl} //0X1F
}; };
struct oid_obj_priv oid_rtl_seg_87_11_20[] = static struct oid_obj_priv oid_rtl_seg_87_11_20[] =
{ {
{1, &oid_rt_pro_cfg_debug_message_hdl}, //0x20 {1, &oid_rt_pro_cfg_debug_message_hdl}, //0x20
{1, &oid_rt_pro_set_data_rate_ex_hdl}, //0x21 {1, &oid_rt_pro_set_data_rate_ex_hdl}, //0x21
@ -340,23 +340,23 @@ struct oid_obj_priv oid_rtl_seg_87_11_20[] =
}; };
struct oid_obj_priv oid_rtl_seg_87_11_50[] = static struct oid_obj_priv oid_rtl_seg_87_11_50[] =
{ {
{1, &oid_rt_pro_qry_pwrstate_hdl}, //0x50 {1, &oid_rt_pro_qry_pwrstate_hdl}, //0x50
{1, &oid_rt_pro_set_pwrstate_hdl} //0x51 {1, &oid_rt_pro_set_pwrstate_hdl} //0x51
}; };
struct oid_obj_priv oid_rtl_seg_87_11_80[] = static struct oid_obj_priv oid_rtl_seg_87_11_80[] =
{ {
{1, &oid_null_function} //0x80 {1, &oid_null_function} //0x80
}; };
struct oid_obj_priv oid_rtl_seg_87_11_B0[] = static struct oid_obj_priv oid_rtl_seg_87_11_B0[] =
{ {
{1, &oid_null_function} //0xB0 {1, &oid_null_function} //0xB0
}; };
struct oid_obj_priv oid_rtl_seg_87_11_F0[] = static struct oid_obj_priv oid_rtl_seg_87_11_F0[] =
{ {
{1, &oid_null_function}, //0xF0 {1, &oid_null_function}, //0xF0
{1, &oid_null_function}, //0xF1 {1, &oid_null_function}, //0xF1
@ -377,7 +377,7 @@ struct oid_obj_priv oid_rtl_seg_87_11_F0[] =
}; };
struct oid_obj_priv oid_rtl_seg_87_12_00[]= static struct oid_obj_priv oid_rtl_seg_87_12_00[]=
{ {
{1, &oid_rt_pro_encryption_ctrl_hdl}, //0x00 Q&S {1, &oid_rt_pro_encryption_ctrl_hdl}, //0x00 Q&S
{1, &oid_rt_pro_add_sta_info_hdl}, //0x01 S {1, &oid_rt_pro_add_sta_info_hdl}, //0x01 S
@ -403,25 +403,6 @@ struct oid_obj_priv oid_rtl_seg_87_12_00[]=
{1, &oid_rt_get_power_mode_hdl} //0x15 Q OID_RT_GET_POWER_MODE {1, &oid_rt_get_power_mode_hdl} //0x15 Q OID_RT_GET_POWER_MODE
}; };
#else /* _RTL871X_MP_IOCTL_C_ */
extern struct oid_obj_priv oid_rtl_seg_81_80_00[32];
extern struct oid_obj_priv oid_rtl_seg_81_80_20[16];
extern struct oid_obj_priv oid_rtl_seg_81_80_40[6];
extern struct oid_obj_priv oid_rtl_seg_81_80_80[3];
extern struct oid_obj_priv oid_rtl_seg_81_85[1];
extern struct oid_obj_priv oid_rtl_seg_81_87[5];
extern struct oid_obj_priv oid_rtl_seg_87_11_00[32];
extern struct oid_obj_priv oid_rtl_seg_87_11_20[5];
extern struct oid_obj_priv oid_rtl_seg_87_11_50[2];
extern struct oid_obj_priv oid_rtl_seg_87_11_80[1];
extern struct oid_obj_priv oid_rtl_seg_87_11_B0[1];
extern struct oid_obj_priv oid_rtl_seg_87_11_F0[16];
extern struct oid_obj_priv oid_rtl_seg_87_12_00[32];
#endif /* _RTL871X_MP_IOCTL_C_ */ #endif /* _RTL871X_MP_IOCTL_C_ */
struct rwreg_param{ struct rwreg_param{

68
os_dep/ioctl_linux.c
View file

@ -96,7 +96,7 @@ extern u8 key_2char2num(u8 hch, u8 lch);
extern u8 str_2char2num(u8 hch, u8 lch); extern u8 str_2char2num(u8 hch, u8 lch);
extern u8 convert_ip_addr(u8 hch, u8 mch, u8 lch); extern u8 convert_ip_addr(u8 hch, u8 mch, u8 lch);
u32 rtw_rates[] = {1000000,2000000,5500000,11000000, static u32 rtw_rates[] = {1000000,2000000,5500000,11000000,
6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000}; 6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000};
static const char * const iw_operation_mode[] = static const char * const iw_operation_mode[] =
@ -3799,7 +3799,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
break; break;
case GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO): case GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO):
DBG_871X("==> trigger gpio 0\n"); DBG_871X("==> trigger gpio 0\n");
rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, 0); rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, NULL);
break; break;
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
case GEN_MP_IOCTL_SUBCODE(SET_DM_BT): case GEN_MP_IOCTL_SUBCODE(SET_DM_BT):
@ -4044,7 +4044,7 @@ static int rtw_get_ap_info(struct net_device *dev,
if (pdata->length>=34) if (pdata->length>=34)
{ {
if (copy_to_user((u8*)pdata->pointer+32, (u8*)&pdata->flags, 1)) if (copy_to_user(pdata->pointer+32, (u8*)&pdata->flags, 1))
{ {
ret= -EINVAL; ret= -EINVAL;
goto exit; goto exit;
@ -6480,57 +6480,7 @@ exit:
} }
#if 0 static void mac_reg_dump(_adapter *padapter)
void mac_reg_dump(_adapter *padapter)
{
int i,j=1;
DBG_871X("\n======= MAC REG =======\n");
for (i=0x0;i<0x300;i+=4)
{
if (j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if ((j++)%4 == 0) DBG_871X("\n");
}
for (i=0x400;i<0x800;i+=4)
{
if (j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if ((j++)%4 == 0) DBG_871X("\n");
}
}
void bb_reg_dump(_adapter *padapter)
{
int i,j=1;
DBG_871X("\n======= BB REG =======\n");
for (i=0x800;i<0x1000;i+=4)
{
if (j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if ((j++)%4 == 0) DBG_871X("\n");
}
}
void rf_reg_dump(_adapter *padapter)
{
int i,j=1,path;
u32 value;
DBG_871X("\n======= RF REG =======\n");
for (path=0;path<2;path++)
{
DBG_871X("\nRF_Path(%x)\n",path);
for (i=0;i<0x100;i++)
{
value = PHY_QueryRFReg(padapter, (RF_RADIO_PATH_E)path,i, bMaskDWord);
if (j%4==1) DBG_871X("0x%02x ",i);
DBG_871X(" 0x%08x ",value);
if ((j++)%4==0) DBG_871X("\n");
}
}
}
#endif
void mac_reg_dump(_adapter *padapter)
{ {
int i,j=1; int i,j=1;
printk("\n======= MAC REG =======\n"); printk("\n======= MAC REG =======\n");
@ -6547,7 +6497,8 @@ void mac_reg_dump(_adapter *padapter)
if ((j++)%4 == 0) printk("\n"); if ((j++)%4 == 0) printk("\n");
} }
} }
void bb_reg_dump(_adapter *padapter)
static void bb_reg_dump(_adapter *padapter)
{ {
int i,j=1; int i,j=1;
printk("\n======= BB REG =======\n"); printk("\n======= BB REG =======\n");
@ -6559,7 +6510,8 @@ void bb_reg_dump(_adapter *padapter)
if ((j++)%4 == 0) printk("\n"); if ((j++)%4 == 0) printk("\n");
} }
} }
void rf_reg_dump(_adapter *padapter)
static void rf_reg_dump(_adapter *padapter)
{ {
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;
@ -8833,7 +8785,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
struct pwrctrl_priv *pwrctrlpriv ; struct pwrctrl_priv *pwrctrlpriv ;
u8 *data = NULL; u8 *data = NULL;
u8 *rawdata = NULL; u8 *rawdata = NULL;
char *pch, *ptmp, *token, *tmp[3]={0x00,0x00,0x00}; char *pch, *ptmp, *token, *tmp[3]={NULL, NULL, NULL};
u16 i=0, j=0, mapLen=0, addr=0, cnts=0; u16 i=0, j=0, mapLen=0, addr=0, cnts=0;
u16 max_available_size=0, raw_cursize=0, raw_maxsize=0; u16 max_available_size=0, raw_cursize=0, raw_maxsize=0;
int err; int err;
@ -9340,7 +9292,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
u8 *ShadowMapBT = NULL; u8 *ShadowMapBT = NULL;
u8 *ShadowMapWiFi = NULL; u8 *ShadowMapWiFi = NULL;
u8 *setrawdata = NULL; u8 *setrawdata = NULL;
char *pch, *ptmp, *token, *tmp[3]={0x00,0x00,0x00}; char *pch, *ptmp, *token, *tmp[3] = {NULL, NULL, NULL};
u16 addr=0, cnts=0, max_available_size=0; u16 addr=0, cnts=0, max_available_size=0;
int err; int err;

3
os_dep/mlme_linux.c
View file

@ -137,9 +137,6 @@ void rtw_init_mlme_timer(_adapter *padapter)
#endif #endif
} }
extern void rtw_indicate_wx_assoc_event(_adapter *padapter);
extern void rtw_indicate_wx_disassoc_event(_adapter *padapter);
void rtw_os_indicate_connect(_adapter *adapter) void rtw_os_indicate_connect(_adapter *adapter)
{ {