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 name drivers/staging/brcm80211/Kconfig | 25 +- drivers/staging/brcm80211/Makefile | 64 +- drivers/staging/brcm80211/brcmfmac/Kconfig | 15 - drivers/staging/brcm80211/brcmfmac/Makefile | 35 +- drivers/staging/brcm80211/brcmfmac/bcmcdc.h | 98 + drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 113 + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 110 + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 18 +- drivers/staging/brcm80211/brcmfmac/dhdioctl.h | 100 + .../staging/brcm80211/brcmfmac/hndrte_armtrap.h | 75 + drivers/staging/brcm80211/brcmfmac/hndrte_cons.h | 57 + drivers/staging/brcm80211/brcmfmac/msgtrace.h | 61 + drivers/staging/brcm80211/brcmfmac/sdioh.h | 63 + drivers/staging/brcm80211/brcmfmac/sdiovar.h | 38 + drivers/staging/brcm80211/brcmsmac/Makefile | 65 + drivers/staging/brcm80211/brcmsmac/d11.h | 1765 ++ drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h | 35 + .../staging/brcm80211/brcmsmac/phy/phy_version.h | 36 + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 3461 +++ .../staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | 256 + .../staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | 1229 + .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 5325 ++++ .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h | 119 + drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c |29239 ++++++++++++++++++++ .../staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h | 1533 + .../staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h | 167 + .../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 3641 +++ .../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h | 49 + .../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c |10634 +++++++ .../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h | 39 + drivers/staging/brcm80211/brcmsmac/sbhndpio.h | 52 + drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 102 + drivers/staging/brcm80211/brcmsmac/wl_export.h | 63 + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1845 ++ drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 117 + drivers/staging/brcm80211/brcmsmac/wl_ucode.h | 49 + .../staging/brcm80211/brcmsmac/wl_ucode_loader.c | 89 + drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 371 + drivers/staging/brcm80211/brcmsmac/wlc_alloc.h | 25 + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 1356 + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h | 36 + drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 329 + drivers/staging/brcm80211/brcmsmac/wlc_antsel.h | 30 + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 4235 +++ drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 273 + drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 153 + drivers/staging/brcm80211/brcmsmac/wlc_cfg.h | 286 + drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 1609 ++ drivers/staging/brcm80211/brcmsmac/wlc_channel.h | 159 + drivers/staging/brcm80211/brcmsmac/wlc_event.c | 229 + drivers/staging/brcm80211/brcmsmac/wlc_event.h | 52 + drivers/staging/brcm80211/brcmsmac/wlc_key.h | 144 + drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 8479 ++++++ drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h | 989 + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 247 + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h | 112 + drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 624 + drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 501 + drivers/staging/brcm80211/brcmsmac/wlc_rate.h | 170 + drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 84 + drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 600 + drivers/staging/brcm80211/brcmsmac/wlc_stf.h | 43 + drivers/staging/brcm80211/brcmsmac/wlc_types.h | 37 + drivers/staging/brcm80211/include/bcmcdc.h | 98 - drivers/staging/brcm80211/include/bcmsdbus.h | 113 - drivers/staging/brcm80211/include/bcmsdh.h | 1 + drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 110 - drivers/staging/brcm80211/include/bcmsrom_tbl.h | 583 - drivers/staging/brcm80211/include/d11.h | 1765 -- drivers/staging/brcm80211/include/dhdioctl.h | 100 - drivers/staging/brcm80211/include/hndrte_armtrap.h | 75 - drivers/staging/brcm80211/include/hndrte_cons.h | 57 - drivers/staging/brcm80211/include/msgtrace.h | 61 - drivers/staging/brcm80211/include/pci_core.h | 122 - drivers/staging/brcm80211/include/rpc_osl.h | 33 - drivers/staging/brcm80211/include/sbhndpio.h | 52 - drivers/staging/brcm80211/include/sbpcmcia.h | 217 - drivers/staging/brcm80211/include/sbsocram.h | 175 - drivers/staging/brcm80211/include/sdioh.h | 63 - drivers/staging/brcm80211/include/sdiovar.h | 38 - drivers/staging/brcm80211/include/spid.h | 155 - drivers/staging/brcm80211/phy/phy_version.h | 36 - drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 3461 --- drivers/staging/brcm80211/phy/wlc_phy_hal.h | 256 - drivers/staging/brcm80211/phy/wlc_phy_int.h | 1229 - drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 5325 ---- drivers/staging/brcm80211/phy/wlc_phy_lcn.h | 119 - drivers/staging/brcm80211/phy/wlc_phy_n.c |29239 -------------------- drivers/staging/brcm80211/phy/wlc_phy_radio.h | 1533 - drivers/staging/brcm80211/phy/wlc_phyreg_n.h | 167 - drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3641 --- drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h | 49 - drivers/staging/brcm80211/phy/wlc_phytbl_n.c |10634 ------- drivers/staging/brcm80211/phy/wlc_phytbl_n.h | 39 - drivers/staging/brcm80211/sys/d11ucode_ext.h | 35 - drivers/staging/brcm80211/sys/wl_dbg.h | 102 - drivers/staging/brcm80211/sys/wl_export.h | 63 - drivers/staging/brcm80211/sys/wl_mac80211.c | 1846 -- drivers/staging/brcm80211/sys/wl_mac80211.h | 117 - drivers/staging/brcm80211/sys/wl_ucode.h | 49 - drivers/staging/brcm80211/sys/wl_ucode_loader.c | 89 - drivers/staging/brcm80211/sys/wlc_alloc.c | 371 - drivers/staging/brcm80211/sys/wlc_alloc.h | 25 - drivers/staging/brcm80211/sys/wlc_ampdu.c | 1356 - drivers/staging/brcm80211/sys/wlc_ampdu.h | 36 - drivers/staging/brcm80211/sys/wlc_antsel.c | 329 - drivers/staging/brcm80211/sys/wlc_antsel.h | 30 - drivers/staging/brcm80211/sys/wlc_bmac.c | 4235 --- drivers/staging/brcm80211/sys/wlc_bmac.h | 273 - drivers/staging/brcm80211/sys/wlc_bsscfg.h | 153 - drivers/staging/brcm80211/sys/wlc_cfg.h | 286 - drivers/staging/brcm80211/sys/wlc_channel.c | 1609 -- drivers/staging/brcm80211/sys/wlc_channel.h | 159 - drivers/staging/brcm80211/sys/wlc_event.c | 232 - drivers/staging/brcm80211/sys/wlc_event.h | 52 - drivers/staging/brcm80211/sys/wlc_key.h | 144 - drivers/staging/brcm80211/sys/wlc_mac80211.c | 8479 ------ drivers/staging/brcm80211/sys/wlc_mac80211.h | 989 - drivers/staging/brcm80211/sys/wlc_phy_shim.c | 247 - drivers/staging/brcm80211/sys/wlc_phy_shim.h | 112 - drivers/staging/brcm80211/sys/wlc_pub.h | 624 - drivers/staging/brcm80211/sys/wlc_rate.c | 501 - drivers/staging/brcm80211/sys/wlc_rate.h | 170 - drivers/staging/brcm80211/sys/wlc_scb.h | 84 - drivers/staging/brcm80211/sys/wlc_stf.c | 600 - drivers/staging/brcm80211/sys/wlc_stf.h | 43 - drivers/staging/brcm80211/sys/wlc_types.h | 37 - drivers/staging/brcm80211/util/aiutils.c | 7 - drivers/staging/brcm80211/util/bcmsrom_tbl.h | 583 + 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 +- drivers/staging/brcm80211/util/pci_core.h | 122 + drivers/staging/brcm80211/util/sbpcmcia.h | 217 + drivers/staging/brcm80211/util/sbsocram.h | 175 + drivers/staging/brcm80211/util/siutils.c | 3 - 137 files changed, 82961 insertions(+), 83146 deletions(-) delete mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmcdc.h create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdbus.h create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h create mode 100644 drivers/staging/brcm80211/brcmfmac/dhdioctl.h create mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h create mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h create mode 100644 drivers/staging/brcm80211/brcmfmac/msgtrace.h create mode 100644 drivers/staging/brcm80211/brcmfmac/sdioh.h create mode 100644 drivers/staging/brcm80211/brcmfmac/sdiovar.h create mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile create mode 100644 drivers/staging/brcm80211/brcmsmac/d11.h create mode 100644 drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_version.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h create mode 100644 drivers/staging/brcm80211/brcmsmac/sbhndpio.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_dbg.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_export.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_mac80211.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_mac80211.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_ucode.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_alloc.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_alloc.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_antsel.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_antsel.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bmac.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_cfg.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_channel.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_channel.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_event.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_event.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_key.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pub.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_rate.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_rate.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_scb.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_stf.c create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_stf.h create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_types.h delete mode 100644 drivers/staging/brcm80211/include/bcmcdc.h delete mode 100644 drivers/staging/brcm80211/include/bcmsdbus.h delete mode 100644 drivers/staging/brcm80211/include/bcmsdh_sdmmc.h delete mode 100644 drivers/staging/brcm80211/include/bcmsrom_tbl.h delete mode 100644 drivers/staging/brcm80211/include/d11.h delete mode 100644 drivers/staging/brcm80211/include/dhdioctl.h delete mode 100644 drivers/staging/brcm80211/include/hndrte_armtrap.h delete mode 100644 drivers/staging/brcm80211/include/hndrte_cons.h delete mode 100644 drivers/staging/brcm80211/include/msgtrace.h delete mode 100644 drivers/staging/brcm80211/include/pci_core.h delete mode 100644 drivers/staging/brcm80211/include/rpc_osl.h delete mode 100644 drivers/staging/brcm80211/include/sbhndpio.h delete mode 100644 drivers/staging/brcm80211/include/sbpcmcia.h delete mode 100644 drivers/staging/brcm80211/include/sbsocram.h delete mode 100644 drivers/staging/brcm80211/include/sdioh.h delete mode 100644 drivers/staging/brcm80211/include/sdiovar.h delete mode 100644 drivers/staging/brcm80211/include/spid.h delete mode 100644 drivers/staging/brcm80211/phy/phy_version.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_cmn.c delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_hal.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_int.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.c delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_n.c delete mode 100644 drivers/staging/brcm80211/phy/wlc_phy_radio.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phyreg_n.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c delete mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h delete mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.c delete mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.h delete mode 100644 drivers/staging/brcm80211/sys/d11ucode_ext.h delete mode 100644 drivers/staging/brcm80211/sys/wl_dbg.h delete mode 100644 drivers/staging/brcm80211/sys/wl_export.h delete mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.c delete mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.h delete mode 100644 drivers/staging/brcm80211/sys/wl_ucode.h delete mode 100644 drivers/staging/brcm80211/sys/wl_ucode_loader.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_bsscfg.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_cfg.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_channel.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_channel.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_event.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_event.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_key.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_pub.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_rate.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_rate.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_scb.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_stf.c delete mode 100644 drivers/staging/brcm80211/sys/wlc_stf.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_types.h create mode 100644 drivers/staging/brcm80211/util/bcmsrom_tbl.h create mode 100644 drivers/staging/brcm80211/util/pci_core.h create mode 100644 drivers/staging/brcm80211/util/sbpcmcia.h create mode 100644 drivers/staging/brcm80211/util/sbsocram.h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
