Skip to content

Commit

Permalink
rtlwifi: Convert pci routines for addition of rtl8192se and rtl8192de
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chaoming_Li authored and John W. Linville committed Apr 26, 2011
1 parent 0baa0fd commit c7cfe38
Showing 3 changed files with 578 additions and 229 deletions.
788 changes: 561 additions & 227 deletions drivers/net/wireless/rtlwifi/pci.c

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions drivers/net/wireless/rtlwifi/pci.h
Original file line number Diff line number Diff line change
@@ -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))
4 changes: 4 additions & 0 deletions drivers/net/wireless/rtlwifi/ps.c
Original file line number Diff line number Diff line change
@@ -428,6 +428,10 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
{
}

void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
{
}

/*Enter the leisure power save mode.*/
void rtl_lps_enter(struct ieee80211_hw *hw)
{

0 comments on commit c7cfe38

Please sign in to comment.