rtlwifi: Convert pci routines for addition of rtl8192se and rtl8192de

Convert pci routines for addition of RTL8192SE and RTL8192DE code
These changes allow the upper-level driver to specify the BAR to be
used as it is different for rtl8192se than for the others.

Signed-off-by: Chaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 12747b9c71e1..671b1f5aa0cf 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -102,8 +102,8 @@
 #define RTL_PCI_8191CE_DID      0x8177  /*8192ce */
 #define RTL_PCI_8188CE_DID      0x8176  /*8192ce */
 #define RTL_PCI_8192CU_DID      0x8191  /*8192ce */
-#define RTL_PCI_8192DE_DID      0x092D  /*8192ce */
-#define RTL_PCI_8192DU_DID      0x092D  /*8192ce */
+#define RTL_PCI_8192DE_DID      0x8193  /*8192de */
+#define RTL_PCI_8192DE_DID2     0x002B  /*92DE*/
 
 /*8192 support 16 pages of IO registers*/
 #define RTL_MEM_MAPPED_IO_RANGE_8190PCI         0x1000
@@ -129,6 +129,11 @@ enum pci_bridge_vendor {
         PCI_BRIDGE_VENDOR_MAX,
 };
 
+struct rtl_pci_capabilities_header {
+        u8 capability_id;
+        u8 next;
+};
+
 struct rtl_rx_desc {
         u32 dword[8];
 } __packed;
@@ -161,7 +166,9 @@ struct rtl_pci {
 
         bool driver_is_goingto_unload;
         bool up_first_time;
+        bool first_init;
         bool being_init_adapter;
+        bool init_ready;
         bool irq_enabled;
 
         /*Tx */
@@ -197,6 +204,9 @@ struct rtl_pci {
 
         /*QOS & EDCA */
         enum acm_method acm_method;
+
+        u16 shortretry_limit;
+        u16 longretry_limit;
 };
 
 struct mp_adapter {
@@ -227,6 +237,7 @@ struct rtl_pci_priv {
         struct rtl_pci dev;
         struct mp_adapter ndis_adapter;
         struct rtl_led_ctl ledctl;
+        struct bt_coexist_info bt_coexist;
 };
 
 #define rtl_pcipriv(hw)         (((struct rtl_pci_priv *)(rtl_priv(hw))->priv))