rtl8723ds: Remove code for FREEBSD, OS_XP and OS_CE

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2017-10-16 21:04:14 -05:00
parent c3c991544f
commit 58d8344823
40 changed files with 133 additions and 1473 deletions

View File

@ -171,15 +171,6 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
pevtpriv->c2h_mem = pevtpriv->allocated_c2h_mem + 4\ pevtpriv->c2h_mem = pevtpriv->allocated_c2h_mem + 4\
- ((u32)(pevtpriv->allocated_c2h_mem) & 3); - ((u32)(pevtpriv->allocated_c2h_mem) & 3);
#ifdef PLATFORM_OS_XP
pevtpriv->pc2h_mdl = IoAllocateMdl((u8 *)pevtpriv->c2h_mem, C2H_MEM_SZ , FALSE, FALSE, NULL);
if (pevtpriv->pc2h_mdl == NULL) {
res = _FAIL;
goto exit;
}
MmBuildMdlForNonPagedPool(pevtpriv->pc2h_mdl);
#endif
#endif /* end of CONFIG_SDIO_HCI */ #endif /* end of CONFIG_SDIO_HCI */
_rtw_init_queue(&(pevtpriv->evt_queue)); _rtw_init_queue(&(pevtpriv->evt_queue));

View File

@ -19,10 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_MP_C_ #define _RTW_MP_C_
#include <drv_types.h> #include <drv_types.h>
#ifdef PLATFORM_FREEBSD
#include <sys/unistd.h> /* for RFHIGHPID */
#endif
#include "../hal/phydm/phydm_precomp.h" #include "../hal/phydm/phydm_precomp.h"
#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8821A) #if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8821A)
#include <rtw_bt_mp.h> #include <rtw_bt_mp.h>
@ -1766,17 +1762,6 @@ void SetPacketTx(PADAPTER padapter)
if (IS_ERR(pmp_priv->tx.PktTxThread)) if (IS_ERR(pmp_priv->tx.PktTxThread))
RTW_INFO("Create PktTx Thread Fail !!!!!\n"); RTW_INFO("Create PktTx Thread Fail !!!!!\n");
#endif #endif
#ifdef PLATFORM_FREEBSD
{
struct proc *p;
struct thread *td;
pmp_priv->tx.PktTxThread = kproc_kthread_add(mp_xmit_packet_thread, pmp_priv,
&p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread");
if (pmp_priv->tx.PktTxThread < 0)
RTW_INFO("Create PktTx Thread Fail !!!!!\n");
}
#endif
Rtw_MPSetMacTxEDCA(padapter); Rtw_MPSetMacTxEDCA(padapter);
exit: exit:

View File

@ -47,9 +47,6 @@ NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
/* **************** oid_rtl_seg_81_87_80 section start **************** */ /* **************** oid_rtl_seg_81_87_80 section start **************** */
NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
struct bb_reg_param *pbbreg; struct bb_reg_param *pbbreg;
u16 offset; u16 offset;
u32 value; u32 value;
@ -83,9 +80,6 @@ NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
struct bb_reg_param *pbbreg; struct bb_reg_param *pbbreg;
u16 offset; u16 offset;
u32 value; u32 value;
@ -119,9 +113,6 @@ NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
struct rf_reg_param *pbbreg; struct rf_reg_param *pbbreg;
u8 path; u8 path;
u8 offset; u8 offset;
@ -161,9 +152,6 @@ NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
struct rf_reg_param *pbbreg; struct rf_reg_param *pbbreg;
u8 path; u8 path;
u8 offset; u8 offset;
@ -208,9 +196,6 @@ NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
* ------------------------------------------------------------------------------ */ * ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 ratevalue;/* 4 */ u32 ratevalue;/* 4 */
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -239,9 +224,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 mode; u32 mode;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -276,9 +258,6 @@ exit:
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -298,9 +277,6 @@ NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 Channel; u32 Channel;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -333,9 +309,6 @@ NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u16 bandwidth; u16 bandwidth;
u16 channel_offset; u16 channel_offset;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -368,9 +341,6 @@ NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 antenna; u32 antenna;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -400,9 +370,6 @@ NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 tx_pwr_idx; u32 tx_pwr_idx;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -535,9 +502,6 @@ NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_pa
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -557,9 +521,6 @@ NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_p
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -584,9 +545,6 @@ NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -612,9 +570,6 @@ NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_p
/* **************** oid_rtl_seg_81_80_20 section end **************** */ /* **************** oid_rtl_seg_81_80_20 section end **************** */
NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -647,9 +602,6 @@ NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -682,9 +634,6 @@ NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_p
NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -717,9 +666,6 @@ NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_
NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -748,9 +694,6 @@ NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
{ {
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -770,9 +713,6 @@ NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PNDIS_802_11_SSID pssid; PNDIS_802_11_SSID pssid;
@ -806,9 +746,6 @@ NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pRW_Reg RegRWStruct; pRW_Reg RegRWStruct;
u32 offset, width; u32 offset, width;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -851,9 +788,6 @@ NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pRW_Reg RegRWStruct; pRW_Reg RegRWStruct;
u32 offset, width, value; u32 offset, width, value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -907,9 +841,6 @@ NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
#if 0 #if 0
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pBurst_RW_Reg pBstRwReg; pBurst_RW_Reg pBstRwReg;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -938,9 +869,6 @@ NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_pri
NDIS_STATUS oid_rt_pro_burst_write_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_burst_write_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
#if 0 #if 0
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pBurst_RW_Reg pBstRwReg; pBurst_RW_Reg pBstRwReg;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -971,10 +899,6 @@ NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv)
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
TX_CMD_Desc *TxCmd_Info; TX_CMD_Desc *TxCmd_Info;
@ -1004,9 +928,6 @@ NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
{ {
#if 0 #if 0
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pEEPROM_RWParam pEEPROM; pEEPROM_RWParam pEEPROM;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -1036,9 +957,6 @@ NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_write16_eeprom_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
{ {
#if 0 #if 0
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
pEEPROM_RWParam pEEPROM; pEEPROM_RWParam pEEPROM;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -1131,9 +1049,6 @@ NDIS_STATUS oid_rt_rd_attrib_mem_hdl(struct oid_par_priv *poid_par_priv)
struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue; struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue;
struct intf_hdl *pintfhdl = &pio_queue->intf; struct intf_hdl *pintfhdl = &pio_queue->intf;
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
@ -1171,9 +1086,6 @@ NDIS_STATUS oid_rt_wr_attrib_mem_hdl(struct oid_par_priv *poid_par_priv)
struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue; struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue;
struct intf_hdl *pintfhdl = &pio_queue->intf; struct intf_hdl *pintfhdl = &pio_queue->intf;
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
@ -1207,9 +1119,6 @@ NDIS_STATUS oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1292,9 +1201,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
{ {
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1315,9 +1221,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
/* ----------------------------------------------------------------------------- */ /* ----------------------------------------------------------------------------- */
NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
u8 thermal = 0; u8 thermal = 0;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -1346,9 +1249,6 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1385,9 +1285,6 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -1417,9 +1314,6 @@ NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv
NDIS_STATUS oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv *poid_par_priv)
{ {
#if 0 #if 0
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 ratevalue; u32 ratevalue;
u8 datarates[NumRates]; u8 datarates[NumRates];
int i; int i;
@ -1518,9 +1412,6 @@ NDIS_STATUS oid_rt_pro_h2c_set_rate_table_hdl(struct oid_par_priv *poid_par_priv
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
struct setratable_parm *prate_table; struct setratable_parm *prate_table;
@ -1692,9 +1583,6 @@ NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -1736,9 +1624,6 @@ NDIS_STATUS oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -1871,9 +1756,6 @@ NDIS_STATUS oid_rt_pro_query_dr_variable_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
DR_VARIABLE_STRUCT *pdrv_var; DR_VARIABLE_STRUCT *pdrv_var;
@ -1935,9 +1817,6 @@ NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
PEFUSE_ACCESS_STRUCT pefuse; PEFUSE_ACCESS_STRUCT pefuse;
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
@ -1976,9 +1855,6 @@ NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
PEFUSE_ACCESS_STRUCT pefuse; PEFUSE_ACCESS_STRUCT pefuse;
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
@ -2013,9 +1889,6 @@ NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
PPGPKT_STRUCT ppgpkt; PPGPKT_STRUCT ppgpkt;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -2058,9 +1931,6 @@ NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u16 size; u16 size;
u8 ret; u8 ret;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -2124,9 +1994,6 @@ NDIS_STATUS oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u8 *data; u8 *data;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -2175,9 +2042,6 @@ NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u32 crystal_cap = 0; u32 crystal_cap = 0;
@ -2205,9 +2069,6 @@ NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u8 rx_pkt_type; u8 rx_pkt_type;
/* u32 rcr_val32; */ /* u32 rcr_val32; */
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -2287,9 +2148,6 @@ NDIS_STATUS oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
u32 txagc; u32 txagc;
@ -2465,9 +2323,6 @@ unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv)
/* ------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------ */
NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv)
{ {
#ifdef PLATFORM_OS_XP
_irqL oldirql;
#endif
u8 bpwrup; u8 bpwrup;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
@ -2506,9 +2361,6 @@ NDIS_STATUS oid_rt_get_power_mode_hdl(struct oid_par_priv *poid_par_priv)
#if 0 #if 0
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
/* #ifdef PLATFORM_OS_XP */
/* _irqL oldirql;
* #endif */
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {

View File

@ -2376,21 +2376,6 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
/* ptr -= 16; */ /* ptr -= 16; */
/* _rtw_memcpy(ptr, get_rxmem(precvframe), 16); */ /* _rtw_memcpy(ptr, get_rxmem(precvframe), 16); */
} else { } else {
#ifdef PLATFORM_OS_XP
NDIS_PACKET_8021Q_INFO VlanPriInfo;
UINT32 UserPriority = precvframe->u.hdr.attrib.priority;
UINT32 VlanID = (pvlan != NULL ? get_vlan_id(pvlan) : 0);
VlanPriInfo.Value = /* Get current value. */
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo);
VlanPriInfo.TagHeader.UserPriority = UserPriority;
VlanPriInfo.TagHeader.VlanId = VlanID ;
VlanPriInfo.TagHeader.CanonicalFormatId = 0; /* Should be zero. */
VlanPriInfo.TagHeader.Reserved = 0; /* Should be zero. */
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo) = VlanPriInfo.Value;
#endif
} }
if (eth_type == 0x8712) { /* append rx status for mp test packets */ if (eth_type == 0x8712) { /* append rx status for mp test packets */

View File

@ -987,13 +987,11 @@ static void next_key(u8 *key, sint round);
static void byte_sub(u8 *in, u8 *out); static void byte_sub(u8 *in, u8 *out);
static void shift_row(u8 *in, u8 *out); static void shift_row(u8 *in, u8 *out);
static void mix_column(u8 *in, u8 *out); static void mix_column(u8 *in, u8 *out);
#ifndef PLATFORM_FREEBSD
static void add_round_key(u8 *shiftrow_in, static void add_round_key(u8 *shiftrow_in,
u8 *mcol_in, u8 *mcol_in,
u8 *block_in, u8 *block_in,
sint round, sint round,
u8 *out); u8 *out);
#endif /* PLATFORM_FREEBSD */
static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext); static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);
@ -2133,7 +2131,6 @@ BIP_exit:
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifndef PLATFORM_FREEBSD
/* compress 512-bits */ /* compress 512-bits */
static int sha256_compress(struct sha256_state *md, unsigned char *buf) static int sha256_compress(struct sha256_state *md, unsigned char *buf)
{ {
@ -2403,7 +2400,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
_len[1] = 32; _len[1] = 32;
sha256_vector(2, _addr, _len, mac); sha256_vector(2, _addr, _len, mac);
} }
#endif /* PLATFORM_FREEBSD */
/** /**
* sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2) * sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2)
* @key: Key for PRF * @key: Key for PRF
@ -2417,7 +2414,6 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
* This function is used to derive new, cryptographically separate keys from a * This function is used to derive new, cryptographically separate keys from a
* given key. * given key.
*/ */
#ifndef PLATFORM_FREEBSD /* Baron */
static void sha256_prf(u8 *key, size_t key_len, char *label, static void sha256_prf(u8 *key, size_t key_len, char *label,
u8 *data, size_t data_len, u8 *buf, size_t buf_len) u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{ {
@ -2454,7 +2450,6 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
counter++; counter++;
} }
} }
#endif /* PLATFORM_FREEBSD Baron */
/* AES tables*/ /* AES tables*/
const u32 Te0[256] = { const u32 Te0[256] = {
@ -2633,7 +2628,6 @@ const u8 rcons[] = {
* *
* @return the number of rounds for the given cipher key size. * @return the number of rounds for the given cipher key size.
*/ */
#ifndef PLATFORM_FREEBSD /* Baron */
static void rijndaelKeySetupEnc(u32 rk[/*44*/], const u8 cipherKey[]) static void rijndaelKeySetupEnc(u32 rk[/*44*/], const u8 cipherKey[])
{ {
int i; int i;
@ -2850,7 +2844,6 @@ int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
{ {
return omac1_aes_128_vector(key, 1, &data, &data_len, mac); return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
} }
#endif /* PLATFORM_FREEBSD Baron */
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta) void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta)

View File

@ -74,50 +74,6 @@
#endif #endif
#ifdef PLATFORM_FREEBSD
typedef signed char s8;
typedef unsigned char u8;
typedef signed short s16;
typedef unsigned short u16;
typedef signed int s32;
typedef unsigned int u32;
typedef unsigned int uint;
typedef signed int sint;
typedef long atomic_t;
typedef signed long long s64;
typedef unsigned long long u64;
#define IN
#define OUT
#define VOID void
#define NDIS_OID uint
#define NDIS_STATUS uint
#ifndef PVOID
typedef void *PVOID;
/* #define PVOID (void *) */
#endif
typedef u32 dma_addr_t;
#define UCHAR u8
#define USHORT u16
#define UINT u32
#define ULONG u32
typedef void (*proc_t)(void *);
typedef unsigned int __kernel_size_t;
typedef int __kernel_ssize_t;
typedef __kernel_size_t SIZE_T;
typedef __kernel_ssize_t SSIZE_T;
#define FIELD_OFFSET(s, field) ((SSIZE_T)&((s *)(0))->field)
#endif
#define MEM_ALIGNMENT_OFFSET (sizeof (SIZE_T)) #define MEM_ALIGNMENT_OFFSET (sizeof (SIZE_T))
#define MEM_ALIGNMENT_PADDING (sizeof(SIZE_T) - 1) #define MEM_ALIGNMENT_PADDING (sizeof(SIZE_T) - 1)

View File

@ -169,15 +169,11 @@
extern __u32 ntohl(__u32); extern __u32 ntohl(__u32);
extern __u32 htonl(__u32); extern __u32 htonl(__u32);
#else /* defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) */ #else /* defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) */
#ifndef PLATFORM_FREEBSD extern unsigned long int ntohl(unsigned long int);
extern unsigned long int ntohl(unsigned long int); extern unsigned long int htonl(unsigned long int);
extern unsigned long int htonl(unsigned long int);
#endif
#endif #endif
#ifndef PLATFORM_FREEBSD
extern unsigned short int ntohs(unsigned short int); extern unsigned short int ntohs(unsigned short int);
extern unsigned short int htons(unsigned short int); extern unsigned short int htons(unsigned short int);
#endif
#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) || defined(PLATFORM_MPIXEL) #if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) || defined(PLATFORM_MPIXEL)

View File

@ -109,19 +109,11 @@ __inline static __u64 __arch__swab64(__u64 x)
#define __swab64(x) __fswab64(x) #define __swab64(x) __fswab64(x)
#endif /* __swab16 */ #endif /* __swab16 */
#ifdef PLATFORM_FREEBSD __inline static const __u16 __fswab16(__u16 x)
__inline static __u16 __fswab16(__u16 x)
#else
__inline static const __u16 __fswab16(__u16 x)
#endif /* PLATFORM_FREEBSD */
{ {
return __arch__swab16(x); return __arch__swab16(x);
} }
#ifdef PLATFORM_FREEBSD __inline static const __u32 __fswab32(__u32 x)
__inline static __u32 __fswab32(__u32 x)
#else
__inline static const __u32 __fswab32(__u32 x)
#endif /* PLATFORM_FREEBSD */
{ {
return __arch__swab32(x); return __arch__swab32(x);
} }

View File

@ -4,14 +4,6 @@
#include <drv_conf.h> #include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#ifdef PLATFORM_OS_XP
#include <drv_types_xp.h>
#endif
#ifdef PLATFORM_OS_CE
#include <drv_types_ce.h>
#endif
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
#include <drv_types_linux.h> #include <drv_types_linux.h>
#endif #endif

View File

@ -39,14 +39,6 @@
#include <net/arp.h> #include <net/arp.h>
#endif #endif
#ifdef PLATFORM_OS_XP
#include <drv_types_xp.h>
#endif
#ifdef PLATFORM_OS_CE
#include <drv_types_ce.h>
#endif
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
#include <drv_types_linux.h> #include <drv_types_linux.h>
#endif #endif
@ -981,11 +973,6 @@ struct dvobj_priv {
struct usb_device *pusbdev; struct usb_device *pusbdev;
#endif/* PLATFORM_LINUX */ #endif/* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
struct usb_interface *pusbintf;
struct usb_device *pusbdev;
#endif/* PLATFORM_FREEBSD */
#endif/* CONFIG_USB_HCI */ #endif/* CONFIG_USB_HCI */
/*-------- below is for PCIE INTERFACE --------*/ /*-------- below is for PCIE INTERFACE --------*/
@ -1323,11 +1310,6 @@ struct _ADAPTER {
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
_nic_hdl pifp;
int bup;
_lock glock;
#endif /* PLATFORM_FREEBSD */
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
int net_closed; int net_closed;

View File

@ -33,16 +33,6 @@
#endif /* CONFIG_PLATFORM_SPRD */ #endif /* CONFIG_PLATFORM_SPRD */
#endif #endif
#ifdef PLATFORM_OS_XP
#include <wdm.h>
#include <ntddsd.h>
#endif
#ifdef PLATFORM_OS_CE
#include <sdcardddk.h>
#endif
typedef struct sdio_data { typedef struct sdio_data {
u8 func_number; u8 func_number;
@ -56,22 +46,6 @@ typedef struct sdio_data {
unsigned int clock; unsigned int clock;
#endif #endif
#ifdef PLATFORM_OS_XP
PDEVICE_OBJECT pphysdevobj;
PDEVICE_OBJECT pfuncdevobj;
PDEVICE_OBJECT pnextdevobj;
SDBUS_INTERFACE_STANDARD sdbusinft;
u8 nextdevstacksz;
#endif
#ifdef PLATFORM_OS_CE
SD_DEVICE_HANDLE hDevice;
SD_CARD_RCA sd_rca;
SD_CARD_INTERFACE card_intf;
BOOLEAN enableIsarWithStatus;
WCHAR active_path[MAX_ACTIVE_REG_PATH];
SD_HOST_BLOCK_CAPABILITY sd_host_blk_cap;
#endif
} SDIO_DATA, *PSDIO_DATA; } SDIO_DATA, *PSDIO_DATA;
#define dvobj_to_sdio_func(d) ((d)->intf_data.func) #define dvobj_to_sdio_func(d) ((d)->intf_data.func)

View File

@ -1,30 +1 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __SDIO_OSINTF_H__
#define __SDIO_OSINTF_H__
#ifdef PLATFORM_OS_CE
extern NDIS_STATUS ce_sd_get_dev_hdl(PADAPTER padapter);
SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, PADAPTER padapter);
extern void sd_setup_irs(PADAPTER padapter);
#endif
#endif

View File

@ -21,15 +21,6 @@
#define __IEEE80211_H #define __IEEE80211_H
#ifndef CONFIG_RTL8711FW
#if defined PLATFORM_OS_XP
#include <ntstrsafe.h>
#endif
#else
#endif
#define MGMT_QUEUE_NUM 5 #define MGMT_QUEUE_NUM 5
#define ETH_ALEN 6 #define ETH_ALEN 6
@ -342,7 +333,7 @@ struct ieee_ibss_seq {
_list list; _list list;
}; };
#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW)
struct rtw_ieee80211_hdr { struct rtw_ieee80211_hdr {
u16 frame_ctl; u16 frame_ctl;
@ -503,7 +494,7 @@ enum eap_type {
#define P80211_OUI_LEN 3 #define P80211_OUI_LEN 3
#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW)
struct ieee80211_snap_hdr { struct ieee80211_snap_hdr {
@ -974,7 +965,6 @@ struct ieee80211_frag_entry {
u8 dst_addr[ETH_ALEN]; u8 dst_addr[ETH_ALEN];
}; };
#ifndef PLATFORM_FREEBSD /* Baron BSD has already defined */
struct ieee80211_stats { struct ieee80211_stats {
uint tx_unicast_frames; uint tx_unicast_frames;
uint tx_multicast_frames; uint tx_multicast_frames;
@ -998,7 +988,7 @@ struct ieee80211_stats {
uint rx_message_in_msg_fragments; uint rx_message_in_msg_fragments;
uint rx_message_in_bad_msg_fragments; uint rx_message_in_bad_msg_fragments;
}; };
#endif /* PLATFORM_FREEBSD */
struct ieee80211_softmac_stats { struct ieee80211_softmac_stats {
uint rx_ass_ok; uint rx_ass_ok;
uint rx_ass_err; uint rx_ass_err;
@ -1271,8 +1261,6 @@ join_res:
> 0: TID > 0: TID
*/ */
#ifndef PLATFORM_FREEBSD /* Baron BSD has already defined */
enum ieee80211_state { enum ieee80211_state {
/* the card is not linked at all */ /* the card is not linked at all */
@ -1311,7 +1299,6 @@ enum ieee80211_state {
IEEE80211_LINKED_SCANNING, IEEE80211_LINKED_SCANNING,
}; };
#endif /* PLATFORM_FREEBSD */
#define DEFAULT_MAX_SCAN_AGE (15 * HZ) #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
#define DEFAULT_FTS 2346 #define DEFAULT_FTS 2346
@ -1324,12 +1311,6 @@ enum ieee80211_state {
#define PORT_FMT "%u" #define PORT_FMT "%u"
#define PORT_ARG(x) ntohs(*((__be16 *)(x))) #define PORT_ARG(x) ntohs(*((__be16 *)(x)))
#ifdef PLATFORM_FREEBSD /* Baron change func to macro */
#define is_multicast_mac_addr(Addr) ((((Addr[0]) & 0x01) == 0x01) && ((Addr[0]) != 0xff))
#define is_broadcast_mac_addr(Addr) ((((Addr[0]) & 0xff) == 0xff) && (((Addr[1]) & 0xff) == 0xff) && \
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff))
#else
extern __inline int is_multicast_mac_addr(const u8 *addr) extern __inline int is_multicast_mac_addr(const u8 *addr)
{ {
return (addr[0] != 0xff) && (0x01 & addr[0]); return (addr[0] != 0xff) && (0x01 & addr[0]);
@ -1346,7 +1327,6 @@ extern __inline int is_zero_mac_addr(const u8 *addr)
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
} }
#endif /* PLATFORM_FREEBSD */
#define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_RESERVE_FCS (1<<0)
#define CFG_IEEE80211_COMPUTE_FCS (1<<1) #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
@ -1506,9 +1486,7 @@ enum rtw_ieee80211_ft_actioncode {
#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs) #define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
* 00:50:F2 */ * 00:50:F2 */
#ifndef PLATFORM_FREEBSD /* Baron BSD has defined */ #define WME_OUI_TYPE 2
#define WME_OUI_TYPE 2
#endif /* PLATFORM_FREEBSD */
#define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0 #define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0
#define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1 #define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1
#define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2 #define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2

View File

@ -61,27 +61,6 @@ struct intf_priv {
u8 bio_timer_cancel; u8 bio_timer_cancel;
#endif #endif
#endif #endif
#ifdef PLATFORM_OS_XP
#ifdef CONFIG_SDIO_HCI
/* below is for io_rwmem... */
PMDL pmdl;
PSDBUS_REQUEST_PACKET sdrp;
PSDBUS_REQUEST_PACKET recv_sdrp;
PSDBUS_REQUEST_PACKET xmit_sdrp;
PIRP piorw_irp;
#endif
#ifdef CONFIG_USB_HCI
PURB piorw_urb;
PIRP piorw_irp;
u8 io_irp_cnt;
u8 bio_irp_pending;
_sema io_retevt;
#endif
#endif
}; };
@ -136,11 +115,6 @@ void rtw_ndev_notifier_unregister(void);
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
extern int rtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
#endif
void rtw_ips_dev_unload(_adapter *padapter); void rtw_ips_dev_unload(_adapter *padapter);
#ifdef CONFIG_IPS #ifdef CONFIG_IPS

View File

@ -33,22 +33,10 @@
#define _FALSE 0 #define _FALSE 0
#ifdef PLATFORM_FREEBSD
#include <osdep_service_bsd.h>
#endif
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
#include <osdep_service_linux.h> #include <osdep_service_linux.h>
#endif #endif
#ifdef PLATFORM_OS_XP
#include <osdep_service_xp.h>
#endif
#ifdef PLATFORM_OS_CE
#include <osdep_service_ce.h>
#endif
#define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl
#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
@ -289,9 +277,7 @@ extern void _rtw_init_listhead(_list *list);
extern u32 rtw_is_list_empty(_list *phead); extern u32 rtw_is_list_empty(_list *phead);
extern void rtw_list_insert_head(_list *plist, _list *phead); extern void rtw_list_insert_head(_list *plist, _list *phead);
extern void rtw_list_insert_tail(_list *plist, _list *phead); extern void rtw_list_insert_tail(_list *plist, _list *phead);
#ifndef PLATFORM_FREEBSD
extern void rtw_list_delete(_list *plist); extern void rtw_list_delete(_list *plist);
#endif /* PLATFORM_FREEBSD */
extern void _rtw_init_sema(_sema *sema, int init_val); extern void _rtw_init_sema(_sema *sema, int init_val);
extern void _rtw_free_sema(_sema *sema); extern void _rtw_free_sema(_sema *sema);
@ -299,9 +285,7 @@ extern void _rtw_up_sema(_sema *sema);
extern u32 _rtw_down_sema(_sema *sema); extern u32 _rtw_down_sema(_sema *sema);
extern void _rtw_mutex_init(_mutex *pmutex); extern void _rtw_mutex_init(_mutex *pmutex);
extern void _rtw_mutex_free(_mutex *pmutex); extern void _rtw_mutex_free(_mutex *pmutex);
#ifndef PLATFORM_FREEBSD
extern void _rtw_spinlock_init(_lock *plock); extern void _rtw_spinlock_init(_lock *plock);
#endif /* PLATFORM_FREEBSD */
extern void _rtw_spinlock_free(_lock *plock); extern void _rtw_spinlock_free(_lock *plock);
extern void _rtw_spinlock(_lock *plock); extern void _rtw_spinlock(_lock *plock);
extern void _rtw_spinunlock(_lock *plock); extern void _rtw_spinunlock(_lock *plock);
@ -347,10 +331,6 @@ __inline static unsigned char _cancel_timer_ex(_timer *ptimer)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return del_timer_sync(ptimer); return del_timer_sync(ptimer);
#endif #endif
#ifdef PLATFORM_FREEBSD
_cancel_timer(ptimer, 0);
return 0;
#endif
} }
static __inline void thread_enter(char *name) static __inline void thread_enter(char *name)
@ -361,9 +341,6 @@ static __inline void thread_enter(char *name)
#endif #endif
allow_signal(SIGTERM); allow_signal(SIGTERM);
#endif #endif
#ifdef PLATFORM_FREEBSD
printf("%s", "RTKTHREAD_enter");
#endif
} }
__inline static void flush_signals_thread(void) __inline static void flush_signals_thread(void)
@ -377,7 +354,7 @@ __inline static void flush_signals_thread(void)
__inline static _OS_STATUS res_to_status(sint res) __inline static _OS_STATUS res_to_status(sint res)
{ {
#if defined(PLATFORM_LINUX) || defined (PLATFORM_MPIXEL) || defined (PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX) || defined (PLATFORM_MPIXEL)
return res; return res;
#endif #endif
} }
@ -526,11 +503,7 @@ extern int rtw_is_file_readable(const char *path);
extern int rtw_is_file_readable_with_size(const char *path, u32 *sz); extern int rtw_is_file_readable_with_size(const char *path, u32 *sz);
extern int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz); extern int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz);
extern int rtw_store_to_file(const char *path, u8 *buf, u32 sz); extern int rtw_store_to_file(const char *path, u8 *buf, u32 sz);
#ifndef PLATFORM_FREEBSD
extern void rtw_free_netdev(struct net_device *netdev); extern void rtw_free_netdev(struct net_device *netdev);
#endif /* PLATFORM_FREEBSD */
extern u64 rtw_modular64(u64 x, u64 y); extern u64 rtw_modular64(u64 x, u64 y);

View File

@ -381,11 +381,7 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
} }
static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
{ {
#ifdef PLATFORM_FREEBSD
return __skb_pull(skb, len);
#else
return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
#endif //PLATFORM_FREEBSD
} }
static inline u32 skb_queue_len(const struct sk_buff_head *list_) static inline u32 skb_queue_len(const struct sk_buff_head *list_)
{ {

View File

@ -27,22 +27,18 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ /* #define MAX_RECVBUF_SZ (32768) */ /* 32k */
#else /* #define MAX_RECVBUF_SZ (16384) */ /* 16K */
#ifndef CONFIG_MINIMAL_MEMORY_USAGE /* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (32768) */ /* 32k */ #ifdef CONFIG_PLATFORM_MSTAR
/* #define MAX_RECVBUF_SZ (16384) */ /* 16K */ #define MAX_RECVBUF_SZ (8192) /* 8K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) /* 8K */
#else
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif #endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -22,24 +22,20 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifdef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ #define MAX_RECVBUF_SZ (4000) /* about 4K */
#else #else
#ifdef CONFIG_MINIMAL_MEMORY_USAGE #ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (8192) /* 8K */
#elif defined(CONFIG_PLATFORM_HISILICON)
#define MAX_RECVBUF_SZ (16384) /* 16k */
#else #else
#ifdef CONFIG_PLATFORM_MSTAR #define MAX_RECVBUF_SZ (32768) /* 32k */
#define MAX_RECVBUF_SZ (8192) /* 8K */
#elif defined(CONFIG_PLATFORM_HISILICON)
#define MAX_RECVBUF_SZ (16384) /* 16k */
#else
#define MAX_RECVBUF_SZ (32768) /* 32k */
#endif
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (16384) */ /* 16k - 92E RX BUF :16K */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#endif #endif
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (16384) */ /* 16k - 92E RX BUF :16K */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */
#elif defined(CONFIG_PCI_HCI) #elif defined(CONFIG_PCI_HCI)

View File

@ -23,24 +23,20 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifdef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ #define MAX_RECVBUF_SZ (4000) /* about 4K */
#else #else
#ifdef CONFIG_MINIMAL_MEMORY_USAGE #ifdef CONFIG_PREALLOC_RX_SKB_BUFFER
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (rtw_rtkm_get_buff_size()) /*depend rtkm*/
#elif defined(CONFIG_PLATFORM_HISILICON)
#define MAX_RECVBUF_SZ (16384) /* 16k */
#else #else
#ifdef CONFIG_PREALLOC_RX_SKB_BUFFER #define MAX_RECVBUF_SZ (32768) /* 32k */
#define MAX_RECVBUF_SZ (rtw_rtkm_get_buff_size()) /*depend rtkm*/
#elif defined(CONFIG_PLATFORM_HISILICON)
#define MAX_RECVBUF_SZ (16384) /* 16k */
#else
#define MAX_RECVBUF_SZ (32768) /* 32k */
#endif
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (16384) */ /* 16k - 92E RX BUF :16K */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#endif #endif
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (16384) */ /* 16k - 92E RX BUF :16K */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -27,22 +27,18 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ /* #define MAX_RECVBUF_SZ (32768) */ /* 32k */
#else /* #define MAX_RECVBUF_SZ (16384) */ /* 16K */
#ifndef CONFIG_MINIMAL_MEMORY_USAGE /* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (32768) */ /* 32k */ #ifdef CONFIG_PLATFORM_MSTAR
/* #define MAX_RECVBUF_SZ (16384) */ /* 16K */ #define MAX_RECVBUF_SZ (8192) /* 8K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) /* 8K */
#else
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif #endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -27,22 +27,18 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ /* #define MAX_RECVBUF_SZ (32768) */ /* 32k */
#else /* #define MAX_RECVBUF_SZ (16384) */ /* 16K */
#ifndef CONFIG_MINIMAL_MEMORY_USAGE /* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (32768) */ /* 32k */ #ifdef CONFIG_PLATFORM_MSTAR
/* #define MAX_RECVBUF_SZ (16384) */ /* 16K */ #define MAX_RECVBUF_SZ (8192) /* 8K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) /* 8K */
#else
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif #endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -27,22 +27,18 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ /* #define MAX_RECVBUF_SZ (32768) */ /* 32k */
#else /* #define MAX_RECVBUF_SZ (16384) */ /* 16K */
#ifndef CONFIG_MINIMAL_MEMORY_USAGE /* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (32768) */ /* 32k */ #ifdef CONFIG_PLATFORM_MSTAR
/* #define MAX_RECVBUF_SZ (16384) */ /* 16K */ #define MAX_RECVBUF_SZ (8192) /* 8K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) /* 8K */
#else
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif #endif
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -23,27 +23,23 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ #ifdef CONFIG_PREALLOC_RX_SKB_BUFFER
#else #define MAX_RECVBUF_SZ (rtw_rtkm_get_buff_size()) /*depend rtkm*/
#ifndef CONFIG_MINIMAL_MEMORY_USAGE
#ifdef CONFIG_PREALLOC_RX_SKB_BUFFER
#define MAX_RECVBUF_SZ (rtw_rtkm_get_buff_size()) /*depend rtkm*/
#else
#define MAX_RECVBUF_SZ (32768) /*32k*/
#endif
/* #define MAX_RECVBUF_SZ (24576) */ /* 24k */
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (15360) */ /* 15k < 16k */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#ifdef CONFIG_PLATFORM_NOVATEK_NT72668
#undef MAX_RECVBUF_SZ
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif /* CONFIG_PLATFORM_NOVATEK_NT72668 */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (32768) /*32k*/
#endif #endif
/* #define MAX_RECVBUF_SZ (24576) */ /* 24k */
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (15360) */ /* 15k < 16k */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#ifdef CONFIG_PLATFORM_NOVATEK_NT72668
#undef MAX_RECVBUF_SZ
#define MAX_RECVBUF_SZ (15360) /* 15k < 16k */
#endif /* CONFIG_PLATFORM_NOVATEK_NT72668 */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -23,23 +23,19 @@
#if defined(CONFIG_USB_HCI) #if defined(CONFIG_USB_HCI)
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) /* 8K+1k */ #ifdef CONFIG_PLATFORM_MSTAR
#else #define MAX_RECVBUF_SZ (8192) /* 8K */
#ifndef CONFIG_MINIMAL_MEMORY_USAGE
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) /* 8K */
#else
#define MAX_RECVBUF_SZ (32768) /* 32k */
#endif
/* #define MAX_RECVBUF_SZ (24576) */ /* 24k */
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (15360) */ /* 15k < 16k */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else #else
#define MAX_RECVBUF_SZ (4000) /* about 4K */ #define MAX_RECVBUF_SZ (32768) /* 32k */
#endif #endif
/* #define MAX_RECVBUF_SZ (24576) */ /* 24k */
/* #define MAX_RECVBUF_SZ (20480) */ /* 20K */
/* #define MAX_RECVBUF_SZ (10240) */ /* 10K */
/* #define MAX_RECVBUF_SZ (15360) */ /* 15k < 16k */
/* #define MAX_RECVBUF_SZ (8192+1024) */ /* 8K+1k */
#else
#define MAX_RECVBUF_SZ (4000) /* about 4K */
#endif #endif
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */

View File

@ -34,15 +34,11 @@
/* recv_buffer must be large than usb agg size */ /* recv_buffer must be large than usb agg size */
#ifndef MAX_RECVBUF_SZ #ifndef MAX_RECVBUF_SZ
#ifdef PLATFORM_OS_CE #ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (8192+1024) #define MAX_RECVBUF_SZ (32768)
#else /* !PLATFORM_OS_CE */ #else
#ifndef CONFIG_MINIMAL_MEMORY_USAGE #define MAX_RECVBUF_SZ (4000)
#define MAX_RECVBUF_SZ (32768) #endif
#else
#define MAX_RECVBUF_SZ (4000)
#endif
#endif /* PLATFORM_OS_CE */
#endif /* !MAX_RECVBUF_SZ */ #endif /* !MAX_RECVBUF_SZ */
/* rtl8822bu_ops.c */ /* rtl8822bu_ops.c */

View File

@ -31,11 +31,7 @@
#define MAX_RSPSZ 512 #define MAX_RSPSZ 512
#define MAX_EVTSZ 1024 #define MAX_EVTSZ 1024
#ifdef PLATFORM_OS_CE #define CMDBUFF_ALIGN_SZ 512
#define CMDBUFF_ALIGN_SZ 4
#else
#define CMDBUFF_ALIGN_SZ 512
#endif
struct cmd_obj { struct cmd_obj {
_adapter *padapter; _adapter *padapter;
@ -118,9 +114,6 @@ struct evt_priv {
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
u8 *c2h_mem; u8 *c2h_mem;
u8 *allocated_c2h_mem; u8 *allocated_c2h_mem;
#ifdef PLATFORM_OS_XP
PMDL pc2h_mdl;
#endif
#endif #endif
}; };

View File

@ -66,9 +66,6 @@ enum {
#if defined PLATFORM_LINUX #if defined PLATFORM_LINUX
#define _dbgdump printk #define _dbgdump printk
#define _seqdump seq_printf #define _seqdump seq_printf
#elif defined PLATFORM_FREEBSD
#define _dbgdump printf
#define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg)
#endif #endif
#ifdef CONFIG_RTW_DEBUG #ifdef CONFIG_RTW_DEBUG

View File

@ -143,27 +143,8 @@ struct io_req {
u8 *pbuf; u8 *pbuf;
_sema sema; _sema sema;
#ifdef PLATFORM_OS_CE
#ifdef CONFIG_USB_HCI
/* URB handler for rtw_write_mem */
USB_TRANSFER usb_transfer_write_mem;
#endif
#endif
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt); void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt);
u8 *cnxt; u8 *cnxt;
#ifdef PLATFORM_OS_XP
PMDL pmdl;
PIRP pirp;
#ifdef CONFIG_SDIO_HCI
PSDBUS_REQUEST_PACKET sdrp;
#endif
#endif
}; };
struct intf_hdl { struct intf_hdl {

View File

@ -29,14 +29,6 @@ typedef struct _BSSIDInfo {
} BSSIDInfo, *PBSSIDInfo; } BSSIDInfo, *PBSSIDInfo;
#ifdef PLATFORM_OS_XP
typedef struct _NDIS_802_11_PMKID {
u32 Length;
u32 BSSIDInfoCount;
BSSIDInfo BSSIDInfo[1];
} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID;
#endif
u8 rtw_set_802_11_add_key(_adapter *padapter, NDIS_802_11_KEY *key); u8 rtw_set_802_11_add_key(_adapter *padapter, NDIS_802_11_KEY *key);
u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode);
u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid); u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid);

View File

@ -44,14 +44,9 @@ struct mp_xmit_frame {
u8 *mem_addr; u8 *mem_addr;
u32 sz[8]; u32 sz[8];
#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) #if defined(PLATFORM_LINUX)
PURB pxmit_urb[8]; PURB pxmit_urb[8];
#endif #endif
#ifdef PLATFORM_OS_XP
PIRP pxmit_irp[8];
#endif
u8 bpending[8]; u8 bpending[8];
sint ac_tag[8]; sint ac_tag[8];
sint last[8]; sint last[8];

View File

@ -78,24 +78,7 @@ typedef struct _DR_VARIABLE_STRUCT_ {
/* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */ /* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */
/* void _irqlevel_changed_(_irqL *irqlevel, BOOLEANunsigned char bLower); */ /* void _irqlevel_changed_(_irqL *irqlevel, BOOLEANunsigned char bLower); */
#ifdef PLATFORM_OS_XP
static void _irqlevel_changed_(_irqL *irqlevel, u8 bLower)
{
if (bLower == LOWER) {
*irqlevel = KeGetCurrentIrql();
if (*irqlevel > PASSIVE_LEVEL)
KeLowerIrql(PASSIVE_LEVEL);
} else {
if (KeGetCurrentIrql() == PASSIVE_LEVEL)
KeRaiseIrql(DISPATCH_LEVEL, irqlevel);
}
}
#else
#define _irqlevel_changed_(a, b) #define _irqlevel_changed_(a, b)
#endif
/* oid_rtl_seg_81_80_00 */ /* oid_rtl_seg_81_80_00 */
NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv); NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv);

View File

@ -20,40 +20,25 @@
#ifndef _RTW_RECV_H_ #ifndef _RTW_RECV_H_
#define _RTW_RECV_H_ #define _RTW_RECV_H_
#ifdef PLATFORM_OS_XP #ifdef CONFIG_SINGLE_RECV_BUF
#ifdef CONFIG_SDIO_HCI #define NR_RECVBUFF (1)
#define NR_RECVBUFF 1024/* 512 */ /* 128 */ #else
#if defined(CONFIG_GSPI_HCI)
#define NR_RECVBUFF (32)
#elif defined(CONFIG_SDIO_HCI)
#define NR_RECVBUFF (8)
#else #else
#define NR_RECVBUFF (16) #define NR_RECVBUFF (8)
#endif #endif
#elif defined(PLATFORM_OS_CE) #endif /* CONFIG_SINGLE_RECV_BUF */
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_PREALLOC_RX_SKB_BUFFER
#define NR_RECVBUFF (128) #define NR_PREALLOC_RECV_SKB (rtw_rtkm_get_nr_recv_skb()>>1)
#else #else /*!CONFIG_PREALLOC_RX_SKB_BUFFER */
#define NR_RECVBUFF (4) #define NR_PREALLOC_RECV_SKB 8
#endif #endif /* CONFIG_PREALLOC_RX_SKB_BUFFER */
#else /* PLATFORM_LINUX /PLATFORM_BSD */
#ifdef CONFIG_SINGLE_RECV_BUF #ifdef CONFIG_RTW_NAPI
#define NR_RECVBUFF (1) #define RTL_NAPI_WEIGHT (32)
#else
#if defined(CONFIG_GSPI_HCI)
#define NR_RECVBUFF (32)
#elif defined(CONFIG_SDIO_HCI)
#define NR_RECVBUFF (8)
#else
#define NR_RECVBUFF (8)
#endif
#endif /* CONFIG_SINGLE_RECV_BUF */
#ifdef CONFIG_PREALLOC_RX_SKB_BUFFER
#define NR_PREALLOC_RECV_SKB (rtw_rtkm_get_nr_recv_skb()>>1)
#else /*!CONFIG_PREALLOC_RX_SKB_BUFFER */
#define NR_PREALLOC_RECV_SKB 8
#endif /* CONFIG_PREALLOC_RX_SKB_BUFFER */
#ifdef CONFIG_RTW_NAPI
#define RTL_NAPI_WEIGHT (32)
#endif
#endif #endif
#define NR_RECVFRAME 256 #define NR_RECVFRAME 256
@ -413,14 +398,9 @@ struct recv_priv {
#endif /* CONFIG_USB_INTERRUPT_IN_PIPE */ #endif /* CONFIG_USB_INTERRUPT_IN_PIPE */
#endif #endif
#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
#ifdef PLATFORM_FREEBSD
struct task irq_prepare_beacon_tasklet;
struct task recv_tasklet;
#else /* PLATFORM_FREEBSD */
struct tasklet_struct irq_prepare_beacon_tasklet; struct tasklet_struct irq_prepare_beacon_tasklet;
struct tasklet_struct recv_tasklet; struct tasklet_struct recv_tasklet;
#endif /* PLATFORM_FREEBSD */
struct sk_buff_head free_recv_skb_queue; struct sk_buff_head free_recv_skb_queue;
struct sk_buff_head rx_skb_queue; struct sk_buff_head rx_skb_queue;
#ifdef CONFIG_RTW_NAPI #ifdef CONFIG_RTW_NAPI
@ -431,7 +411,7 @@ struct recv_priv {
struct ifqueue rx_indicate_queue; struct ifqueue rx_indicate_queue;
#endif /* CONFIG_RX_INDICATE_QUEUE */ #endif /* CONFIG_RX_INDICATE_QUEUE */
#endif /* defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) */ #endif /* defined(PLATFORM_LINUX) */
u8 *pallocated_recv_buf; u8 *pallocated_recv_buf;
u8 *precv_buf; /* 4 alignment */ u8 *precv_buf; /* 4 alignment */
@ -520,20 +500,12 @@ struct recv_buf {
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
PURB purb; PURB purb;
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u32 alloc_sz; u32 alloc_sz;
#endif #endif
#ifdef PLATFORM_OS_XP
PIRP pirp;
#endif
#ifdef PLATFORM_OS_CE
USB_TRANSFER usb_transfer_read_port;
#endif
u8 irp_pending; u8 irp_pending;
int transfer_len; int transfer_len;
@ -542,9 +514,6 @@ struct recv_buf {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
_pkt *pskb; _pkt *pskb;
#endif #endif
#ifdef PLATFORM_FREEBSD /* skb solution */
struct sk_buff *pskb;
#endif /* PLATFORM_FREEBSD */ /* skb solution */
}; };

View File

@ -61,17 +61,13 @@
#define NR_XMITBUFF (128) #define NR_XMITBUFF (128)
#endif #endif
#ifdef PLATFORM_OS_CE #ifdef CONFIG_PCI_HCI
#define XMITBUF_ALIGN_SZ 4 #define XMITBUF_ALIGN_SZ 4
#else #else
#ifdef CONFIG_PCI_HCI #ifdef USB_XMITBUF_ALIGN_SZ
#define XMITBUF_ALIGN_SZ 4 #define XMITBUF_ALIGN_SZ (USB_XMITBUF_ALIGN_SZ)
#else #else
#ifdef USB_XMITBUF_ALIGN_SZ #define XMITBUF_ALIGN_SZ 512
#define XMITBUF_ALIGN_SZ (USB_XMITBUF_ALIGN_SZ)
#else
#define XMITBUF_ALIGN_SZ 512
#endif
#endif #endif
#endif #endif
@ -533,19 +529,11 @@ struct xmit_buf {
u8 bulkout_id; /* for halmac */ u8 bulkout_id; /* for halmac */
#endif /* RTW_HALMAC */ #endif /* RTW_HALMAC */
#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
PURB pxmit_urb[8]; PURB pxmit_urb[8];
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
#endif #endif
#ifdef PLATFORM_OS_XP
PIRP pxmit_irp[8];
#endif
#ifdef PLATFORM_OS_CE
USB_TRANSFER usb_transfer_write_port;
#endif
u8 bpending[8]; u8 bpending[8];
sint last[8]; sint last[8];
@ -560,11 +548,6 @@ struct xmit_buf {
u32 ff_hwaddr; u32 ff_hwaddr;
u8 pg_num; u8 pg_num;
u8 agg_num; u8 agg_num;
#ifdef PLATFORM_OS_XP
PMDL pxmitbuf_mdl;
PIRP pxmitbuf_irp;
PSDBUS_REQUEST_PACKET pxmitbuf_sdrp;
#endif
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
@ -732,15 +715,8 @@ struct xmit_priv {
_sema tx_retevt;/* all tx return event; */ _sema tx_retevt;/* all tx return event; */
u8 txirp_cnt; u8 txirp_cnt;
#ifdef PLATFORM_OS_CE
USB_TRANSFER usb_transfer_write_port;
/* USB_TRANSFER usb_transfer_write_mem; */
#endif
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
struct tasklet_struct xmit_tasklet; struct tasklet_struct xmit_tasklet;
#endif
#ifdef PLATFORM_FREEBSD
struct task xmit_tasklet;
#endif #endif
/* per AC pending irp */ /* per AC pending irp */
int beq_cnt; int beq_cnt;

View File

@ -1,54 +1 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef _SDIO_OPS_WINCE_H_
#define _SDIO_OPS_WINCE_H_
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include <osdep_intf.h>
#ifdef PLATFORM_OS_CE
extern u8 sdbus_cmd52r_ce(struct intf_priv *pintfpriv, u32 addr);
extern void sdbus_cmd52w_ce(struct intf_priv *pintfpriv, u32 addr, u8 val8);
uint sdbus_read_blocks_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern uint sdbus_read_bytes_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern uint sdbus_write_blocks_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf, u8 async);
extern uint sdbus_write_bytes_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern u8 sdbus_func1cmd52r_ce(struct intf_priv *pintfpriv, u32 addr);
extern void sdbus_func1cmd52w_ce(struct intf_priv *pintfpriv, u32 addr, u8 val8);
extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
extern void sdio_read_int(_adapter *padapter, u32 addr, u8 sz, void *pdata);
#endif
#endif

View File

@ -1,54 +1 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef _SDIO_OPS_XP_H_
#define _SDIO_OPS_XP_H_
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include <osdep_intf.h>
#ifdef PLATFORM_OS_XP
extern u8 sdbus_cmd52r_xp(struct intf_priv *pintfpriv, u32 addr);
extern void sdbus_cmd52w_xp(struct intf_priv *pintfpriv, u32 addr, u8 val8);
uint sdbus_read_blocks_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern uint sdbus_read_bytes_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern uint sdbus_write_blocks_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf, u8 async);
extern uint sdbus_write_bytes_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
extern u8 sdbus_func1cmd52r_xp(struct intf_priv *pintfpriv, u32 addr);
extern void sdbus_func1cmd52w_xp(struct intf_priv *pintfpriv, u32 addr, u8 val8);
extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
extern void sdio_read_int(_adapter *padapter, u32 addr, u8 sz, void *pdata);
#endif
#endif

View File

@ -1,30 +1 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __SDIO_OSINTF_H__
#define __SDIO_OSINTF_H__
#ifdef PLATFORM_OS_CE
extern NDIS_STATUS ce_sd_get_dev_hdl(PADAPTER padapter);
SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, PADAPTER padapter);
extern void sd_setup_irs(PADAPTER padapter);
#endif
#endif

View File

@ -785,7 +785,7 @@ struct rtw_ieee80211_bar {
#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004
#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) || defined(PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW)

View File

@ -273,251 +273,6 @@ typedef struct _NDIS_802_11_TEST {
#endif /* end of #ifdef PLATFORM_LINUX */ #endif /* end of #ifdef PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
#define NDIS_802_11_LENGTH_SSID 32
#define NDIS_802_11_LENGTH_RATES 8
#define NDIS_802_11_LENGTH_RATES_EX 16
typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
typedef long NDIS_802_11_RSSI; /* in dBm */
typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; /* Set of 8 data rates */
typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; /* Set of 16 data rates */
typedef ULONG NDIS_802_11_KEY_INDEX;
typedef unsigned long long NDIS_802_11_KEY_RSC;
typedef struct _NDIS_802_11_SSID {
ULONG SsidLength;
UCHAR Ssid[32];
} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
typedef enum _NDIS_802_11_NETWORK_TYPE {
Ndis802_11FH,
Ndis802_11DS,
Ndis802_11OFDM5,
Ndis802_11OFDM24,
Ndis802_11NetworkTypeMax /* not a real type, defined as an upper bound */
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct _NDIS_802_11_CONFIGURATION_FH {
ULONG Length; /* Length of structure */
ULONG HopPattern; /* As defined by 802.11, MSB set */
ULONG HopSet; /* to one if non-802.11 */
ULONG DwellTime; /* units are Kusec */
} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
/*
FW will only save the channel number in DSConfig.
ODI Handler will convert the channel number to freq. number.
*/
typedef struct _NDIS_802_11_CONFIGURATION {
ULONG Length; /* Length of structure */
ULONG BeaconPeriod; /* units are Kusec */
ULONG ATIMWindow; /* units are Kusec */
ULONG DSConfig; /* channel number */
NDIS_802_11_CONFIGURATION_FH FHConfig;
} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE {
Ndis802_11IBSS,
Ndis802_11Infrastructure,
Ndis802_11AutoUnknown,
Ndis802_11InfrastructureMax, /* Not a real value, defined as upper bound */
Ndis802_11APMode
} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE;
typedef struct _NDIS_802_11_FIXED_IEs {
UCHAR Timestamp[8];
USHORT BeaconInterval;
USHORT Capabilities;
} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
typedef struct _NDIS_802_11_VARIABLE_IEs {
UCHAR ElementID;
UCHAR Length;
UCHAR data[1];
} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs;
/*
Length is the 4 bytes multiples of the sume of
sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (ULONG)
+ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + sizeof (NDIS_802_11_CONFIGURATION)
+ sizeof (NDIS_802_11_RATES_EX) + IELength
Except the IELength, all other fields are fixed length. Therefore, we can define a marco to present the
partial sum.
*/
#if 0
typedef struct _NDIS_WLAN_BSSID_EX {
ULONG Length;
NDIS_802_11_MAC_ADDRESS MacAddress;
UCHAR Reserved[2];/* [0]: IS beacon frame, [1]:optimum_antenna=>For antenna diversity; */
NDIS_802_11_SSID Ssid;
ULONG Privacy;
NDIS_802_11_RSSI Rssi;
NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
NDIS_802_11_CONFIGURATION Configuration;
NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
ULONG IELength;
UCHAR IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability information) */
} NDIS_WLAN_BSSID_EX, *PNDIS_WLAN_BSSID_EX;
typedef struct _NDIS_802_11_BSSID_LIST_EX {
ULONG NumberOfItems;
NDIS_WLAN_BSSID_EX Bssid[1];
} NDIS_802_11_BSSID_LIST_EX, *PNDIS_802_11_BSSID_LIST_EX;
#endif
typedef enum _NDIS_802_11_AUTHENTICATION_MODE {
Ndis802_11AuthModeOpen,
Ndis802_11AuthModeShared,
Ndis802_11AuthModeAutoSwitch,
Ndis802_11AuthModeWPA,
Ndis802_11AuthModeWPAPSK,
Ndis802_11AuthModeWPANone,
Ndis802_11AuthModeMax /* Not a real mode, defined as upper bound */
} NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE;
typedef enum _NDIS_802_11_WEP_STATUS {
Ndis802_11WEPEnabled,
Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
Ndis802_11WEPDisabled,
Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled,
Ndis802_11WEPKeyAbsent,
Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent,
Ndis802_11WEPNotSupported,
Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported,
Ndis802_11Encryption2Enabled,
Ndis802_11Encryption2KeyAbsent,
Ndis802_11Encryption3Enabled,
Ndis802_11Encryption3KeyAbsent
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
#define NDIS_802_11_AI_REQFI_CAPABILITIES 1
#define NDIS_802_11_AI_REQFI_LISTENINTERVAL 2
#define NDIS_802_11_AI_REQFI_CURRENTAPADDRESS 4
#define NDIS_802_11_AI_RESFI_CAPABILITIES 1
#define NDIS_802_11_AI_RESFI_STATUSCODE 2
#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4
typedef struct _NDIS_802_11_AI_REQFI {
USHORT Capabilities;
USHORT ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
typedef struct _NDIS_802_11_AI_RESFI {
USHORT Capabilities;
USHORT StatusCode;
USHORT AssociationId;
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
ULONG Length;
USHORT AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
ULONG RequestIELength;
ULONG OffsetRequestIEs;
USHORT AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
ULONG ResponseIELength;
ULONG OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
typedef enum _NDIS_802_11_RELOAD_DEFAULTS {
Ndis802_11ReloadWEPKeys
} NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS;
/* Key mapping keys require a BSSID */
typedef struct _NDIS_802_11_KEY {
ULONG Length; /* Length of this structure */
ULONG KeyIndex;
ULONG KeyLength; /* length of key in bytes */
NDIS_802_11_MAC_ADDRESS BSSID;
NDIS_802_11_KEY_RSC KeyRSC;
UCHAR KeyMaterial[32]; /* variable length depending on above field */
} NDIS_802_11_KEY, *PNDIS_802_11_KEY;
typedef struct _NDIS_802_11_REMOVE_KEY {
ULONG Length; /* Length of this structure */
ULONG KeyIndex;
NDIS_802_11_MAC_ADDRESS BSSID;
} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY;
typedef struct _NDIS_802_11_WEP {
ULONG Length; /* Length of this structure */
ULONG KeyIndex; /* 0 is the per-client key, 1-N are the global keys */
ULONG KeyLength; /* length of key in bytes */
UCHAR KeyMaterial[16];/* variable length depending on above field */
} NDIS_802_11_WEP, *PNDIS_802_11_WEP;
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST {
ULONG Length; /* Length of structure */
NDIS_802_11_MAC_ADDRESS Bssid;
ULONG Flags;
} NDIS_802_11_AUTHENTICATION_REQUEST, *PNDIS_802_11_AUTHENTICATION_REQUEST;
typedef enum _NDIS_802_11_STATUS_TYPE {
Ndis802_11StatusType_Authentication,
Ndis802_11StatusType_MediaStreamMode,
Ndis802_11StatusType_PMKID_CandidateList,
Ndis802_11StatusTypeMax /* not a real type, defined as an upper bound */
} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE;
typedef struct _NDIS_802_11_STATUS_INDICATION {
NDIS_802_11_STATUS_TYPE StatusType;
} NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION;
/* mask for authentication/integrity fields */
#define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f
#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01
#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02
#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06
#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E
/* MIC check time, 60 seconds. */
#define MIC_CHECK_TIME 60000000
typedef struct _NDIS_802_11_AUTHENTICATION_EVENT {
NDIS_802_11_STATUS_INDICATION Status;
NDIS_802_11_AUTHENTICATION_REQUEST Request[1];
} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT;
typedef struct _NDIS_802_11_TEST {
ULONG Length;
ULONG Type;
union {
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
} tt;
} NDIS_802_11_TEST, *PNDIS_802_11_TEST;
#endif /* PLATFORM_FREEBSD */
#ifndef Ndis802_11APMode #ifndef Ndis802_11APMode
#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
#endif #endif
@ -644,7 +399,6 @@ enum UAPSD_MAX_SP {
* WPA2 * WPA2
*/ */
#ifndef PLATFORM_OS_CE
typedef struct _PMKID_CANDIDATE { typedef struct _PMKID_CANDIDATE {
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
ULONG Flags; ULONG Flags;
@ -671,7 +425,6 @@ typedef struct _NDIS_802_11_CAPABILITY {
NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1]; NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1];
} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY; } NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;
#endif
#endif /* #ifndef WLAN_BSSDEF_H_ */ #endif /* #ifndef WLAN_BSSDEF_H_ */

View File

@ -30,12 +30,6 @@ struct pkt_file {
SIZE_T buf_len; SIZE_T buf_len;
}; };
#ifdef PLATFORM_FREEBSD
#define NR_XMITFRAME 256
extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
extern void rtw_xmit_entry_wrap(struct ifnet *pifp);
#endif /* PLATFORM_FREEBSD */
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
#define NR_XMITFRAME 256 #define NR_XMITFRAME 256

View File

@ -84,9 +84,6 @@ inline u8 *_rtw_vmalloc(u32 sz)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
pbuf = vmalloc(sz); pbuf = vmalloc(sz);
#endif #endif
#ifdef PLATFORM_FREEBSD
pbuf = malloc(sz, M_DEVBUF, M_NOWAIT);
#endif
#ifdef DBG_MEMORY_LEAK #ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
@ -107,9 +104,6 @@ inline u8 *_rtw_zvmalloc(u32 sz)
pbuf = _rtw_vmalloc(sz); pbuf = _rtw_vmalloc(sz);
if (pbuf != NULL) if (pbuf != NULL)
memset(pbuf, 0, sz); memset(pbuf, 0, sz);
#endif
#ifdef PLATFORM_FREEBSD
pbuf = malloc(sz, M_DEVBUF, M_ZERO | M_NOWAIT);
#endif #endif
return pbuf; return pbuf;
} }
@ -119,9 +113,6 @@ inline void _rtw_vmfree(u8 *pbuf, u32 sz)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
vfree(pbuf); vfree(pbuf);
#endif #endif
#ifdef PLATFORM_FREEBSD
free(pbuf, M_DEVBUF);
#endif
#ifdef DBG_MEMORY_LEAK #ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_dec(&_malloc_cnt); atomic_dec(&_malloc_cnt);
@ -144,9 +135,6 @@ u8 *_rtw_malloc(u32 sz)
pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif #endif
#ifdef PLATFORM_FREEBSD
pbuf = malloc(sz, M_DEVBUF, M_NOWAIT);
#endif
#ifdef DBG_MEMORY_LEAK #ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
if (pbuf != NULL) { if (pbuf != NULL) {
@ -163,9 +151,6 @@ u8 *_rtw_malloc(u32 sz)
u8 *_rtw_zmalloc(u32 sz) u8 *_rtw_zmalloc(u32 sz)
{ {
#ifdef PLATFORM_FREEBSD
return malloc(sz, M_DEVBUF, M_ZERO | M_NOWAIT);
#else /* PLATFORM_FREEBSD */
u8 *pbuf = _rtw_malloc(sz); u8 *pbuf = _rtw_malloc(sz);
if (pbuf != NULL) { if (pbuf != NULL) {
@ -176,7 +161,6 @@ u8 *_rtw_zmalloc(u32 sz)
} }
return pbuf; return pbuf;
#endif /* PLATFORM_FREEBSD */
} }
void _rtw_mfree(u8 *pbuf, u32 sz) void _rtw_mfree(u8 *pbuf, u32 sz)
@ -191,9 +175,6 @@ void _rtw_mfree(u8 *pbuf, u32 sz)
kfree(pbuf); kfree(pbuf);
#endif #endif
#ifdef PLATFORM_FREEBSD
free(pbuf, M_DEVBUF);
#endif
#ifdef DBG_MEMORY_LEAK #ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_dec(&_malloc_cnt); atomic_dec(&_malloc_cnt);
@ -203,62 +184,11 @@ void _rtw_mfree(u8 *pbuf, u32 sz)
} }
#ifdef PLATFORM_FREEBSD
/* review again */
struct sk_buff *dev_alloc_skb(unsigned int size)
{
struct sk_buff *skb = NULL;
u8 *data = NULL;
/* skb = (struct sk_buff *)_rtw_zmalloc(sizeof(struct sk_buff)); */ /* for skb->len, etc. */
skb = (struct sk_buff *)_rtw_malloc(sizeof(struct sk_buff));
if (!skb)
goto out;
data = _rtw_malloc(size);
if (!data)
goto nodata;
skb->head = (unsigned char *)data;
skb->data = (unsigned char *)data;
skb->tail = (unsigned char *)data;
skb->end = (unsigned char *)data + size;
skb->len = 0;
/* printf("%s()-%d: skb=%p, skb->head = %p\n", __FUNCTION__, __LINE__, skb, skb->head); */
out:
return skb;
nodata:
_rtw_mfree((u8 *)skb, sizeof(struct sk_buff));
skb = NULL;
goto out;
}
void dev_kfree_skb_any(struct sk_buff *skb)
{
/* printf("%s()-%d: skb->head = %p\n", __FUNCTION__, __LINE__, skb->head); */
if (skb->head)
_rtw_mfree(skb->head, 0);
/* printf("%s()-%d: skb = %p\n", __FUNCTION__, __LINE__, skb); */
if (skb)
_rtw_mfree((u8 *)skb, 0);
}
struct sk_buff *skb_clone(const struct sk_buff *skb)
{
return NULL;
}
#endif /* PLATFORM_FREEBSD */
inline struct sk_buff *_rtw_skb_alloc(u32 sz) inline struct sk_buff *_rtw_skb_alloc(u32 sz)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return __dev_alloc_skb(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); return __dev_alloc_skb(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
return dev_alloc_skb(sz);
#endif /* PLATFORM_FREEBSD */
} }
inline void _rtw_skb_free(struct sk_buff *skb) inline void _rtw_skb_free(struct sk_buff *skb)
@ -271,10 +201,6 @@ inline struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
return NULL;
#endif /* PLATFORM_FREEBSD */
} }
inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb) inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
@ -282,10 +208,6 @@ inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
return skb_clone(skb);
#endif /* PLATFORM_FREEBSD */
} }
inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb) inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
{ {
@ -296,10 +218,6 @@ inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif #endif
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
return NULL;
#endif /* PLATFORM_FREEBSD */
} }
inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb) inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)
@ -307,11 +225,6 @@ inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)
#if defined(PLATFORM_LINUX) #if defined(PLATFORM_LINUX)
skb->dev = ndev; skb->dev = ndev;
return netif_rx(skb); return netif_rx(skb);
#elif defined(PLATFORM_FREEBSD)
return (*ndev->if_input)(ndev, skb);
#else
rtw_warn_on(1);
return -1;
#endif #endif
} }
@ -359,10 +272,6 @@ inline void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr
#endif #endif
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
return malloc(size, M_USBDEV, M_NOWAIT | M_ZERO);
#endif /* PLATFORM_FREEBSD */
}
inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma) inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
@ -372,10 +281,6 @@ inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr
usb_buffer_free(dev, size, addr, dma); usb_buffer_free(dev, size, addr, dma);
#endif #endif
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD
free(addr, M_USBDEV);
#endif /* PLATFORM_FREEBSD */
} }
#endif /* CONFIG_USB_HCI */ #endif /* CONFIG_USB_HCI */
@ -856,7 +761,7 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size)
void _rtw_memcpy(void *dst, const void *src, u32 sz) void _rtw_memcpy(void *dst, const void *src, u32 sz)
{ {
#if defined(PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
memcpy(dst, src, sz); memcpy(dst, src, sz);
@ -875,7 +780,7 @@ inline void _rtw_memmove(void *dst, const void *src, u32 sz)
int _rtw_memcmp(const void *dst, const void *src, u32 sz) int _rtw_memcmp(const void *dst, const void *src, u32 sz)
{ {
#if defined(PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
/* under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 */ /* under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 */
if (!(memcmp(dst, src, sz))) if (!(memcmp(dst, src, sz)))
@ -888,24 +793,13 @@ int _rtw_memcmp(const void *dst, const void *src, u32 sz)
void _rtw_memset(void *pbuf, int c, u32 sz) void _rtw_memset(void *pbuf, int c, u32 sz)
{ {
#if defined(PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) #if defined(PLATFORM_LINUX)
memset(pbuf, c, sz); memset(pbuf, c, sz);
#endif #endif
} }
#ifdef PLATFORM_FREEBSD
static inline void __list_add(_list *pnew, _list *pprev, _list *pnext)
{
pnext->prev = pnew;
pnew->next = pnext;
pnew->prev = pprev;
pprev->next = pnew;
}
#endif /* PLATFORM_FREEBSD */
void _rtw_init_listhead(_list *list) void _rtw_init_listhead(_list *list)
{ {
@ -914,14 +808,8 @@ void _rtw_init_listhead(_list *list)
INIT_LIST_HEAD(list); INIT_LIST_HEAD(list);
#endif #endif
#ifdef PLATFORM_FREEBSD
list->next = list;
list->prev = list;
#endif
} }
/* /*
For the following list_xxx operations, For the following list_xxx operations,
caller must guarantee the atomic context. caller must guarantee the atomic context.
@ -937,14 +825,6 @@ u32 rtw_is_list_empty(_list *phead)
else else
return _FALSE; return _FALSE;
#endif
#ifdef PLATFORM_FREEBSD
if (phead->next == phead)
return _TRUE;
else
return _FALSE;
#endif #endif
} }
@ -954,10 +834,6 @@ void rtw_list_insert_head(_list *plist, _list *phead)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
list_add(plist, phead); list_add(plist, phead);
#endif #endif
#ifdef PLATFORM_FREEBSD
__list_add(plist, phead, phead->next);
#endif
} }
void rtw_list_insert_tail(_list *plist, _list *phead) void rtw_list_insert_tail(_list *plist, _list *phead)
@ -967,11 +843,6 @@ void rtw_list_insert_tail(_list *plist, _list *phead)
list_add_tail(plist, phead); list_add_tail(plist, phead);
#endif
#ifdef PLATFORM_FREEBSD
__list_add(plist, phead->prev, phead);
#endif #endif
} }
@ -982,9 +853,6 @@ void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
_init_timer(ptimer, adapter->pnetdev, pfunc, adapter); _init_timer(ptimer, adapter->pnetdev, pfunc, adapter);
#endif #endif
#ifdef PLATFORM_FREEBSD
_init_timer(ptimer, adapter->pifp, pfunc, adapter->mlmepriv.nic_hdl);
#endif
} }
/* /*
@ -1002,31 +870,10 @@ void _rtw_init_sema(_sema *sema, int init_val)
sema_init(sema, init_val); sema_init(sema, init_val);
#endif #endif
#ifdef PLATFORM_FREEBSD
sema_init(sema, init_val, "rtw_drv");
#endif
#ifdef PLATFORM_OS_XP
KeInitializeSemaphore(sema, init_val, SEMA_UPBND); /* count=0; */
#endif
#ifdef PLATFORM_OS_CE
if (*sema == NULL)
*sema = CreateSemaphore(NULL, init_val, SEMA_UPBND, NULL);
#endif
} }
void _rtw_free_sema(_sema *sema) void _rtw_free_sema(_sema *sema)
{ {
#ifdef PLATFORM_FREEBSD
sema_destroy(sema);
#endif
#ifdef PLATFORM_OS_CE
CloseHandle(*sema);
#endif
} }
void _rtw_up_sema(_sema *sema) void _rtw_up_sema(_sema *sema)
@ -1037,18 +884,6 @@ void _rtw_up_sema(_sema *sema)
up(sema); up(sema);
#endif #endif
#ifdef PLATFORM_FREEBSD
sema_post(sema);
#endif
#ifdef PLATFORM_OS_XP
KeReleaseSemaphore(sema, IO_NETWORK_INCREMENT, 1, FALSE);
#endif
#ifdef PLATFORM_OS_CE
ReleaseSemaphore(*sema, 1, NULL);
#endif
} }
u32 _rtw_down_sema(_sema *sema) u32 _rtw_down_sema(_sema *sema)
@ -1062,24 +897,6 @@ u32 _rtw_down_sema(_sema *sema)
return _SUCCESS; return _SUCCESS;
#endif #endif
#ifdef PLATFORM_FREEBSD
sema_wait(sema);
return _SUCCESS;
#endif
#ifdef PLATFORM_OS_XP
if (STATUS_SUCCESS == KeWaitForSingleObject(sema, Executive, KernelMode, TRUE, NULL))
return _SUCCESS;
else
return _FAIL;
#endif
#ifdef PLATFORM_OS_CE
if (WAIT_OBJECT_0 == WaitForSingleObject(*sema, INFINITE))
return _SUCCESS;
else
return _FAIL;
#endif
} }
@ -1094,18 +911,6 @@ void _rtw_mutex_init(_mutex *pmutex)
init_MUTEX(pmutex); init_MUTEX(pmutex);
#endif #endif
#endif
#ifdef PLATFORM_FREEBSD
mtx_init(pmutex, "", NULL, MTX_DEF | MTX_RECURSE);
#endif
#ifdef PLATFORM_OS_XP
KeInitializeMutex(pmutex, 0);
#endif
#ifdef PLATFORM_OS_CE
*pmutex = CreateMutex(NULL, _FALSE, NULL);
#endif #endif
} }
@ -1116,21 +921,8 @@ void _rtw_mutex_free(_mutex *pmutex)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37))
mutex_destroy(pmutex); mutex_destroy(pmutex);
#else
#endif #endif
#ifdef PLATFORM_FREEBSD
sema_destroy(pmutex);
#endif
#endif
#ifdef PLATFORM_OS_XP
#endif
#ifdef PLATFORM_OS_CE
#endif #endif
} }
@ -1142,37 +934,11 @@ void _rtw_spinlock_init(_lock *plock)
spin_lock_init(plock); spin_lock_init(plock);
#endif #endif
#ifdef PLATFORM_FREEBSD
mtx_init(plock, "", NULL, MTX_DEF | MTX_RECURSE);
#endif
} }
void _rtw_spinlock_free(_lock *plock) void _rtw_spinlock_free(_lock *plock)
{ {
#ifdef PLATFORM_FREEBSD
mtx_destroy(plock);
#endif
} }
#ifdef PLATFORM_FREEBSD
extern PADAPTER prtw_lock;
void rtw_mtx_lock(_lock *plock)
{
if (prtw_lock)
mtx_lock(&prtw_lock->glock);
else
printf("%s prtw_lock==NULL", __FUNCTION__);
}
void rtw_mtx_unlock(_lock *plock)
{
if (prtw_lock)
mtx_unlock(&prtw_lock->glock);
else
printf("%s prtw_lock==NULL", __FUNCTION__);
}
#endif /* PLATFORM_FREEBSD */
void _rtw_spinlock(_lock *plock) void _rtw_spinlock(_lock *plock)
{ {
@ -1182,9 +948,6 @@ void _rtw_spinlock(_lock *plock)
spin_lock(plock); spin_lock(plock);
#endif #endif
#ifdef PLATFORM_FREEBSD
mtx_lock(plock);
#endif
} }
void _rtw_spinunlock(_lock *plock) void _rtw_spinunlock(_lock *plock)
@ -1195,12 +958,8 @@ void _rtw_spinunlock(_lock *plock)
spin_unlock(plock); spin_unlock(plock);
#endif #endif
#ifdef PLATFORM_FREEBSD
mtx_unlock(plock);
#endif
} }
void _rtw_spinlock_ex(_lock *plock) void _rtw_spinlock_ex(_lock *plock)
{ {
@ -1209,9 +968,6 @@ void _rtw_spinlock_ex(_lock *plock)
spin_lock(plock); spin_lock(plock);
#endif #endif
#ifdef PLATFORM_FREEBSD
mtx_lock(plock);
#endif
} }
void _rtw_spinunlock_ex(_lock *plock) void _rtw_spinunlock_ex(_lock *plock)
@ -1222,9 +978,6 @@ void _rtw_spinunlock_ex(_lock *plock)
spin_unlock(plock); spin_unlock(plock);
#endif #endif
#ifdef PLATFORM_FREEBSD
mtx_unlock(plock);
#endif
} }
void _rtw_init_queue(_queue *pqueue) void _rtw_init_queue(_queue *pqueue)
@ -1259,11 +1012,6 @@ u32 rtw_get_current_time(void)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return jiffies; return jiffies;
#endif #endif
#ifdef PLATFORM_FREEBSD
struct timeval tvp;
getmicrotime(&tvp);
return tvp.tv_sec;
#endif
} }
inline u32 rtw_systime_to_ms(u32 systime) inline u32 rtw_systime_to_ms(u32 systime)
@ -1271,9 +1019,6 @@ inline u32 rtw_systime_to_ms(u32 systime)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return systime * 1000 / HZ; return systime * 1000 / HZ;
#endif #endif
#ifdef PLATFORM_FREEBSD
return systime * 1000;
#endif
} }
inline u32 rtw_ms_to_systime(u32 ms) inline u32 rtw_ms_to_systime(u32 ms)
@ -1281,9 +1026,6 @@ inline u32 rtw_ms_to_systime(u32 ms)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return ms * HZ / 1000; return ms * HZ / 1000;
#endif #endif
#ifdef PLATFORM_FREEBSD
return ms / 1000;
#endif
} }
/* the input parameter start use the same unit as returned by rtw_get_current_time */ /* the input parameter start use the same unit as returned by rtw_get_current_time */
@ -1292,9 +1034,6 @@ inline s32 rtw_get_passing_time_ms(u32 start)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return rtw_systime_to_ms(jiffies - start); return rtw_systime_to_ms(jiffies - start);
#endif #endif
#ifdef PLATFORM_FREEBSD
return rtw_systime_to_ms(rtw_get_current_time());
#endif
} }
inline s32 rtw_get_time_interval_ms(u32 start, u32 end) inline s32 rtw_get_time_interval_ms(u32 start, u32 end)
@ -1302,9 +1041,6 @@ inline s32 rtw_get_time_interval_ms(u32 start, u32 end)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return rtw_systime_to_ms(end - start); return rtw_systime_to_ms(end - start);
#endif #endif
#ifdef PLATFORM_FREEBSD
return rtw_systime_to_ms(rtw_get_current_time());
#endif
} }
void rtw_sleep_schedulable(int ms) void rtw_sleep_schedulable(int ms)
@ -1324,10 +1060,6 @@ void rtw_sleep_schedulable(int ms)
return; return;
#endif #endif
#ifdef PLATFORM_FREEBSD
DELAY(ms * 1000);
return ;
#endif
} }
@ -1344,11 +1076,6 @@ void rtw_msleep_os(int ms)
msleep((unsigned int)ms); msleep((unsigned int)ms);
#endif #endif
#ifdef PLATFORM_FREEBSD
/* Delay for delay microseconds */
DELAY(ms * 1000);
return ;
#endif
} }
void rtw_usleep_os(int us) void rtw_usleep_os(int us)
{ {
@ -1364,13 +1091,6 @@ void rtw_usleep_os(int us)
msleep((us / 1000) + 1); msleep((us / 1000) + 1);
#endif #endif
#endif #endif
#ifdef PLATFORM_FREEBSD
/* Delay for delay microseconds */
DELAY(us);
return ;
#endif
} }
#ifdef DBG_DELAY_OS #ifdef DBG_DELAY_OS
@ -1417,10 +1137,6 @@ void rtw_mdelay_os(int ms)
mdelay((unsigned long)ms); mdelay((unsigned long)ms);
#endif #endif
#ifdef PLATFORM_FREEBSD
DELAY(ms * 1000);
return ;
#endif
} }
void rtw_udelay_os(int us) void rtw_udelay_os(int us)
{ {
@ -1430,11 +1146,6 @@ void rtw_udelay_os(int us)
udelay((unsigned long)us); udelay((unsigned long)us);
#endif #endif
#ifdef PLATFORM_FREEBSD
/* Delay for delay microseconds */
DELAY(us);
return ;
#endif
} }
#endif #endif
@ -1443,9 +1154,6 @@ void rtw_yield_os(void)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
yield(); yield();
#endif #endif
#ifdef PLATFORM_FREEBSD
yield();
#endif
} }
#define RTW_SUSPEND_LOCK_NAME "rtw_wifi" #define RTW_SUSPEND_LOCK_NAME "rtw_wifi"
@ -1626,8 +1334,6 @@ inline void ATOMIC_SET(ATOMIC_T *v, int i)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_set(v, i); atomic_set(v, i);
#elif defined(PLATFORM_FREEBSD)
atomic_set_int(v, i);
#endif #endif
} }
@ -1635,8 +1341,6 @@ inline int ATOMIC_READ(ATOMIC_T *v)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return atomic_read(v); return atomic_read(v);
#elif defined(PLATFORM_FREEBSD)
return atomic_load_acq_32(v);
#endif #endif
} }
@ -1644,16 +1348,12 @@ inline void ATOMIC_ADD(ATOMIC_T *v, int i)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_add(i, v); atomic_add(i, v);
#elif defined(PLATFORM_FREEBSD)
atomic_add_int(v, i);
#endif #endif
} }
inline void ATOMIC_SUB(ATOMIC_T *v, int i) inline void ATOMIC_SUB(ATOMIC_T *v, int i)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_sub(i, v); atomic_sub(i, v);
#elif defined(PLATFORM_FREEBSD)
atomic_subtract_int(v, i);
#endif #endif
} }
@ -1661,8 +1361,6 @@ inline void ATOMIC_INC(ATOMIC_T *v)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_inc(v); atomic_inc(v);
#elif defined(PLATFORM_FREEBSD)
atomic_add_int(v, 1);
#endif #endif
} }
@ -1670,8 +1368,6 @@ inline void ATOMIC_DEC(ATOMIC_T *v)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
atomic_dec(v); atomic_dec(v);
#elif defined(PLATFORM_FREEBSD)
atomic_subtract_int(v, 1);
#endif #endif
} }
@ -1679,9 +1375,6 @@ inline int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return atomic_add_return(i, v); return atomic_add_return(i, v);
#elif defined(PLATFORM_FREEBSD)
atomic_add_int(v, i);
return atomic_load_acq_32(v);
#endif #endif
} }
@ -1689,9 +1382,6 @@ inline int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return atomic_sub_return(i, v); return atomic_sub_return(i, v);
#elif defined(PLATFORM_FREEBSD)
atomic_subtract_int(v, i);
return atomic_load_acq_32(v);
#endif #endif
} }
@ -1699,9 +1389,6 @@ inline int ATOMIC_INC_RETURN(ATOMIC_T *v)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return atomic_inc_return(v); return atomic_inc_return(v);
#elif defined(PLATFORM_FREEBSD)
atomic_add_int(v, 1);
return atomic_load_acq_32(v);
#endif #endif
} }
@ -1709,9 +1396,6 @@ inline int ATOMIC_DEC_RETURN(ATOMIC_T *v)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return atomic_dec_return(v); return atomic_dec_return(v);
#elif defined(PLATFORM_FREEBSD)
atomic_subtract_int(v, 1);
return atomic_load_acq_32(v);
#endif #endif
} }
@ -2114,76 +1798,6 @@ error:
} }
#endif #endif
#ifdef PLATFORM_FREEBSD
/*
* Copy a buffer from userspace and write into kernel address
* space.
*
* This emulation just calls the FreeBSD copyin function (to
* copy data from user space buffer into a kernel space buffer)
* and is designed to be used with the above io_write_wrapper.
*
* This function should return the number of bytes not copied.
* I.e. success results in a zero value.
* Negative error values are not returned.
*/
unsigned long
copy_from_user(void *to, const void *from, unsigned long n)
{
if (copyin(from, to, n) != 0) {
/* Any errors will be treated as a failure
to copy any of the requested bytes */
return n;
}
return 0;
}
unsigned long
copy_to_user(void *to, const void *from, unsigned long n)
{
if (copyout(from, to, n) != 0) {
/* Any errors will be treated as a failure
to copy any of the requested bytes */
return n;
}
return 0;
}
/*
* The usb_register and usb_deregister functions are used to register
* usb drivers with the usb subsystem. In this compatibility layer
* emulation a list of drivers (struct usb_driver) is maintained
* and is used for probing/attaching etc.
*
* usb_register and usb_deregister simply call these functions.
*/
int
usb_register(struct usb_driver *driver)
{
rtw_usb_linux_register(driver);
return 0;
}
int
usb_deregister(struct usb_driver *driver)
{
rtw_usb_linux_deregister(driver);
return 0;
}
void module_init_exit_wrapper(void *arg)
{
int (*func)(void) = arg;
func();
return;
}
#endif /* PLATFORM_FREEBSD */
#ifdef CONFIG_PLATFORM_SPRD #ifdef CONFIG_PLATFORM_SPRD
#ifdef do_div #ifdef do_div
#undef do_div #undef do_div
@ -2195,8 +1809,6 @@ u64 rtw_modular64(u64 x, u64 y)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
return do_div(x, y); return do_div(x, y);
#elif defined(PLATFORM_FREEBSD)
return x % y;
#endif #endif
} }
@ -2205,8 +1817,6 @@ u64 rtw_division64(u64 x, u64 y)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
do_div(x, y); do_div(x, y);
return x; return x;
#elif defined(PLATFORM_FREEBSD)
return x / y;
#endif #endif
} }
@ -2222,8 +1832,6 @@ inline u32 rtw_random32(void)
#else #else
return random32(); return random32();
#endif #endif
#elif defined(PLATFORM_FREEBSD)
#error "to be implemented\n"
#endif #endif
} }