Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1a3bfc9 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ee: Move driver from staging to the regular tree 



This driver was entered into staging a few cycles ago because there was
not time to integrate the Realtek version into the support routines in
the kernel. Now that there is an effort to converg the code base from Linux
and the Realtek repo, it is time to move this driver. In addition, all the
updates included in the 06/28/2014 version of the Realtek drivers are
included here.

With this change, it will be necessary to delete the staging driver. That
will be handled in a separate patch. As it impacts the staging tree, such a
patch is sent to a different destination.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7fe3b3ab

drivers/net/wireless/rtlwifi/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ menuconfig RTL_CARDS 
	---help---

	  This option will enable support for the Realtek mac80211-based

	  wireless drivers. Drivers rtl8192ce, rtl8192cu, rtl8192se, rtl8192de,

	  rtl8723ae, rtl8723be, rtl8188ee, and rtl8821ae share some common code.

	  rtl8723ae, rtl8723be, rtl8188ee, rtl8192ee, and rtl8821ae share

	  some common code.



if RTL_CARDS
@@ -80,6 +81,17 @@ config RTL8188EE 


	If you choose to build it as a module, it will be called rtl8188ee



config RTL8192EE

	tristate "Realtek RTL8192EE Wireless Network Adapter"

	depends on PCI

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8192EE 802.11n PCIe

	wireless network adapters.



	If you choose to build it as a module, it will be called rtl8192ee



config RTL8821AE

	tristate "Realtek RTL8821AE/RTL8812AE Wireless Network Adapter"

	depends on PCI

drivers/net/wireless/rtlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ obj-$(CONFIG_RTL8188EE) += rtl8188ee/ 
obj-$(CONFIG_RTLBTCOEXIST)	+= btcoexist/

obj-$(CONFIG_RTL8723_COMMON)	+= rtl8723com/

obj-$(CONFIG_RTL8821AE)		+= rtl8821ae/

obj-$(CONFIG_RTL8192EE)		+= rtl8192ee/



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/rtlwifi/rtl8192ee/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
obj-m := rtl8192ee.o





rtl8192ee-objs :=		\

		dm.o		\

		fw.o		\

		hw.o		\

		led.o		\

		phy.o		\

		pwrseq.o	\

		rf.o		\

		sw.o		\

		table.o		\

		trx.o		\





obj-$(CONFIG_RTL8821AE) += rtl8192ee.o



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/rtlwifi/rtl8192ee/def.h

0 → 100644
+101 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2009-2014  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.

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information:

 * wlanfae <wlanfae@realtek.com>

 * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,

 * Hsinchu 300, Taiwan.

 *

 * Larry Finger <Larry.Finger@lwfinger.net>

 *

 *****************************************************************************/



#ifndef __RTL92E_DEF_H__

#define __RTL92E_DEF_H__



#define RX_DESC_NUM_92E					512



#define HAL_PRIME_CHNL_OFFSET_DONT_CARE			0

#define HAL_PRIME_CHNL_OFFSET_LOWER			1

#define HAL_PRIME_CHNL_OFFSET_UPPER			2



#define RX_MPDU_QUEUE					0



#define IS_HT_RATE(_rate)	\

	(_rate >= DESC92C_RATEMCS0)

#define IS_CCK_RATE(_rate)	\

	(_rate >= DESC92C_RATE1M && _rate <= DESC92C_RATE11M)

#define IS_OFDM_RATE(_rate)	\

	(_rate >= DESC92C_RATE6M && _rate <= DESC92C_RATE54M)



enum version_8192e {

	VERSION_TEST_CHIP_2T2R_8192E = 0x0024,

	VERSION_NORMAL_CHIP_2T2R_8192E = 0x102C,

	VERSION_UNKNOWN = 0xFF,

};



enum rx_packet_type {

	NORMAL_RX,

	TX_REPORT1,

	TX_REPORT2,

	HIS_REPORT,

	C2H_PACKET,

};



enum rtl_desc_qsel {

	QSLT_BK = 0x2,

	QSLT_BE = 0x0,

	QSLT_VI = 0x5,

	QSLT_VO = 0x7,

	QSLT_BEACON = 0x10,

	QSLT_HIGH = 0x11,

	QSLT_MGNT = 0x12,

	QSLT_CMD = 0x13,

};



enum rtl_desc92c_rate {

	DESC92C_RATE1M = 0x00,

	DESC92C_RATE2M = 0x01,

	DESC92C_RATE5_5M = 0x02,

	DESC92C_RATE11M = 0x03,



	DESC92C_RATE6M = 0x04,

	DESC92C_RATE9M = 0x05,

	DESC92C_RATE12M = 0x06,

	DESC92C_RATE18M = 0x07,

	DESC92C_RATE24M = 0x08,

	DESC92C_RATE36M = 0x09,

	DESC92C_RATE48M = 0x0a,

	DESC92C_RATE54M = 0x0b,



	DESC92C_RATEMCS0 = 0x0c,

	DESC92C_RATEMCS1 = 0x0d,

	DESC92C_RATEMCS2 = 0x0e,

	DESC92C_RATEMCS3 = 0x0f,

	DESC92C_RATEMCS4 = 0x10,

	DESC92C_RATEMCS5 = 0x11,

	DESC92C_RATEMCS6 = 0x12,

	DESC92C_RATEMCS7 = 0x13,

	DESC92C_RATEMCS8 = 0x14,

	DESC92C_RATEMCS9 = 0x15,

	DESC92C_RATEMCS10 = 0x16,

	DESC92C_RATEMCS11 = 0x17,

	DESC92C_RATEMCS12 = 0x18,

	DESC92C_RATEMCS13 = 0x19,

	DESC92C_RATEMCS14 = 0x1a,

	DESC92C_RATEMCS15 = 0x1b,

};

#endif

drivers/net/wireless/rtlwifi/rtl8192ee/dm.c

0 → 100644
+1263 −0

File added.

Preview size limit exceeded, changes collapsed.