Reapplied all changes to latest staging-next and assured individual
patches will build successfully.
Directory structure has been cleaned up to allow building both drivers
in one build cycle. Kconfig has been modified for this as well. This
should increase consistency.
Arend van Spriel (6):
staging: brcm80211: moved code around for cleanup
staging: brcm80211: cleanup on the brcm80211 include directory
staging: brcm80211: removed sys directory layer from brcmsmac driver
staging: brcm80211: assure common sources are truly common
staging: brcm80211: use KBUILD_MODNAME as driver name in registration
staging: brcm80211: align message upon driver load with Kconfig
driver name
drivers/staging/brcm80211/Kconfig | 25 ++-
drivers/staging/brcm80211/Makefile | 64 +--------
drivers/staging/brcm80211/brcmfmac/Kconfig | 15 --
drivers/staging/brcm80211/brcmfmac/Makefile | 35 ++++-
.../brcm80211/{include => brcmfmac}/bcmcdc.h | 0
.../brcm80211/{include => brcmfmac}/bcmsdbus.h | 0
.../brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h | 0
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 18 +--
.../brcm80211/{include => brcmfmac}/dhdioctl.h | 0
.../{include => brcmfmac}/hndrte_armtrap.h | 0
.../brcm80211/{include => brcmfmac}/hndrte_cons.h | 0
.../brcm80211/{include => brcmfmac}/msgtrace.h | 0
.../brcm80211/{include => brcmfmac}/sdioh.h | 0
.../brcm80211/{include => brcmfmac}/sdiovar.h | 0
drivers/staging/brcm80211/brcmsmac/Makefile | 65 ++++++++
.../staging/brcm80211/{include => brcmsmac}/d11.h | 0
.../brcm80211/{sys => brcmsmac}/d11ucode_ext.h | 0
.../brcm80211/{ => brcmsmac}/phy/phy_version.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c | 0
.../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h | 0
.../brcm80211/{include => brcmsmac}/sbhndpio.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wl_dbg.h | 0
.../brcm80211/{sys => brcmsmac}/wl_export.h | 0
.../brcm80211/{sys => brcmsmac}/wl_mac80211.c | 23 ++--
.../brcm80211/{sys => brcmsmac}/wl_mac80211.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wl_ucode.h | 0
.../brcm80211/{sys => brcmsmac}/wl_ucode_loader.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_alloc.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_alloc.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_ampdu.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_ampdu.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_antsel.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_antsel.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_bsscfg.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_channel.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_channel.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_event.c | 3 -
.../brcm80211/{sys => brcmsmac}/wlc_event.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_key.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_mac80211.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_mac80211.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_phy_shim.c | 0
.../brcm80211/{sys => brcmsmac}/wlc_phy_shim.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_pub.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_rate.c | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_rate.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_scb.h | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_stf.c | 0
.../staging/brcm80211/{sys => brcmsmac}/wlc_stf.h | 0
.../brcm80211/{sys => brcmsmac}/wlc_types.h | 0
drivers/staging/brcm80211/include/bcmsdh.h | 1 +
drivers/staging/brcm80211/include/rpc_osl.h | 33 ----
drivers/staging/brcm80211/include/spid.h | 155 --------------------
drivers/staging/brcm80211/util/aiutils.c | 7 -
.../brcm80211/{include => util}/bcmsrom_tbl.h | 0
drivers/staging/brcm80211/util/bcmutils.c | 1 +
drivers/staging/brcm80211/util/bcmwifi.c | 3 -
drivers/staging/brcm80211/util/hnddma.c | 1 +
drivers/staging/brcm80211/util/hndpmu.c | 17 +-
.../staging/brcm80211/{include => util}/pci_core.h | 0
.../staging/brcm80211/{include => util}/sbpcmcia.h | 0
.../staging/brcm80211/{include => util}/sbsocram.h | 0
drivers/staging/brcm80211/util/siutils.c | 3 -
76 files changed, 142 insertions(+), 327 deletions(-)
delete mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig
rename drivers/staging/brcm80211/{include => brcmfmac}/bcmcdc.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdbus.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/dhdioctl.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_armtrap.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_cons.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/msgtrace.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/sdioh.h (100%)
rename drivers/staging/brcm80211/{include => brcmfmac}/sdiovar.h (100%)
create mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile
rename drivers/staging/brcm80211/{include => brcmsmac}/d11.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/d11ucode_ext.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/phy_version.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c (100%)
rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h (100%)
rename drivers/staging/brcm80211/{include => brcmsmac}/sbhndpio.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_dbg.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_export.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.c (99%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_ucode.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_ucode_loader.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bsscfg.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_event.c (99%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_event.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_key.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_mac80211.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_mac80211.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_pub.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_scb.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.c (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.h (100%)
rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_types.h (100%)
delete mode 100644 drivers/staging/brcm80211/include/rpc_osl.h
delete mode 100644 drivers/staging/brcm80211/include/spid.h
rename drivers/staging/brcm80211/{include => util}/bcmsrom_tbl.h (100%)
rename drivers/staging/brcm80211/{include => util}/pci_core.h (100%)
rename drivers/staging/brcm80211/{include => util}/sbpcmcia.h (100%)
rename drivers/staging/brcm80211/{include => util}/sbsocram.h (100%)
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
