rtlwifi: Modify build system for rtl8192cu

Modify Kconfig and Makefile to build rtl8192cu.

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

diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 7f6573f7f47021617cee956d10ff2532343166e7..86f8d4d64037a480c03117c35720180a4fd8eede 100644 (file)
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -1,6 +1,6 @@
 config RTL8192CE
-       tristate "Realtek RTL8192CE/RTL8188SE Wireless Network Adapter"
-       depends on MAC80211 && EXPERIMENTAL
+       tristate "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter"
+       depends on MAC80211 && PCI && EXPERIMENTAL
        select FW_LOADER
        select RTLWIFI
        ---help---
@@ -9,7 +9,18 @@ config RTL8192CE
 
        If you choose to build it as a module, it will be called rtl8192ce
 
+config RTL8192CU
+       tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
+       depends on MAC80211 && USB && EXPERIMENTAL
+       select FW_LOADER
+       select RTLWIFI
+       ---help---
+       This is the driver for Realtek RTL8192CU/RTL8188CU 802.11n USB
+       wireless network adapters.
+
+       If you choose to build it as a module, it will be called rtl8192cu
+
 config RTLWIFI
        tristate
-       depends on RTL8192CE
+       depends on RTL8192CE || RTL8192CU
        default m

diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
index efbff2f478bf4cb8c57e4c088d31775787725bc8..c3e83a1da33b370f030b0167d7ed7e220d87b072 100644 (file)
--- a/drivers/net/wireless/rtlwifi/Makefile
+++ b/drivers/net/wireless/rtlwifi/Makefile
@@ -12,3 +12,6 @@ rtlwifi-objs  :=              \
                usb.o
 
 obj-$(CONFIG_RTL8192CE)                += rtl8192ce/
+obj-$(CONFIG_RTL8192CU)                += rtl8192cu/
+
+ccflags-y += -D__CHECK_ENDIAN__

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile b/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
index 0f0be7c763b8274ec2a00cd4e8704932fbfe3ca9..5c5fdde637cb83f2ddef270aff9543af7e576372 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
@@ -10,3 +10,5 @@ rtl8192ce-objs :=             \
                trx.o
 
 obj-$(CONFIG_RTL8192CE) += rtl8192ce.o
+
+ccflags-y += -D__CHECK_ENDIAN__

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index 9ffbadc281f21173e34e3a68c84c99e031663de4..3df22bd9480deb9c4a5d4284afe359055a843ad8 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -1077,6 +1077,7 @@
 #define _RARF_RC8(x)                           (((x) & 0x1F) << 24)
 
 #define AC_PARAM_TXOP_LIMIT_OFFSET             16
+#define AC_PARAM_TXOP_OFFSET                   16
 #define AC_PARAM_ECW_MAX_OFFSET                        12
 #define AC_PARAM_ECW_MIN_OFFSET                        8
 #define AC_PARAM_AIFS_OFFSET                   0

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/Makefile b/drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
new file mode 100644 (file)
index 0000000..91c6512
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
@@ -0,0 +1,15 @@
+rtl8192cu-objs :=              \
+               dm.o            \
+               fw.o            \
+               hw.o            \
+               led.o           \
+               mac.o           \
+               phy.o           \
+               rf.o            \
+               sw.o            \
+               table.o         \
+               trx.o
+
+obj-$(CONFIG_RTL8192CU) += rtl8192cu.o
+
+ccflags-y += -D__CHECK_ENDIAN__