From f4bd60fbcdc62099991892604459126ba3fb7837 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Sat, 24 Aug 2019 00:45:57 +0200 Subject: [PATCH] Rename autoconf.h include duo to kernels autoconf --- include/drv_conf.h | 14 ++-- include/linux/old_unused_rtl_wireless.h | 87 +++++++++++++++++++++++++ include/{autoconf.h => rtl_autoconf.h} | 0 3 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 include/linux/old_unused_rtl_wireless.h rename include/{autoconf.h => rtl_autoconf.h} (100%) diff --git a/include/drv_conf.h b/include/drv_conf.h index 6e242e7..7ee65e2 100644 --- a/include/drv_conf.h +++ b/include/drv_conf.h @@ -14,13 +14,11 @@ *****************************************************************************/ #ifndef __DRV_CONF_H__ #define __DRV_CONF_H__ -#include "autoconf.h" + +#include +#include "rtl_autoconf.h" #include "hal_ic_cfg.h" -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) - #error "Shall be Linux or Windows, but not both!\n" - -#endif #define CONFIG_RSSI_PRIORITY #ifdef CONFIG_RTW_REPEATER_SON #ifndef CONFIG_AP @@ -364,7 +362,7 @@ defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) || defined(CONFIG_RTL8723D) #define CONFIG_HWMPCAP_GEN3 #endif -#if defined(CONFIG_HWMPCAP_GEN1) && (CONFIG_IFACE_NUMBER > 2) +#if defined(CONFIG_HWMPCAP_GEN1) && (CONFIG_IFACE_NUMBER > 2) #ifdef CONFIG_POWER_SAVING /*#warning "Disable PS when CONFIG_IFACE_NUMBER > 2"*/ #undef CONFIG_POWER_SAVING @@ -500,11 +498,11 @@ defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) || defined(CONFIG_RTL8723D) #endif #endif -#define CONFIG_RTW_TPT_MODE +#define CONFIG_RTW_TPT_MODE #ifdef CONFIG_PCI_BCN_POLLING #define CONFIG_BCN_ICF -#endif +#endif #ifndef CONFIG_PCI_MSI #define CONFIG_RTW_PCI_MSI_DISABLE diff --git a/include/linux/old_unused_rtl_wireless.h b/include/linux/old_unused_rtl_wireless.h new file mode 100644 index 0000000..c7f4a6c --- /dev/null +++ b/include/linux/old_unused_rtl_wireless.h @@ -0,0 +1,87 @@ +/****************************************************************************** + * + * Copyright(c) 2007 - 2017 Realtek Corporation. + * + * 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. + * + *****************************************************************************/ + +#ifndef _LINUX_WIRELESS_H +#define _LINUX_WIRELESS_H + +/***************************** INCLUDES *****************************/ + +#if 0 + #include /* for __u* and __s* typedefs */ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ +#else + #define __user + /* typedef uint16_t __u16; */ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ +#endif + +/****************************** TYPES ******************************/ +#ifdef CONFIG_COMPAT +struct compat_iw_point { + compat_caddr_t pointer; + __u16 length; + __u16 flags; +}; +#endif +/* --------------------------- SUBTYPES --------------------------- */ +/* + * For all data larger than 16 octets, we need to use a + * pointer to memory allocated in user space. + */ +struct iw_point { + void __user *pointer; /* Pointer to the data (in user space) */ + __u16 length; /* number of fields or size in bytes */ + __u16 flags; /* Optional params */ +}; + + +/* ------------------------ IOCTL REQUEST ------------------------ */ +/* + * This structure defines the payload of an ioctl, and is used + * below. + * + * Note that this structure should fit on the memory footprint + * of iwreq (which is the same as ifreq), which mean a max size of + * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... + * You should check this when increasing the structures defined + * above in this file... + */ +union iwreq_data { + /* Config - generic */ + char name[IFNAMSIZ]; + /* Name : used to verify the presence of wireless extensions. + * Name of the protocol/provider... */ + + struct iw_point data; /* Other large parameters */ +}; + +/* + * The structure to exchange data for ioctl. + * This structure is the same as 'struct ifreq', but (re)defined for + * convenience... + * Do I need to remind you about structure size (32 octets) ? + */ +struct iwreq { + union { + char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ + } ifr_ifrn; + + /* Data part (defined just above) */ + union iwreq_data u; +}; + +#endif /* _LINUX_WIRELESS_H */ diff --git a/include/autoconf.h b/include/rtl_autoconf.h similarity index 100% rename from include/autoconf.h rename to include/rtl_autoconf.h