rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_MUTEX - not selected

This change made include/drv_conf.h and core/rtw_ioctl_query.c redundant.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-21 13:00:05 -05:00
parent 42e1c0f32b
commit dfe35fb489
82 changed files with 4 additions and 171 deletions

View file

@ -139,7 +139,6 @@ rtk_core := \
core/rtw_efuse.o \ core/rtw_efuse.o \
core/rtw_ieee80211.o \ core/rtw_ieee80211.o \
core/rtw_io.o \ core/rtw_io.o \
core/rtw_ioctl_query.o \
core/rtw_ioctl_set.o \ core/rtw_ioctl_set.o \
core/rtw_iol.o \ core/rtw_iol.o \
core/rtw_led.o \ core/rtw_led.o \

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_AP_C_ #define _RTW_AP_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -28,7 +28,6 @@
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
#endif #endif
#include <drv_conf.h>
#include <drv_types.h> #include <drv_types.h>
#include "rtw_br_ext.h" #include "rtw_br_ext.h"
#include <usb_osintf.h> #include <usb_osintf.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_CMD_C_ #define _RTW_CMD_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_EFUSE_C_ #define _RTW_EFUSE_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_efuse.h> #include <rtw_efuse.h>

View file

@ -40,7 +40,6 @@ jackson@realtek.com.tw
*/ */
#define _RTW_IO_C_ #define _RTW_IO_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_io.h> #include <rtw_io.h>

View file

@ -1,26 +0,0 @@
/******************************************************************************
*
* 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
*
*
******************************************************************************/
#define _RTW_IOCTL_QUERY_C_
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include <rtw_ioctl_query.h>
#include <wifi.h>

View file

@ -20,7 +20,6 @@
#define _RTW_IOCTL_SET_C_ #define _RTW_IOCTL_SET_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>

View file

@ -20,7 +20,6 @@
#define _RTW_MLME_C_ #define _RTW_MLME_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_MLME_EXT_C_ #define _RTW_MLME_EXT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_MP_IOCTL_C_ #define _RTW_MP_IOCTL_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <mlme_osdep.h> #include <mlme_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_PWRCTRL_C_ #define _RTW_PWRCTRL_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <osdep_intf.h> #include <osdep_intf.h>

View file

@ -18,7 +18,7 @@
* *
******************************************************************************/ ******************************************************************************/
#define _RTW_RECV_C_ #define _RTW_RECV_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_RF_C_ #define _RTW_RF_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_SECURITY_C_ #define _RTW_SECURITY_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_STA_MGT_C_ #define _RTW_STA_MGT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_WLAN_UTIL_C_ #define _RTW_WLAN_UTIL_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_XMIT_C_ #define _RTW_XMIT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -17,7 +17,6 @@
* *
* *
******************************************************************************/ ******************************************************************************/
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _HAL_INTF_C_ #define _HAL_INTF_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <hal_intf.h> #include <hal_intf.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTL8188E_CMD_C_ #define _RTL8188E_CMD_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -29,7 +29,6 @@
/* */ /* */
/* include files */ /* include files */
/* */ /* */
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTL8188E_PHYCFG_C_ #define _RTL8188E_PHYCFG_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_iol.h> #include <rtw_iol.h>

View file

@ -41,7 +41,6 @@
#define _RTL8188E_RF6052_C_ #define _RTL8188E_RF6052_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTL8188E_REDESC_C_ #define _RTL8188E_REDESC_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTL8188E_XMIT_C_ #define _RTL8188E_XMIT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>

View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>

View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#define _RTL8188EU_RECV_C_ #define _RTL8188EU_RECV_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#define _RTL8188E_XMIT_C_ #define _RTL8188E_XMIT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _HCI_HAL_INIT_C_ #define _HCI_HAL_INIT_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_efuse.h> #include <rtw_efuse.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _HCI_OPS_OS_C_ #define _HCI_OPS_OS_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <osdep_intf.h> #include <osdep_intf.h>
@ -59,10 +58,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
goto exit; goto exit;
} }
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
#endif
/* Acquire IO memory for vendorreq */ /* Acquire IO memory for vendorreq */
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
@ -157,12 +153,9 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
#endif #endif
release_mutex: release_mutex:
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); _exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
#endif
exit: exit:
return status; return status;
} }
static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr) static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)

View file

@ -20,9 +20,6 @@
#ifndef __BASIC_TYPES_H__ #ifndef __BASIC_TYPES_H__
#define __BASIC_TYPES_H__ #define __BASIC_TYPES_H__
#include <drv_conf.h>
#define SUCCESS 0 #define SUCCESS 0
#define FAIL (-1) #define FAIL (-1)

View file

@ -20,8 +20,6 @@
#ifndef __CMD_OSDEP_H_ #ifndef __CMD_OSDEP_H_
#define __CMD_OSDEP_H_ #define __CMD_OSDEP_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -1,34 +0,0 @@
/******************************************************************************
*
* 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 __DRV_CONF_H__
#define __DRV_CONF_H__
#include "autoconf.h"
//About USB VENDOR REQ
#if defined(CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC automatically"
#define CONFIG_USB_VENDOR_REQ_MUTEX
#endif
#if defined(CONFIG_VENDOR_REQ_RETRY) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_VENDOR_REQ_RETRY automatically"
#define CONFIG_USB_VENDOR_REQ_MUTEX
#endif
#endif // __DRV_CONF_H__

View file

@ -27,7 +27,7 @@
#ifndef __DRV_TYPES_H__ #ifndef __DRV_TYPES_H__
#define __DRV_TYPES_H__ #define __DRV_TYPES_H__
#include <drv_conf.h> #include <autoconf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>
#include <drv_types_linux.h> #include <drv_types_linux.h>

View file

@ -20,7 +20,6 @@
#ifndef __HAL_INTF_H__ #ifndef __HAL_INTF_H__
#define __HAL_INTF_H__ #define __HAL_INTF_H__
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <Hal8188EPhyCfg.h> #include <Hal8188EPhyCfg.h>

View file

@ -20,7 +20,6 @@
#ifndef __IEEE80211_H #ifndef __IEEE80211_H
#define __IEEE80211_H #define __IEEE80211_H
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include "wifi.h" #include "wifi.h"

View file

@ -20,7 +20,6 @@
#ifndef __IEEE80211_EXT_H #ifndef __IEEE80211_EXT_H
#define __IEEE80211_EXT_H #define __IEEE80211_EXT_H
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __MLME_OSDEP_H_ #ifndef __MLME_OSDEP_H_
#define __MLME_OSDEP_H_ #define __MLME_OSDEP_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -22,8 +22,6 @@
#ifndef __NIC_SPEC_H__ #ifndef __NIC_SPEC_H__
#define __NIC_SPEC_H__ #define __NIC_SPEC_H__
#include <drv_conf.h>
#define RTL8711_MCTRL_ (0x20000) #define RTL8711_MCTRL_ (0x20000)
#define RTL8711_UART_ (0x30000) #define RTL8711_UART_ (0x30000)
#define RTL8711_TIMER_ (0x40000) #define RTL8711_TIMER_ (0x40000)

View file

@ -27,7 +27,6 @@
//2 Config Flags and Structs - defined by each ODM Type //2 Config Flags and Structs - defined by each ODM Type
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <hal_intf.h> #include <hal_intf.h>

View file

@ -21,7 +21,6 @@
#ifndef __OSDEP_INTF_H_ #ifndef __OSDEP_INTF_H_
#define __OSDEP_INTF_H_ #define __OSDEP_INTF_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __OSDEP_SERVICE_H_ #ifndef __OSDEP_SERVICE_H_
#define __OSDEP_SERVICE_H_ #define __OSDEP_SERVICE_H_
#include <drv_conf.h>
#include <basic_types.h> #include <basic_types.h>
#define _FAIL 0 #define _FAIL 0

View file

@ -20,7 +20,6 @@
#ifndef __RECV_OSDEP_H_ #ifndef __RECV_OSDEP_H_
#define __RECV_OSDEP_H_ #define __RECV_OSDEP_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTL8188E_LED_H__ #ifndef __RTL8188E_LED_H__
#define __RTL8188E_LED_H__ #define __RTL8188E_LED_H__
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,8 +19,6 @@
#ifndef __RTL8188E_SPEC_H__ #ifndef __RTL8188E_SPEC_H__
#define __RTL8188E_SPEC_H__ #define __RTL8188E_SPEC_H__
#include <drv_conf.h>
#ifndef BIT #ifndef BIT
#define BIT(x) (1 << (x)) #define BIT(x) (1 << (x))
#endif #endif

View file

@ -20,7 +20,6 @@
#ifndef _RTL8188E_SRESET_H_ #ifndef _RTL8188E_SRESET_H_
#define _RTL8188E_SRESET_H_ #define _RTL8188E_SRESET_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_sreset.h> #include <rtw_sreset.h>

View file

@ -20,11 +20,9 @@
#ifndef __RTW_AP_H_ #ifndef __RTW_AP_H_
#define __RTW_AP_H_ #define __RTW_AP_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
//external function //external function

View file

@ -20,7 +20,6 @@
#ifndef __RTW_CMD_H_ #ifndef __RTW_CMD_H_
#define __RTW_CMD_H_ #define __RTW_CMD_H_
#include <drv_conf.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>
#include <rtw_rf.h> #include <rtw_rf.h>
#include <rtw_led.h> #include <rtw_led.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_DEBUG_H__ #ifndef __RTW_DEBUG_H__
#define __RTW_DEBUG_H__ #define __RTW_DEBUG_H__
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_EEPROM_H__ #ifndef __RTW_EEPROM_H__
#define __RTW_EEPROM_H__ #define __RTW_EEPROM_H__
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_EFUSE_H__ #ifndef __RTW_EFUSE_H__
#define __RTW_EFUSE_H__ #define __RTW_EFUSE_H__
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#define EFUSE_ERROE_HANDLE 1 #define EFUSE_ERROE_HANDLE 1

View file

@ -19,7 +19,7 @@
******************************************************************************/ ******************************************************************************/
#ifndef _RTW_EVENT_H_ #ifndef _RTW_EVENT_H_
#define _RTW_EVENT_H_ #define _RTW_EVENT_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>

View file

@ -20,7 +20,6 @@
#ifndef _RTW_HT_H_ #ifndef _RTW_HT_H_
#define _RTW_HT_H_ #define _RTW_HT_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include "wifi.h" #include "wifi.h"

View file

@ -21,7 +21,6 @@
#ifndef _RTW_IO_H_ #ifndef _RTW_IO_H_
#define _RTW_IO_H_ #define _RTW_IO_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <osdep_intf.h> #include <osdep_intf.h>

View file

@ -20,7 +20,6 @@
#ifndef _RTW_IOCTL_H_ #ifndef _RTW_IOCTL_H_
#define _RTW_IOCTL_H_ #define _RTW_IOCTL_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef _RTW_IOCTL_QUERY_H_ #ifndef _RTW_IOCTL_QUERY_H_
#define _RTW_IOCTL_QUERY_H_ #define _RTW_IOCTL_QUERY_H_
#include <drv_conf.h>
#include <drv_types.h> #include <drv_types.h>
#endif #endif

View file

@ -20,7 +20,6 @@
#ifndef _RTW_IOCTL_RTL_H_ #ifndef _RTW_IOCTL_RTL_H_
#define _RTW_IOCTL_RTL_H_ #define _RTW_IOCTL_RTL_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_IOCTL_SET_H_ #ifndef __RTW_IOCTL_SET_H_
#define __RTW_IOCTL_SET_H_ #define __RTW_IOCTL_SET_H_
#include <drv_conf.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_IOL_H_ #ifndef __RTW_IOL_H_
#define __RTW_IOL_H_ #define __RTW_IOL_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter); struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter);

View file

@ -20,7 +20,6 @@
#ifndef __RTW_LED_H_ #ifndef __RTW_LED_H_
#define __RTW_LED_H_ #define __RTW_LED_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_MLME_H_ #ifndef __RTW_MLME_H_
#define __RTW_MLME_H_ #define __RTW_MLME_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <mlme_osdep.h> #include <mlme_osdep.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_MLME_EXT_H_ #ifndef __RTW_MLME_EXT_H_
#define __RTW_MLME_EXT_H_ #define __RTW_MLME_EXT_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>

View file

@ -20,8 +20,6 @@
#ifndef _RTW_MP_IOCTL_H_ #ifndef _RTW_MP_IOCTL_H_
#define _RTW_MP_IOCTL_H_ #define _RTW_MP_IOCTL_H_
//#include <drv_conf.h>
//#include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <mp_custom_oid.h> #include <mp_custom_oid.h>
#include <rtw_ioctl.h> #include <rtw_ioctl.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_PWRCTRL_H_ #ifndef __RTW_PWRCTRL_H_
#define __RTW_PWRCTRL_H_ #define __RTW_PWRCTRL_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -17,23 +17,13 @@
* *
* *
******************************************************************************/ ******************************************************************************/
#ifndef _RTW_QOS_H_ #ifndef _RTW_QOS_H_
#define _RTW_QOS_H_ #define _RTW_QOS_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
struct qos_priv { struct qos_priv {
unsigned int qos_option; //bit mask option: u-apsd, s-apsd, ts, block ack... unsigned int qos_option; //bit mask option: u-apsd, s-apsd, ts, block ack...
}; };
#endif //_RTL871X_QOS_H_ #endif //_RTL871X_QOS_H_

View file

@ -20,7 +20,6 @@
#ifndef _RTW_RECV_H_ #ifndef _RTW_RECV_H_
#define _RTW_RECV_H_ #define _RTW_RECV_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __RTW_RF_H_ #ifndef __RTW_RF_H_
#define __RTW_RF_H_ #define __RTW_RF_H_
#include <drv_conf.h>
#include <rtw_cmd.h> #include <rtw_cmd.h>
#define OFDM_PHY 1 #define OFDM_PHY 1

View file

@ -20,12 +20,9 @@
#ifndef __RTW_SECURITY_H_ #ifndef __RTW_SECURITY_H_
#define __RTW_SECURITY_H_ #define __RTW_SECURITY_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#define _NO_PRIVACY_ 0x0 #define _NO_PRIVACY_ 0x0
#define _WEP40_ 0x1 #define _WEP40_ 0x1
#define _TKIP_ 0x2 #define _TKIP_ 0x2

View file

@ -20,7 +20,6 @@
#ifndef _RTW_SRESET_C_ #ifndef _RTW_SRESET_C_
#define _RTW_SRESET_C_ #define _RTW_SRESET_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef _RTW_XMIT_H_ #ifndef _RTW_XMIT_H_
#define _RTW_XMIT_H_ #define _RTW_XMIT_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -20,7 +20,6 @@
#ifndef __STA_INFO_H_ #ifndef __STA_INFO_H_
#define __STA_INFO_H_ #define __STA_INFO_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>

View file

@ -20,7 +20,6 @@
#ifndef __USB_OPS_H_ #ifndef __USB_OPS_H_
#define __USB_OPS_H_ #define __USB_OPS_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <osdep_intf.h> #include <osdep_intf.h>

View file

@ -20,7 +20,6 @@
#ifndef __USB_OSINTF_H #ifndef __USB_OSINTF_H
#define __USB_OSINTF_H #define __USB_OSINTF_H
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <usb_vendor_req.h> #include <usb_vendor_req.h>

View file

@ -20,7 +20,6 @@
#ifndef __XMIT_OSDEP_H_ #ifndef __XMIT_OSDEP_H_
#define __XMIT_OSDEP_H_ #define __XMIT_OSDEP_H_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _IOCTL_LINUX_C_ #define _IOCTL_LINUX_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>

View file

@ -21,7 +21,6 @@
#define _MLME_OSDEP_C_ #define _MLME_OSDEP_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <mlme_osdep.h> #include <mlme_osdep.h>

View file

@ -19,8 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _OS_INTFS_C_ #define _OS_INTFS_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <xmit_osdep.h> #include <xmit_osdep.h>

View file

@ -21,7 +21,6 @@
#define _OSDEP_SERVICE_C_ #define _OSDEP_SERVICE_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RECV_OSDEP_C_ #define _RECV_OSDEP_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _HCI_INTF_C_ #define _HCI_INTF_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <recv_osdep.h> #include <recv_osdep.h>
@ -200,10 +199,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
{ {
u8 rst = _SUCCESS; u8 rst = _SUCCESS;
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_rtw_mutex_init(&dvobj->usb_vendor_req_mutex); _rtw_mutex_init(&dvobj->usb_vendor_req_mutex);
#endif
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
@ -230,9 +226,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE);
#endif #endif
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_rtw_mutex_free(&dvobj->usb_vendor_req_mutex); _rtw_mutex_free(&dvobj->usb_vendor_req_mutex);
#endif
return rst; return rst;
} }

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _XMIT_OSDEP_C_ #define _XMIT_OSDEP_C_
#include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>