Merge pull request #149 from CGarces/realtek-5.x.x

Updrade to version v5.6.4

core/mesh/rtw_mesh_hwmp.h

@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ * 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 __RTW_MESH_HWMP_H_
+#define __RTW_MESH_HWMP_H_
+
+#ifndef DBG_RTW_HWMP
+#define DBG_RTW_HWMP 0
+#endif
+#if DBG_RTW_HWMP
+#define RTW_HWMP_DBG(fmt, arg...) RTW_PRINT(fmt, ##arg)
+#else
+#define RTW_HWMP_DBG(fmt, arg...) RTW_DBG(fmt, ##arg)
+#endif
+
+#ifndef INFO_RTW_HWMP
+#define INFO_RTW_HWMP 0
+#endif
+#if INFO_RTW_HWMP
+#define RTW_HWMP_INFO(fmt, arg...) RTW_PRINT(fmt, ##arg)
+#else
+#define RTW_HWMP_INFO(fmt, arg...) RTW_INFO(fmt, ##arg)
+#endif
+
+
+void rtw_ewma_err_rate_init(struct rtw_ewma_err_rate *e);
+unsigned long rtw_ewma_err_rate_read(struct rtw_ewma_err_rate *e);
+void rtw_ewma_err_rate_add(struct rtw_ewma_err_rate *e, unsigned long val);
+int rtw_mesh_path_error_tx(_adapter *adapter,
+			   u8 ttl, const u8 *target, u32 target_sn,
+			   u16 target_rcode, const u8 *ra);
+void rtw_ieee80211s_update_metric(_adapter *adapter, u8 mac_id,
+				  u8 per, u8 rate,
+				  u8 bw, u8 total_pkt);
+void rtw_mesh_rx_path_sel_frame(_adapter *adapter, union recv_frame *rframe);
+void rtw_mesh_queue_preq(struct rtw_mesh_path *mpath, u8 flags);
+void rtw_mesh_path_start_discovery(_adapter *adapter);
+void rtw_mesh_path_timer(void *ctx);
+void rtw_mesh_path_tx_root_frame(_adapter *adapter);
+void rtw_mesh_work_hdl(_workitem *work);
+void rtw_ieee80211_mesh_path_timer(void *ctx);
+void rtw_ieee80211_mesh_path_root_timer(void *ctx);
+BOOLEAN rtw_ieee80211_mesh_root_setup(_adapter *adapter);
+void rtw_mesh_work(_workitem *work);
+void rtw_mesh_atlm_param_req_timer(void *ctx);
+
+#endif /* __RTW_MESH_HWMP_H_ */
+
+

core/mesh/rtw_mesh_pathtbl.h

@@ -0,0 +1,206 @@
+/******************************************************************************
+ *
+ * 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 __RTW_MESH_PATHTBL_H_
+#define __RTW_MESH_PATHTBL_H_
+
+#ifndef DBG_RTW_MPATH
+#define DBG_RTW_MPATH 1
+#endif
+#if DBG_RTW_MPATH
+#define RTW_MPATH_DBG(fmt, arg...) RTW_PRINT(fmt, ##arg)
+#else
+#define RTW_MPATH_DBG(fmt, arg...) do {} while (0)
+#endif
+
+/**
+ * enum rtw_mesh_path_flags - mesh path flags
+ *
+ * @RTW_MESH_PATH_ACTIVE: the mesh path can be used for forwarding
+ * @RTW_MESH_PATH_RESOLVING: the discovery process is running for this mesh path
+ * @RTW_MESH_PATH_SN_VALID: the mesh path contains a valid destination sequence
+ *	number
+ * @RTW_MESH_PATH_FIXED: the mesh path has been manually set and should not be
+ *	modified
+ * @RTW_MESH_PATH_RESOLVED: the mesh path can has been resolved
+ * @RTW_MESH_PATH_REQ_QUEUED: there is an unsent path request for this destination
+ *	already queued up, waiting for the discovery process to start.
+ * @RTW_MESH_PATH_DELETED: the mesh path has been deleted and should no longer
+ *	be used
+ * @RTW_MESH_PATH_ROOT_ADD_CHK: root additional check in root mode.
+ *	With this flag, It will try the last used rann_snd_addr
+ * @RTW_MESH_PATH_PEER_AKA: only used toward a peer, only used in active keep
+ *	alive mechanism. PREQ's da = path dst
+ * 
+ * RTW_MESH_PATH_RESOLVED is used by the mesh path timer to
+ * decide when to stop or cancel the mesh path discovery.
+ */
+enum rtw_mesh_path_flags {
+	RTW_MESH_PATH_ACTIVE =	BIT(0),
+	RTW_MESH_PATH_RESOLVING =	BIT(1),
+	RTW_MESH_PATH_SN_VALID =	BIT(2),
+	RTW_MESH_PATH_FIXED	=	BIT(3),
+	RTW_MESH_PATH_RESOLVED =	BIT(4),
+	RTW_MESH_PATH_REQ_QUEUED =	BIT(5),
+	RTW_MESH_PATH_DELETED =	BIT(6),
+	RTW_MESH_PATH_ROOT_ADD_CHK =	BIT(7),
+	RTW_MESH_PATH_PEER_AKA =	BIT(8),
+};
+
+/**
+ * struct rtw_mesh_path - mesh path structure
+ *
+ * @dst: mesh path destination mac address
+ * @mpp: mesh proxy mac address
+ * @rhash: rhashtable list pointer
+ * @gate_list: list pointer for known gates list
+ * @sdata: mesh subif
+ * @next_hop: mesh neighbor to which frames for this destination will be
+ *	forwarded
+ * @timer: mesh path discovery timer
+ * @frame_queue: pending queue for frames sent to this destination while the
+ *	path is unresolved
+ * @rcu: rcu head for freeing mesh path
+ * @sn: target sequence number
+ * @metric: current metric to this destination
+ * @hop_count: hops to destination
+ * @exp_time: in jiffies, when the path will expire or when it expired
+ * @discovery_timeout: timeout (lapse in jiffies) used for the last discovery
+ *	retry
+ * @discovery_retries: number of discovery retries
+ * @flags: mesh path flags, as specified on &enum rtw_mesh_path_flags
+ * @state_lock: mesh path state lock used to protect changes to the
+ * mpath itself.  No need to take this lock when adding or removing
+ * an mpath to a hash bucket on a path table.
+ * @rann_snd_addr: the RANN sender address
+ * @rann_metric: the aggregated path metric towards the root node
+ * @last_preq_to_root: Timestamp of last PREQ sent to root
+ * @is_root: the destination station of this path is a root node
+ * @is_gate: the destination station of this path is a mesh gate
+ *
+ *
+ * The dst address is unique in the mesh path table. Since the mesh_path is
+ * protected by RCU, deleting the next_hop STA must remove / substitute the
+ * mesh_path structure and wait until that is no longer reachable before
+ * destroying the STA completely.
+ */
+struct rtw_mesh_path {
+	u8 dst[ETH_ALEN];
+	u8 mpp[ETH_ALEN];	/* used for MPP or MAP */
+	rtw_rhash_head rhash;
+	rtw_hlist_node gate_list;
+	_adapter *adapter;
+	struct sta_info __rcu *next_hop;
+	_timer timer;
+	_queue frame_queue;
+	u32 frame_queue_len;
+	rtw_rcu_head rcu;
+	u32 sn;
+	u32 metric;
+	u8 hop_count;
+	systime exp_time;
+	systime discovery_timeout;
+	systime gate_timeout;
+	u32 gate_ann_int;    /* gate announce interval */
+	u8 discovery_retries;
+	enum rtw_mesh_path_flags flags;
+	_lock state_lock;
+	u8 rann_snd_addr[ETH_ALEN];
+#ifdef CONFIG_RTW_MESH_ADD_ROOT_CHK
+	u8 add_chk_rann_snd_addr[ETH_ALEN];
+#endif
+	u32 rann_metric;
+	unsigned long last_preq_to_root;
+	bool is_root;
+	bool is_gate;
+	bool gate_asked;
+};
+
+/**
+ * struct rtw_mesh_table
+ *
+ * @known_gates: list of known mesh gates and their mpaths by the station. The
+ * gate's mpath may or may not be resolved and active.
+ * @gates_lock: protects updates to known_gates
+ * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr
+ * @entries: number of entries in the table
+ */
+struct rtw_mesh_table {
+	rtw_hlist_head known_gates;
+	_lock gates_lock;
+	rtw_rhashtable rhead;
+	ATOMIC_T entries;
+};
+
+#define RTW_MESH_PATH_EXPIRE (600 * HZ)
+
+/* Maximum number of paths per interface */
+#define RTW_MESH_MAX_MPATHS		1024
+
+/* Number of frames buffered per destination for unresolved destinations */
+#define RTW_MESH_FRAME_QUEUE_LEN	10
+
+int rtw_mesh_nexthop_lookup(_adapter *adapter,
+	const u8 *mda, const u8 *msa, u8 *ra);
+int rtw_mesh_nexthop_resolve(_adapter *adapter,
+			 struct xmit_frame *xframe);
+
+struct rtw_mesh_path *rtw_mesh_path_lookup(_adapter *adapter,
+				   const u8 *dst);
+struct rtw_mesh_path *rtw_mpp_path_lookup(_adapter *adapter,
+				  const u8 *dst);
+int rtw_mpp_path_add(_adapter *adapter,
+		 const u8 *dst, const u8 *mpp);
+void dump_mpp(void *sel, _adapter *adapter);
+
+struct rtw_mesh_path *
+rtw_mesh_path_lookup_by_idx(_adapter *adapter, int idx);
+struct rtw_mesh_path *
+rtw_mpp_path_lookup_by_idx(_adapter *adapter, int idx);
+void rtw_mesh_path_fix_nexthop(struct rtw_mesh_path *mpath, struct sta_info *next_hop);
+void rtw_mesh_path_expire(_adapter *adapter);
+
+struct rtw_mesh_path *
+rtw_mesh_path_add(_adapter *adapter, const u8 *dst);
+
+int rtw_mesh_path_add_gate(struct rtw_mesh_path *mpath);
+void rtw_mesh_gate_del(struct rtw_mesh_table *tbl, struct rtw_mesh_path *mpath);
+bool rtw_mesh_gate_search(struct rtw_mesh_table *tbl, const u8 *addr);
+int rtw_mesh_path_send_to_gates(struct rtw_mesh_path *mpath);
+int rtw_mesh_gate_num(_adapter *adapter);
+bool rtw_mesh_is_primary_gate(_adapter *adapter);
+void dump_known_gates(void *sel, _adapter *adapter);
+
+void rtw_mesh_plink_broken(struct sta_info *sta);
+
+void rtw_mesh_path_assign_nexthop(struct rtw_mesh_path *mpath, struct sta_info *sta);
+void rtw_mesh_path_flush_pending(struct rtw_mesh_path *mpath);
+void rtw_mesh_path_tx_pending(struct rtw_mesh_path *mpath);
+int rtw_mesh_pathtbl_init(_adapter *adapter);
+void rtw_mesh_pathtbl_unregister(_adapter *adapter);
+int rtw_mesh_path_del(_adapter *adapter, const u8 *addr);
+
+void rtw_mesh_path_flush_by_nexthop(struct sta_info *sta);
+void rtw_mesh_path_discard_frame(_adapter *adapter,
+			     struct xmit_frame *xframe);
+
+static inline void rtw_mesh_path_activate(struct rtw_mesh_path *mpath)
+{
+	mpath->flags |= RTW_MESH_PATH_ACTIVE | RTW_MESH_PATH_RESOLVED;
+}
+
+void rtw_mesh_path_flush_by_iface(_adapter *adapter);
+
+#endif /* __RTW_MESH_PATHTBL_H_ */
+

core/rtw_btcoex_wifionly.c

@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2013 - 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.
+ *
+ *****************************************************************************/
+#include <drv_types.h>
+#include <hal_btcoex_wifionly.h>
+#include <hal_data.h>
+
+void rtw_btcoex_wifionly_switchband_notify(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_switchband_notify(padapter);
+}
+
+void rtw_btcoex_wifionly_scan_notify(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_scan_notify(padapter);
+}
+
+void rtw_btcoex_wifionly_connect_notify(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_connect_notify(padapter);
+}
+
+void rtw_btcoex_wifionly_hw_config(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_hw_config(padapter);
+}
+
+void rtw_btcoex_wifionly_initialize(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_initlizevariables(padapter);
+}
+
+void rtw_btcoex_wifionly_AntInfoSetting(PADAPTER padapter)
+{
+	hal_btcoex_wifionly_AntInfoSetting(padapter);
+}

core/rtw_chplan.h

@@ -0,0 +1,183 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2018 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 __RTW_CHPLAN_H__
+#define __RTW_CHPLAN_H__
+
+enum rtw_chplan_id {
+	/* ===== 0x00 ~ 0x1F, legacy channel plan ===== */
+	RTW_CHPLAN_FCC = 0x00,
+	RTW_CHPLAN_IC = 0x01,
+	RTW_CHPLAN_ETSI = 0x02,
+	RTW_CHPLAN_SPAIN = 0x03,
+	RTW_CHPLAN_FRANCE = 0x04,
+	RTW_CHPLAN_MKK = 0x05,
+	RTW_CHPLAN_MKK1 = 0x06,
+	RTW_CHPLAN_ISRAEL = 0x07,
+	RTW_CHPLAN_TELEC = 0x08,
+	RTW_CHPLAN_GLOBAL_DOAMIN = 0x09,
+	RTW_CHPLAN_WORLD_WIDE_13 = 0x0A,
+	RTW_CHPLAN_TAIWAN = 0x0B,
+	RTW_CHPLAN_CHINA = 0x0C,
+	RTW_CHPLAN_SINGAPORE_INDIA_MEXICO = 0x0D,
+	RTW_CHPLAN_KOREA = 0x0E,
+	RTW_CHPLAN_TURKEY = 0x0F,
+	RTW_CHPLAN_JAPAN = 0x10,
+	RTW_CHPLAN_FCC_NO_DFS = 0x11,
+	RTW_CHPLAN_JAPAN_NO_DFS = 0x12,
+	RTW_CHPLAN_WORLD_WIDE_5G = 0x13,
+	RTW_CHPLAN_TAIWAN_NO_DFS = 0x14,
+
+	/* ===== 0x20 ~ 0x7F, new channel plan ===== */
+	RTW_CHPLAN_WORLD_NULL = 0x20,
+	RTW_CHPLAN_ETSI1_NULL = 0x21,
+	RTW_CHPLAN_FCC1_NULL = 0x22,
+	RTW_CHPLAN_MKK1_NULL = 0x23,
+	RTW_CHPLAN_ETSI2_NULL = 0x24,
+	RTW_CHPLAN_FCC1_FCC1 = 0x25,
+	RTW_CHPLAN_WORLD_ETSI1 = 0x26,
+	RTW_CHPLAN_MKK1_MKK1 = 0x27,
+	RTW_CHPLAN_WORLD_KCC1 = 0x28,
+	RTW_CHPLAN_WORLD_FCC2 = 0x29,
+	RTW_CHPLAN_FCC2_NULL = 0x2A,
+	RTW_CHPLAN_IC1_IC2 = 0x2B,
+	RTW_CHPLAN_MKK2_NULL = 0x2C,
+	RTW_CHPLAN_WORLD_CHILE1= 0x2D,
+	RTW_CHPLAN_WORLD1_WORLD1 = 0x2E,
+	RTW_CHPLAN_WORLD_CHILE2 = 0x2F,
+	RTW_CHPLAN_WORLD_FCC3 = 0x30,
+	RTW_CHPLAN_WORLD_FCC4 = 0x31,
+	RTW_CHPLAN_WORLD_FCC5 = 0x32,
+	RTW_CHPLAN_WORLD_FCC6 = 0x33,
+	RTW_CHPLAN_FCC1_FCC7 = 0x34,
+	RTW_CHPLAN_WORLD_ETSI2 = 0x35,
+	RTW_CHPLAN_WORLD_ETSI3 = 0x36,
+	RTW_CHPLAN_MKK1_MKK2 = 0x37,
+	RTW_CHPLAN_MKK1_MKK3 = 0x38,
+	RTW_CHPLAN_FCC1_NCC1 = 0x39,
+	RTW_CHPLAN_ETSI1_ETSI1 = 0x3A,
+	RTW_CHPLAN_ETSI1_ACMA1 = 0x3B,
+	RTW_CHPLAN_ETSI1_ETSI6 = 0x3C,
+	RTW_CHPLAN_ETSI1_ETSI12 = 0x3D,
+	RTW_CHPLAN_KCC1_KCC2 = 0x3E,
+	RTW_CHPLAN_FCC1_FCC11 = 0x3F,
+	RTW_CHPLAN_FCC1_NCC2 = 0x40,
+	RTW_CHPLAN_GLOBAL_NULL = 0x41,
+	RTW_CHPLAN_ETSI1_ETSI4 = 0x42,
+	RTW_CHPLAN_FCC1_FCC2 = 0x43,
+	RTW_CHPLAN_FCC1_NCC3 = 0x44,
+	RTW_CHPLAN_WORLD_ACMA1 = 0x45,
+	RTW_CHPLAN_FCC1_FCC8 = 0x46,
+	RTW_CHPLAN_WORLD_ETSI6 = 0x47,
+	RTW_CHPLAN_WORLD_ETSI7 = 0x48,
+	RTW_CHPLAN_WORLD_ETSI8 = 0x49,
+	RTW_CHPLAN_IC2_IC2 = 0x4A,
+	RTW_CHPLAN_KCC1_KCC3 = 0x4B,
+	RTW_CHPLAN_FCC1_FCC15 = 0x4C,
+	RTW_CHPLAN_WORLD_ETSI9 = 0x50,
+	RTW_CHPLAN_WORLD_ETSI10 = 0x51,
+	RTW_CHPLAN_WORLD_ETSI11 = 0x52,
+	RTW_CHPLAN_FCC1_NCC4 = 0x53,
+	RTW_CHPLAN_WORLD_ETSI12 = 0x54,
+	RTW_CHPLAN_FCC1_FCC9 = 0x55,
+	RTW_CHPLAN_WORLD_ETSI13 = 0x56,
+	RTW_CHPLAN_FCC1_FCC10 = 0x57,
+	RTW_CHPLAN_MKK2_MKK4 = 0x58,
+	RTW_CHPLAN_WORLD_ETSI14 = 0x59,
+	RTW_CHPLAN_FCC1_FCC5 = 0x60,
+	RTW_CHPLAN_FCC2_FCC7 = 0x61,
+	RTW_CHPLAN_FCC2_FCC1 = 0x62,
+	RTW_CHPLAN_WORLD_ETSI15 = 0x63,
+	RTW_CHPLAN_MKK2_MKK5 = 0x64,
+	RTW_CHPLAN_ETSI1_ETSI16 = 0x65,
+	RTW_CHPLAN_FCC1_FCC14 = 0x66,
+	RTW_CHPLAN_FCC1_FCC12 = 0x67,
+	RTW_CHPLAN_FCC2_FCC14 = 0x68,
+	RTW_CHPLAN_FCC2_FCC12 = 0x69,
+	RTW_CHPLAN_ETSI1_ETSI17 = 0x6A,
+	RTW_CHPLAN_WORLD_FCC16 = 0x6B,
+	RTW_CHPLAN_WORLD_FCC13 = 0x6C,
+	RTW_CHPLAN_FCC2_FCC15 = 0x6D,
+	RTW_CHPLAN_WORLD_FCC12 = 0x6E,
+	RTW_CHPLAN_NULL_ETSI8 = 0x6F,
+	RTW_CHPLAN_NULL_ETSI18 = 0x70,
+	RTW_CHPLAN_NULL_ETSI17 = 0x71,
+	RTW_CHPLAN_NULL_ETSI19 = 0x72,
+	RTW_CHPLAN_WORLD_FCC7 = 0x73,
+	RTW_CHPLAN_FCC2_FCC17 = 0x74,
+	RTW_CHPLAN_WORLD_ETSI20 = 0x75,
+	RTW_CHPLAN_FCC2_FCC11 = 0x76,
+	RTW_CHPLAN_WORLD_ETSI21 = 0x77,
+	RTW_CHPLAN_FCC1_FCC18 = 0x78,
+	RTW_CHPLAN_MKK2_MKK1 = 0x79,
+
+	RTW_CHPLAN_MAX,
+	RTW_CHPLAN_REALTEK_DEFINE = 0x7F,
+	RTW_CHPLAN_UNSPECIFIED = 0xFF,
+};
+
+u8 rtw_chplan_get_default_regd(u8 id);
+bool rtw_chplan_is_empty(u8 id);
+#define rtw_is_channel_plan_valid(chplan) (((chplan) < RTW_CHPLAN_MAX || (chplan) == RTW_CHPLAN_REALTEK_DEFINE) && !rtw_chplan_is_empty(chplan))
+#define rtw_is_legacy_channel_plan(chplan) ((chplan) < 0x20)
+
+struct _RT_CHANNEL_INFO;
+u8 init_channel_set(_adapter *padapter, u8 ChannelPlan, struct _RT_CHANNEL_INFO *channel_set);
+
+#define IS_ALPHA2_NO_SPECIFIED(_alpha2) ((*((u16 *)(_alpha2))) == 0xFFFF)
+
+#define RTW_MODULE_RTL8821AE_HMC_M2		BIT0	/* RTL8821AE(HMC + M.2) */
+#define RTW_MODULE_RTL8821AU			BIT1	/* RTL8821AU */
+#define RTW_MODULE_RTL8812AENF_NGFF		BIT2	/* RTL8812AENF(8812AE+8761)_NGFF */
+#define RTW_MODULE_RTL8812AEBT_HMC		BIT3	/* RTL8812AEBT(8812AE+8761)_HMC */
+#define RTW_MODULE_RTL8188EE_HMC_M2		BIT4	/* RTL8188EE(HMC + M.2) */
+#define RTW_MODULE_RTL8723BE_HMC_M2		BIT5	/* RTL8723BE(HMC + M.2) */
+#define RTW_MODULE_RTL8723BS_NGFF1216	BIT6	/* RTL8723BS(NGFF1216) */
+#define RTW_MODULE_RTL8192EEBT_HMC_M2	BIT7	/* RTL8192EEBT(8192EE+8761AU)_(HMC + M.2) */
+#define RTW_MODULE_RTL8723DE_NGFF1630	BIT8	/* RTL8723DE(NGFF1630) */
+#define RTW_MODULE_RTL8822BE			BIT9	/* RTL8822BE */
+#define RTW_MODULE_RTL8821CE			BIT10	/* RTL8821CE */
+
+struct country_chplan {
+	char alpha2[2];
+	u8 chplan;
+#ifdef CONFIG_80211AC_VHT
+	u8 en_11ac;
+#endif
+#if RTW_DEF_MODULE_REGULATORY_CERT
+	u16 def_module_flags; /* RTW_MODULE_RTLXXX */
+#endif
+};
+
+#ifdef CONFIG_80211AC_VHT
+#define COUNTRY_CHPLAN_EN_11AC(_ent) ((_ent)->en_11ac)
+#else
+#define COUNTRY_CHPLAN_EN_11AC(_ent) 0
+#endif
+
+#if RTW_DEF_MODULE_REGULATORY_CERT
+#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) ((_ent)->def_module_flags)
+#else
+#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) 0
+#endif
+
+const struct country_chplan *rtw_get_chplan_from_country(const char *country_code);
+
+void dump_country_chplan(void *sel, const struct country_chplan *ent);
+void dump_country_chplan_map(void *sel);
+void dump_chplan_id_list(void *sel);
+void dump_chplan_test(void *sel);
+void dump_chplan_ver(void *sel);
+
+#endif /* __RTW_CHPLAN_H__ */

core/rtw_eeprom.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,12 +11,7 @@
  * 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_EEPROM_C_
 
 #include <drv_conf.h>
@@ -25,31 +20,25 @@
 
 void up_clk(_adapter	*padapter,	 u16 *x)
 {
-_func_enter_;
 	*x = *x | _EESK;
 	rtw_write8(padapter, EE_9346CR, (u8)*x);
 	rtw_udelay_os(CLOCK_RATE);
 
-_func_exit_;
 
 }
 
 void down_clk(_adapter	*padapter, u16 *x)
 {
-_func_enter_;
 	*x = *x & ~_EESK;
 	rtw_write8(padapter, EE_9346CR, (u8)*x);
 	rtw_udelay_os(CLOCK_RATE);
-_func_exit_;	
 }
 
 void shift_out_bits(_adapter *padapter, u16 data, u16 count)
 {
 	u16 x, mask;
-_func_enter_;
 
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	mask = 0x01 << (count - 1);
@@ -57,13 +46,11 @@ _func_enter_;
 
 	x &= ~(_EEDO | _EEDI);
 
-	do
+	do {
-	{
 		x &= ~_EEDI;
 		if (data & mask)
 			x |= _EEDI;
 		if (rtw_is_surprise_removed(padapter)) {
-			RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 			goto out;
 		}
 		rtw_write8(padapter, EE_9346CR, (u8)x);
@@ -73,21 +60,18 @@ _func_enter_;
 		mask = mask >> 1;
 	} while (mask);
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	x &= ~_EEDI;
 	rtw_write8(padapter, EE_9346CR, (u8)x);
 out:
-_func_exit_;		
+	return;
 }
 
 u16 shift_in_bits(_adapter *padapter)
 {
 	u16 x, d = 0, i;
-_func_enter_;	
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	x = rtw_read8(padapter, EE_9346CR);
@@ -95,12 +79,10 @@ _func_enter_;
 	x &= ~(_EEDO | _EEDI);
 	d = 0;
 
-	for(i=0; i<16; i++)
+	for (i = 0; i < 16; i++) {
-	{
 		d = d << 1;
 		up_clk(padapter, &x);
 		if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 			goto out;
 		}
 		x = rtw_read8(padapter, EE_9346CR);
@@ -112,7 +94,6 @@ _func_enter_;
 		down_clk(padapter, &x);
 	}
 out:
-_func_exit_;		
 
 	return d;
 }
@@ -120,7 +101,6 @@ _func_exit_;
 void standby(_adapter	*padapter)
 {
 	u8   x;
-_func_enter_;	
 	x = rtw_read8(padapter, EE_9346CR);
 
 	x &= ~(_EECS | _EESK);
@@ -130,17 +110,14 @@ _func_enter_;
 	x |= _EECS;
 	rtw_write8(padapter, EE_9346CR, x);
 	rtw_udelay_os(CLOCK_RATE);
-_func_exit_;		
 }
 
 u16 wait_eeprom_cmd_done(_adapter *padapter)
 {
 	u8	x;
 	u16	i, res = _FALSE;
-_func_enter_;	
 	standby(padapter);
-	for (i=0; i<200; i++) 
+	for (i = 0; i < 200; i++) {
-	{
 		x = rtw_read8(padapter, EE_9346CR);
 		if (x & _EEDO) {
 			res = _TRUE;
@@ -149,37 +126,31 @@ _func_enter_;
 		rtw_udelay_os(CLOCK_RATE);
 	}
 exit:
-_func_exit_;			
 	return res;
 }
 
 void eeprom_clean(_adapter *padapter)
 {
 	u16 x;
-_func_enter_;		
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	x = rtw_read8(padapter, EE_9346CR);
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	x &= ~(_EECS | _EEDI);
 	rtw_write8(padapter, EE_9346CR, (u8)x);
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	up_clk(padapter, &x);
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 	down_clk(padapter, &x);
 out:
-_func_exit_;			
+	return;
 }
 
 void eeprom_write16(_adapter *padapter, u16 reg, u16 data)
@@ -191,16 +162,13 @@ void eeprom_write16(_adapter * padapter, u16 reg, u16 data)
 	tmp8_new = tmp8_ori & 0xf7;
 	if (tmp8_ori != tmp8_new) {
 		rtw_write8(padapter, 0x102502f1, tmp8_new);
-		RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n"));
 	}
 	tmp8_clk_ori = rtw_read8(padapter, 0x10250003);
 	tmp8_clk_new = tmp8_clk_ori | 0x20;
 	if (tmp8_clk_new != tmp8_clk_ori) {
-		RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n"));
 		rtw_write8(padapter, 0x10250003, tmp8_clk_new);
 	}
 #endif
-_func_enter_;		
 
 	x = rtw_read8(padapter, EE_9346CR);
 
@@ -210,43 +178,41 @@ _func_enter_;
 
 	shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);
 
-	if(padapter->EepromAddressSize==8)	//CF+ and SDIO
+	if (padapter->EepromAddressSize == 8)	/* CF+ and SDIO */
 		shift_out_bits(padapter, 0, 6);
-	else									//USB
+	else									/* USB */
 		shift_out_bits(padapter, 0, 4);
 
 	standby(padapter);
 
-// Commented out by rcnjko, 2004.0
+	/* Commented out by rcnjko, 2004.0
-//	// Erase this particular word.  Write the erase opcode and register
+	 * 	  Erase this particular word.  Write the erase opcode and register
-//	// number in that order. The opcode is 3bits in length; reg is 6 bits long.
+	 *    number in that order. The opcode is 3bits in length; reg is 6 bits long. */
-//	shift_out_bits(Adapter, EEPROM_ERASE_OPCODE, 3);
+/*	shift_out_bits(Adapter, EEPROM_ERASE_OPCODE, 3);
-//	shift_out_bits(Adapter, reg, Adapter->EepromAddressSize);
+ *	shift_out_bits(Adapter, reg, Adapter->EepromAddressSize);
-//
+ *
-//	if (wait_eeprom_cmd_done(Adapter ) == FALSE) 
+ *	if (wait_eeprom_cmd_done(Adapter ) == FALSE)
-//	{
+ *	{
-//		return;
+ *		return;
-//	}
+ *	} */
 
 
 	standby(padapter);
 
-	// write the new word to the EEPROM
+	/* write the new word to the EEPROM */
 
-	// send the write opcode the EEPORM
+	/* send the write opcode the EEPORM */
 	shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3);
 
-	// select which word in the EEPROM that we are writing to.
+	/* select which word in the EEPROM that we are writing to. */
 	shift_out_bits(padapter, reg, padapter->EepromAddressSize);
 
-	// write the data to the selected EEPROM word.
+	/* write the data to the selected EEPROM word. */
 	shift_out_bits(padapter, data, 16);
 
 	if (wait_eeprom_cmd_done(padapter) == _FALSE)
-	{
 
 		goto exit;
-	}
 
 	standby(padapter);
 
@@ -262,11 +228,10 @@ exit:
 		rtw_write8(padapter, 0x102502f1, tmp8_ori);
 
 #endif
-_func_exit_;	
 	return;
 }
 
-u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom
+u16 eeprom_read16(_adapter *padapter, u16 reg)  /* ReadEEprom */
 {
 
 	u16 x;
@@ -277,26 +242,21 @@ u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom
 	tmp8_new = tmp8_ori & 0xf7;
 	if (tmp8_ori != tmp8_new) {
 		rtw_write8(padapter, 0x102502f1, tmp8_new);
-		RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n"));
 	}
 	tmp8_clk_ori = rtw_read8(padapter, 0x10250003);
 	tmp8_clk_new = tmp8_clk_ori | 0x20;
 	if (tmp8_clk_new != tmp8_clk_ori) {
-		RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n"));
 		rtw_write8(padapter, 0x10250003, tmp8_clk_new);
 	}
 #endif
-_func_enter_;		
 
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
-	// select EEPROM, reset bits, set _EECS
+	/* select EEPROM, reset bits, set _EECS */
 	x = rtw_read8(padapter, EE_9346CR);
 
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 
@@ -304,12 +264,12 @@ _func_enter_;
 	x |= _EEM1 | _EECS;
 	rtw_write8(padapter, EE_9346CR, (unsigned char)x);
 
-	// write the read opcode and register number in that order
+	/* write the read opcode and register number in that order */
-	// The opcode is 3bits in length, reg is 6 bits long
+	/* The opcode is 3bits in length, reg is 6 bits long */
 	shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);
 	shift_out_bits(padapter, reg, padapter->EepromAddressSize);
 
-	// Now read the data (16 bits) in from the selected EEPROM word
+	/* Now read the data (16 bits) in from the selected EEPROM word */
 	data = shift_in_bits(padapter);
 
 	eeprom_clean(padapter);
@@ -321,7 +281,6 @@ out:
 		rtw_write8(padapter, 0x102502f1, tmp8_ori);
 
 #endif
-_func_exit_;		
 	return data;
 
 
@@ -330,22 +289,19 @@ _func_exit_;
 
 
 
-//From even offset
+/* From even offset */
 void eeprom_read_sz(_adapter *padapter, u16 reg, u8 *data, u32 sz)
 {
 
 	u16 x, data16;
 	u32 i;
-_func_enter_;		
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
-	// select EEPROM, reset bits, set _EECS
+	/* select EEPROM, reset bits, set _EECS */
 	x = rtw_read8(padapter, EE_9346CR);
 
 	if (rtw_is_surprise_removed(padapter)) {
-		RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==_TRUE"));
 		goto out;
 	}
 
@@ -353,14 +309,13 @@ _func_enter_;
 	x |= _EEM1 | _EECS;
 	rtw_write8(padapter, EE_9346CR, (unsigned char)x);
 
-	// write the read opcode and register number in that order
+	/* write the read opcode and register number in that order */
-	// The opcode is 3bits in length, reg is 6 bits long
+	/* The opcode is 3bits in length, reg is 6 bits long */
 	shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);
 	shift_out_bits(padapter, reg, padapter->EepromAddressSize);
 
 
-	for(i=0; i<sz; i+=2)
+	for (i = 0; i < sz; i += 2) {
-	{
 		data16 = shift_in_bits(padapter);
 		data[i] = data16 & 0xff;
 		data[i + 1] = data16 >> 8;
@@ -368,45 +323,39 @@ _func_enter_;
 
 	eeprom_clean(padapter);
 out:
-_func_exit_;		
+	return;
-
-
-
 }
 
 
-//addr_off : address offset of the entry in eeprom (not the tuple number of eeprom (reg); that is addr_off !=reg)
+/* addr_off : address offset of the entry in eeprom (not the tuple number of eeprom (reg); that is addr_off !=reg) */
 u8 eeprom_read(_adapter *padapter, u32 addr_off, u8 sz, u8 *rbuf)
 {
 	u8 quotient, remainder, addr_2align_odd;
 	u16 reg, stmp , i = 0, idx = 0;
-_func_enter_;		
 	reg = (u16)(addr_off >> 1);
 	addr_2align_odd = (u8)(addr_off & 0x1);
 
-	if(addr_2align_odd) //read that start at high part: e.g  1,3,5,7,9,...
+	if (addr_2align_odd) { /* read that start at high part: e.g  1,3,5,7,9,... */
-	{
 		stmp = eeprom_read16(padapter, reg);
-		rbuf[idx++] = (u8) ((stmp>>8)&0xff); //return hogh-part of the short
+		rbuf[idx++] = (u8)((stmp >> 8) & 0xff); /* return hogh-part of the short */
-		reg++; sz--;
+		reg++;
+		sz--;
 	}
 
 	quotient = sz >> 1;
 	remainder = sz & 0x1;
 
-	for( i=0 ; i < quotient; i++)
+	for (i = 0 ; i < quotient; i++) {
-	{
 		stmp = eeprom_read16(padapter, reg + i);
 		rbuf[idx++] = (u8)(stmp & 0xff);
 		rbuf[idx++] = (u8)((stmp >> 8) & 0xff);
 	}
 
 	reg = reg + i;
-	if(remainder){ //end of read at lower part of short : 0,2,4,6,...
+	if (remainder) { /* end of read at lower part of short : 0,2,4,6,... */
 		stmp = eeprom_read16(padapter, reg);
 		rbuf[idx] = (u8)(stmp & 0xff);
 	}
-_func_exit_;		
 	return _TRUE;
 }
 
@@ -415,9 +364,6 @@ _func_exit_;
 VOID read_eeprom_content(_adapter	*padapter)
 {
 
-_func_enter_;		
 
 
-_func_exit_;		
 }
-

core/rtw_ioctl_query.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,21 +11,16 @@
  * 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_types.h>
 
 
 #ifdef PLATFORM_WINDOWS
-//
+/*
-// Added for WPA2-PSK, by Annie, 2005-09-20.
+ * Added for WPA2-PSK, by Annie, 2005-09-20.
-//
+ *   */
 u8
 query_802_11_capability(
 	_adapter		*Adapter,
@@ -33,8 +28,7 @@ query_802_11_capability(
 	u32		*pulOutLen
 )
 {
-	static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] = 
+	static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] = {
-	{
 		{Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled},
 		{Ndis802_11AuthModeOpen, Ndis802_11Encryption1Enabled},
 		{Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled},
@@ -63,16 +57,12 @@ query_802_11_capability(
 	pCap->NoOfPMKIDs = NUM_PMKID_CACHE;
 	pCap->NoOfAuthEncryptPairsSupported = ulNumOfPairSupported;
 
-	if( sizeof (szAuthEnc) <= 240 )		// 240 = 256 - 4*4	// SecurityInfo.szCapability: only 256 bytes in size.
+	if (sizeof(szAuthEnc) <= 240)		/* 240 = 256 - 4*4	 */ { /* SecurityInfo.szCapability: only 256 bytes in size. */
-	{
 		_rtw_memcpy(pucAuthEncryptionSupported, (u8 *)szAuthEnc,  sizeof(szAuthEnc));
 		*pulOutLen = pCap->Length;
 		return _TRUE;
-	}
+	} else {
-	else
-	{
 		*pulOutLen = 0;
-		RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("_query_802_11_capability(): szAuthEnc size is too large.\n"));
 		return _FALSE;
 	}
 }
@@ -86,14 +76,14 @@ u8 query_802_11_association_information(	_adapter *padapter,PNDIS_802_11_ASSOCIA
 	u8	*pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
 	unsigned char i, *auth_ie, *supp_ie;
 
-	//NdisZeroMemory(pAssocInfo, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION));
+	/* NdisZeroMemory(pAssocInfo, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); */
 	_rtw_memset(pAssocInfo, 0, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION));
-	//pAssocInfo->Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
+	/* pAssocInfo->Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); */
 
-	//------------------------------------------------------
+	/* ------------------------------------------------------ */
-	// Association Request related information
+	/* Association Request related information */
-	//------------------------------------------------------
+	/* ------------------------------------------------------ */
-	// Req_1. AvailableRequestFixedIEs
+	/* Req_1. AvailableRequestFixedIEs */
 	if (psecnetwork != NULL) {
 
 		pAssocInfo->AvailableRequestFixedIEs |= NDIS_802_11_AI_REQFI_CAPABILITIES | NDIS_802_11_AI_REQFI_CURRENTAPADDRESS;
@@ -103,23 +93,16 @@ u8 query_802_11_association_information(	_adapter *padapter,PNDIS_802_11_ASSOCIA
 
 		pAssocInfo->OffsetRequestIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
 
-	if(check_fwstate( pmlmepriv, _FW_UNDER_LINKING|_FW_LINKED)==_TRUE)
+		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING | _FW_LINKED) == _TRUE) {
-	{
 
 			if (psecuritypriv->ndisauthtype >= Ndis802_11AuthModeWPA2)
-			pDest[0] =48;		//RSN Information Element
+				pDest[0] = 48;		/* RSN Information Element */
 			else
-			pDest[0] =221;	//WPA(SSN) Information Element
+				pDest[0] = 221;	/* WPA(SSN) Information Element */
 
-		RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n Adapter->ndisauthtype==Ndis802_11AuthModeWPA)?0xdd:0x30 [%d]",pDest[0]));
 			supp_ie = &psecuritypriv->supplicant_ie[0];
-		for(i=0;i<supp_ie[0];i++)
-		{
-			RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x \n\n", i,supp_ie[i]));
-		}
 
-		i=13;	//0~11 is fixed information element		
+			i = 13;	/* 0~11 is fixed information element		 */
-		RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("i= %d tgt_network->network.IELength=%d\n\n", i,(int)psecnetwork->IELength));
 			while ((i < supp_ie[0]) && (i < 256)) {
 				if ((unsigned char)supp_ie[i] == pDest[0]) {
 					_rtw_memcpy((u8 *)(pDest),
@@ -132,27 +115,24 @@ u8 query_802_11_association_information(	_adapter *padapter,PNDIS_802_11_ASSOCIA
 				i = i + supp_ie[i + 1] + 2;
 				if (supp_ie[1 + i] == 0)
 					i = i + 1;
-			RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("iteration i=%d IEs [%d] = 0x%x \n\n", i,i,supp_ie[i+1]));
 
 			}
 
 
-		pAssocInfo->RequestIELength += (2 + supp_ie[1+i]);// (2 + psecnetwork->IEs[1+i]+4);
+			pAssocInfo->RequestIELength += (2 + supp_ie[1 + i]); /* (2 + psecnetwork->IEs[1+i]+4); */
 
 		}
 
 
-		RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n psecnetwork != NULL,fwstate==_FW_UNDER_LINKING \n"));
 
 	}
 
 
-	//------------------------------------------------------
+	/* ------------------------------------------------------ */
-	// Association Response related information
+	/* Association Response related information */
-	//------------------------------------------------------
+	/* ------------------------------------------------------ */
 
-	if(check_fwstate( pmlmepriv, _FW_LINKED)==_TRUE)
+	if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
-	{
 		tgt_network = &(pmlmepriv->cur_network);
 		if (tgt_network != NULL) {
 			pAssocInfo->AvailableResponseFixedIEs =
@@ -167,8 +147,6 @@ u8 query_802_11_association_information(	_adapter *padapter,PNDIS_802_11_ASSOCIA
 			pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
 			auth_ie = &psecuritypriv->authenticator_ie[0];
 
-		for(i=0;i<auth_ie[0];i++)
-			RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x \n\n", i,auth_ie[i]));
 
 			i = auth_ie[0] - 12;
 			if (i > 0) {
@@ -180,13 +158,9 @@ u8 query_802_11_association_information(	_adapter *padapter,PNDIS_802_11_ASSOCIA
 			pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
 
 
-		RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n tgt_network != NULL,fwstate==_FW_LINKED \n"));
 		}
 	}
-	RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n exit query_802_11_association_information \n"));
-_func_exit_;
 
 	return _TRUE;
 }
 #endif
-

core/rtw_iol.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,12 +11,7 @@
  * 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
- *
- *
- ******************************************************************************/
 
 #include <drv_types.h>
 
@@ -29,15 +24,15 @@ struct xmit_frame	*rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
 	struct xmit_priv	*pxmitpriv = &(adapter->xmitpriv);
 
 #if 1
-	if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL)
+	xmit_frame = rtw_alloc_xmitframe(pxmitpriv);
-	{
+	if (xmit_frame == NULL) {
-		DBG_871X("%s rtw_alloc_xmitframe return null\n", __FUNCTION__);
+		RTW_INFO("%s rtw_alloc_xmitframe return null\n", __FUNCTION__);
 		goto exit;
 	}
 
-	if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL)
+	xmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
-	{
+	if (xmitbuf == NULL) {
-		DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
+		RTW_INFO("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
 		rtw_free_xmitframe(pxmitpriv, xmit_frame);
 		xmit_frame = NULL;
 		goto exit;
@@ -50,15 +45,14 @@ struct xmit_frame	*rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
 
 	pattrib = &xmit_frame->attrib;
 	update_mgntframe_attrib(adapter, pattrib);
-	pattrib->qsel = QSLT_BEACON;//Beacon	
+	pattrib->qsel = QSLT_BEACON;/* Beacon	 */
 	pattrib->subtype = WIFI_BEACON;
 	pattrib->pktlen = pattrib->last_txcmdsz = 0;
 
 #else
-	if ((xmit_frame = alloc_mgtxmitframe(pxmitpriv)) == NULL)
+	xmit_frame = alloc_mgtxmitframe(pxmitpriv);
-	{
+	if (xmit_frame == NULL)
-		DBG_871X("%s alloc_mgtxmitframe return null\n", __FUNCTION__);
+		RTW_INFO("%s alloc_mgtxmitframe return null\n", __FUNCTION__);
-	}
 	else {
 		pattrib = &xmit_frame->attrib;
 		update_mgntframe_attrib(adapter, pattrib);
@@ -81,9 +75,9 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
 	buf_offset = TXDESC_OFFSET;
 	ori_len = buf_offset + pattrib->pktlen;
 
-	//check if the io_buf can accommodate new cmds
+	/* check if the io_buf can accommodate new cmds */
 	if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) {
-		DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__
+		RTW_INFO("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__
 			 , ori_len + cmd_len + 8, MAX_XMITBUF_SZ);
 		return _FAIL;
 	}
@@ -92,7 +86,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
 	pattrib->pktlen += cmd_len;
 	pattrib->last_txcmdsz += cmd_len;
 
-	//DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen);
+	/* RTW_INFO("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); */
 
 	return _SUCCESS;
 }
@@ -124,19 +118,18 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8
 {
 	struct ioreg_cfg cmd = {8, IOREG_CMD_WB_REG, 0x0, 0x0, 0x0};
 
-	//RTW_PUT_LE16((u8*)&cmd.address, addr);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, addr);	 */
-	//RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	
+	/* RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	 */
 	cmd.address = cpu_to_le16(addr);
 	cmd.data = cpu_to_le32(value);
 
-	if(mask!=0xFF)
+	if (mask != 0xFF) {
-	{
 		cmd.length = 12;
-		//RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	
+		/* RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	 */
 		cmd.mask = cpu_to_le32(mask);
 	}
 
-	//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask);
+	/* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
 
@@ -145,19 +138,18 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u
 {
 	struct ioreg_cfg cmd = {8, IOREG_CMD_WW_REG, 0x0, 0x0, 0x0};
 
-	//RTW_PUT_LE16((u8*)&cmd.address, addr);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, addr);	 */
-	//RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	
+	/* RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	 */
 	cmd.address = cpu_to_le16(addr);
 	cmd.data = cpu_to_le32(value);
 
-	if(mask!=0xFFFF)
+	if (mask != 0xFFFF) {
-	{
 		cmd.length = 12;
-		//RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	
+		/* RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	 */
 		cmd.mask =  cpu_to_le32(mask);
 	}
 
-	//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask);
+	/* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
 
@@ -166,19 +158,18 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u
 {
 	struct ioreg_cfg cmd = {8, IOREG_CMD_WD_REG, 0x0, 0x0, 0x0};
 
-	//RTW_PUT_LE16((u8*)&cmd.address, addr);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, addr);	 */
-	//RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	
+	/* RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	 */
 	cmd.address = cpu_to_le16(addr);
 	cmd.data = cpu_to_le32(value);
 
-	if(mask!=0xFFFFFFFF)
+	if (mask != 0xFFFFFFFF) {
-	{
 		cmd.length = 12;
-		//RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	
+		/* RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	 */
 		cmd.mask =  cpu_to_le32(mask);
 	}
 
-	//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask);
+	/* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
 
@@ -188,19 +179,18 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,
 {
 	struct ioreg_cfg cmd = {8, IOREG_CMD_W_RF, 0x0, 0x0, 0x0};
 
-	//RTW_PUT_LE16((u8*)&cmd.address, addr);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, addr);	 */
-	//RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	
+	/* RTW_PUT_LE32((u8*)&cmd.value, (u32)value);	 */
 	cmd.address = (rf_path << 8) | ((addr) & 0xFF);
 	cmd.data = cpu_to_le32(value);
 
-	if(mask!=0x000FFFFF)
+	if (mask != 0x000FFFFF) {
-	{
 		cmd.length = 12;
-		//RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	
+		/* RTW_PUT_LE32((u8*)&cmd.mask, (u32)mask);	 */
 		cmd.mask =  cpu_to_le32(mask);
 	}
 
-	//DBG_871X("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, addr,value,mask);
+	/* RTW_INFO("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, addr,value,mask); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
 
@@ -211,10 +201,10 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,
 int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
 {
 	struct ioreg_cfg cmd = {4, IOREG_CMD_DELAY_US, 0x0, 0x0, 0x0};
-	//RTW_PUT_LE16((u8*)&cmd.address, us);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, us);	 */
 	cmd.address = cpu_to_le16(us);
 
-	//DBG_871X("%s %u\n", __FUNCTION__, us);
+	/* RTW_INFO("%s %u\n", __FUNCTION__, us); */
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4);
 }
 
@@ -222,10 +212,10 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
 {
 	struct ioreg_cfg cmd = {4, IOREG_CMD_DELAY_US, 0x0, 0x0, 0x0};
 
-	//RTW_PUT_LE16((u8*)&cmd.address, ms);	
+	/* RTW_PUT_LE16((u8*)&cmd.address, ms);	 */
 	cmd.address = cpu_to_le16(ms);
 
-	//DBG_871X("%s %u\n", __FUNCTION__, ms);
+	/* RTW_INFO("%s %u\n", __FUNCTION__, ms); */
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4);
 }
 int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
@@ -242,7 +232,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame)
 		rtw_IOL_append_END_cmd(pxmit_frame);
 		pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen + 32) / 256) + 1) * 256);
 
-		//printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen);
+		/* printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); */
 		pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen;
 		is_cmd_bndy = _TRUE;
 	}
@@ -258,14 +248,16 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf)
 	for (i = 0; i < buf_len; i++) {
 		printk("%02x-", *(pbuf + i));
 
-		if(j%32 ==0) printk("\n");j++;				
+		if (j % 32 == 0)
+			printk("\n");
+		j++;
 	}
 	printk("\n");
 	printk("============= ioreg_cmd len = %d ===============\n", buf_len);
 }
 
 
-#else //CONFIG_IOL_NEW_GENERATION
+#else /* CONFIG_IOL_NEW_GENERATION */
 int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary)
 {
 	IOL_CMD cmd = {0x0, IOL_CMD_LLT, 0x0, 0x0};
@@ -309,24 +301,36 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value)
 #ifdef DBG_IO
 int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line)
 {
-	if (match_write_sniff_ranges(addr, 1))
+	const struct rtw_io_sniff_ent *ent = match_write_sniff(xmit_frame->padapter, addr, 1, value);
-		DBG_871X("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value);
+
+	if (ent) {
+		RTW_INFO("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x) %s\n"
+			, caller, line, addr, value, rtw_io_sniff_ent_get_tag(ent));
+	}
 
 	return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value);
 }
 
 int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line)
 {
-	if (match_write_sniff_ranges(addr, 2))
+	const struct rtw_io_sniff_ent *ent = match_write_sniff(xmit_frame->padapter, addr, 2, value);
-		DBG_871X("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value);
+
+	if (ent) {
+		RTW_INFO("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x) %s\n"
+			, caller, line, addr, value, rtw_io_sniff_ent_get_tag(ent));
+	}
 
 	return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value);
 }
 
 int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line)
 {
-	if (match_write_sniff_ranges(addr, 4))
+	const struct rtw_io_sniff_ent *ent = match_write_sniff(xmit_frame->padapter, addr, 4, value);
-		DBG_871X("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value);
+
+	if (ent) {
+		RTW_INFO("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x) %s\n"
+			, caller, line, addr, value, rtw_io_sniff_ent_get_tag(ent));
+	}
 
 	return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value);
 }
@@ -338,7 +342,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
 
 	RTW_PUT_BE32((u8 *)&cmd.value, (u32)us);
 
-	//DBG_871X("%s %u\n", __FUNCTION__, us);
+	/* RTW_INFO("%s %u\n", __FUNCTION__, us); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8);
 }
@@ -349,7 +353,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
 
 	RTW_PUT_BE32((u8 *)&cmd.value, (u32)ms);
 
-	//DBG_871X("%s %u\n", __FUNCTION__, ms);
+	/* RTW_INFO("%s %u\n", __FUNCTION__, ms); */
 
 	return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8);
 }
@@ -367,7 +371,8 @@ int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32
 {
 	struct xmit_frame	*xmit_frame;
 
-	if((xmit_frame=rtw_IOL_accquire_xmit_frame(adapter)) == NULL)
+	xmit_frame = rtw_IOL_accquire_xmit_frame(adapter);
+	if (xmit_frame == NULL)
 		return _FAIL;
 
 	if (rtw_IOL_append_cmds(xmit_frame, IOL_cmds, cmd_num << 3) == _FAIL)
@@ -381,10 +386,9 @@ int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms)
 	IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0};
 	return rtw_IOL_exec_cmd_array_sync(adapter, (u8 *)&end_cmd, 1, max_wating_ms);
 }
-#endif //CONFIG_IOL_NEW_GENERATION
+#endif /* CONFIG_IOL_NEW_GENERATION */
 
 
 
 
-#endif //CONFIG_IOL
+#endif /* CONFIG_IOL */
-

core/rtw_mem.c

@@ -1,3 +1,17 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
 
 #include <drv_types.h>
 #include <rtw_mem.h>
@@ -75,28 +89,21 @@ static int __init rtw_mem_init(void)
 
 #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
 	for (i = 0; i < NR_RECVBUFF; i++)
-	{
 		rtk_buf_mem[i] = usb_buffer_alloc(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma);
-	}
+#endif /* CONFIG_USE_USB_BUFFER_ALLOC_RX */
-#endif //CONFIG_USE_USB_BUFFER_ALLOC_RX
 
 	skb_queue_head_init(&rtk_skb_mem_q);
 
-	for(i=0; i<MAX_RTKM_NR_PREALLOC_RECV_SKB; i++)
+	for (i = 0; i < MAX_RTKM_NR_PREALLOC_RECV_SKB; i++) {
-	{
 		pskb = __dev_alloc_skb(MAX_RTKM_RECVBUF_SZ + RECVBUFF_ALIGN_SZ, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
-		if(pskb)
+		if (pskb) {
-		{		
 			tmpaddr = (SIZE_PTR)pskb->data;
 			alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
 			skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignment));
 
 			skb_queue_tail(&rtk_skb_mem_q, pskb);
-		}
+		} else
-		else
-		{
 			printk("%s, alloc skb memory fail!\n", __func__);
-		}
 
 		pskb = NULL;
 	}
@@ -109,9 +116,8 @@ static int __init rtw_mem_init(void)
 
 static void __exit rtw_mem_exit(void)
 {
-	if (skb_queue_len(&rtk_skb_mem_q)) {
+	if (skb_queue_len(&rtk_skb_mem_q))
 		printk("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q));
-	}
 
 	skb_queue_purge(&rtk_skb_mem_q);
 

core/rtw_sdio.c

@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2015 - 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.
+ *
+ *****************************************************************************/
+#define _RTW_SDIO_C_
+
+#include <drv_types.h>		/* struct dvobj_priv and etc. */
+#include <drv_types_sdio.h>	/* RTW_SDIO_ADDR_CMD52_GEN */
+
+/*
+ * Description:
+ *	Use SDIO cmd52 or cmd53 to read/write data
+ *
+ * Parameters:
+ *	d	pointer of device object(struct dvobj_priv)
+ *	addr	SDIO address, 17 bits
+ *	buf	buffer for I/O
+ *	len	length
+ *	write	0:read, 1:write
+ *	cmd52	0:cmd52, 1:cmd53
+ *
+ * Return:
+ *	_SUCCESS	I/O ok.
+ *	_FAIL		I/O fail.
+ */
+static u8 sdio_io(struct dvobj_priv *d, u32 addr, void *buf, size_t len, u8 write, u8 cmd52)
+{
+	u32 addr_drv;	/* address with driver defined bit */
+	int err;
+	u8 retry = 0;
+	u8 stop_retry = _FALSE;	/* flag for stopping retry or not */
+
+
+	if (rtw_is_surprise_removed(dvobj_get_primary_adapter(d))) {
+		RTW_ERR("%s: bSurpriseRemoved, skip %s 0x%05x, %zu bytes\n",
+			__FUNCTION__, write?"write":"read", addr, len);
+		return _FAIL;
+	}
+
+	addr_drv = addr;
+	if (cmd52)
+		addr_drv = RTW_SDIO_ADDR_CMD52_GEN(addr_drv);
+
+	do {
+		if (write)
+			err = d->intf_ops->write(d, addr_drv, buf, len, 0);
+		else
+			err = d->intf_ops->read(d, addr_drv, buf, len, 0);
+		if (!err) {
+			if (retry) {
+				RTW_INFO("%s: Retry %s OK! addr=0x%05x %zu bytes, retry=%u,%u\n",
+					 __FUNCTION__, write?"write":"read",
+					 addr, len, retry, ATOMIC_READ(&d->continual_io_error));
+				RTW_INFO_DUMP("Data: ", buf, len);
+			}
+			rtw_reset_continual_io_error(d);
+			break;
+		}
+		RTW_ERR("%s: %s FAIL! error(%d) addr=0x%05x %zu bytes, retry=%u,%u\n",
+			__FUNCTION__, write?"write":"read", err, addr, len,
+			retry, ATOMIC_READ(&d->continual_io_error));
+
+		retry++;
+		stop_retry = rtw_inc_and_chk_continual_io_error(d);
+		if ((err == -1) || (stop_retry == _TRUE) || (retry > SD_IO_TRY_CNT)) {
+			/* critical error, unrecoverable */
+			RTW_ERR("%s: Fatal error! Set surprise remove flag ON! (retry=%u,%u)\n",
+				__FUNCTION__, retry, ATOMIC_READ(&d->continual_io_error));
+			rtw_set_surprise_removed(dvobj_get_primary_adapter(d));
+			return _FAIL;
+		}
+
+		/* WLAN IOREG or SDIO Local */
+		if ((addr & 0x10000) || !(addr & 0xE000)) {
+			RTW_WARN("%s: Retry %s addr=0x%05x %zu bytes, retry=%u,%u\n",
+				 __FUNCTION__, write?"write":"read", addr, len,
+				 retry, ATOMIC_READ(&d->continual_io_error));
+			continue;
+		}
+		return _FAIL;
+	} while (1);
+
+	return _SUCCESS;
+}
+
+u8 rtw_sdio_read_cmd52(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
+{
+	return sdio_io(d, addr, buf, len, 0, 1);
+}
+
+u8 rtw_sdio_read_cmd53(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
+{
+	return sdio_io(d, addr, buf, len, 0, 0);
+}
+
+u8 rtw_sdio_write_cmd52(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
+{
+	return sdio_io(d, addr, buf, len, 1, 1);
+}
+
+u8 rtw_sdio_write_cmd53(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
+{
+	return sdio_io(d, addr, buf, len, 1, 0);
+}
+
+u8 rtw_sdio_f0_read(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
+{
+	int err;
+	u8 ret;
+
+
+	ret = _SUCCESS;
+	addr = RTW_SDIO_ADDR_F0_GEN(addr);
+
+	err = d->intf_ops->read(d, addr, buf, len, 0);
+	if (err)
+		ret = _FAIL;
+
+	return ret;
+}

core/rtw_sreset.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,12 +11,7 @@
  * 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
- *
- *
- ******************************************************************************/
 
 #include <drv_types.h>
 #include <hal_data.h>
@@ -52,31 +47,26 @@ u8 sreset_get_wifi_status(_adapter *padapter)
 #if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
-
 	u8 status = WIFI_STATUS_SUCCESS;
 	u32 val32 = 0;
-	_irqL irqL;
+
 	if (psrtpriv->silent_reset_inprogress == _TRUE)
-        {
 		return status;
-	}
 	val32 = rtw_read32(padapter, REG_TXDMA_STATUS);
-	if(val32==0xeaeaeaea){
+	if (val32 == 0xeaeaeaea)
 		psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST;
-	}
 	else if (val32 != 0) {
-		DBG_8192C("txdmastatu(%x)\n",val32);
+		RTW_INFO("txdmastatu(%x)\n", val32);
 		psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR;
 	}
 
-	if(WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status)
+	if (WIFI_STATUS_SUCCESS != psrtpriv->Wifi_Error_Status) {
-	{
+		RTW_INFO("==>%s error_status(0x%x)\n", __FUNCTION__, psrtpriv->Wifi_Error_Status);
-		DBG_8192C("==>%s error_status(0x%x) \n",__FUNCTION__,psrtpriv->Wifi_Error_Status);
 		status = (psrtpriv->Wifi_Error_Status & (~(USB_READ_PORT_FAIL | USB_WRITE_PORT_FAIL)));
 	}
-	DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status);
+	RTW_INFO("==> %s wifi_status(0x%x)\n", __FUNCTION__, status);
 
-	//status restore
+	/* status restore */
 	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 
 	return status;
@@ -113,11 +103,9 @@ bool sreset_inprogress(_adapter *padapter)
 
 void sreset_restore_security_station(_adapter *padapter)
 {
-	u8 EntryId = 0;
 	struct mlme_priv *mlmepriv = &padapter->mlmepriv;
 	struct sta_priv *pstapriv = &padapter->stapriv;
 	struct sta_info *psta;
-	struct security_priv* psecuritypriv=&(padapter->securitypriv);
 	struct mlme_ext_info	*pmlmeinfo = &padapter->mlmeextpriv.mlmext_info;
 
 	{
@@ -127,43 +115,23 @@ void sreset_restore_security_station(_adapter *padapter)
 			val8 = 0xcc;
 #ifdef CONFIG_WAPI_SUPPORT
 		} else if (padapter->wapiInfo.bWapiEnable && pmlmeinfo->auth_algo == dot11AuthAlgrthm_WAPI) {
-			//Disable TxUseDefaultKey, RxUseDefaultKey, RxBroadcastUseDefaultKey.
+			/* Disable TxUseDefaultKey, RxUseDefaultKey, RxBroadcastUseDefaultKey. */
 			val8 = 0x4c;
 #endif
-		} else {
+		} else
 			val8 = 0xcf;
-		}
 		rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
 	}
 
-	#if 0
-	if (	( padapter->securitypriv.dot11PrivacyAlgrthm == _WEP40_ ) ||
-		( padapter->securitypriv.dot11PrivacyAlgrthm == _WEP104_ ))
-	{
-
-		for(EntryId=0; EntryId<4; EntryId++)
-		{
-			if(EntryId == psecuritypriv->dot11PrivacyKeyIndex)
-				rtw_set_key(padapter,&padapter->securitypriv, EntryId, 1,_FALSE);
-			else
-				rtw_set_key(padapter,&padapter->securitypriv, EntryId, 0,_FALSE);
-		}
-
-	}
-	else
-	#endif
 	if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
-		(padapter->securitypriv.dot11PrivacyAlgrthm == _AES_))
+	    (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {
-	{
 		psta = rtw_get_stainfo(pstapriv, get_bssid(mlmepriv));
 		if (psta == NULL) {
-			//DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n"));
+			/* DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n")); */
-		}
+		} else {
-		else
+			/* pairwise key */
-		{
-			//pairwise key
 			rtw_setstakey_cmd(padapter, psta, UNICAST_KEY, _FALSE);
-			//group key
+			/* group key */
 			rtw_set_key(padapter, &padapter->securitypriv, padapter->securitypriv.dot118021XGrpKeyid, 0, _FALSE);
 		}
 	}
@@ -176,32 +144,14 @@ void sreset_restore_network_station(_adapter *padapter)
 	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
 	u8 doiqk = _FALSE;
 
-	#if 0
+	rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure, RTW_CMDF_DIRECTLY);
-	{
-	//=======================================================
-	// reset related register of Beacon control
-
-	//set MSR to nolink
-	Set_MSR(padapter, _HW_STATE_NOLINK_);		
-	// reject all data frame
-	rtw_write16(padapter, REG_RXFLTMAP2,0x00);
-	//reset TSF
-	rtw_write8(padapter, REG_DUAL_TSF_RST, (BIT(0)|BIT(1)));
-
-	// disable update TSF
-	SetBcnCtrlReg(padapter, BIT(4), 0);
-
-	//=======================================================
-	}
-	#endif
-	
-	rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure,_FALSE);
 
 	{
 		u8 threshold;
 #ifdef CONFIG_USB_HCI
-		// TH=1 => means that invalidate usb rx aggregation
+		/* TH=1 => means that invalidate usb rx aggregation */
-		// TH=0 => means that validate usb rx aggregation, use init value.
+		/* TH=0 => means that validate usb rx aggregation, use init value. */
+#ifdef CONFIG_80211N_HT
 		if (mlmepriv->htpriv.ht_option) {
 			if (padapter->registrypriv.wifi_spec == 1)
 				threshold = 1;
@@ -212,6 +162,7 @@ void sreset_restore_network_station(_adapter *padapter)
 			threshold = 1;
 			rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold));
 		}
+#endif /* CONFIG_80211N_HT */
 #endif
 	}
 
@@ -222,20 +173,22 @@ void sreset_restore_network_station(_adapter *padapter)
 
 	doiqk = _FALSE;
 	rtw_hal_set_hwreg(padapter , HW_VAR_DO_IQK , &doiqk);
-	//disable dynamic functions, such as high power, DIG
+	/* disable dynamic functions, such as high power, DIG */
 	/*rtw_phydm_func_disable_all(padapter);*/
 
 	rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress);
 
 	{
 		u8	join_type = 0;
+
+		rtw_hal_rcr_set_chk_bssid(padapter, MLME_STA_CONNECTING);
 		rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
 	}
 
 	Set_MSR(padapter, (pmlmeinfo->state & 0x3));
 
 	mlmeext_joinbss_event_callback(padapter, 1);
-	//restore Sequence No.
+	/* restore Sequence No. */
 	rtw_hal_set_hwreg(padapter, HW_VAR_RESTORE_HW_SEQ, 0);
 
 	sreset_restore_security_station(padapter);
@@ -245,20 +198,17 @@ void sreset_restore_network_station(_adapter *padapter)
 void sreset_restore_network_status(_adapter *padapter)
 {
 	struct mlme_priv *mlmepriv = &padapter->mlmepriv;
-	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;
-	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
 
 	if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) {
-		DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+		RTW_INFO(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
 		sreset_restore_network_station(padapter);
-	} else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) {
+	} else if (MLME_IS_AP(padapter) || MLME_IS_MESH(padapter)) {
-		DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+		RTW_INFO(FUNC_ADPT_FMT" %s\n", FUNC_ADPT_ARG(padapter), MLME_IS_AP(padapter) ? "AP" : "MESH");
 		rtw_ap_restore_network(padapter);
-	} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) {
+	} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE))
-		DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+		RTW_INFO(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
-	} else {
+	else
-		DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+		RTW_INFO(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
-	}
 }
 
 void sreset_stop_adapter(_adapter *padapter)
@@ -269,7 +219,7 @@ void sreset_stop_adapter(_adapter *padapter)
 	if (padapter == NULL)
 		return;
 
-	DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
+	RTW_INFO(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
 
 	rtw_netif_stop_queue(padapter->pnetdev);
 
@@ -283,10 +233,9 @@ void sreset_stop_adapter(_adapter *padapter)
 	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
 		rtw_scan_abort(padapter);
 
-	if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
+	if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
-	{
 		rtw_set_to_roam(padapter, 0);
-		_rtw_join_timeout_handler(padapter);
+		rtw_join_timeout_handler(padapter);
 	}
 
 }
@@ -299,11 +248,10 @@ void sreset_start_adapter(_adapter *padapter)
 	if (padapter == NULL)
 		return;
 
-	DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
+	RTW_INFO(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
 
-	if (check_fwstate(pmlmepriv, _FW_LINKED)) {
+	if (check_fwstate(pmlmepriv, _FW_LINKED))
 		sreset_restore_network_status(padapter);
-	}
 
 	/* TODO: OS and HCI independent */
 #if defined(PLATFORM_LINUX) && defined(CONFIG_USB_HCI)
@@ -311,7 +259,7 @@ void sreset_start_adapter(_adapter *padapter)
 #endif
 
 	if (is_primary_adapter(padapter))
-		_set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
+		_set_timer(&adapter_to_dvobj(padapter)->dynamic_chk_timer, 2000);
 
 	rtw_netif_wake_queue(padapter->pnetdev);
 }
@@ -325,45 +273,42 @@ void sreset_reset(_adapter *padapter)
 	struct mlme_priv	*pmlmepriv = &(padapter->mlmepriv);
 	struct xmit_priv	*pxmitpriv = &padapter->xmitpriv;
 	_irqL irqL;
-	u32 start = rtw_get_current_time();
+	systime start = rtw_get_current_time();
 	struct dvobj_priv *psdpriv = padapter->dvobj;
 	struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
 
-	DBG_871X("%s\n", __FUNCTION__);
+	RTW_INFO("%s\n", __FUNCTION__);
 
 	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 
 
 #ifdef CONFIG_LPS
 	rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0, "SRESET");
-#endif//#ifdef CONFIG_LPS
+#endif/* #ifdef CONFIG_LPS */
 
 	_enter_pwrlock(&pwrpriv->lock);
 
 	psrtpriv->silent_reset_inprogress = _TRUE;
 	pwrpriv->change_rfpwrstate = rf_off;
 
-	sreset_stop_adapter(padapter);
+	rtw_mi_sreset_adapter_hdl(padapter, _FALSE);/*sreset_stop_adapter*/
-	#ifdef CONFIG_CONCURRENT_MODE
-	sreset_stop_adapter(padapter->pbuddy_adapter);
-	#endif
-
 #ifdef CONFIG_IPS
 	_ips_enter(padapter);
 	_ips_leave(padapter);
 #endif
-
-	sreset_start_adapter(padapter);
 #ifdef CONFIG_CONCURRENT_MODE
-	sreset_start_adapter(padapter->pbuddy_adapter);
+	rtw_mi_ap_info_restore(padapter);
 #endif
+	rtw_mi_sreset_adapter_hdl(padapter, _TRUE);/*sreset_start_adapter*/
 
 	psrtpriv->silent_reset_inprogress = _FALSE;
 
 	_exit_pwrlock(&pwrpriv->lock);
 
-	DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start));
+	RTW_INFO("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start));
 	pdbgpriv->dbg_sreset_cnt++;
+
+	psrtpriv->self_dect_fw = _FALSE;
+	psrtpriv->rx_cnt = 0;
 #endif
 }
-

core/rtw_wapi_sms4.c

@@ -1,3 +1,17 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
 #ifdef CONFIG_WAPI_SUPPORT
 
 #include <linux/unistd.h>
@@ -9,7 +23,7 @@
 #ifdef CONFIG_WAPI_SW_SMS4
 
 #define WAPI_LITTLE_ENDIAN
-//#define BIG_ENDIAN
+/* #define BIG_ENDIAN */
 #define ENCRYPT  0
 #define DECRYPT  1
 
@@ -43,7 +57,8 @@ const u32 CK[32] = {
 	0xc0c7ced5, 0xdce3eaf1, 0xf8ff060d, 0x141b2229,
 	0x30373e45, 0x4c535a61, 0x686f767d, 0x848b9299,
 	0xa0a7aeb5, 0xbcc3cad1, 0xd8dfe6ed, 0xf4fb0209,
-	0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279 };
+	0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279
+};
 
 #define Rotl(_x, _y) (((_x) << (_y)) | ((_x) >> (32 - (_y))))
 
@@ -75,13 +90,16 @@ void SMS4Crypt(u8 *Input, u8 *Output, u32 *rk)
 	x2 = p[2];
 	x3 = p[3];
 #ifdef WAPI_LITTLE_ENDIAN
-	 x0 = Rotl(x0, 16); x0 = ((x0 & 0x00FF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
+	x0 = Rotl(x0, 16);
-	 x1 = Rotl(x1, 16); x1 = ((x1 & 0x00FF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x0 = ((x0 & 0x00FF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
-	 x2 = Rotl(x2, 16); x2 = ((x2 & 0x00FF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x1 = Rotl(x1, 16);
-	 x3 = Rotl(x3, 16); x3 = ((x3 & 0x00FF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
+	x1 = ((x1 & 0x00FF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x2 = Rotl(x2, 16);
+	x2 = ((x2 & 0x00FF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x3 = Rotl(x3, 16);
+	x3 = ((x3 & 0x00FF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
 #endif
-	 for (r = 0; r < 32; r += 4)
+	for (r = 0; r < 32; r += 4) {
-	 {
 		mid = x1 ^ x2 ^ x3 ^ rk[r + 0];
 		mid = ByteSub(mid);
 		x0 ^= L1(mid);
@@ -96,10 +114,14 @@ void SMS4Crypt(u8 *Input, u8 *Output, u32 *rk)
 		x3 ^= L1(mid);
 	}
 #ifdef WAPI_LITTLE_ENDIAN
-	 x0 = Rotl(x0, 16); x0 = ((x0 & 0x00FF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
+	x0 = Rotl(x0, 16);
-	 x1 = Rotl(x1, 16); x1 = ((x1 & 0x00FF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x0 = ((x0 & 0x00FF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
-	 x2 = Rotl(x2, 16); x2 = ((x2 & 0x00FF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x1 = Rotl(x1, 16);
-	 x3 = Rotl(x3, 16); x3 = ((x3 & 0x00FF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
+	x1 = ((x1 & 0x00FF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x2 = Rotl(x2, 16);
+	x2 = ((x2 & 0x00FF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x3 = Rotl(x3, 16);
+	x3 = ((x3 & 0x00FF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
 #endif
 	p = (u32 *)Output;
 	p[0] = x3;
@@ -120,18 +142,21 @@ void SMS4KeyExt(u8 *Key, u32 *rk, u32 CryptFlag)
 	x2 = p[2];
 	x3 = p[3];
 #ifdef WAPI_LITTLE_ENDIAN
-	 x0 = Rotl(x0, 16); x0 = ((x0 & 0xFF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
+	x0 = Rotl(x0, 16);
-	 x1 = Rotl(x1, 16); x1 = ((x1 & 0xFF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x0 = ((x0 & 0xFF00FF) << 8) | ((x0 & 0xFF00FF00) >> 8);
-	 x2 = Rotl(x2, 16); x2 = ((x2 & 0xFF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x1 = Rotl(x1, 16);
-	 x3 = Rotl(x3, 16); x3 = ((x3 & 0xFF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
+	x1 = ((x1 & 0xFF00FF) << 8) | ((x1 & 0xFF00FF00) >> 8);
+	x2 = Rotl(x2, 16);
+	x2 = ((x2 & 0xFF00FF) << 8) | ((x2 & 0xFF00FF00) >> 8);
+	x3 = Rotl(x3, 16);
+	x3 = ((x3 & 0xFF00FF) << 8) | ((x3 & 0xFF00FF00) >> 8);
 #endif
 
 	x0 ^= 0xa3b1bac6;
 	x1 ^= 0x56aa3350;
 	x2 ^= 0x677d9197;
 	x3 ^= 0xb27022dc;
-	 for (r = 0; r < 32; r += 4)
+	for (r = 0; r < 32; r += 4) {
-	 {
 		mid = x1 ^ x2 ^ x3 ^ CK[r + 0];
 		mid = ByteSub(mid);
 		rk[r + 0] = x0 ^= L2(mid);
@@ -145,8 +170,7 @@ void SMS4KeyExt(u8 *Key, u32 *rk, u32 CryptFlag)
 		mid = ByteSub(mid);
 		rk[r + 3] = x3 ^= L2(mid);
 	}
-	 if (CryptFlag == DECRYPT)
+	if (CryptFlag == DECRYPT) {
-	 {
 		for (r = 0; r < 16; r++)
 			mid = rk[r], rk[r] = rk[31 - r], rk[31 - r] = mid;
 	}
@@ -175,8 +199,7 @@ void WapiSMS4Cryption(u8 *Key, u8 *IV, u8 *Input, u16 InputLength,
 
 	SMS4KeyExt((u8 *)Key, rk, CryptFlag);
 
-	for(i=0; i<blockNum-1; i++)
+	for (i = 0; i < blockNum - 1; i++) {
-	{
 		SMS4Crypt((u8 *)blockIn, blockOut, rk);
 		xor_block(&Output[i * 16], &Input[i * 16], blockOut);
 		memcpy(blockIn, blockOut, 16);
@@ -187,9 +210,7 @@ void WapiSMS4Cryption(u8 *Key, u8 *IV, u8 *Input, u16 InputLength,
 	SMS4Crypt((u8 *)blockIn, blockOut, rk);
 
 	for (j = 0; j < remainder; j++)
-	{
 		Output[i * 16 + j] = Input[i * 16 + j] ^ blockOut[j];
-	}
 	*OutputLength += remainder;
 
 }
@@ -204,7 +225,7 @@ void WapiSMS4Encryption(u8 *Key, u8 *IV, u8 *Input, u16 InputLength,
 void WapiSMS4Decryption(u8 *Key, u8 *IV, u8 *Input, u16 InputLength,
 			u8 *Output, u16 *OutputLength)
 {
-	// OFB mode: is also ENCRYPT flag
+	/* OFB mode: is also ENCRYPT flag */
 	WapiSMS4Cryption(Key, IV, Input, InputLength, Output, OutputLength, ENCRYPT);
 }
 
@@ -278,23 +299,22 @@ void SecCalculateMicSMS4(
 
 	header = (struct ieee80211_hdr_3addr_qos *)pHeader;
 	memset(TempBuf, 0, 34);
-	memcpy(TempBuf, pHeader, 2); //FrameCtrl
+	memcpy(TempBuf, pHeader, 2); /* FrameCtrl */
 	pTemp = (u16 *)TempBuf;
-	*pTemp &= 0xc78f;       //bit4,5,6,11,12,13
+	*pTemp &= 0xc78f;       /* bit4,5,6,11,12,13 */
 
-	memcpy((TempBuf+2), (pHeader+4), 12); //Addr1, Addr2
+	memcpy((TempBuf + 2), (pHeader + 4), 12); /* Addr1, Addr2 */
-	memcpy((TempBuf+14), (pHeader+22), 2); // SeqCtrl
+	memcpy((TempBuf + 14), (pHeader + 22), 2); /* SeqCtrl */
 	pTemp = (u16 *)(TempBuf + 14);
 	*pTemp &= 0x000f;
 
-	memcpy((TempBuf+16), (pHeader+16), 6); //Addr3
+	memcpy((TempBuf + 16), (pHeader + 16), 6); /* Addr3 */
 
 	fc = le16_to_cpu(header->frame_ctl);
 
 
 
-	if (GetFrDs((u16*)&fc) && GetToDs((u16 *)&fc))
+	if (GetFrDs((u16 *)&fc) && GetToDs((u16 *)&fc)) {
-	{
 		memcpy((TempBuf + 22), (pHeader + 24), 6);
 		QosOffset = 30;
 	} else {
@@ -305,11 +325,11 @@ void SecCalculateMicSMS4(
 	if ((fc & 0x0088) == 0x0088) {
 		memcpy((TempBuf + 28), (pHeader + QosOffset), 2);
 		TempLen += 2;
-		//IV = pHeader + QosOffset + 2 + SNAP_SIZE + sizeof(u16) + 2;
+		/* IV = pHeader + QosOffset + 2 + SNAP_SIZE + sizeof(u16) + 2; */
 		IV = pHeader + QosOffset + 2 + 2;
 	} else {
 		IV = pHeader + QosOffset + 2;
-		//IV = pHeader + QosOffset + SNAP_SIZE + sizeof(u16) + 2;
+		/* IV = pHeader + QosOffset + SNAP_SIZE + sizeof(u16) + 2; */
 	}
 
 	TempBuf[TempLen - 1] = (u8)(DataLen & 0xff);
@@ -341,10 +361,10 @@ u8 WapiIncreasePN(u8 *PN, u8 AddCount)
 
 	if (NULL == PN)
 		return 1;
-	//YJ,test,091102
+	/* YJ,test,091102 */
 	/*
 	if(AddCount == 2){
-		DBG_8192C("############################%s(): PN[0]=0x%x\n", __FUNCTION__, PN[0]);
+		RTW_INFO("############################%s(): PN[0]=0x%x\n", __FUNCTION__, PN[0]);
 		if(PN[0] == 0x48){
 			PN[0] += AddCount;
 			return 1;
@@ -354,17 +374,13 @@ u8 WapiIncreasePN(u8 *PN, u8 AddCount)
 		}
 	}
 	*/
-	//YJ,test,091102,end
+	/* YJ,test,091102,end */
 
-	for (i=0; i<16; i++)
+	for (i = 0; i < 16; i++) {
-	{
+		if (PN[i] + AddCount <= 0xff) {
-		if (PN[i] + AddCount <= 0xff)
-		{
 			PN[i] += AddCount;
 			return 0;
-		}
+		} else {
-		else
-		{
 			PN[i] += AddCount;
 			AddCount = 1;
 		}
@@ -380,8 +396,7 @@ void WapiGetLastRxUnicastPNForQoSData(
 )
 {
 	WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__);
-	switch(UserPriority)
+	switch (UserPriority) {
-	{
 	case 0:
 	case 3:
 		memcpy(PNOut, pWapiStaInfo->lastRxUnicastPNBEQueue, 16);
@@ -413,8 +428,7 @@ void WapiSetLastRxUnicastPNForQoSData(
 )
 {
 	WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__);
-	switch(UserPriority)
+	switch (UserPriority) {
-	{
 	case 0:
 	case 3:
 		memcpy(pWapiStaInfo->lastRxUnicastPNBEQueue, PNIn, 16);
@@ -469,8 +483,8 @@ u8 WapiCheckPnInSwDecrypt(
 	if ((_rtw_memcmp(pRaddr, padapter->pnetdev->dev_addr, ETH_ALEN) == 0)
 	    &&	!(pDaddr)
 	    && (GetFrameType(&fc) == WIFI_QOS_DATA_TYPE))
-		//&& ieee->pHTInfo->bCurrentHTSupport &&
+		/* && ieee->pHTInfo->bCurrentHTSupport && */
-		//ieee->pHTInfo->bCurRxReorderEnable)
+		/* ieee->pHTInfo->bCurRxReorderEnable) */
 		ret = false;
 	else
 		ret = true;
@@ -496,10 +510,8 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 #if 0
 	hdr_len = sMacHdrLng;
 	if (GetFrameType(pskb->data) == WIFI_QOS_DATA_TYPE)
-	{
 		hdr_len += 2;
-	}
+	/* hdr_len += SNAP_SIZE + sizeof(u16); */
-	//hdr_len += SNAP_SIZE + sizeof(u16);
 
 	pos = skb_push(pskb, padapter->wapiInfo.extra_prefix_len);
 	memmove(pos, pos + padapter->wapiInfo.extra_prefix_len, hdr_len);
@@ -510,7 +522,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 
 	WAPI_DATA(WAPI_TX, "FillIV - Before Fill IV", pskb->data, pskb->len);
 
-	//Address 1 is always receiver's address
+	/* Address 1 is always receiver's address */
 	if (IS_MCAST(pRA)) {
 		if (!pWapiInfo->wapiTxMsk.bTxEnable) {
 			WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __FUNCTION__);
@@ -522,7 +534,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 			bPNOverflow = WapiIncreasePN(pWapiInfo->lastTxMulticastPN, 1);
 			memcpy(pWapiExt->PN, pWapiInfo->lastTxMulticastPN, 16);
 			if (bPNOverflow) {
-				// Update MSK Notification.
+				/* Update MSK Notification. */
 				WAPI_TRACE(WAPI_ERR, "===============>%s():multicast PN overflow\n", __FUNCTION__);
 				rtw_wapi_app_event_handler(padapter, NULL, 0, pRA, false, false, true, 0, false);
 			}
@@ -530,8 +542,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 			WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Multicast KeyIdx!!\n", __FUNCTION__);
 			ret = -3;
 		}
-	}
+	} else {
-    	else{
 		list_for_each_entry(pWapiSta, &pWapiInfo->wapiSTAUsedList, list) {
 			if (!memcmp(pWapiSta->PeerMacAddr, pRA, 6)) {
 				bFindMatchPeer = true;
@@ -553,7 +564,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 				bPNOverflow = WapiIncreasePN(pWapiSta->lastTxUnicastPN, 2);
 				memcpy(pWapiExt->PN, pWapiSta->lastTxUnicastPN, 16);
 				if (bPNOverflow) {
-					// Update USK Notification.
+					/* Update USK Notification. */
 					WAPI_TRACE(WAPI_ERR, "===============>%s():unicast PN overflow\n", __FUNCTION__);
 					rtw_wapi_app_event_handler(padapter, NULL, 0, pWapiSta->PeerMacAddr, false, true, false, 0, false);
 				}
@@ -561,8 +572,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 				WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Unicast KeyIdx!!\n", __FUNCTION__);
 				ret = -5;
 			}
-		}
+		} else {
-		else{
 			WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta "MAC_FMT"!!\n", __FUNCTION__, MAC_ARG(pRA));
 			ret = -6;
 		}
@@ -574,7 +584,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
 #endif
 }
 
-// WAPI SW Enc: must have done Coalesce!
+/* WAPI SW Enc: must have done Coalesce! */
 void SecSWSMS4Encryption(
 	_adapter *padapter,
 	u8 *pxmitframe
@@ -685,14 +695,13 @@ u8 SecSWSMS4Decryption(
 
 	IVOffset = sMacHdrLng;
 	bQosData = GetFrameType(pskb->data) == WIFI_QOS_DATA_TYPE;
-	if (bQosData){
+	if (bQosData)
 		IVOffset += 2;
-	}
 
-	//if(GetHTC())
+	/* if(GetHTC()) */
-	//	IVOffset += 4;
+	/*	IVOffset += 4; */
 
-	//IVOffset += SNAP_SIZE + sizeof(u16);
+	/* IVOffset += SNAP_SIZE + sizeof(u16); */
 
 	DataOffset = IVOffset + padapter->wapiInfo.extra_prefix_len;
 
@@ -743,8 +752,7 @@ u8 SecSWSMS4Decryption(
 			WAPI_TRACE(WAPI_ERR, "%s: Can not find MSK with matched KeyIdx(%d), Dropped !!!\n", __FUNCTION__, KeyIdx);
 			return false;
 		}
-	}
+	} else {
-	else{
 		WAPI_TRACE(WAPI_RX, "%s: Unicast decryption !!!\n", __FUNCTION__);
 		if (pWapiSta->wapiUsk.keyId == KeyIdx && pWapiSta->wapiUsk.bSet) {
 			WAPI_TRACE(WAPI_RX, "%s: Use USK for Decryption!!!\n", __FUNCTION__);
@@ -752,23 +760,18 @@ u8 SecSWSMS4Decryption(
 				if (GetFrameType(pskb->data) == WIFI_QOS_DATA_TYPE) {
 					WapiGetLastRxUnicastPNForQoSData(TID, pWapiSta, lastRxPNforQoS);
 					pLastRxPN = lastRxPNforQoS;
-				}else{
+				} else
 					pLastRxPN = pWapiSta->lastRxUnicastPN;
-				}
+				if (!WapiComparePN(pRecvPN, pLastRxPN))
-				if (!WapiComparePN(pRecvPN, pLastRxPN)){
 					return false;
-				}
+				if (bQosData)
-				if(bQosData){
 					WapiSetLastRxUnicastPNForQoSData(TID, pRecvPN, pWapiSta);
-				}else{
+				else
 					memcpy(pWapiSta->lastRxUnicastPN, pRecvPN, 16);
-				}
+			} else
-			}else{
 				memcpy(precv_hdr->WapiTempPN, pRecvPN, 16);
-			}
 
-			if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE))
+			if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE)) {
-			{
 				if ((pRecvPN[0] & 0x1) == 0) {
 					WAPI_TRACE(WAPI_ERR, "%s: Rx USK PN is not odd when Infra STA mode, Dropped !!!\n", __FUNCTION__);
 					return false;
@@ -777,24 +780,23 @@ u8 SecSWSMS4Decryption(
 
 			pMicKey = pWapiSta->wapiUsk.micKey;
 			pDataKey = pWapiSta->wapiUsk.dataKey;
-		}
+		} else if (pWapiSta->wapiUskUpdate.keyId == KeyIdx && pWapiSta->wapiUskUpdate.bSet) {
-		else if (pWapiSta->wapiUskUpdate.keyId == KeyIdx && pWapiSta->wapiUskUpdate.bSet ){
 			WAPI_TRACE(WAPI_RX, "%s: Use Updated USK for Decryption!!!\n", __FUNCTION__);
 			if (pWapiSta->bAuthenticatorInUpdata)
 				bUseUpdatedKey = true;
 			else
 				bUseUpdatedKey = false;
 
-			if(bQosData){
+			if (bQosData)
 				WapiSetLastRxUnicastPNForQoSData(TID, pRecvPN, pWapiSta);
-			}else{
+			else
 				memcpy(pWapiSta->lastRxUnicastPN, pRecvPN, 16);
-			}
 			pMicKey = pWapiSta->wapiUskUpdate.micKey;
 			pDataKey = pWapiSta->wapiUskUpdate.dataKey;
 		} else {
-			WAPI_TRACE(WAPI_ERR, "%s: No valid USK!!!KeyIdx=%d pWapiSta->wapiUsk.keyId=%d pWapiSta->wapiUskUpdate.keyId=%d\n", __FUNCTION__, KeyIdx, pWapiSta->wapiUsk.keyId, pWapiSta->wapiUskUpdate.keyId);
+			WAPI_TRACE(WAPI_ERR, "%s: No valid USK!!!KeyIdx=%d pWapiSta->wapiUsk.keyId=%d pWapiSta->wapiUskUpdate.keyId=%d\n", __FUNCTION__, KeyIdx, pWapiSta->wapiUsk.keyId,
-			//dump_buf(pskb->data,pskb->len);
+				   pWapiSta->wapiUskUpdate.keyId);
+			/* dump_buf(pskb->data,pskb->len); */
 			return false;
 		}
 	}
@@ -818,7 +820,7 @@ u8 SecSWSMS4Decryption(
 	if (0 == memcmp(MicBuffer, pRecvMic, padapter->wapiInfo.extra_postfix_len)) {
 		WAPI_TRACE(WAPI_RX, "%s: Check MIC OK!!\n", __FUNCTION__);
 		if (bUseUpdatedKey) {
-			// delete the old key
+			/* delete the old key */
 			if (IS_MCAST(pRA)) {
 				WAPI_TRACE(WAPI_API, "%s(): AE use new update MSK!!\n", __FUNCTION__);
 				pWapiSta->wapiMsk.keyId = pWapiSta->wapiMskUpdate.keyId;
@@ -855,8 +857,7 @@ u32	rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe)
 
 	WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__);
 
-	if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable))
+	if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
-	{
 		WAPI_TRACE(WAPI_TX, "<========== %s, WAPI not supported or enabled!\n", __FUNCTION__);
 		return _FAIL;
 	}
@@ -879,21 +880,19 @@ u32	rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe)
 
 	WAPI_TRACE(WAPI_RX, "=========>%s\n", __FUNCTION__);
 
-	if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable))
+	if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
-	{
 		WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or enabled!\n", __FUNCTION__);
 		return _FAIL;
 	}
 
 
-	//drop packet when hw decrypt fail
+	/* drop packet when hw decrypt fail
-       //return tempraily
+	* return tempraily */
 	return _FAIL;
 
-	//pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data;
+	/* pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; */
 
-	if (false == SecSWSMS4Decryption(padapter, precvframe, &padapter->recvpriv))
+	if (false == SecSWSMS4Decryption(padapter, precvframe, &padapter->recvpriv)) {
-	{
 		WAPI_TRACE(WAPI_ERR, "%s():SMS4 decrypt frame error\n", __FUNCTION__);
 		return _FAIL;
 	}

hal/HalPwrSeqCmd.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,12 +11,7 @@
  * 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
- *
- *
- ******************************************************************************/
 /*++
 Copyright (c) Realtek Semiconductor Corp. All rights reserved.
 
@@ -36,15 +31,15 @@ Major Change History:
 #include <HalPwrSeqCmd.h>
 
 
-//
+/*
-//	Description:
+ *	Description:
-//		This routine deal with the Power Configuration CMDs parsing for RTL8723/RTL8188E Series IC.
+ *		This routine deal with the Power Configuration CMDs parsing for RTL8723/RTL8188E Series IC.
-//
+ *
-//	Assumption:
+ *	Assumption:
-//		We should follow specific format which was released from HW SD.
+ *		We should follow specific format which was released from HW SD.
-//
+ *
-//	2011.07.07, added by Roger.
+ *	2011.07.07, added by Roger.
-//
+ *   */
 u8 HalPwrSeqCmdParsing(
 	PADAPTER		padapter,
 	u8				CutVersion,
@@ -54,80 +49,73 @@ u8 HalPwrSeqCmdParsing(
 {
 	WLAN_PWR_CFG	PwrCfgCmd = {0};
 	u8				bPollingBit = _FALSE;
+	u8				bHWICSupport = _FALSE;
 	u32				AryIdx = 0;
 	u8				value = 0;
 	u32				offset = 0;
-	u32				pollingCount = 0; // polling autoload done.
+	u8				flag = 0;
+	u32				pollingCount = 0; /* polling autoload done. */
 	u32				maxPollingCnt = 5000;
 
 	do {
 		PwrCfgCmd = PwrSeqCmd[AryIdx];
 
-		RT_TRACE(_module_hal_init_c_ , _drv_info_,
-				 ("HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
-					GET_PWR_CFG_OFFSET(PwrCfgCmd),
-					GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
-					GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
-					GET_PWR_CFG_INTF_MASK(PwrCfgCmd),
-					GET_PWR_CFG_BASE(PwrCfgCmd),
-					GET_PWR_CFG_CMD(PwrCfgCmd),
-					GET_PWR_CFG_MASK(PwrCfgCmd),
-					GET_PWR_CFG_VALUE(PwrCfgCmd)));
 
-		//2 Only Handle the command whose FAB, CUT, and Interface are matched
+		/* 2 Only Handle the command whose FAB, CUT, and Interface are matched */
 		if ((GET_PWR_CFG_FAB_MASK(PwrCfgCmd) & FabVersion) &&
 		    (GET_PWR_CFG_CUT_MASK(PwrCfgCmd) & CutVersion) &&
-			(GET_PWR_CFG_INTF_MASK(PwrCfgCmd) & InterfaceType))
+		    (GET_PWR_CFG_INTF_MASK(PwrCfgCmd) & InterfaceType)) {
-		{
+			switch (GET_PWR_CFG_CMD(PwrCfgCmd)) {
-			switch (GET_PWR_CFG_CMD(PwrCfgCmd))
-			{
 			case PWR_CMD_READ:
-					RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n"));
 				break;
 
 			case PWR_CMD_WRITE:
-					RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n"));
 				offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
 
 #ifdef CONFIG_SDIO_HCI
-					//
+				/*  */
-					// <Roger_Notes> We should deal with interface specific address mapping for some interfaces, e.g., SDIO interface
+				/* <Roger_Notes> We should deal with interface specific address mapping for some interfaces, e.g., SDIO interface */
-					// 2011.07.07.
+				/* 2011.07.07. */
-					//
+				/*  */
-					if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
+				if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO) {
-					{
+					/* Read Back SDIO Local value */
-						// Read Back SDIO Local value
 					value = SdioLocalCmd52Read1Byte(padapter, offset);
 
 					value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd));
 					value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd));
 
-						// Write Back SDIO Local value
+					/* Write Back SDIO Local value */
 					SdioLocalCmd52Write1Byte(padapter, offset, value);
-					}
+				} else
-					else
 #endif
 				{
 #ifdef CONFIG_GSPI_HCI
 					if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
 						offset = SPI_LOCAL_OFFSET | offset;
 #endif
-						// Read the value from system register
+					/* Read the value from system register */
 					value = rtw_read8(padapter, offset);
 
 					value = value & (~(GET_PWR_CFG_MASK(PwrCfgCmd)));
 					value = value | (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd));
 
-						// Write the value back to sytem register
+					/* Write the value back to sytem register */
 					rtw_write8(padapter, offset, value);
 				}
 				break;
 
 			case PWR_CMD_POLLING:
-					RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n"));
 
 				bPollingBit = _FALSE;
 				offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
+
+				rtw_hal_get_hwreg(padapter, HW_VAR_PWR_CMD, &bHWICSupport);
+				if (bHWICSupport && offset == 0x06) {
+					flag = 0;
+					maxPollingCnt = 100000;
+				} else
+					maxPollingCnt = 5000;
+
 #ifdef CONFIG_GSPI_HCI
 				if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO)
 					offset = SPI_LOCAL_OFFSET | offset;
@@ -147,15 +135,33 @@ u8 HalPwrSeqCmdParsing(
 						rtw_udelay_os(10);
 
 					if (pollingCount++ > maxPollingCnt) {
-							DBG_871X_LEVEL(_drv_err_, "HalPwrSeqCmdParsing: Fail to polling Offset[%#x]=%02x\n", offset, value);
+						RTW_ERR("HalPwrSeqCmdParsing: Fail to polling Offset[%#x]=%02x\n", offset, value);
+
+						/* For PCIE + USB package poll power bit timeout issue only modify 8821AE and 8723BE */
+						if (bHWICSupport && offset == 0x06  && flag == 0) {
+
+							RTW_ERR("[WARNING] PCIE polling(0x%X) timeout(%d), Toggle 0x04[3] and try again.\n", offset, maxPollingCnt);
+							if (IS_HARDWARE_TYPE_8723DE(padapter))
+								PlatformEFIOWrite1Byte(padapter, 0x40, (PlatformEFIORead1Byte(padapter, 0x40)) & (~BIT3));
+
+							PlatformEFIOWrite1Byte(padapter, 0x04, PlatformEFIORead1Byte(padapter, 0x04) | BIT3);
+							PlatformEFIOWrite1Byte(padapter, 0x04, PlatformEFIORead1Byte(padapter, 0x04) & ~BIT3);
+
+							if (IS_HARDWARE_TYPE_8723DE(padapter))
+								PlatformEFIOWrite1Byte(padapter, 0x40, PlatformEFIORead1Byte(padapter, 0x40)|BIT3);
+
+							/* Retry Polling Process one more time */
+							pollingCount = 0;
+							flag = 1;
+						} else {
 							return _FALSE;
 						}
+					}
 				} while (!bPollingBit);
 
 				break;
 
 			case PWR_CMD_DELAY:
-					RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n"));
 				if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US)
 					rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd));
 				else
@@ -163,21 +169,17 @@ u8 HalPwrSeqCmdParsing(
 				break;
 
 			case PWR_CMD_END:
-					// When this command is parsed, end the process
+				/* When this command is parsed, end the process */
-					RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n"));
 				return _TRUE;
 				break;
 
 			default:
-					RT_TRACE(_module_hal_init_c_ , _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n"));
 				break;
 			}
 		}
 
-		AryIdx++;//Add Array Index
+		AryIdx++;/* Add Array Index */
 	} while (1);
 
 	return _TRUE;
 }
-
-

hal/btc/HalBtc8188c2Ant.h

@@ -1,149 +0,0 @@
-//===========================================
-// The following is for 8188C 2Ant BT Co-exist definition
-//===========================================
-#define		BTC_RSSI_COEX_THRESH_TOL_8188C_2ANT		6
-
-typedef enum _BT_INFO_SRC_8188C_2ANT{
-	BT_INFO_SRC_8188C_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8188C_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8188C_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8188C_2ANT_MAX
-}BT_INFO_SRC_8188C_2ANT,*PBT_INFO_SRC_8188C_2ANT;
-
-typedef enum _BT_8188C_2ANT_BT_STATUS{
-	BT_8188C_2ANT_BT_STATUS_IDLE				= 0x0,
-	BT_8188C_2ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,
-	BT_8188C_2ANT_BT_STATUS_NON_IDLE			= 0x2,
-	BT_8188C_2ANT_BT_STATUS_MAX
-}BT_8188C_2ANT_BT_STATUS,*PBT_8188C_2ANT_BT_STATUS;
-
-typedef enum _BT_8188C_2ANT_COEX_ALGO{
-	BT_8188C_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8188C_2ANT_COEX_ALGO_SCO					= 0x1,
-	BT_8188C_2ANT_COEX_ALGO_HID					= 0x2,
-	BT_8188C_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8188C_2ANT_COEX_ALGO_PAN					= 0x4,
-	BT_8188C_2ANT_COEX_ALGO_HID_A2DP			= 0x5,
-	BT_8188C_2ANT_COEX_ALGO_HID_PAN				= 0x6,
-	BT_8188C_2ANT_COEX_ALGO_PAN_A2DP			= 0x7,
-	BT_8188C_2ANT_COEX_ALGO_MAX
-}BT_8188C_2ANT_COEX_ALGO,*PBT_8188C_2ANT_COEX_ALGO;
-
-typedef struct _COEX_DM_8188C_2ANT{
-	// fw mechanism
-	BOOLEAN		bPreBalanceOn;
-	BOOLEAN		bCurBalanceOn;
-
-	// diminishWifi
-	BOOLEAN		bPreDacOn;
-	BOOLEAN		bCurDacOn;
-	BOOLEAN 	bPreInterruptOn;
-	BOOLEAN		bCurInterruptOn;
-	u1Byte		preFwDacSwingLvl;
-	u1Byte		curFwDacSwingLvl;
-	BOOLEAN 	bPreNavOn;
-	BOOLEAN		bCurNavOn;
-
-	// sw mechanism
-	BOOLEAN		bPreRfRxLpfShrink;
-	BOOLEAN		bCurRfRxLpfShrink;
-	u4Byte		btRf0x1eBackup;
-	BOOLEAN 	bPreLowPenaltyRa;
-	BOOLEAN		bCurLowPenaltyRa;
-	BOOLEAN		bPreDacSwingOn;
-	u4Byte		preDacSwingLvl;
-	BOOLEAN		bCurDacSwingOn;
-	u4Byte		curDacSwingLvl;
-	BOOLEAN		bPreAdcBackOff;
-	BOOLEAN		bCurAdcBackOff;
-	BOOLEAN 	bPreAgcTableEn;
-	BOOLEAN		bCurAgcTableEn;
-	//u4Byte		preVal0x6c0;
-	//u4Byte		curVal0x6c0;
-	u4Byte		preVal0x6c4;
-	u4Byte		curVal0x6c4;
-	u4Byte		preVal0x6c8;
-	u4Byte		curVal0x6c8;
-	u4Byte		preVal0x6cc;
-	u4Byte		curVal0x6cc;
-	//BOOLEAN		bLimitedDig;
-
-	// algorithm related
-	u1Byte		preAlgorithm;
-	u1Byte		curAlgorithm;
-	//u1Byte		btStatus;
-	//u1Byte		wifiChnlInfo[3];
-} COEX_DM_8188C_2ANT, *PCOEX_DM_8188C_2ANT;
-
-typedef struct _COEX_STA_8188C_2ANT{
-	u1Byte					preWifiRssiState[4];
-	BOOLEAN					bBtBusy;
-	BOOLEAN					bBtUplink;
-	BOOLEAN					bBtDownLink;
-	BOOLEAN					bA2dpBusy;
-}COEX_STA_8188C_2ANT, *PCOEX_STA_8188C_2ANT;
-
-//===========================================
-// The following is interface which will notify coex module.
-//===========================================
-VOID
-EXhalbtc8188c2ant_PowerOnSetting(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8188c2ant_InitHwConfig(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	BOOLEAN				bWifiOnly
-	);
-VOID
-EXhalbtc8188c2ant_InitCoexDm(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8188c2ant_IpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8188c2ant_LpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8188c2ant_ScanNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8188c2ant_ConnectNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8188c2ant_MediaStatusNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8188c2ant_SpecialPacketNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8188c2ant_HaltNotify(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8188c2ant_Periodical(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8188c2ant_BtInfoNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	pu1Byte			tmpBuf,
-	IN	u1Byte			length
-	);
-VOID
-EXhalbtc8188c2ant_DisplayCoexInfo(
-	IN	PBTC_COEXIST		pBtCoexist
-	);

hal/btc/HalBtc8192d2Ant.h

@@ -1,170 +0,0 @@
-//===========================================
-// The following is for 8192D 2Ant BT Co-exist definition
-//===========================================
-#define		BTC_RSSI_COEX_THRESH_TOL_8192D_2ANT		6
-
-typedef enum _BT_INFO_SRC_8192D_2ANT{
-	BT_INFO_SRC_8192D_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8192D_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8192D_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8192D_2ANT_MAX
-}BT_INFO_SRC_8192D_2ANT,*PBT_INFO_SRC_8192D_2ANT;
-
-typedef enum _BT_8192D_2ANT_BT_STATUS{
-	BT_8192D_2ANT_BT_STATUS_IDLE				= 0x0,
-	BT_8192D_2ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,
-	BT_8192D_2ANT_BT_STATUS_NON_IDLE			= 0x2,
-	BT_8192D_2ANT_BT_STATUS_MAX
-}BT_8192D_2ANT_BT_STATUS,*PBT_8192D_2ANT_BT_STATUS;
-
-typedef enum _BT_8192D_2ANT_COEX_ALGO{
-	BT_8192D_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8192D_2ANT_COEX_ALGO_SCO					= 0x1,
-	BT_8192D_2ANT_COEX_ALGO_HID					= 0x2,
-	BT_8192D_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8192D_2ANT_COEX_ALGO_PAN					= 0x4,
-	BT_8192D_2ANT_COEX_ALGO_HID_A2DP			= 0x5,
-	BT_8192D_2ANT_COEX_ALGO_HID_PAN				= 0x6,
-	BT_8192D_2ANT_COEX_ALGO_PAN_A2DP			= 0x7,
-	BT_8192D_2ANT_COEX_ALGO_MAX
-}BT_8192D_2ANT_COEX_ALGO,*PBT_8192D_2ANT_COEX_ALGO;
-
-typedef struct _COEX_DM_8192D_2ANT{
-	// fw mechanism
-	BOOLEAN		bPreBalanceOn;
-	BOOLEAN		bCurBalanceOn;
-
-	// diminishWifi
-	BOOLEAN		bPreDacOn;
-	BOOLEAN		bCurDacOn;
-	BOOLEAN 	bPreInterruptOn;
-	BOOLEAN		bCurInterruptOn;
-	u1Byte		preFwDacSwingLvl;
-	u1Byte		curFwDacSwingLvl;
-	BOOLEAN 	bPreNavOn;
-	BOOLEAN		bCurNavOn;
-
-
-	
-
-	
-	//BOOLEAN		bPreDecBtPwr;
-	//BOOLEAN		bCurDecBtPwr;
-
-	//u1Byte		preFwDacSwingLvl;
-	//u1Byte		curFwDacSwingLvl;
-	//BOOLEAN		bCurIgnoreWlanAct;
-	//BOOLEAN		bPreIgnoreWlanAct;
-	//u1Byte		prePsTdma;
-	//u1Byte		curPsTdma;
-	//u1Byte		psTdmaPara[5];
-	//u1Byte		psTdmaDuAdjType;
-	//BOOLEAN		bResetTdmaAdjust;
-	//BOOLEAN		bPrePsTdmaOn;
-	//BOOLEAN		bCurPsTdmaOn;
-	//BOOLEAN		bPreBtAutoReport;
-	//BOOLEAN		bCurBtAutoReport;
-
-	// sw mechanism
-	BOOLEAN		bPreRfRxLpfShrink;
-	BOOLEAN		bCurRfRxLpfShrink;
-	u4Byte		btRf0x1eBackup;
-	BOOLEAN 	bPreLowPenaltyRa;
-	BOOLEAN		bCurLowPenaltyRa;
-	BOOLEAN		bPreDacSwingOn;
-	u4Byte		preDacSwingLvl;
-	BOOLEAN		bCurDacSwingOn;
-	u4Byte		curDacSwingLvl;
-	BOOLEAN		bPreAdcBackOff;
-	BOOLEAN		bCurAdcBackOff;
-	BOOLEAN 	bPreAgcTableEn;
-	BOOLEAN		bCurAgcTableEn;
-	//u4Byte		preVal0x6c0;
-	//u4Byte		curVal0x6c0;
-	u4Byte		preVal0x6c4;
-	u4Byte		curVal0x6c4;
-	u4Byte		preVal0x6c8;
-	u4Byte		curVal0x6c8;
-	u4Byte		preVal0x6cc;
-	u4Byte		curVal0x6cc;
-	//BOOLEAN		bLimitedDig;
-
-	// algorithm related
-	u1Byte		preAlgorithm;
-	u1Byte		curAlgorithm;
-	//u1Byte		btStatus;
-	//u1Byte		wifiChnlInfo[3];
-} COEX_DM_8192D_2ANT, *PCOEX_DM_8192D_2ANT;
-
-typedef struct _COEX_STA_8192D_2ANT{
-	u1Byte					preWifiRssiState[4];
-	BOOLEAN					bBtBusy;
-	BOOLEAN					bBtUplink;
-	BOOLEAN					bBtDownLink;
-	BOOLEAN					bA2dpBusy;
-}COEX_STA_8192D_2ANT, *PCOEX_STA_8192D_2ANT;
-
-//===========================================
-// The following is interface which will notify coex module.
-//===========================================
-VOID
-EXhalbtc8192d2ant_PowerOnSetting(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8192d2ant_InitHwConfig(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	BOOLEAN				bWifiOnly
-	);
-VOID
-EXhalbtc8192d2ant_InitCoexDm(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8192d2ant_IpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8192d2ant_LpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8192d2ant_ScanNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8192d2ant_ConnectNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8192d2ant_MediaStatusNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8192d2ant_SpecialPacketNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8192d2ant_HaltNotify(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8192d2ant_Periodical(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8192d2ant_BtInfoNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	pu1Byte			tmpBuf,
-	IN	u1Byte			length
-	);
-VOID
-EXhalbtc8192d2ant_DisplayCoexInfo(
-	IN	PBTC_COEXIST		pBtCoexist
-	);

hal/btc/HalBtc8703b1Ant.h

@@ -1,343 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8703B_SUPPORT == 1)
-/* *******************************************
- * The following is for 8703B 1ANT BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8703B_1ANT				1
-#define BT_8703B_1ANT_ENABLE_GNTBT_TO_GPIO14		0
-
-#define	BT_INFO_8703B_1ANT_B_FTP						BIT(7)
-#define	BT_INFO_8703B_1ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8703B_1ANT_B_HID						BIT(5)
-#define	BT_INFO_8703B_1ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8703B_1ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8703B_1ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8703B_1ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8703B_1ANT_B_CONNECTION				BIT(0)
-
-#define	BT_INFO_8703B_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)	\
-		(((_BT_INFO_EXT_&BIT(0))) ? true : false)
-
-#define	BTC_RSSI_COEX_THRESH_TOL_8703B_1ANT		2
-
-#define  BT_8703B_1ANT_WIFI_NOISY_THRESH							50   /* max: 255 */
-
-/* for Antenna detection */
-#define	BT_8703B_1ANT_ANTDET_PSDTHRES_BACKGROUND					50
-#define	BT_8703B_1ANT_ANTDET_PSDTHRES_2ANT_BADISOLATION				70
-#define	BT_8703B_1ANT_ANTDET_PSDTHRES_2ANT_GOODISOLATION			55
-#define	BT_8703B_1ANT_ANTDET_PSDTHRES_1ANT							35
-#define	BT_8703B_1ANT_ANTDET_RETRY_INTERVAL							10	/* retry timer if ant det is fail, unit: second */
-#define	BT_8703B_1ANT_ANTDET_ENABLE									0
-#define	BT_8703B_1ANT_ANTDET_COEXMECHANISMSWITCH_ENABLE				0
-
-#define	BT_8703B_1ANT_LTECOEX_INDIRECTREG_ACCESS_TIMEOUT		30000
-
-enum bt_8703b_1ant_signal_state {
-	BT_8703B_1ANT_SIG_STA_SET_TO_LOW		= 0x0,
-	BT_8703B_1ANT_SIG_STA_SET_BY_HW		= 0x0,
-	BT_8703B_1ANT_SIG_STA_SET_TO_HIGH		= 0x1,
-	BT_8703B_1ANT_SIG_STA_MAX
-};
-
-enum bt_8703b_1ant_path_ctrl_owner {
-	BT_8703B_1ANT_PCO_BTSIDE		= 0x0,
-	BT_8703B_1ANT_PCO_WLSIDE	= 0x1,
-	BT_8703B_1ANT_PCO_MAX
-};
-
-enum bt_8703b_1ant_gnt_ctrl_type {
-	BT_8703B_1ANT_GNT_TYPE_CTRL_BY_PTA		= 0x0,
-	BT_8703B_1ANT_GNT_TYPE_CTRL_BY_SW		= 0x1,
-	BT_8703B_1ANT_GNT_TYPE_MAX
-};
-
-enum bt_8703b_1ant_gnt_ctrl_block {
-	BT_8703B_1ANT_GNT_BLOCK_RFC_BB		= 0x0,
-	BT_8703B_1ANT_GNT_BLOCK_RFC			= 0x1,
-	BT_8703B_1ANT_GNT_BLOCK_BB			= 0x2,
-	BT_8703B_1ANT_GNT_BLOCK_MAX
-};
-
-enum bt_8703b_1ant_lte_coex_table_type {
-	BT_8703B_1ANT_CTT_WL_VS_LTE			= 0x0,
-	BT_8703B_1ANT_CTT_BT_VS_LTE			= 0x1,
-	BT_8703B_1ANT_CTT_MAX
-};
-
-enum bt_8703b_1ant_lte_break_table_type {
-	BT_8703B_1ANT_LBTT_WL_BREAK_LTE			= 0x0,
-	BT_8703B_1ANT_LBTT_BT_BREAK_LTE				= 0x1,
-	BT_8703B_1ANT_LBTT_LTE_BREAK_WL			= 0x2,
-	BT_8703B_1ANT_LBTT_LTE_BREAK_BT				= 0x3,
-	BT_8703B_1ANT_LBTT_MAX
-};
-
-enum bt_info_src_8703b_1ant {
-	BT_INFO_SRC_8703B_1ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8703B_1ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8703B_1ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8703B_1ANT_MAX
-};
-
-enum bt_8703b_1ant_bt_status {
-	BT_8703B_1ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8703B_1ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8703B_1ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8703B_1ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8703B_1ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8703B_1ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8703B_1ANT_BT_STATUS_MAX
-};
-
-enum bt_8703b_1ant_wifi_status {
-	BT_8703B_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE				= 0x0,
-	BT_8703B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN		= 0x1,
-	BT_8703B_1ANT_WIFI_STATUS_CONNECTED_SCAN					= 0x2,
-	BT_8703B_1ANT_WIFI_STATUS_CONNECTED_SPECIFIC_PKT				= 0x3,
-	BT_8703B_1ANT_WIFI_STATUS_CONNECTED_IDLE					= 0x4,
-	BT_8703B_1ANT_WIFI_STATUS_CONNECTED_BUSY					= 0x5,
-	BT_8703B_1ANT_WIFI_STATUS_MAX
-};
-
-enum bt_8703b_1ant_coex_algo {
-	BT_8703B_1ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8703B_1ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8703B_1ANT_COEX_ALGO_HID				= 0x2,
-	BT_8703B_1ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8703B_1ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8703B_1ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8703B_1ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8703B_1ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8703B_1ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8703B_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8703B_1ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8703B_1ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8703b_1ant {
-	/* hw setting */
-	u8		pre_ant_pos_type;
-	u8		cur_ant_pos_type;
-	/* fw mechanism */
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	/* sw mechanism */
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-
-	u32		backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */
-	u32		backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */
-	u16		backup_retry_limit;
-	u8		backup_ampdu_max_time;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-	u8		pre_arfr_type;
-	u8		cur_arfr_type;
-	u8		pre_retry_limit_type;
-	u8		cur_retry_limit_type;
-	u8		pre_ampdu_time_type;
-	u8		cur_ampdu_time_type;
-	u32		arp_cnt;
-
-	u8		error_condition;
-};
-
-struct coex_sta_8703b_1ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-	boolean					bt_hi_pri_link_exist;
-	u8					num_of_profile;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					specific_pkt_period_cnt;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	s8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8703B_1ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8703B_1ANT_MAX];
-	boolean					bt_whck_test;
-	boolean					c2h_bt_inquiry_page;
-	boolean					c2h_bt_page;				/* Add for win8.1 page out issue */
-	boolean					wifi_is_high_pri_task;		/* Add for win8.1 page out issue */
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-	u32					pop_event_cnt;
-	u8					scan_ap_num;
-
-	u32					crc_ok_cck;
-	u32					crc_ok_11g;
-	u32					crc_ok_11n;
-	u32					crc_ok_11n_agg;
-
-	u32					crc_err_cck;
-	u32					crc_err_11g;
-	u32					crc_err_11n;
-	u32					crc_err_11n_agg;
-
-	boolean					cck_lock;
-	boolean					pre_ccklock;
-	boolean					cck_ever_lock;
-	u8					coex_table_type;
-
-	boolean					force_lps_on;
-	u32					wrong_profile_notification;
-
-	boolean					concurrent_rx_mode_on;
-
-	u16					score_board;
-};
-
-#define  BT_8703B_1ANT_ANTDET_PSD_POINTS			256	/* MAX:1024 */
-#define  BT_8703B_1ANT_ANTDET_PSD_AVGNUM			1	/* MAX:3 */
-#define	BT_8703B_1ANT_ANTDET_BUF_LEN				16
-
-struct psdscan_sta_8703b_1ant {
-
-	u32			ant_det_bt_le_channel;  /* BT LE Channel ex:2412 */
-	u32			ant_det_bt_tx_time;
-	u32			ant_det_pre_psdscan_peak_val;
-	boolean			ant_det_is_ant_det_available;
-	u32			ant_det_psd_scan_peak_val;
-	boolean			ant_det_is_btreply_available;
-	u32			ant_det_psd_scan_peak_freq;
-
-	u8			ant_det_result;
-	u8			ant_det_peak_val[BT_8703B_1ANT_ANTDET_BUF_LEN];
-	u8			ant_det_peak_freq[BT_8703B_1ANT_ANTDET_BUF_LEN];
-	u32			ant_det_try_count;
-	u32			ant_det_fail_count;
-	u32			ant_det_inteval_count;
-	u32			ant_det_thres_offset;
-
-	u32			real_cent_freq;
-	s32			real_offset;
-	u32			real_span;
-
-	u32			psd_band_width;  /* unit: Hz */
-	u32			psd_point;		/* 128/256/512/1024 */
-	u32			psd_report[1024];  /* unit:dB (20logx), 0~255 */
-	u32			psd_report_max_hold[1024];  /* unit:dB (20logx), 0~255 */
-	u32			psd_start_point;
-	u32			psd_stop_point;
-	u32			psd_max_value_point;
-	u32			psd_max_value;
-	u32			psd_start_base;
-	u32			psd_avg_num;	/* 1/8/16/32 */
-	u32			psd_gen_count;
-	boolean			is_psd_running;
-	boolean			is_psd_show_max_only;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8703b1ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8703b1ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8703b1ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8703b1ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8703b1ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8703b1ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8703b1ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8703b1ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8703b1ant_rf_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8703b1ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8703b1ant_ScoreBoardStatusNotify(IN struct btc_coexist *btcoexist,
-		IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8703b1ant_coex_dm_reset(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_display_coex_info(IN struct btc_coexist *btcoexist);
-void ex_halbtc8703b1ant_antenna_detection(IN struct btc_coexist *btcoexist,
-		IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds);
-void ex_halbtc8703b1ant_antenna_isolation(IN struct btc_coexist *btcoexist,
-		IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds);
-
-void ex_halbtc8703b1ant_psd_scan(IN struct btc_coexist *btcoexist,
-		 IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds);
-void ex_halbtc8703b1ant_display_ant_detection(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8703b1ant_power_on_setting(btcoexist)
-#define	ex_halbtc8703b1ant_pre_load_firmware(btcoexist)
-#define	ex_halbtc8703b1ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8703b1ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8703b1ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8703b1ant_rf_status_notify(btcoexist, type)
-#define	ex_halbtc8703b1ant_halt_notify(btcoexist)
-#define	ex_halbtc8703b1ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8703b1ant_ScoreBoardStatusNotify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8703b1ant_coex_dm_reset(btcoexist)
-#define	ex_halbtc8703b1ant_periodical(btcoexist)
-#define	ex_halbtc8703b1ant_display_coex_info(btcoexist)
-#define	ex_halbtc8703b1ant_antenna_detection(btcoexist, cent_freq, offset, span, seconds)
-#define	ex_halbtc8703b1ant_antenna_isolation(btcoexist, cent_freq, offset, span, seconds)
-#define	ex_halbtc8703b1ant_psd_scan(btcoexist, cent_freq, offset, span, seconds)
-#define	ex_halbtc8703b1ant_display_ant_detection(btcoexist)
-
-#endif
-
-
-#endif

hal/btc/HalBtc8723a1Ant.h

@@ -1,171 +0,0 @@
-//===========================================
-// The following is for 8723A 1Ant BT Co-exist definition
-//===========================================
-#define	BT_INFO_8723A_1ANT_B_FTP						BIT7
-#define	BT_INFO_8723A_1ANT_B_A2DP					BIT6
-#define	BT_INFO_8723A_1ANT_B_HID						BIT5
-#define	BT_INFO_8723A_1ANT_B_SCO_BUSY				BIT4
-#define	BT_INFO_8723A_1ANT_B_ACL_BUSY				BIT3
-#define	BT_INFO_8723A_1ANT_B_INQ_PAGE				BIT2
-#define	BT_INFO_8723A_1ANT_B_SCO_ESCO				BIT1
-#define	BT_INFO_8723A_1ANT_B_CONNECTION				BIT0
-
-typedef enum _BT_STATE_8723A_1ANT{
-	BT_STATE_8723A_1ANT_DISABLED				= 0,
-	BT_STATE_8723A_1ANT_NO_CONNECTION		= 1,
-	BT_STATE_8723A_1ANT_CONNECT_IDLE		= 2,
-	BT_STATE_8723A_1ANT_INQ_OR_PAG			= 3,
-	BT_STATE_8723A_1ANT_ACL_ONLY_BUSY		= 4,
-	BT_STATE_8723A_1ANT_SCO_ONLY_BUSY		= 5,
-	BT_STATE_8723A_1ANT_ACL_SCO_BUSY			= 6,
-	BT_STATE_8723A_1ANT_HID_BUSY				= 7,
-	BT_STATE_8723A_1ANT_HID_SCO_BUSY			= 8,
-	BT_STATE_8723A_1ANT_MAX
-}BT_STATE_8723A_1ANT, *PBT_STATE_8723A_1ANT;
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8723A_1ANT		2
-
-typedef enum _BT_INFO_SRC_8723A_1ANT{
-	BT_INFO_SRC_8723A_1ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8723A_1ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8723A_1ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8723A_1ANT_MAX
-}BT_INFO_SRC_8723A_1ANT,*PBT_INFO_SRC_8723A_1ANT;
-
-typedef enum _BT_8723A_1ANT_BT_STATUS{
-	BT_8723A_1ANT_BT_STATUS_IDLE				= 0x0,
-	BT_8723A_1ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,
-	BT_8723A_1ANT_BT_STATUS_NON_IDLE			= 0x2,
-	BT_8723A_1ANT_BT_STATUS_MAX
-}BT_8723A_1ANT_BT_STATUS,*PBT_8723A_1ANT_BT_STATUS;
-
-typedef enum _BT_8723A_1ANT_COEX_ALGO{
-	BT_8723A_1ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8723A_1ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8723A_1ANT_COEX_ALGO_HID				= 0x2,
-	BT_8723A_1ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8723A_1ANT_COEX_ALGO_PANEDR			= 0x4,
-	BT_8723A_1ANT_COEX_ALGO_PANHS			= 0x5,
-	BT_8723A_1ANT_COEX_ALGO_PANEDR_A2DP		= 0x6,
-	BT_8723A_1ANT_COEX_ALGO_PANEDR_HID		= 0x7,
-	BT_8723A_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x8,
-	BT_8723A_1ANT_COEX_ALGO_HID_A2DP			= 0x9,
-	BT_8723A_1ANT_COEX_ALGO_MAX
-}BT_8723A_1ANT_COEX_ALGO,*PBT_8723A_1ANT_COEX_ALGO;
-
-typedef struct _COEX_DM_8723A_1ANT{
-	// fw mechanism
-	BOOLEAN		bCurIgnoreWlanAct;
-	BOOLEAN		bPreIgnoreWlanAct;
-	u1Byte		prePsTdma;
-	u1Byte		curPsTdma;
-	u1Byte		psTdmaPara[5];
-	u1Byte		psTdmaDuAdjType;
-	u4Byte		psTdmaMonitorCnt;
-	u4Byte		psTdmaGlobalCnt;
-	BOOLEAN		bResetTdmaAdjust;
-	BOOLEAN		bPrePsTdmaOn;
-	BOOLEAN		bCurPsTdmaOn;
-
-	// sw mechanism
-	BOOLEAN		bPreRfRxLpfShrink;
-	BOOLEAN		bCurRfRxLpfShrink;
-	u4Byte		btRf0x1eBackup;
-	BOOLEAN 	bPreLowPenaltyRa;
-	BOOLEAN		bCurLowPenaltyRa;
-	u4Byte		preVal0x6c0;
-	u4Byte		curVal0x6c0;
-	u4Byte		preVal0x6c8;
-	u4Byte		curVal0x6c8;
-	u1Byte		preVal0x6cc;
-	u1Byte		curVal0x6cc;
-	BOOLEAN		bLimitedDig;
-
-	// algorithm related
-	u1Byte		preAlgorithm;
-	u1Byte		curAlgorithm;
-	u1Byte		btStatus;
-	u1Byte		wifiChnlInfo[3];
-} COEX_DM_8723A_1ANT, *PCOEX_DM_8723A_1ANT;
-
-typedef struct _COEX_STA_8723A_1ANT{
-	u4Byte					highPriorityTx;
-	u4Byte					highPriorityRx;
-	u4Byte					lowPriorityTx;
-	u4Byte					lowPriorityRx;
-	u1Byte					btRssi;
-	u1Byte					preBtRssiState;
-	u1Byte					preBtRssiState1;
-	u1Byte					preWifiRssiState[4];
-	BOOLEAN					bC2hBtInfoReqSent;
-	u1Byte					btInfoC2h[BT_INFO_SRC_8723A_1ANT_MAX][10];
-	u4Byte					btInfoC2hCnt[BT_INFO_SRC_8723A_1ANT_MAX];
-	BOOLEAN					bC2hBtInquiryPage;
-	u1Byte					btRetryCnt;
-	u1Byte					btInfoExt;
-	//BOOLEAN					bHoldForStackOperation;
-	//u1Byte					bHoldPeriodCnt;
-	// this is for c2h hang work-around
-	u4Byte					c2hHangDetectCnt;
-}COEX_STA_8723A_1ANT, *PCOEX_STA_8723A_1ANT;
-
-//===========================================
-// The following is interface which will notify coex module.
-//===========================================
-VOID
-EXhalbtc8723a1ant_InitHwConfig(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8723a1ant_InitCoexDm(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8723a1ant_IpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a1ant_LpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a1ant_ScanNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a1ant_ConnectNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a1ant_MediaStatusNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8723a1ant_SpecialPacketNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8723a1ant_BtInfoNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	pu1Byte			tmpBuf,
-	IN	u1Byte			length
-	);
-VOID
-EXhalbtc8723a1ant_HaltNotify(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8723a1ant_Periodical(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8723a1ant_DisplayCoexInfo(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-

hal/btc/HalBtc8723a2Ant.h

@@ -1,184 +0,0 @@
-//===========================================
-// The following is for 8723A 2Ant BT Co-exist definition
-//===========================================
-#define	BT_INFO_8723A_2ANT_B_FTP						BIT7
-#define	BT_INFO_8723A_2ANT_B_A2DP					BIT6
-#define	BT_INFO_8723A_2ANT_B_HID						BIT5
-#define	BT_INFO_8723A_2ANT_B_SCO_BUSY				BIT4
-#define	BT_INFO_8723A_2ANT_B_ACL_BUSY				BIT3
-#define	BT_INFO_8723A_2ANT_B_INQ_PAGE				BIT2
-#define	BT_INFO_8723A_2ANT_B_SCO_ESCO				BIT1
-#define	BT_INFO_8723A_2ANT_B_CONNECTION				BIT0
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8723A_2ANT		2
-
-typedef enum _BT_INFO_SRC_8723A_2ANT{
-	BT_INFO_SRC_8723A_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8723A_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8723A_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8723A_2ANT_MAX
-}BT_INFO_SRC_8723A_2ANT,*PBT_INFO_SRC_8723A_2ANT;
-
-typedef enum _BT_8723A_2ANT_BT_STATUS{
-	BT_8723A_2ANT_BT_STATUS_IDLE				= 0x0,
-	BT_8723A_2ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,
-	BT_8723A_2ANT_BT_STATUS_NON_IDLE			= 0x2,
-	BT_8723A_2ANT_BT_STATUS_MAX
-}BT_8723A_2ANT_BT_STATUS,*PBT_8723A_2ANT_BT_STATUS;
-
-typedef enum _BT_8723A_2ANT_COEX_ALGO{
-	BT_8723A_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8723A_2ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8723A_2ANT_COEX_ALGO_HID				= 0x2,
-	BT_8723A_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8723A_2ANT_COEX_ALGO_PANEDR			= 0x4,
-	BT_8723A_2ANT_COEX_ALGO_PANHS			= 0x5,
-	BT_8723A_2ANT_COEX_ALGO_PANEDR_A2DP		= 0x6,
-	BT_8723A_2ANT_COEX_ALGO_PANEDR_HID		= 0x7,
-	BT_8723A_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x8,
-	BT_8723A_2ANT_COEX_ALGO_HID_A2DP			= 0x9,
-	BT_8723A_2ANT_COEX_ALGO_MAX
-}BT_8723A_2ANT_COEX_ALGO,*PBT_8723A_2ANT_COEX_ALGO;
-
-typedef struct _COEX_DM_8723A_2ANT{
-	// fw mechanism
-	BOOLEAN		bPreDecBtPwr;
-	BOOLEAN		bCurDecBtPwr;
-	//BOOLEAN		bPreBtLnaConstrain;
-	//BOOLEAN		bCurBtLnaConstrain;
-	//u1Byte		bPreBtPsdMode;
-	//u1Byte		bCurBtPsdMode;
-	u1Byte		preFwDacSwingLvl;
-	u1Byte		curFwDacSwingLvl;
-	BOOLEAN		bCurIgnoreWlanAct;
-	BOOLEAN		bPreIgnoreWlanAct;
-	u1Byte		prePsTdma;
-	u1Byte		curPsTdma;
-	u1Byte		psTdmaPara[5];
-	u1Byte		psTdmaDuAdjType;
-	BOOLEAN		bResetTdmaAdjust;
-	BOOLEAN		bPrePsTdmaOn;
-	BOOLEAN		bCurPsTdmaOn;
-	//BOOLEAN		bPreBtAutoReport;
-	//BOOLEAN		bCurBtAutoReport;
-
-	// sw mechanism
-	BOOLEAN		bPreRfRxLpfShrink;
-	BOOLEAN		bCurRfRxLpfShrink;
-	u4Byte		btRf0x1eBackup;
-	BOOLEAN 	bPreLowPenaltyRa;
-	BOOLEAN		bCurLowPenaltyRa;
-	BOOLEAN		bPreDacSwingOn;
-	u4Byte		preDacSwingLvl;
-	BOOLEAN		bCurDacSwingOn;
-	u4Byte		curDacSwingLvl;
-	BOOLEAN		bPreAdcBackOff;
-	BOOLEAN		bCurAdcBackOff;
-	BOOLEAN 	bPreAgcTableEn;
-	BOOLEAN		bCurAgcTableEn;
-	u4Byte		preVal0x6c0;
-	u4Byte		curVal0x6c0;
-	u4Byte		preVal0x6c8;
-	u4Byte		curVal0x6c8;
-	u1Byte		preVal0x6cc;
-	u1Byte		curVal0x6cc;
-	BOOLEAN		bLimitedDig;
-
-	// algorithm related
-	u1Byte		preAlgorithm;
-	u1Byte		curAlgorithm;
-	u1Byte		btStatus;
-	u1Byte		wifiChnlInfo[3];
-} COEX_DM_8723A_2ANT, *PCOEX_DM_8723A_2ANT;
-
-typedef struct _COEX_STA_8723A_2ANT{
-	u4Byte					highPriorityTx;
-	u4Byte					highPriorityRx;
-	u4Byte					lowPriorityTx;
-	u4Byte					lowPriorityRx;
-	u1Byte					btRssi;
-	u1Byte					preBtRssiState;
-	u1Byte					preBtRssiState1;
-	u1Byte					preWifiRssiState[4];
-	BOOLEAN					bC2hBtInfoReqSent;
-	u1Byte					btInfoC2h[BT_INFO_SRC_8723A_2ANT_MAX][10];
-	u4Byte					btInfoC2hCnt[BT_INFO_SRC_8723A_2ANT_MAX];
-	BOOLEAN					bC2hBtInquiryPage;
-	u1Byte					btRetryCnt;
-	u1Byte					btInfoExt;
-	BOOLEAN					bHoldForStackOperation;
-	u1Byte					bHoldPeriodCnt;
-	// this is for c2h hang work-around
-	u4Byte					c2hHangDetectCnt;
-}COEX_STA_8723A_2ANT, *PCOEX_STA_8723A_2ANT;
-
-//===========================================
-// The following is interface which will notify coex module.
-//===========================================
-VOID
-EXhalbtc8723a2ant_PowerOnSetting(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8723a2ant_InitHwConfig(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	BOOLEAN				bWifiOnly
-	);
-VOID
-EXhalbtc8723a2ant_InitCoexDm(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-VOID
-EXhalbtc8723a2ant_IpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a2ant_LpsNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a2ant_ScanNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a2ant_ConnectNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	u1Byte			type
-	);
-VOID
-EXhalbtc8723a2ant_MediaStatusNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8723a2ant_SpecialPacketNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8723a2ant_HaltNotify(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8723a2ant_Periodical(
-	IN	PBTC_COEXIST			pBtCoexist
-	);
-VOID
-EXhalbtc8723a2ant_BtInfoNotify(
-	IN	PBTC_COEXIST		pBtCoexist,
-	IN	pu1Byte			tmpBuf,
-	IN	u1Byte			length
-	);
-VOID
-EXhalbtc8723a2ant_StackOperationNotify(
-	IN	PBTC_COEXIST			pBtCoexist,
-	IN	u1Byte				type
-	);
-VOID
-EXhalbtc8723a2ant_DisplayCoexInfo(
-	IN	PBTC_COEXIST		pBtCoexist
-	);
-

hal/btc/HalBtc8723b1Ant.h

@@ -1,288 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8723B_SUPPORT == 1)
-/* *******************************************
- * The following is for 8723B 1ANT BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8723B_1ANT				1
-
-#define	BT_INFO_8723B_1ANT_B_FTP						BIT(7)
-#define	BT_INFO_8723B_1ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8723B_1ANT_B_HID						BIT(5)
-#define	BT_INFO_8723B_1ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8723B_1ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8723B_1ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8723B_1ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8723B_1ANT_B_CONNECTION				BIT(0)
-
-#define	BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)	\
-		(((_BT_INFO_EXT_&BIT(0))) ? true : false)
-
-#define	BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT		2
-
-#define  BT_8723B_1ANT_WIFI_NOISY_THRESH								50 /* 30   //max: 255								 */
-
-/* for Antenna detection */
-#define	BT_8723B_1ANT_ANTDET_PSDTHRES_BACKGROUND						50
-#define	BT_8723B_1ANT_ANTDET_PSDTHRES_2ANT_BADISOLATION				70
-#define	BT_8723B_1ANT_ANTDET_PSDTHRES_2ANT_GOODISOLATION			55
-#define	BT_8723B_1ANT_ANTDET_PSDTHRES_1ANT							32
-#define	BT_8723B_1ANT_ANTDET_RETRY_INTERVAL							10	/* retry timer if ant det is fail, unit: second */
-#define	BT_8723B_1ANT_ANTDET_SWEEPPOINT_DELAY							40000  
-#define	BT_8723B_1ANT_ANTDET_ENABLE										1
-#define	BT_8723B_1ANT_ANTDET_COEXMECHANISMSWITCH_ENABLE				1
-#define	BT_8723B_1ANT_ANTDET_BTTXTIME									100
-#define	BT_8723B_1ANT_ANTDET_BTTXCHANNEL								39
-
-enum bt_info_src_8723b_1ant {
-	BT_INFO_SRC_8723B_1ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8723B_1ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8723B_1ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8723B_1ANT_MAX
-};
-
-enum bt_8723b_1ant_bt_status {
-	BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8723B_1ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8723B_1ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8723B_1ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8723B_1ANT_BT_STATUS_MAX
-};
-
-enum bt_8723b_1ant_wifi_status {
-	BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE				= 0x0,
-	BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN		= 0x1,
-	BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN					= 0x2,
-	BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SPECIFIC_PKT				= 0x3,
-	BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE					= 0x4,
-	BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY					= 0x5,
-	BT_8723B_1ANT_WIFI_STATUS_MAX
-};
-
-enum bt_8723b_1ant_coex_algo {
-	BT_8723B_1ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8723B_1ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8723B_1ANT_COEX_ALGO_HID				= 0x2,
-	BT_8723B_1ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8723B_1ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8723B_1ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8723B_1ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8723B_1ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8723B_1ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8723B_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8723B_1ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8723B_1ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8723b_1ant {
-	/* hw setting */
-	u8		pre_ant_pos_type;
-	u8		cur_ant_pos_type;
-	/* fw mechanism */
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	/* sw mechanism */
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-
-	u32		backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */
-	u32		backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */
-	u16		backup_retry_limit;
-	u8		backup_ampdu_max_time;
-
-	/* algorithm related */
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-	u8		pre_arfr_type;
-	u8		cur_arfr_type;
-	u8		pre_retry_limit_type;
-	u8		cur_retry_limit_type;
-	u8		pre_ampdu_time_type;
-	u8		cur_ampdu_time_type;
-	u32		arp_cnt;
-
-	u8		error_condition;
-};
-
-struct coex_sta_8723b_1ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-	boolean					bt_hi_pri_link_exist;
-	u8					num_of_profile;
-	boolean					bt_abnormal_scan;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					specific_pkt_period_cnt;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	s8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8723B_1ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8723B_1ANT_MAX];
-	boolean					bt_whck_test;
-	boolean					c2h_bt_inquiry_page;
-	boolean					c2h_bt_remote_name_req;
-	boolean					wifi_is_high_pri_task;		/* Add for win8.1 page out issue */
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-	u32					pop_event_cnt;
-	u8					scan_ap_num;
-
-	u32					crc_ok_cck;
-	u32					crc_ok_11g;
-	u32					crc_ok_11n;
-	u32					crc_ok_11n_agg;
-	
-	u32					crc_err_cck;
-	u32					crc_err_11g;
-	u32					crc_err_11n;
-	u32					crc_err_11n_agg;
-
-	boolean					cck_lock;
-	boolean					pre_ccklock;
-	boolean					cck_ever_lock;
-	u8					coex_table_type;
-
-	boolean					force_lps_on;
-	u32					wrong_profile_notification;
-
-	u8					a2dp_bit_pool;
-	u8					cut_version;
-};
-
-#define BT_8723B_1ANT_ANTDET_PSD_POINTS			256	/* MAX:1024 */
-#define BT_8723B_1ANT_ANTDET_PSD_AVGNUM		1	/* MAX:3 */
-#define	BT_8723B_1ANT_ANTDET_BUF_LEN			16
-
-struct psdscan_sta_8723b_1ant {
-
-	u32			ant_det_bt_le_channel;  /* BT LE Channel ex:2412 */
-	u32			ant_det_bt_tx_time;
-	u32			ant_det_pre_psdscan_peak_val;
-	boolean			ant_det_is_ant_det_available;
-	u32			ant_det_psd_scan_peak_val;
-	boolean			ant_det_is_btreply_available;
-	u32			ant_det_psd_scan_peak_freq;
-
-	u8			ant_det_result;
-	u8			ant_det_peak_val[BT_8723B_1ANT_ANTDET_BUF_LEN];
-	u8			ant_det_peak_freq[BT_8723B_1ANT_ANTDET_BUF_LEN];
-	u32			ant_det_try_count;
-	u32			ant_det_fail_count;
-	u32			ant_det_inteval_count;
-	u32			ant_det_thres_offset;
-
-	u32			real_cent_freq;
-	s32			real_offset;
-	u32			real_span;
-	
-	u32			psd_band_width;  /* unit: Hz */
-	u32			psd_point;		/* 128/256/512/1024 */
-	u32			psd_report[1024];  /* unit:dB (20logx), 0~255 */
-	u32			psd_report_max_hold[1024];  /* unit:dB (20logx), 0~255 */
-	u32			psd_start_point;
-	u32			psd_stop_point;
-	u32			psd_max_value_point;
-	u32			psd_max_value;
-	u32			psd_start_base;
-	u32			psd_avg_num;	/* 1/8/16/32 */
-	u32			psd_gen_count;
-	boolean			is_psd_running;
-	boolean			is_psd_show_max_only;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8723b1ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8723b1ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8723b1ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8723b1ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8723b1ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8723b1ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8723b1ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8723b1ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8723b1ant_rf_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8723b1ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8723b1ant_coex_dm_reset(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_display_coex_info(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b1ant_antenna_detection(IN struct btc_coexist *btcoexist,
-		IN u32 cent_freq, IN u32 offset, IN u32 span, IN u32 seconds);
-
-void ex_halbtc8723b1ant_display_ant_detection(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8723b1ant_power_on_setting(btcoexist)
-#define	ex_halbtc8723b1ant_pre_load_firmware(btcoexist)
-#define	ex_halbtc8723b1ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8723b1ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8723b1ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8723b1ant_rf_status_notify(btcoexist, type)
-#define	ex_halbtc8723b1ant_halt_notify(btcoexist)
-#define	ex_halbtc8723b1ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8723b1ant_coex_dm_reset(btcoexist)
-#define	ex_halbtc8723b1ant_periodical(btcoexist)
-#define	ex_halbtc8723b1ant_display_coex_info(btcoexist)
-#define	ex_halbtc8723b1ant_antenna_detection(btcoexist, cent_freq, offset, span, seconds)
-#define	ex_halbtc8723b1ant_display_ant_detection(btcoexist)
-
-#endif
-
-#endif

hal/btc/HalBtc8723b2Ant.h

@@ -1,214 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8723B_SUPPORT == 1)
-/* *******************************************
- * The following is for 8723B 2Ant BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8723B_2ANT				1
-
-
-#define	BT_INFO_8723B_2ANT_B_FTP						BIT(7)
-#define	BT_INFO_8723B_2ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8723B_2ANT_B_HID						BIT(5)
-#define	BT_INFO_8723B_2ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8723B_2ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8723B_2ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8723B_2ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8723B_2ANT_B_CONNECTION				BIT(0)
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT		2
-
-
-#define	BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES				42  /* WiFi RSSI Threshold for 2-Ant TDMA/1-Ant PS-TDMA translation */
-#define	BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES				46 /* BT RSSI Threshold for 2-Ant TDMA/1-Ant PS-TDMA translation */
-
-enum bt_info_src_8723b_2ant {
-	BT_INFO_SRC_8723B_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8723B_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8723B_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8723B_2ANT_MAX
-};
-
-enum bt_8723b_2ant_bt_status {
-	BT_8723B_2ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8723B_2ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8723B_2ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8723B_2ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8723B_2ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8723B_2ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8723B_2ANT_BT_STATUS_MAX
-};
-
-enum bt_8723b_2ant_coex_algo {
-	BT_8723B_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8723B_2ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8723B_2ANT_COEX_ALGO_HID				= 0x2,
-	BT_8723B_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8723B_2ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8723B_2ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8723B_2ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8723B_2ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8723B_2ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8723B_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8723B_2ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8723B_2ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8723b_2ant {
-	/* fw mechanism */
-	u8		pre_bt_dec_pwr_lvl;
-	u8		cur_bt_dec_pwr_lvl;
-	u8		pre_fw_dac_swing_lvl;
-	u8		cur_fw_dac_swing_lvl;
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		reset_tdma_adjust;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-
-	/* sw mechanism */
-	boolean		pre_rf_rx_lpf_shrink;
-	boolean		cur_rf_rx_lpf_shrink;
-	u32		bt_rf_0x1e_backup;
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	boolean		pre_dac_swing_on;
-	u32		pre_dac_swing_lvl;
-	boolean		cur_dac_swing_on;
-	u32		cur_dac_swing_lvl;
-	boolean		pre_adc_back_off;
-	boolean		cur_adc_back_off;
-	boolean	pre_agc_table_en;
-	boolean		cur_agc_table_en;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	boolean		need_recover0x948;
-	u32		backup0x948;
-
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	boolean		is_switch_to_1dot5_ant;
-	u8		switch_thres_offset;
-};
-
-struct coex_sta_8723b_2ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-	boolean					bt_abnormal_scan;
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	u8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8723B_2ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8723B_2ANT_MAX];
-	boolean				bt_whck_test;
-	boolean					c2h_bt_inquiry_page;
-	boolean					c2h_bt_remote_name_req;
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-	u32					pop_event_cnt;
-	u8					scan_ap_num;
-
-	u32					crc_ok_cck;
-	u32					crc_ok_11g;
-	u32					crc_ok_11n;
-	u32					crc_ok_11n_agg;
-
-	u32					crc_err_cck;
-	u32					crc_err_11g;
-	u32					crc_err_11n;
-	u32					crc_err_11n_agg;
-
-	u8					coex_table_type;
-	boolean					force_lps_on;
-
-	u8					dis_ver_info_cnt;
-
-	u8					a2dp_bit_pool;
-	u8					cut_version;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8723b2ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b2ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b2ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8723b2ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b2ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8723b2ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8723b2ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8723b2ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8723b2ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8723b2ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8723b2ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8723b2ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b2ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8723b2ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8723b2ant_display_coex_info(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8723b2ant_power_on_setting(btcoexist)
-#define	ex_halbtc8723b2ant_pre_load_firmware(btcoexist)
-#define	ex_halbtc8723b2ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8723b2ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8723b2ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8723b2ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8723b2ant_halt_notify(btcoexist)
-#define	ex_halbtc8723b2ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8723b2ant_periodical(btcoexist)
-#define	ex_halbtc8723b2ant_display_coex_info(btcoexist)
-
-#endif
-
-#endif

hal/btc/HalBtc8812a1Ant.h

@@ -1,230 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8812A_SUPPORT == 1)
-
-/* *******************************************
- * The following is for 8812A 1ANT BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8812A_1ANT				1
-
-#define	BT_INFO_8812A_1ANT_B_FTP						BIT(7)
-#define	BT_INFO_8812A_1ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8812A_1ANT_B_HID						BIT(5)
-#define	BT_INFO_8812A_1ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8812A_1ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8812A_1ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8812A_1ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8812A_1ANT_B_CONNECTION				BIT(0)
-
-#define	BT_INFO_8812A_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)	\
-		(((_BT_INFO_EXT_&BIT(0))) ? true : false)
-
-#define	BTC_RSSI_COEX_THRESH_TOL_8812A_1ANT		2
-
-#define  BT_8812A_1ANT_WIFI_NOISY_THRESH								30   /* max: 255 */
-
-enum bt_info_src_8812a_1ant {
-	BT_INFO_SRC_8812A_1ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8812A_1ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8812A_1ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8812A_1ANT_MAX
-};
-
-enum bt_8812a_1ant_bt_status {
-	BT_8812A_1ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8812A_1ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8812A_1ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8812A_1ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8812A_1ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8812A_1ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8812A_1ANT_BT_STATUS_MAX
-};
-
-enum bt_8812a_1ant_wifi_status {
-	BT_8812A_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE				= 0x0,
-	BT_8812A_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN		= 0x1,
-	BT_8812A_1ANT_WIFI_STATUS_CONNECTED_SCAN					= 0x2,
-	BT_8812A_1ANT_WIFI_STATUS_CONNECTED_SPECIFIC_PKT				= 0x3,
-	BT_8812A_1ANT_WIFI_STATUS_CONNECTED_IDLE					= 0x4,
-	BT_8812A_1ANT_WIFI_STATUS_CONNECTED_BUSY					= 0x5,
-	BT_8812A_1ANT_WIFI_STATUS_MAX
-};
-
-enum bt_8812a_1ant_coex_algo {
-	BT_8812A_1ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8812A_1ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8812A_1ANT_COEX_ALGO_HID				= 0x2,
-	BT_8812A_1ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8812A_1ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8812A_1ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8812A_1ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8812A_1ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8812A_1ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8812A_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8812A_1ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8812A_1ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8812a_1ant {
-	/* hw setting */
-	u8		pre_ant_pos_type;
-	u8		cur_ant_pos_type;
-	/* fw mechanism */
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	/* sw mechanism */
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-
-	u32		backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */
-	u32		backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */
-	u16		backup_retry_limit;
-	u8		backup_ampdu_max_time;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-	u8		pre_arfr_type;
-	u8		cur_arfr_type;
-	u8		pre_retry_limit_type;
-	u8		cur_retry_limit_type;
-	u8		pre_ampdu_time_type;
-	u8		cur_ampdu_time_type;
-	u32		arp_cnt;
-
-	u8		error_condition;
-};
-
-struct coex_sta_8812a_1ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					specific_pkt_period_cnt;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	s8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8812A_1ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8812A_1ANT_MAX];
-	u32					bt_info_query_cnt;
-	boolean					c2h_bt_inquiry_page;
-	boolean					c2h_bt_page;				/* Add for win8.1 page out issue */
-	boolean					wifi_is_high_pri_task;		/* Add for win8.1 page out issue */
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-	u32					pop_event_cnt;
-	u8					scan_ap_num;
-
-	u32					crc_ok_cck;
-	u32					crc_ok_11g;
-	u32					crc_ok_11n;
-	u32					crc_ok_11n_agg;
-
-	u32					crc_err_cck;
-	u32					crc_err_11g;
-	u32					crc_err_11n;
-	u32					crc_err_11n_agg;
-
-	boolean					cck_lock;
-	boolean					pre_ccklock;
-	u8					coex_table_type;
-
-	boolean					force_lps_on;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8812a1ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8812a1ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8812a1ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8812a1ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8812a1ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8812a1ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8812a1ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8812a1ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8812a1ant_rf_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8812a1ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8812a1ant_coex_dm_reset(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a1ant_dbg_control(IN struct btc_coexist *btcoexist,
-				    IN u8 op_code, IN u8 op_len, IN u8 *pdata);
-void ex_halbtc8812a1ant_display_coex_info(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8812a1ant_power_on_setting(btcoexist)
-#define	ex_halbtc8812a1ant_pre_load_firmware(btcoexist)
-#define	ex_halbtc8812a1ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8812a1ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8812a1ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8812a1ant_rf_status_notify(btcoexist, type)
-#define	ex_halbtc8812a1ant_halt_notify(btcoexist)
-#define	ex_halbtc8812a1ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8812a1ant_coex_dm_reset(btcoexist)
-#define	ex_halbtc8812a1ant_periodical(btcoexist)
-#define	ex_halbtc8812a1ant_dbg_control(btcoexist, op_code, op_len, pdata)
-#define	ex_halbtc8812a1ant_display_coex_info(btcoexist)
-
-#endif
-
-#endif

hal/btc/HalBtc8812a2Ant.h

@@ -1,202 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8812A_SUPPORT == 1)
-
-/* *******************************************
- * The following is for 8812A 2Ant BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8812A_2ANT				0
-
-#define	BT_INFO_8812A_2ANT_B_FTP						BIT(7)
-#define	BT_INFO_8812A_2ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8812A_2ANT_B_HID						BIT(5)
-#define	BT_INFO_8812A_2ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8812A_2ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8812A_2ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8812A_2ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8812A_2ANT_B_CONNECTION				BIT(0)
-
-#define	BT_INFO_8812A_2ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)	\
-		(((_BT_INFO_EXT_&BIT(0))) ? true : false)
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8812A_2ANT		2
-
-enum bt_info_src_8812a_2ant {
-	BT_INFO_SRC_8812A_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8812A_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8812A_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8812A_2ANT_MAX
-};
-
-enum bt_8812a_2ant_bt_status {
-	BT_8812A_2ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8812A_2ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8812A_2ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8812A_2ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8812A_2ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8812A_2ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8812A_2ANT_BT_STATUS_MAX
-};
-
-enum bt_8812a_2ant_coex_algo {
-	BT_8812A_2ANT_COEX_ALGO_UNDEFINED		= 0x0,
-	BT_8812A_2ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8812A_2ANT_COEX_ALGO_SCO_HID		= 0x2,
-	BT_8812A_2ANT_COEX_ALGO_HID				= 0x3,
-	BT_8812A_2ANT_COEX_ALGO_A2DP			= 0x4,
-	BT_8812A_2ANT_COEX_ALGO_A2DP_PANHS		= 0x5,
-	BT_8812A_2ANT_COEX_ALGO_PANEDR			= 0x6,
-	BT_8812A_2ANT_COEX_ALGO_PANHS			= 0x7,
-	BT_8812A_2ANT_COEX_ALGO_PANEDR_A2DP		= 0x8,
-	BT_8812A_2ANT_COEX_ALGO_PANEDR_HID		= 0x9,
-	BT_8812A_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0xa,
-	BT_8812A_2ANT_COEX_ALGO_HID_A2DP_PANHS	= 0xb,
-	BT_8812A_2ANT_COEX_ALGO_HID_A2DP		= 0xc,
-	BT_8812A_2ANT_COEX_ALGO_MAX				= 0xd
-};
-
-struct coex_dm_8812a_2ant {
-	/* fw mechanism */
-	u8		pre_bt_dec_pwr_lvl;
-	u8		cur_bt_dec_pwr_lvl;
-	u8		pre_fw_dac_swing_lvl;
-	u8		cur_fw_dac_swing_lvl;
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		auto_tdma_adjust;
-	boolean		auto_tdma_adjust_low_rssi;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	/* sw mechanism */
-	boolean		pre_rf_rx_lpf_shrink;
-	boolean		cur_rf_rx_lpf_shrink;
-	u32		bt_rf_0x1e_backup;
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	boolean		pre_dac_swing_on;
-	u32		pre_dac_swing_lvl;
-	boolean		cur_dac_swing_on;
-	u32		cur_dac_swing_lvl;
-	boolean		pre_adc_back_off;
-	boolean		cur_adc_back_off;
-	boolean	pre_agc_table_en;
-	boolean		cur_agc_table_en;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-	u32		backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */
-	u32		backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */
-	u16		backup_retry_limit;
-	u8		backup_ampdu_max_time;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-	u8		cur_ra_mask_type;
-	u8		pre_arfr_type;
-	u8		cur_arfr_type;
-	u8		pre_retry_limit_type;
-	u8		cur_retry_limit_type;
-	u8		pre_ampdu_time_type;
-	u8		cur_ampdu_time_type;
-};
-
-struct coex_sta_8812a_2ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-	boolean					acl_busy;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	u8					bt_rssi;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8812A_2ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8812A_2ANT_MAX];
-	u32					bt_info_query_cnt;
-	boolean					c2h_bt_inquiry_page;
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8812a2ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a2ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8812a2ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a2ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8812a2ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8812a2ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8812a2ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8812a2ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8812a2ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8812a2ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8812a2ant_rf_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-
-void ex_halbtc8812a2ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a2ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a2ant_display_coex_info(IN struct btc_coexist *btcoexist);
-void ex_halbtc8812a2ant_dbg_control(IN struct btc_coexist *btcoexist,
-				    IN u8 op_code, IN u8 op_len, IN u8 *pdata);
-
-#else
-#define	ex_halbtc8812a2ant_power_on_setting(btcoexist)
-#define	ex_halbtc8812a2ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8812a2ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8812a2ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8812a2ant_rf_status_notify(btcoexist, type)
-#define	ex_halbtc8812a2ant_halt_notify(btcoexist)
-#define	ex_halbtc8812a2ant_periodical(btcoexist)
-#define	ex_halbtc8812a2ant_display_coex_info(btcoexist)
-#define	ex_halbtc8812a2ant_dbg_control(btcoexist, op_code, op_len, pdata)
-#endif
-
-#endif

hal/btc/HalBtc8821a1Ant.h

@@ -1,197 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8821A_SUPPORT == 1)
-
-/* *******************************************
- * The following is for 8821A 1ANT BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8821A_1ANT				1
-
-#define	BT_INFO_8821A_1ANT_B_FTP						BIT(7)
-#define	BT_INFO_8821A_1ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8821A_1ANT_B_HID						BIT(5)
-#define	BT_INFO_8821A_1ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8821A_1ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8821A_1ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8821A_1ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8821A_1ANT_B_CONNECTION				BIT(0)
-
-#define	BT_INFO_8821A_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)	\
-		(((_BT_INFO_EXT_&BIT(0))) ? true : false)
-
-#define	BTC_RSSI_COEX_THRESH_TOL_8821A_1ANT		2
-
-enum bt_info_src_8821a_1ant {
-	BT_INFO_SRC_8821A_1ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8821A_1ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8821A_1ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8821A_1ANT_MAX
-};
-
-enum bt_8821a_1ant_bt_status {
-	BT_8821A_1ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8821A_1ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8821A_1ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8821A_1ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8821A_1ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8821A_1ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8821A_1ANT_BT_STATUS_MAX
-};
-
-enum bt_8821a_1ant_wifi_status {
-	BT_8821A_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE				= 0x0,
-	BT_8821A_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN		= 0x1,
-	BT_8821A_1ANT_WIFI_STATUS_CONNECTED_SCAN					= 0x2,
-	BT_8821A_1ANT_WIFI_STATUS_CONNECTED_SPECIFIC_PKT				= 0x3,
-	BT_8821A_1ANT_WIFI_STATUS_CONNECTED_IDLE					= 0x4,
-	BT_8821A_1ANT_WIFI_STATUS_CONNECTED_BUSY					= 0x5,
-	BT_8821A_1ANT_WIFI_STATUS_MAX
-};
-
-enum bt_8821a_1ant_coex_algo {
-	BT_8821A_1ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8821A_1ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8821A_1ANT_COEX_ALGO_HID				= 0x2,
-	BT_8821A_1ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8821A_1ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8821A_1ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8821A_1ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8821A_1ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8821A_1ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8821A_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8821A_1ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8821A_1ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8821a_1ant {
-	/* fw mechanism */
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-
-	/* sw mechanism */
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-
-	u32		backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */
-	u32		backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */
-	u16		backup_retry_limit;
-	u8		backup_ampdu_max_time;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-	u8		pre_arfr_type;
-	u8		cur_arfr_type;
-	u8		pre_retry_limit_type;
-	u8		cur_retry_limit_type;
-	u8		pre_ampdu_time_type;
-	u8		cur_ampdu_time_type;
-	u32		arp_cnt;
-
-	u8		error_condition;
-};
-
-struct coex_sta_8821a_1ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					specific_pkt_period_cnt;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	u8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8821A_1ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8821A_1ANT_MAX];
-	boolean					c2h_bt_inquiry_page;
-	boolean					c2h_bt_page;				/* Add for win8.1 page out issue */
-	boolean					wifi_is_high_pri_task;		/* Add for win8.1 page out issue */
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-	boolean
-	bt_whck_test;                        /* Add for ASUS WHQL TEST that enable wifi test bt */
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8821a1ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a1ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8821a1ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a1ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8821a1ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8821a1ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8821a1ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8821a1ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821a1ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821a1ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8821a1ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a1ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8821a1ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a1ant_display_coex_info(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8821a1ant_power_on_setting(btcoexist)
-#define	ex_halbtc8821a1ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8821a1ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8821a1ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8821a1ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8821a1ant_halt_notify(btcoexist)
-#define	ex_halbtc8821a1ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8821a1ant_periodical(btcoexist)
-#define	ex_halbtc8821a1ant_display_coex_info(btcoexist)
-
-#endif
-
-#endif

hal/btc/HalBtc8821a2Ant.h

@@ -1,205 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8821A_SUPPORT == 1)
-
-/* *******************************************
- * The following is for 8821A 2Ant BT Co-exist definition
- * ******************************************* */
-#define	BT_AUTO_REPORT_ONLY_8821A_2ANT				1
-
-
-#define	BT_INFO_8821A_2ANT_B_FTP						BIT(7)
-#define	BT_INFO_8821A_2ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8821A_2ANT_B_HID						BIT(5)
-#define	BT_INFO_8821A_2ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8821A_2ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8821A_2ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8821A_2ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8821A_2ANT_B_CONNECTION				BIT(0)
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8821A_2ANT		2
-
-
-#define	BT_8821A_2ANT_WIFI_RSSI_COEXSWITCH_THRES				42  /* WiFi RSSI Threshold for 2-Ant TDMA/1-Ant PS-TDMA translation */
-#define	BT_8821A_2ANT_BT_RSSI_COEXSWITCH_THRES				46 /* BT RSSI Threshold for 2-Ant TDMA/1-Ant PS-TDMA translation */
-
-enum bt_info_src_8821a_2ant {
-	BT_INFO_SRC_8821A_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8821A_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8821A_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8821A_2ANT_MAX
-};
-
-enum bt_8821a_2ant_bt_status {
-	BT_8821A_2ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,
-	BT_8821A_2ANT_BT_STATUS_CONNECTED_IDLE		= 0x1,
-	BT_8821A_2ANT_BT_STATUS_INQ_PAGE				= 0x2,
-	BT_8821A_2ANT_BT_STATUS_ACL_BUSY				= 0x3,
-	BT_8821A_2ANT_BT_STATUS_SCO_BUSY				= 0x4,
-	BT_8821A_2ANT_BT_STATUS_ACL_SCO_BUSY			= 0x5,
-	BT_8821A_2ANT_BT_STATUS_MAX
-};
-
-enum bt_8821a_2ant_coex_algo {
-	BT_8821A_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8821A_2ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8821A_2ANT_COEX_ALGO_HID				= 0x2,
-	BT_8821A_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8821A_2ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8821A_2ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8821A_2ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8821A_2ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8821A_2ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8821A_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8821A_2ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8821A_2ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8821a_2ant {
-	/* fw mechanism */
-	u8		pre_bt_dec_pwr_lvl;
-	u8		cur_bt_dec_pwr_lvl;
-	u8		pre_fw_dac_swing_lvl;
-	u8		cur_fw_dac_swing_lvl;
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[5];
-	u8		ps_tdma_du_adj_type;
-	boolean		reset_tdma_adjust;
-	boolean		auto_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-
-	/* sw mechanism */
-	boolean		pre_rf_rx_lpf_shrink;
-	boolean		cur_rf_rx_lpf_shrink;
-	u32		bt_rf_0x1e_backup;
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	boolean		pre_dac_swing_on;
-	u32		pre_dac_swing_lvl;
-	boolean		cur_dac_swing_on;
-	u32		cur_dac_swing_lvl;
-	boolean		pre_adc_back_off;
-	boolean		cur_adc_back_off;
-	boolean	pre_agc_table_en;
-	boolean		cur_agc_table_en;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-
-	boolean		need_recover0x948;
-	u32		backup0x948;
-
-	u8		pre_lps;
-	u8		cur_lps;
-	u8		pre_rpwm;
-	u8		cur_rpwm;
-};
-
-struct coex_sta_8821a_2ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					hid_exist;
-	boolean					pan_exist;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	u8					bt_rssi;
-	boolean					bt_tx_rx_mask;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8821A_2ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8821A_2ANT_MAX];
-	boolean				bt_whck_test;
-	boolean					c2h_bt_inquiry_page;
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-
-	u32					crc_ok_cck;
-	u32					crc_ok_11g;
-	u32					crc_ok_11n;
-	u32					crc_ok_11n_agg;
-
-	u32					crc_err_cck;
-	u32					crc_err_11g;
-	u32					crc_err_11n;
-	u32					crc_err_11n_agg;
-
-	u8					coex_table_type;
-	boolean					force_lps_on;
-
-	u8					dis_ver_info_cnt;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8821a2ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a2ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a2ant_init_hw_config(IN struct btc_coexist *btcoexist,
-				       IN boolean wifi_only);
-void ex_halbtc8821a2ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a2ant_ips_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8821a2ant_lps_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 type);
-void ex_halbtc8821a2ant_scan_notify(IN struct btc_coexist *btcoexist,
-				    IN u8 type);
-void ex_halbtc8821a2ant_connect_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8821a2ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821a2ant_specific_packet_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821a2ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8821a2ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a2ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				   IN u8 pnp_state);
-void ex_halbtc8821a2ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821a2ant_display_coex_info(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8821a2ant_power_on_setting(btcoexist)
-#define	ex_halbtc8821a2ant_pre_load_firmware(btcoexist)
-#define	ex_halbtc8821a2ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8821a2ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8821a2ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8821a2ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8821a2ant_halt_notify(btcoexist)
-#define	ex_halbtc8821a2ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8821a2ant_periodical(btcoexist)
-#define	ex_halbtc8821a2ant_display_coex_info(btcoexist)
-#endif
-
-#endif

hal/btc/HalBtc8821aCsr2Ant.h

@@ -1,188 +0,0 @@
-
-#if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
-
-#if (RTL8821A_SUPPORT == 1)
-
-/* *******************************************
- * The following is for 8821A_CSR 2Ant BT Co-exist definition
- * ******************************************* */
-#define	BT_INFO_8821A_CSR_2ANT_B_FTP						BIT(7)
-#define	BT_INFO_8821A_CSR_2ANT_B_A2DP					BIT(6)
-#define	BT_INFO_8821A_CSR_2ANT_B_HID						BIT(5)
-#define	BT_INFO_8821A_CSR_2ANT_B_SCO_BUSY				BIT(4)
-#define	BT_INFO_8821A_CSR_2ANT_B_ACL_BUSY				BIT(3)
-#define	BT_INFO_8821A_CSR_2ANT_B_INQ_PAGE				BIT(2)
-#define	BT_INFO_8821A_CSR_2ANT_B_SCO_ESCO				BIT(1)
-#define	BT_INFO_8821A_CSR_2ANT_B_CONNECTION				BIT(0)
-
-#define		BTC_RSSI_COEX_THRESH_TOL_8821A_CSR_2ANT		2
-
-enum bt_info_src_8821a_csr_2ant {
-	BT_INFO_SRC_8821A_CSR_2ANT_WIFI_FW			= 0x0,
-	BT_INFO_SRC_8821A_CSR_2ANT_BT_RSP				= 0x1,
-	BT_INFO_SRC_8821A_CSR_2ANT_BT_ACTIVE_SEND		= 0x2,
-	BT_INFO_SRC_8821A_CSR_2ANT_MAX
-};
-
-enum bt_8821a_csr_2ant_bt_status {
-	BT_8821A_CSR_2ANT_BT_STATUS_IDLE				= 0x0,
-	BT_8821A_CSR_2ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,
-	BT_8821A_CSR_2ANT_BT_STATUS_NON_IDLE			= 0x2,
-	BT_8821A_CSR_2ANT_BT_STATUS_MAX
-};
-
-enum bt_8821a_csr_2ant_coex_algo {
-	BT_8821A_CSR_2ANT_COEX_ALGO_UNDEFINED			= 0x0,
-	BT_8821A_CSR_2ANT_COEX_ALGO_SCO				= 0x1,
-	BT_8821A_CSR_2ANT_COEX_ALGO_HID				= 0x2,
-	BT_8821A_CSR_2ANT_COEX_ALGO_A2DP				= 0x3,
-	BT_8821A_CSR_2ANT_COEX_ALGO_A2DP_PANHS		= 0x4,
-	BT_8821A_CSR_2ANT_COEX_ALGO_PANEDR			= 0x5,
-	BT_8821A_CSR_2ANT_COEX_ALGO_PANHS			= 0x6,
-	BT_8821A_CSR_2ANT_COEX_ALGO_PANEDR_A2DP		= 0x7,
-	BT_8821A_CSR_2ANT_COEX_ALGO_PANEDR_HID		= 0x8,
-	BT_8821A_CSR_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,
-	BT_8821A_CSR_2ANT_COEX_ALGO_HID_A2DP			= 0xa,
-	BT_8821A_CSR_2ANT_COEX_ALGO_MAX				= 0xb,
-};
-
-struct coex_dm_8821a_csr_2ant {
-	/* fw mechanism */
-	boolean		pre_dec_bt_pwr;
-	boolean		cur_dec_bt_pwr;
-	u8		pre_fw_dac_swing_lvl;
-	u8		cur_fw_dac_swing_lvl;
-	boolean		cur_ignore_wlan_act;
-	boolean		pre_ignore_wlan_act;
-	u8		pre_ps_tdma;
-	u8		cur_ps_tdma;
-	u8		ps_tdma_para[6];
-	u8		ps_tdma_du_adj_type;
-	boolean		reset_tdma_adjust;
-	boolean		pre_ps_tdma_on;
-	boolean		cur_ps_tdma_on;
-	boolean		pre_bt_auto_report;
-	boolean		cur_bt_auto_report;
-
-	/* sw mechanism */
-	boolean		pre_rf_rx_lpf_shrink;
-	boolean		cur_rf_rx_lpf_shrink;
-	u32		bt_rf_0x1e_backup;
-	boolean	pre_low_penalty_ra;
-	boolean		cur_low_penalty_ra;
-	boolean		pre_dac_swing_on;
-	u32		pre_dac_swing_lvl;
-	boolean		cur_dac_swing_on;
-	u32		cur_dac_swing_lvl;
-	boolean		pre_adc_back_off;
-	boolean		cur_adc_back_off;
-	boolean	pre_agc_table_en;
-	boolean		cur_agc_table_en;
-	u32		pre_val0x6c0;
-	u32		cur_val0x6c0;
-	u32		pre_val0x6c4;
-	u32		cur_val0x6c4;
-	u32		pre_val0x6c8;
-	u32		cur_val0x6c8;
-	u8		pre_val0x6cc;
-	u8		cur_val0x6cc;
-	boolean		limited_dig;
-
-	u32		pre_ra_mask;
-	u32		cur_ra_mask;
-
-	u8 cur_ampdu_num_type;
-	u8 pre_ampdu_num_type;
-	u16 backup_ampdu_max_num;
-
-	u8 cur_ampdu_time_type;
-	u8 pre_ampdu_time_type;
-	u8 backup_ampdu_max_time;
-
-	u8		cur_arfr_type;
-	u8		pre_arfr_type;
-	u32		backup_arfr_cnt1;
-	u32		backup_arfr_cnt2;
-
-	u8		cur_retry_limit_type;
-	u8		pre_retry_limit_type;
-	u16		backup_retry_limit;
-
-	/* algorithm related */
-	u8		pre_algorithm;
-	u8		cur_algorithm;
-	u8		bt_status;
-	u8		wifi_chnl_info[3];
-};
-
-struct coex_sta_8821a_csr_2ant {
-	boolean					bt_disabled;
-	boolean					bt_link_exist;
-	boolean					sco_exist;
-	boolean					a2dp_exist;
-	boolean					slave;
-	boolean					hid_exist;
-	boolean					pan_exist;
-
-	boolean					under_lps;
-	boolean					under_ips;
-	u32					high_priority_tx;
-	u32					high_priority_rx;
-	u32					low_priority_tx;
-	u32					low_priority_rx;
-	u8					bt_rssi;
-	u8					pre_bt_rssi_state;
-	u8					pre_wifi_rssi_state[4];
-	boolean					c2h_bt_info_req_sent;
-	u8					bt_info_c2h[BT_INFO_SRC_8821A_CSR_2ANT_MAX][10];
-	u32					bt_info_c2h_cnt[BT_INFO_SRC_8821A_CSR_2ANT_MAX];
-	boolean					c2h_bt_inquiry_page;
-	u8					bt_retry_cnt;
-	u8					bt_info_ext;
-};
-
-/* *******************************************
- * The following is interface which will notify coex module.
- * ******************************************* */
-void ex_halbtc8821aCsr2ant_power_on_setting(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821aCsr2ant_init_hw_config(IN struct btc_coexist *btcoexist,
-		IN boolean wifi_only);
-void ex_halbtc8821aCsr2ant_init_coex_dm(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821aCsr2ant_ips_notify(IN struct btc_coexist *btcoexist,
-				      IN u8 type);
-void ex_halbtc8821aCsr2ant_lps_notify(IN struct btc_coexist *btcoexist,
-				      IN u8 type);
-void ex_halbtc8821aCsr2ant_scan_notify(IN struct btc_coexist *btcoexist,
-				       IN u8 type);
-void ex_halbtc8821aCsr2ant_connect_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821aCsr2ant_media_status_notify(IN struct btc_coexist *btcoexist,
-		IN u8 type);
-void ex_halbtc8821aCsr2ant_specific_packet_notify(IN struct btc_coexist
-		*btcoexist, IN u8 type);
-void ex_halbtc8821aCsr2ant_bt_info_notify(IN struct btc_coexist *btcoexist,
-		IN u8 *tmp_buf, IN u8 length);
-void ex_halbtc8821aCsr2ant_halt_notify(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821aCsr2ant_pnp_notify(IN struct btc_coexist *btcoexist,
-				      IN u8 pnp_state);
-void ex_halbtc8821aCsr2ant_periodical(IN struct btc_coexist *btcoexist);
-void ex_halbtc8821aCsr2ant_display_coex_info(IN struct btc_coexist *btcoexist);
-
-#else
-#define	ex_halbtc8821aCsr2ant_power_on_setting(btcoexist)
-#define	ex_halbtc8821aCsr2ant_init_hw_config(btcoexist, wifi_only)
-#define	ex_halbtc8821aCsr2ant_init_coex_dm(btcoexist)
-#define	ex_halbtc8821aCsr2ant_ips_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_lps_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_scan_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_connect_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_media_status_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_specific_packet_notify(btcoexist, type)
-#define	ex_halbtc8821aCsr2ant_bt_info_notify(btcoexist, tmp_buf, length)
-#define	ex_halbtc8821aCsr2ant_halt_notify(btcoexist)
-#define	ex_halbtc8821aCsr2ant_pnp_notify(btcoexist, pnp_state)
-#define	ex_halbtc8821aCsr2ant_periodical(btcoexist)
-#define	ex_halbtc8821aCsr2ant_display_coex_info(btcoexist)
-#endif
-
-#endif

hal/btc/Mp_Precomp.h

@@ -1,98 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2013 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 __MP_PRECOMP_H__
-#define __MP_PRECOMP_H__
-
-#include <drv_types.h>
-#include <hal_data.h>
-
-#define BT_TMP_BUF_SIZE	100
-
-#ifdef PLATFORM_LINUX
-#define rsprintf snprintf
-#elif defined(PLATFORM_WINDOWS)
-#define rsprintf sprintf_s
-#endif
-
-#define DCMD_Printf			DBG_BT_INFO
-
-#define delay_ms(ms)		rtw_mdelay_os(ms)
-
-#ifdef bEnable
-#undef bEnable
-#endif
-
-#define WPP_SOFTWARE_TRACE 0
-
-typedef enum _BTC_MSG_COMP_TYPE{
-	COMP_COEX		= 0,
-	COMP_MAX
-}BTC_MSG_COMP_TYPE;
-extern u4Byte GLBtcDbgType[];
-
-#define DBG_OFF			0
-#define DBG_SEC			1
-#define DBG_SERIOUS		2
-#define DBG_WARNING		3
-#define DBG_LOUD		4
-#define DBG_TRACE		5
-
-#if DBG
-#ifdef RT_TRACE
-#undef RT_TRACE
-#define RT_TRACE(dbgtype, dbgflag, printstr)\
-do {\
-	if (GLBtcDbgType[dbgtype] & BIT(dbgflag))\
-	{\
-		DbgPrint printstr;\
-	}\
-} while (0)
-#endif
-#else
-#define RT_TRACE(dbgtype, dbgflag, printstr)
-#endif
-
-#ifdef CONFIG_BT_COEXIST
-#define BT_SUPPORT		1
-#define COEX_SUPPORT	1
-#define HS_SUPPORT		1
-#else
-#define BT_SUPPORT		0
-#define COEX_SUPPORT	0
-#define HS_SUPPORT		0
-#endif
-
-#include "HalBtcOutSrc.h"
-#include "HalBtc8188c2Ant.h"
-#include "HalBtc8192d2Ant.h"
-#include "HalBtc8192e1Ant.h"
-#include "HalBtc8192e2Ant.h"
-#include "HalBtc8723a1Ant.h"
-#include "HalBtc8723a2Ant.h"
-#include "HalBtc8723b1Ant.h"
-#include "HalBtc8723b2Ant.h"
-#include "HalBtc8812a1Ant.h"
-#include "HalBtc8812a2Ant.h"
-#include "HalBtc8821a1Ant.h"
-#include "HalBtc8821a2Ant.h"
-#include "HalBtc8821aCsr2Ant.h"
-#include "HalBtc8703b1Ant.h"
-
-#endif // __MP_PRECOMP_H__

hal/btc/halbtc8192e1ant.c

@@ -1,3 +1,17 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
 /* ************************************************************
  * Description:
  *
@@ -11,7 +25,7 @@
 /* ************************************************************
  * include files
  * ************************************************************ */
-#include "Mp_Precomp.h"
+#include "mp_precomp.h"
 
 #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
 
@@ -916,9 +930,8 @@ void halbtc8192e1ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist,
 {
 	u8			h2c_parameter[1] = {0};
 
-	if (enable) {
+	if (enable)
 		h2c_parameter[0] |= BIT(0);		/* function enable */
-	}
 
 	btcoexist->btc_fill_h2c(btcoexist, 0x63, 1, h2c_parameter);
 }
@@ -1432,7 +1445,7 @@ void halbtc8192e1ant_tdma_duration_adjust_for_acl(IN struct btc_coexist
 		result = 0;
 		wait_count = 0;
 	} else {
-		/* accquire the BT TRx retry count from BT_Info byte2 */
+		/* acquire the BT TRx retry count from BT_Info byte2 */
 		retry_count = coex_sta->bt_retry_cnt;
 		bt_info_ext = coex_sta->bt_info_ext;
 
@@ -1845,6 +1858,7 @@ void halbtc8192e1ant_action_wifi_connected_bt_acl_busy(IN struct btc_coexist
 	u8		bt_rssi_state;
 
 	struct  btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
+
 	bt_rssi_state = halbtc8192e1ant_bt_rssi_state(2, 28, 0);
 
 	if ((coex_sta->low_priority_rx >= 1000)  &&
@@ -2319,11 +2333,11 @@ void halbtc8192e1ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist)
 			halbtc8192e1ant_action_wifi_multi_port(btcoexist);
 
 		return;
-	} else {
+	}
+
 	miracast_plus_bt = false;
 	btcoexist->btc_set(btcoexist, BTC_SET_BL_MIRACAST_PLUS_BT,
 			   &miracast_plus_bt);
-	}
 
 	if ((bt_link_info->bt_link_exist) && (wifi_connected)) {
 		halbtc8192e1ant_limited_tx(btcoexist, NORMAL_EXEC, 1, 1, 0, 1);

hal/btc/halbtc8192e1ant.h

@@ -1,3 +1,17 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
 
 #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1)
 

hal/btc/halbtc8192e2ant.h

@@ -134,6 +134,7 @@ struct coex_sta_8192e_2ant {
 	boolean					a2dp_exist;
 	boolean					hid_exist;
 	boolean					pan_exist;
+	boolean					force_lps_on;
 
 	boolean					under_lps;
 	boolean					under_ips;
@@ -151,6 +152,21 @@ struct coex_sta_8192e_2ant {
 	u8					bt_retry_cnt;
 	u8					bt_info_ext;
 	u8					scan_ap_num;
+	u32				bt_coex_supported_version;
+	u32					cnt_setup_link;
+	u32					cnt_wifi_high_pri;
+	boolean				is_setup_link;
+	boolean				wifi_is_high_pri_task;
+
+	u32				crc_ok_cck;
+	u32				crc_ok_11g;
+	u32				crc_ok_11n;
+	u32				crc_ok_11n_vht;
+
+	u32				crc_err_cck;
+	u32				crc_err_11g;
+	u32				crc_err_11n;
+	u32				crc_err_11n_vht;
 };
 
 /* *******************************************
@@ -197,3 +213,4 @@ void ex_halbtc8192e2ant_display_coex_info(IN struct btc_coexist *btcoexist);
 
 #endif
 
+

hal/btc/mp_precomp.h

@@ -0,0 +1,132 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2013 - 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 __MP_PRECOMP_H__
+#define __MP_PRECOMP_H__
+
+#include <drv_types.h>
+#include <hal_data.h>
+
+#define BT_TMP_BUF_SIZE	100
+
+#ifdef PLATFORM_LINUX
+#define rsprintf snprintf
+#define rstrncat(dst, src, src_size) strncat(dst, src, src_size)
+#elif defined(PLATFORM_WINDOWS)
+#define rsprintf sprintf_s
+#endif
+
+#define DCMD_Printf			DBG_BT_INFO
+
+#define delay_ms(ms)		rtw_mdelay_os(ms)
+
+#ifdef bEnable
+#undef bEnable
+#endif
+
+#define WPP_SOFTWARE_TRACE 0
+
+typedef enum _BTC_MSG_COMP_TYPE {
+	COMP_COEX		= 0,
+	COMP_MAX
+} BTC_MSG_COMP_TYPE;
+extern u4Byte GLBtcDbgType[];
+
+#define DBG_OFF			0
+#define DBG_SEC			1
+#define DBG_SERIOUS		2
+#define DBG_WARNING		3
+#define DBG_LOUD		4
+#define DBG_TRACE		5
+
+#ifdef CONFIG_BT_COEXIST
+#define BT_SUPPORT		1
+#define COEX_SUPPORT	1
+#define HS_SUPPORT		1
+#else
+#define BT_SUPPORT		0
+#define COEX_SUPPORT	0
+#define HS_SUPPORT		0
+#endif
+
+/* for wifi only mode */
+#include "hal_btcoex_wifionly.h"
+
+#ifdef CONFIG_BT_COEXIST
+#define BTC_BTINFO_LENGTH_MAX 10
+
+struct wifi_only_cfg;
+struct btc_coexist;
+
+#ifdef CONFIG_RTL8192E
+#include "halbtc8192e1ant.h"
+#include "halbtc8192e2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8723B
+#include "halbtc8723bwifionly.h"
+#include "halbtc8723b1ant.h"
+#include "halbtc8723b2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8812A
+#include "halbtc8812a1ant.h"
+#include "halbtc8812a2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8821A
+#include "halbtc8821a1ant.h"
+#include "halbtc8821a2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8703B
+#include "halbtc8703b1ant.h"
+#endif
+
+#ifdef CONFIG_RTL8723D
+#include "halbtc8723d1ant.h"
+#include "halbtc8723d2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8822B
+#include "halbtc8822bwifionly.h"
+#include "halbtc8822b1ant.h"
+#include "halbtc8822b2ant.h"
+#endif
+
+#ifdef CONFIG_RTL8821C
+#include "halbtc8821cwifionly.h"
+#include "halbtc8821c1ant.h"
+#include "halbtc8821c2ant.h"
+#endif
+
+#include "halbtcoutsrc.h"
+
+#else /* CONFIG_BT_COEXIST */
+
+#ifdef CONFIG_RTL8723B
+#include "halbtc8723bwifionly.h"
+#endif
+
+#ifdef CONFIG_RTL8822B
+#include "halbtc8822bwifionly.h"
+#endif
+
+#ifdef CONFIG_RTL8821C
+#include "halbtc8821cwifionly.h"
+#endif
+
+#endif /* CONFIG_BT_COEXIST */
+
+#endif /*  __MP_PRECOMP_H__ */

hal/efuse/efuse_mask.h

@@ -1,5 +1,19 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
 
-#if DEV_BUS_TYPE == RT_USB_INTERFACE
+#ifdef CONFIG_USB_HCI
 
 	#if defined(CONFIG_RTL8188E)
 		#include "rtl8188e/HalEfuseMask8188E_USB.h"
@@ -29,11 +43,36 @@
 		#include "rtl8703b/HalEfuseMask8703B_USB.h"
 	#endif
 
+	#if defined(CONFIG_RTL8723D)
+		#include "rtl8723d/HalEfuseMask8723D_USB.h"
+	#endif
+
 	#if defined(CONFIG_RTL8188F)
 		#include "rtl8188f/HalEfuseMask8188F_USB.h"
 	#endif
 
-#elif DEV_BUS_TYPE == RT_PCI_INTERFACE
+	#if defined(CONFIG_RTL8188GTV)
+		#include "rtl8188gtv/HalEfuseMask8188GTV_USB.h"
+	#endif
+
+	#if defined(CONFIG_RTL8822B)
+		#include "rtl8822b/HalEfuseMask8822B_USB.h"
+	#endif
+
+	#if defined(CONFIG_RTL8821C)
+		#include "rtl8821c/HalEfuseMask8821C_USB.h"
+	#endif
+	
+	#if defined(CONFIG_RTL8710B)
+		#include "rtl8710b/HalEfuseMask8710B_USB.h"
+	#endif
+	
+	#if defined(CONFIG_RTL8192F)
+		#include "rtl8192f/HalEfuseMask8192F_USB.h"
+	#endif
+#endif /*CONFIG_USB_HCI*/
+
+#ifdef CONFIG_PCI_HCI
 
 	#if defined(CONFIG_RTL8188E)
 		#include "rtl8188e/HalEfuseMask8188E_PCIE.h"
@@ -63,7 +102,24 @@
 		#include "rtl8703b/HalEfuseMask8703B_PCIE.h"
 	#endif
 
-#elif DEV_BUS_TYPE == RT_SDIO_INTERFACE
+	#if defined(CONFIG_RTL8822B)
+		#include "rtl8822b/HalEfuseMask8822B_PCIE.h"
+	#endif
+	#if defined(CONFIG_RTL8723D)
+		#include "rtl8723d/HalEfuseMask8723D_PCIE.h"
+	#endif
+	#if defined(CONFIG_RTL8821C)
+		#include "rtl8821c/HalEfuseMask8821C_PCIE.h"
+	#endif
+
+	#if defined(CONFIG_RTL8192F)
+		#include "rtl8192f/HalEfuseMask8192F_PCIE.h"
+	#endif
+#endif /*CONFIG_PCI_HCI*/
+#ifdef CONFIG_SDIO_HCI
+	#if defined(CONFIG_RTL8723B)
+		#include "rtl8723b/HalEfuseMask8723B_SDIO.h"
+	#endif
 
 	#if defined(CONFIG_RTL8188E)
 		#include "rtl8188e/HalEfuseMask8188E_SDIO.h"
@@ -77,4 +133,32 @@
 		#include "rtl8188f/HalEfuseMask8188F_SDIO.h"
 	#endif
 
+	#if defined(CONFIG_RTL8188GTV)
+		#include "rtl8188gtv/HalEfuseMask8188GTV_SDIO.h"
 	#endif
+
+	#if defined(CONFIG_RTL8723D)
+		#include "rtl8723d/HalEfuseMask8723D_SDIO.h"
+	#endif
+
+	#if defined(CONFIG_RTL8192E)
+		#include "rtl8192e/HalEfuseMask8192E_SDIO.h"
+	#endif
+
+	#if defined(CONFIG_RTL8821A)
+		#include "rtl8812a/HalEfuseMask8821A_SDIO.h"
+	#endif
+
+	#if defined(CONFIG_RTL8821C)
+		#include "rtl8821c/HalEfuseMask8821C_SDIO.h"
+	#endif
+
+	#if defined(CONFIG_RTL8822B)
+		#include "rtl8822b/HalEfuseMask8822B_SDIO.h"
+	#endif
+
+	#if defined(CONFIG_RTL8192F)
+		#include "rtl8192f/HalEfuseMask8192F_SDIO.h"
+	#endif
+
+#endif /*CONFIG_SDIO_HCI*/

hal/efuse/rtl8192e/HalEfuseMask8192E_PCIE.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
-* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. 
+ * 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
@@ -11,15 +11,10 @@
  * 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 
-* 
-* 
-******************************************************************************/
 
-//#include "Mp_Precomp.h"
+/* #include "Mp_Precomp.h" */
-//#include "../odm_precomp.h"
+/* #include "../odm_precomp.h" */
 
 #include <drv_types.h>
 
@@ -42,7 +37,7 @@ u1Byte Array_MP_8192E_MPCIE[] = {
 	0x00,
 	0x00,
 	0x07,
-		0xF1,
+	0xF3,
 	0xF7,
 	0x10,
 	0x00,
@@ -90,12 +85,10 @@ EFUSE_IsAddressMasked_MP_8192E_MPCIE(
 	int c = (Offset % 16) / 2;
 	int result = 0;
 
-	if (c < 4) // Upper double word
+	if (c < 4) /* Upper double word */
 		result = (Array_MP_8192E_MPCIE[r] & (0x10 << c));
 	else
 		result = (Array_MP_8192E_MPCIE[r] & (0x01 << (c - 4)));
 
 	return (result > 0) ? 0 : 1;
 }
-
-

hal/efuse/rtl8192e/HalEfuseMask8192E_PCIE.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
-* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. 
+ * 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
@@ -11,12 +11,7 @@
  * 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 
-* 
-* 
-******************************************************************************/
 
 
 
@@ -34,9 +29,6 @@ EFUSE_GetMaskArray_MP_8192E_MPCIE(
 );
 
 BOOLEAN
-EFUSE_IsAddressMasked_MP_8192E_MPCIE( // TC: Test Chip, MP: MP Chip
+EFUSE_IsAddressMasked_MP_8192E_MPCIE(/* TC: Test Chip, MP: MP Chip */
 	IN   u2Byte  Offset
 );
-
-
-

hal/efuse/rtl8192e/HalEfuseMask8192E_SDIO.c

@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
+ * 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.
+ *
+ *****************************************************************************/
+
+/* #include "Mp_Precomp.h" */
+/* #include "../odm_precomp.h" */
+
+#include <drv_types.h>
+
+#include "HalEfuseMask8192E_SDIO.h"
+
+
+
+/******************************************************************************
+*                           MSDIO.TXT
+******************************************************************************/
+
+u1Byte Array_MP_8192E_MSDIO[] = {
+	0xFF,
+	0xF3,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x0F,
+	0xF1,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+
+};
+
+u2Byte EFUSE_GetArrayLen_MP_8192E_MSDIO(VOID)
+{
+	return sizeof(Array_MP_8192E_MSDIO) / sizeof(u1Byte);
+}
+
+VOID EFUSE_GetMaskArray_MP_8192E_MSDIO(pu1Byte Array)
+{
+	u2Byte len = EFUSE_GetArrayLen_MP_8192E_MSDIO(), i = 0;
+
+	for (i = 0; i < len; ++i)
+		Array[i] = Array_MP_8192E_MSDIO[i];
+}
+
+BOOLEAN EFUSE_IsAddressMasked_MP_8192E_MSDIO(u2Byte Offset)
+{
+	int r = Offset / 16;
+	int c = (Offset % 16) / 2;
+	int result = 0;
+
+	/* RTW_INFO(" %s ,Offset=%x r= %d , c=%d , Array_MP_8192E_MSDIO[r]= %x\n",__func__,Offset,r,c,Array_MP_8192E_MSDIO[r]); */
+
+	if (c < 4) /* Upper double word */
+		result = (Array_MP_8192E_MSDIO[r] & (0x10 << c));
+	else
+		result = (Array_MP_8192E_MSDIO[r] & (0x01 << (c - 4)));
+
+	return (result > 0) ? 0 : 1;
+}

hal/efuse/rtl8192e/HalEfuseMask8192E_SDIO.h

@@ -0,0 +1,26 @@
+/******************************************************************************
+ *
+ * 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.
+ *
+ *****************************************************************************/
+
+
+
+/******************************************************************************
+*                           MSDIO.TXT
+******************************************************************************/
+u2Byte EFUSE_GetArrayLen_MP_8192E_MSDIO(VOID);
+
+VOID EFUSE_GetMaskArray_MP_8192E_MSDIO(pu1Byte Array);
+
+BOOLEAN EFUSE_IsAddressMasked_MP_8192E_MSDIO(/* TC: Test Chip, MP: MP Chip */
+	u2Byte Offset);

hal/efuse/rtl8192e/HalEfuseMask8192E_USB.c

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
-* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. 
+ * 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
@@ -11,15 +11,10 @@
  * 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 
-* 
-* 
-******************************************************************************/
 
-//#include "Mp_Precomp.h"
+/* #include "Mp_Precomp.h" */
-//#include "../odm_precomp.h"
+/* #include "../odm_precomp.h" */
 
 #include <drv_types.h>
 
@@ -44,7 +39,7 @@ u1Byte Array_MP_8192E_MUSB[] = {
 	0x00,
 	0x00,
 	0x07,
-		0xF1,
+	0xF3,
 	0xFF,
 	0xFF,
 	0xFF,
@@ -92,15 +87,12 @@ EFUSE_IsAddressMasked_MP_8192E_MUSB(
 	int c = (Offset % 16) / 2;
 	int result = 0;
 
-	//DBG_871X(" %s ,Offset=%x r= %d , c=%d , Array_MP_8192E_MUSB[r]= %x \n",__func__,Offset,r,c,Array_MP_8192E_MUSB[r]);
+	/* RTW_INFO(" %s ,Offset=%x r= %d , c=%d , Array_MP_8192E_MUSB[r]= %x\n",__func__,Offset,r,c,Array_MP_8192E_MUSB[r]); */
 
-	if (c < 4) // Upper double word
+	if (c < 4) /* Upper double word */
 		result = (Array_MP_8192E_MUSB[r] & (0x10 << c));
 	else
 		result = (Array_MP_8192E_MUSB[r] & (0x01 << (c - 4)));
 
 	return (result > 0) ? 0 : 1;
 }
-
-
-

hal/efuse/rtl8192e/HalEfuseMask8192E_USB.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
-* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. 
+ * 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
@@ -11,12 +11,7 @@
  * 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 
-* 
-* 
-******************************************************************************/
 
 
 
@@ -30,9 +25,6 @@ EFUSE_GetMaskArray_MP_8192E_MUSB(
 	IN	OUT pu1Byte Array
 );
 
-BOOLEAN EFUSE_IsAddressMasked_MP_8192E_MUSB( // TC: Test Chip, MP: MP Chip
+BOOLEAN EFUSE_IsAddressMasked_MP_8192E_MUSB(/* TC: Test Chip, MP: MP Chip */
 	IN   u2Byte  Offset
 );
-
-
-

hal/hal_btcoex_wifionly.c

@@ -0,0 +1,224 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2016 - 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.
+ *
+ *****************************************************************************/
+#include <hal_btcoex_wifionly.h>
+
+#if (CONFIG_BTCOEX_SUPPORT_WIFI_ONLY_CFG == 1)
+
+#include "btc/mp_precomp.h"
+
+struct  wifi_only_cfg GLBtCoexistWifiOnly;
+
+void halwifionly_write1byte(PVOID pwifionlyContext, u32 RegAddr, u8 Data)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	rtw_write8(Adapter, RegAddr, Data);
+}
+
+void halwifionly_write2byte(PVOID pwifionlyContext, u32 RegAddr, u16 Data)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	rtw_write16(Adapter, RegAddr, Data);
+}
+
+void halwifionly_write4byte(PVOID pwifionlyContext, u32 RegAddr, u32 Data)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	rtw_write32(Adapter, RegAddr, Data);
+}
+
+u8 halwifionly_read1byte(PVOID pwifionlyContext, u32 RegAddr)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	return rtw_read8(Adapter, RegAddr);
+}
+
+u16 halwifionly_read2byte(PVOID pwifionlyContext, u32 RegAddr)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	return rtw_read16(Adapter, RegAddr);
+}
+
+u32 halwifionly_read4byte(PVOID pwifionlyContext, u32 RegAddr)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	return rtw_read32(Adapter, RegAddr);
+}
+
+void halwifionly_bitmaskwrite1byte(PVOID pwifionlyContext, u32 regAddr, u8 bitMask, u8 data)
+{
+	u8 originalValue, bitShift = 0;
+	u8 i;
+
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	if (bitMask != 0xff) {
+		originalValue = rtw_read8(Adapter, regAddr);
+		for (i = 0; i <= 7; i++) {
+			if ((bitMask >> i) & 0x1)
+				break;
+		}
+		bitShift = i;
+		data = ((originalValue) & (~bitMask)) | (((data << bitShift)) & bitMask);
+	}
+	rtw_write8(Adapter, regAddr, data);
+}
+
+void halwifionly_phy_set_rf_reg(PVOID pwifionlyContext, enum rf_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	phy_set_rf_reg(Adapter, eRFPath, RegAddr, BitMask, Data);
+}
+
+void halwifionly_phy_set_bb_reg(PVOID pwifionlyContext, u32 RegAddr, u32 BitMask, u32 Data)
+{
+	struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext;
+	PADAPTER		Adapter = pwifionlycfg->Adapter;
+
+	phy_set_bb_reg(Adapter, RegAddr, BitMask, Data);
+}
+
+void hal_btcoex_wifionly_switchband_notify(PADAPTER padapter)
+{
+	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	u8 is_5g = _FALSE;
+
+	if (pHalData->current_band_type == BAND_ON_5G)
+		is_5g = _TRUE;
+
+	if (IS_HARDWARE_TYPE_8822B(padapter)) {
+#ifdef CONFIG_RTL8822B
+		ex_hal8822b_wifi_only_switchbandnotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+	}
+
+#ifdef CONFIG_RTL8821C
+	else if (IS_HARDWARE_TYPE_8821C(padapter))
+		ex_hal8821c_wifi_only_switchbandnotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+}
+
+void hal_btcoex_wifionly_scan_notify(PADAPTER padapter)
+{
+	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	u8 is_5g = _FALSE;
+
+	if (pHalData->current_band_type == BAND_ON_5G)
+		is_5g = _TRUE;
+
+	if (IS_HARDWARE_TYPE_8822B(padapter)) {
+#ifdef CONFIG_RTL8822B
+		ex_hal8822b_wifi_only_scannotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+	}
+
+#ifdef CONFIG_RTL8821C
+	else if (IS_HARDWARE_TYPE_8821C(padapter))
+		ex_hal8821c_wifi_only_scannotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+}
+
+void hal_btcoex_wifionly_connect_notify(PADAPTER padapter)
+{
+	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	u8 is_5g = _FALSE;
+
+	if (pHalData->current_band_type == BAND_ON_5G)
+		is_5g = _TRUE;
+
+	if (IS_HARDWARE_TYPE_8822B(padapter)) {
+#ifdef CONFIG_RTL8822B
+		ex_hal8822b_wifi_only_connectnotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+	}
+
+#ifdef CONFIG_RTL8821C
+	else if (IS_HARDWARE_TYPE_8821C(padapter))
+		ex_hal8821c_wifi_only_connectnotify(&GLBtCoexistWifiOnly, is_5g);
+#endif
+}
+
+void hal_btcoex_wifionly_hw_config(PADAPTER padapter)
+{
+	struct wifi_only_cfg *pwifionlycfg = &GLBtCoexistWifiOnly;
+
+	if (IS_HARDWARE_TYPE_8723B(padapter)) {
+#ifdef CONFIG_RTL8723B
+		ex_hal8723b_wifi_only_hw_config(pwifionlycfg);
+#endif
+	}
+
+#ifdef CONFIG_RTL8822B
+	else if (IS_HARDWARE_TYPE_8822B(padapter))
+		ex_hal8822b_wifi_only_hw_config(pwifionlycfg);
+#endif
+
+#ifdef CONFIG_RTL8821C
+	else if (IS_HARDWARE_TYPE_8821C(padapter))
+		ex_hal8821c_wifi_only_hw_config(pwifionlycfg);
+#endif
+}
+
+void hal_btcoex_wifionly_initlizevariables(PADAPTER padapter)
+{
+	struct wifi_only_cfg		*pwifionlycfg = &GLBtCoexistWifiOnly;
+	struct wifi_only_haldata	*pwifionly_haldata = &pwifionlycfg->haldata_info;
+	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+
+	_rtw_memset(&GLBtCoexistWifiOnly, 0, sizeof(GLBtCoexistWifiOnly));
+
+	pwifionlycfg->Adapter = padapter;
+
+#ifdef CONFIG_PCI_HCI
+	pwifionlycfg->chip_interface = WIFIONLY_INTF_PCI;
+#elif defined(CONFIG_USB_HCI)
+	pwifionlycfg->chip_interface = WIFIONLY_INTF_USB;
+#elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
+	pwifionlycfg->chip_interface = WIFIONLY_INTF_SDIO;
+#else
+	pwifionlycfg->chip_interface = WIFIONLY_INTF_UNKNOWN;
+#endif
+
+	pwifionly_haldata->customer_id = CUSTOMER_NORMAL;
+}
+
+void hal_btcoex_wifionly_AntInfoSetting(PADAPTER padapter)
+{
+	struct wifi_only_cfg		*pwifionlycfg = &GLBtCoexistWifiOnly;
+	struct wifi_only_haldata	*pwifionly_haldata = &pwifionlycfg->haldata_info;
+	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+
+	pwifionly_haldata->efuse_pg_antnum = pHalData->EEPROMBluetoothAntNum;
+	pwifionly_haldata->efuse_pg_antpath = pHalData->ant_path;
+	pwifionly_haldata->rfe_type = pHalData->rfe_type;
+	pwifionly_haldata->ant_div_cfg = pHalData->AntDivCfg;
+}
+
+#endif
+

hal/hal_com_c2h.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,31 +11,70 @@
  * 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 __COMMON_C2H_H__
 #define __COMMON_C2H_H__
 
+#define C2H_TYPE_REG 0
+#define C2H_TYPE_PKT 1
+
+/* 
+* C2H event format:
+* Fields    TRIGGER    PAYLOAD    SEQ    PLEN    ID
+* BITS     [127:120]    [119:16]   [15:8]  [7:4]  [3:0]
+*/
+#define C2H_ID(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)), 0, 4)
+#define C2H_PLEN(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)), 4, 4)
+#define C2H_SEQ(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)) + 1, 0, 8)
+#define C2H_PAYLOAD(_c2h)	(((u8*)(_c2h)) + 2)
+
+#define SET_C2H_ID(_c2h, _val)		SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)), 0, 4, _val)
+#define SET_C2H_PLEN(_c2h, _val)	SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)), 4, 4, _val)
+#define SET_C2H_SEQ(_c2h, _val)		SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)) + 1 , 0, 8, _val)
+
+/* 
+* C2H event format:
+* Fields    TRIGGER     PLEN      PAYLOAD    SEQ      ID
+* BITS    [127:120]  [119:112]  [111:16]   [15:8]   [7:0]
+*/
+#define C2H_ID_88XX(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)), 0, 8)
+#define C2H_SEQ_88XX(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)) + 1, 0, 8)
+#define C2H_PAYLOAD_88XX(_c2h)	(((u8*)(_c2h)) + 2)
+#define C2H_PLEN_88XX(_c2h)		LE_BITS_TO_1BYTE(((u8*)(_c2h)) + 14, 0, 8)
+#define C2H_TRIGGER_88XX(_c2h)	LE_BITS_TO_1BYTE(((u8*)(_c2h)) + 15, 0, 8)
+
+#define SET_C2H_ID_88XX(_c2h, _val)		SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)), 0, 8, _val)
+#define SET_C2H_SEQ_88XX(_c2h, _val)	SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)) + 1, 0, 8, _val)
+#define SET_C2H_PLEN_88XX(_c2h, _val)	SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)) + 14, 0, 8, _val)
+
 typedef enum _C2H_EVT {
 	C2H_DBG = 0x00,
 	C2H_LB = 0x01,
 	C2H_TXBF = 0x02,
 	C2H_CCX_TX_RPT = 0x03,
+	C2H_AP_REQ_TXRPT = 0x04,
+	C2H_FW_SCAN_COMPLETE = 0x7,
 	C2H_BT_INFO = 0x09,
 	C2H_BT_MP_INFO = 0x0B,
 	C2H_RA_RPT = 0x0C,
+	C2H_SPC_STAT = 0x0D,
 	C2H_RA_PARA_RPT = 0x0E,
 	C2H_FW_CHNL_SWITCH_COMPLETE = 0x10,
 	C2H_IQK_FINISH = 0x11,
 	C2H_MAILBOX_STATUS = 0x15,
 	C2H_P2P_RPORT = 0x16,
+	C2H_MCC = 0x17,
 	C2H_MAC_HIDDEN_RPT = 0x19,
+	C2H_MAC_HIDDEN_RPT_2 = 0x1A,
 	C2H_BCN_EARLY_RPT = 0x1E,
-	C2H_BT_SCOREBOARD_STATUS = 0x20,
+	C2H_DEFEATURE_DBG = 0x22,
+	C2H_CUSTOMER_STR_RPT = 0x24,
+	C2H_CUSTOMER_STR_RPT_2 = 0x25,
+	C2H_WLAN_INFO = 0x27,
+#ifdef RTW_PER_CMD_SUPPORT_FW
+	C2H_PER_RATE_RPT = 0x2c,
+#endif
+	C2H_DEFEATURE_RSVD = 0xFD,
 	C2H_EXTEND = 0xff,
 } C2H_EVT;
 
@@ -43,9 +82,42 @@ typedef enum _EXTEND_C2H_EVT {
 	EXTEND_C2H_DBG_PRINT = 0
 } EXTEND_C2H_EVT;
 
+#define C2H_REG_LEN 16
+
+/* C2H_IQK_FINISH, 0x11 */
+#define IQK_OFFLOAD_LEN 1
+void c2h_iqk_offload(_adapter *adapter, u8 *data, u8 len);
+int	c2h_iqk_offload_wait(_adapter *adapter, u32 timeout_ms);
+#define rtl8812_iqk_wait c2h_iqk_offload_wait /* TODO: remove this after phydm call c2h_iqk_offload_wait instead */
+
+#ifdef CONFIG_RTW_MAC_HIDDEN_RPT
+/* C2H_MAC_HIDDEN_RPT, 0x19 */
 #define MAC_HIDDEN_RPT_LEN 8
 int c2h_mac_hidden_rpt_hdl(_adapter *adapter, u8 *data, u8 len);
+
+/* C2H_MAC_HIDDEN_RPT_2, 0x1A */
+#define MAC_HIDDEN_RPT_2_LEN 5
+int c2h_mac_hidden_rpt_2_hdl(_adapter *adapter, u8 *data, u8 len);
 int hal_read_mac_hidden_rpt(_adapter *adapter);
+#endif /* CONFIG_RTW_MAC_HIDDEN_RPT */
+
+/* C2H_DEFEATURE_DBG, 0x22 */
+#define DEFEATURE_DBG_LEN 1
+int c2h_defeature_dbg_hdl(_adapter *adapter, u8 *data, u8 len);
+
+#ifdef CONFIG_RTW_CUSTOMER_STR
+/* C2H_CUSTOMER_STR_RPT, 0x24 */
+#define CUSTOMER_STR_RPT_LEN 8
+int c2h_customer_str_rpt_hdl(_adapter *adapter, u8 *data, u8 len);
+
+/* C2H_CUSTOMER_STR_RPT_2, 0x25 */
+#define CUSTOMER_STR_RPT_2_LEN 8
+int c2h_customer_str_rpt_2_hdl(_adapter *adapter, u8 *data, u8 len);
+#endif /* CONFIG_RTW_CUSTOMER_STR */
+
+#ifdef RTW_PER_CMD_SUPPORT_FW
+/* C2H_PER_RATE_RPT, 0x2c */
+int c2h_per_rate_rpt_hdl(_adapter *adapter, u8 *data, u8 len);
+#endif
 
 #endif /* __COMMON_C2H_H__ */
-

hal/hal_dm.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
+ * 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
@@ -11,16 +11,95 @@
  * 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 __HAL_DM_H__
 #define __HAL_DM_H__
 
+#define adapter_to_phydm(adapter) (&(GET_HAL_DATA(adapter)->odmpriv))
+#define dvobj_to_phydm(dvobj) adapter_to_phydm(dvobj_get_primary_adapter(dvobj))
+
+void rtw_phydm_priv_init(_adapter *adapter);
 void Init_ODM_ComInfo(_adapter *adapter);
+void rtw_phydm_init(_adapter *adapter);
+
+void rtw_hal_turbo_edca(_adapter *adapter);
+u8 rtw_phydm_is_iqk_in_progress(_adapter *adapter);
+
+void GetHalODMVar(
+	PADAPTER				Adapter,
+	HAL_ODM_VARIABLE		eVariable,
+	PVOID					pValue1,
+	PVOID					pValue2);
+void SetHalODMVar(
+	PADAPTER				Adapter,
+	HAL_ODM_VARIABLE		eVariable,
+	PVOID					pValue1,
+	BOOLEAN					bSet);
+
+void rtw_phydm_ra_registed(_adapter *adapter, struct sta_info *psta);
+
+#ifdef CONFIG_DYNAMIC_SOML
+void rtw_dyn_soml_byte_update(_adapter *adapter, u8 data_rate, u32 size);
+void rtw_dyn_soml_para_set(_adapter *adapter, u8 train_num, u8 intvl,
+			u8 period, u8 delay);
+void rtw_dyn_soml_config(_adapter *adapter);
+#endif
+void rtw_phydm_watchdog(_adapter *adapter, bool in_lps);
+
+void rtw_hal_update_iqk_fw_offload_cap(_adapter *adapter);
+void dump_sta_info(void *sel, struct sta_info *psta);
+void dump_sta_traffic(void *sel, _adapter *adapter, struct sta_info *psta);
+
+#ifdef CONFIG_DBG_RF_CAL
+void rtw_hal_iqk_test(_adapter *adapter, bool recovery, bool clear, bool segment);
+void rtw_hal_lck_test(_adapter *adapter);
+#endif
+
+s8 rtw_dm_get_min_rssi(_adapter *adapter);
+s8 rtw_phydm_get_min_rssi(_adapter *adapter);
+u8 rtw_phydm_get_cur_igi(_adapter *adapter);
+
+
+#ifdef CONFIG_LPS_LCLK_WD_TIMER
+extern void phydm_rssi_monitor_check(void *p_dm_void);
+
+void rtw_phydm_wd_lps_lclk_hdl(_adapter *adapter);
+void rtw_phydm_watchdog_in_lps_lclk(_adapter *adapter);
+#endif
+
+enum phy_cnt {
+	FA_OFDM,
+	FA_CCK,
+	FA_TOTAL,
+	CCA_OFDM,
+	CCA_CCK,
+	CCA_ALL,
+	CRC32_OK_VHT,
+	CRC32_OK_HT,
+	CRC32_OK_LEGACY,
+	CRC32_OK_CCK,
+	CRC32_ERROR_VHT,
+	CRC32_ERROR_HT,
+	CRC32_ERROR_LEGACY,
+	CRC32_ERROR_CCK,
+};
+u32 rtw_phydm_get_phy_cnt(_adapter *adapter, enum phy_cnt cnt);
+#if ((RTL8822B_SUPPORT == 1) || (RTL8821C_SUPPORT == 1) || (RTL8814B_SUPPORT == 1))
+void rtw_phydm_iqk_trigger(_adapter *adapter);
+#endif
+void rtw_phydm_read_efuse(_adapter *adapter);
+
+#ifdef CONFIG_SUPPORT_DYNAMIC_TXPWR
+void rtw_phydm_set_dyntxpwr(_adapter *adapter, u8 *desc, u8 mac_id);
+#endif
+#ifdef CONFIG_RTW_TX_2PATH_EN
+void rtw_phydm_tx_2path_en(_adapter *adapter);
+#endif
+#ifdef CONFIG_LPS_PG
+void rtw_phydm_lps_pg_hdl(_adapter *adapter, struct sta_info *sta, bool in_lpspg);
+#endif
+#ifdef CONFIG_LPS_PWR_TRACKING
+void rtw_phydm_pwr_tracking_directly(_adapter *adapter);
+#endif
 
 #endif /* __HAL_DM_H__ */
-