Commit f8559b69 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: moved code around for cleanup 



Restructured code to have more consistent directory tree for the
two drivers.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a57d188d

drivers/staging/brcm80211/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ choice 
	help

	Select the appropriate driver style from the list below.



config BRCM80211_PCI

config BRCMSMAC

	bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

	depends on PCI

	depends on BRCM80211 && MAC80211
@@ -16,7 +16,7 @@ config BRCM80211_PCI 
	---help---

	  This module adds support for PCIe wireless adapters based on Broadcom

	  IEEE802.11n SoftMAC chipsets.  If you choose to build a module, it'll

	  be called brcm80211.ko.

	  be called brcmsmac.ko.



config BRCMFMAC

	bool "Broadcom IEEE802.11n embedded FullMAC WLAN driver"

drivers/staging/brcm80211/Makefile

+2 −59
Original line number Diff line number Diff line
@@ -15,62 +15,5 @@ 
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y :=					\

	-DBCMDBG				\

	-DWLC_HIGH				\

	-DSTA					\

	-DWME					\

	-DWL11N					\

	-DDBAND					\

	-DBCMDMA32				\

	-DBCMNVRAMR				\

	-Idrivers/staging/brcm80211/sys		\

	-Idrivers/staging/brcm80211/phy		\

	-Idrivers/staging/brcm80211/util	\

	-Idrivers/staging/brcm80211/include



PCI_CFLAGS := -DWLC_LOW



BRCM80211_OFILES := \

	util/siutils.o \

	util/aiutils.o \

	util/bcmotp.o \

	util/bcmsrom.o \

	util/bcmutils.o \

	util/bcmwifi.o \

	util/hndpmu.o \

	util/linux_osl.o \

	sys/wlc_alloc.o \

	sys/wlc_antsel.o \

	sys/wlc_channel.o \

	sys/wlc_event.o \

	sys/wlc_mac80211.o \

	sys/wlc_rate.o \

	sys/wlc_stf.o \

	sys/wl_mac80211.o \

	sys/wlc_ampdu.o



PCIFILES := \

	phy/wlc_phy_cmn.o \

	phy/wlc_phy_lcn.o \

	phy/wlc_phy_n.o \

	phy/wlc_phytbl_lcn.o \

	phy/wlc_phytbl_n.o \

	sys/wlc_bmac.o \

	sys/wlc_phy_shim.o \

	sys/wl_ucode_loader.o \

	util/hnddma.o \

	util/nicpci.o \

	util/nvram/nvram_ro.o \

	util/qmath.o



MODULEPFX := brcm80211



# PCI driver

ifeq ($(CONFIG_BRCM80211_PCI),y)

obj-m	+= $(MODULEPFX).o

ccflags-y += $(PCI_CFLAGS)

$(MODULEPFX)-objs	= $(BRCM80211_OFILES) $(PCIFILES)

endif



obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/staging/brcm80211/brcmfmac/Kconfig

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
menuconfig BRCMFMAC

	tristate "Broadcom fullmac wireless cards support"

	depends on MMC

	depends on CFG80211

	select FW_LOADER

	select WIRELESS_EXT

	select WEXT_PRIV

	---help---

	  This module adds support for wireless adapters based on

	  Broadcom fullmac chipsets.

	  This driver uses the kernel's wireless extensions subsystem.

	  If you choose to build a module, it'll be called brcmfmac.ko. Say M if

	  unsure.

drivers/staging/brcm80211/brcmfmac/Makefile

+20 −4
Original line number Diff line number Diff line
@@ -37,10 +37,26 @@ ccflags-y := \ 
	-Idrivers/staging/brcm80211/include		\

	-Idrivers/staging/brcm80211/util



DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o	\

	wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o	\

	dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o	\

	bcmsdh_sdmmc_linux.o

DHDOFILES = \

	wl_cfg80211.o \

	wl_iw.o \

	dhd_cdc.o \

	dhd_common.o \

	dhd_custom_gpio.o \

	dhd_sdio.o	\

	dhd_linux.o \

	dhd_linux_sched.o \

	bcmsdh.o \

	bcmsdh_linux.o	\

	bcmsdh_sdmmc.o \

	bcmsdh_sdmmc_linux.o \

	../util/linux_osl.o \

	../util/aiutils.o \

	../util/siutils.o \

	../util/sbutils.o \

	../util/bcmutils.o \

	../util/bcmwifi.o \

	../util/hndpmu.o



obj-m += brcmfmac.o

brcmfmac-objs += $(DHDOFILES)

drivers/staging/brcm80211/brcmsmac/Makefile

0 → 100644
+67 −0
Original line number Diff line number Diff line 
#

# Makefile fragment for Broadcom 802.11n Networking Device Driver

#

# Copyright (c) 2010 Broadcom Corporation

#

# Permission to use, copy, modify, and/or distribute this software for any

# purpose with or without fee is hereby granted, provided that the above

# copyright notice and this permission notice appear in all copies.

#

# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y :=					\

	-DBCMDBG				\

	-DWLC_HIGH				\

	-DWLC_LOW				\

	-DSTA					\

	-DWME					\

	-DWL11N					\

	-DDBAND					\

	-DBCMDMA32				\

	-DBCMNVRAMR				\

	-Idrivers/staging/brcm80211/brcmsmac/sys \

	-Idrivers/staging/brcm80211/brcmsmac/phy \

	-Idrivers/staging/brcm80211/util \

	-Idrivers/staging/brcm80211/include



BRCMSMAC_OFILES := \

	sys/wl_mac80211.o \

	sys/wl_ucode_loader.o \

	sys/wlc_alloc.o \

	sys/wlc_ampdu.o \

	sys/wlc_antsel.o \

	sys/wlc_bmac.o \

	sys/wlc_channel.o \

	sys/wlc_event.o \

	sys/wlc_mac80211.o \

	sys/wlc_phy_shim.o \

	sys/wlc_rate.o \

	sys/wlc_stf.o \

	phy/wlc_phy_cmn.o \

	phy/wlc_phy_lcn.o \

	phy/wlc_phy_n.o \

	phy/wlc_phytbl_lcn.o \

	phy/wlc_phytbl_n.o \

	../util/linux_osl.o \

	../util/aiutils.o \

	../util/siutils.o \

	../util/bcmutils.o \

	../util/bcmwifi.o \

	../util/bcmotp.o \

	../util/bcmsrom.o \

	../util/hnddma.o \

	../util/hndpmu.o \

	../util/nicpci.o \

	../util/qmath.o \

	../util/nvram/nvram_ro.o



MODULEPFX := brcmsmac



obj-m	+= $(MODULEPFX).o

$(MODULEPFX)-objs	= $(BRCMSMAC_OFILES)