253244 Commits

Author SHA1 Message Date
Roland Vossen
25036341c3 staging: brcm80211: cleanup after R_REG/W_REG patches
Code cleanup. Removed unused sections. Added () to make macro safe.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:30 -07:00
Roland Vossen
b61a4be59b staging: brcm80211: further simplified register access macro's
The SELECT_BUS_READ and SELECT_BUS_WRITE macro's always select
a (sdio) bus operation for fullmac, and a memory operation for
softmac. Thus they can be removed by expanding them in place.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:29 -07:00
Roland Vossen
4489518533 staging: brcm80211: moved register read/write macro's
Code cleanup. R_REG()/W_REG() macro's are overly complex. Copied
the macro's to both fullmac and softmac. Next patches will simplify
both copies of the macro's.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:28 -07:00
Roland Vossen
62dfdb38ef staging: brcm80211: removed OSL_WRITE_REG and OSL_READ_REG macros
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:28 -07:00
Arend van Spriel
d794fec0a9 staging: brcm80211: remove nvram related source files
nvram.c is intended for devices with configuration stored in flash. This
is not required for the softmac driver nor the fullmac driver so it has
been removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:28 -07:00
Roland Vossen
f97e956afc staging: brcm80211: renamed utility module related files
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:43:27 -07:00
Roland Vossen
67ad48bcf2 staging: brcm80211: cleaned up prefix for utility functions
Code cleanup. 'bcm' replaced by 'brcmu_', which is shorthand for
'Broadcom Utilities' (the 'brcmutil.ko' library module).

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:25 -07:00
Roland Vossen
3918ec2bed staging: brcm80211: removed lmac remnants
Code cleanup. LMAC (a Broadcom specific acronym) was not used.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:25 -07:00
Roland Vossen
6cd8d7bffb staging: brcm80211: removed Broadcom specific acronym 'hnd'.
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:24 -07:00
Roland Vossen
aefacecc10 staging: brcm80211: removed unused code from bcmotp.c
Code cleanup. The supported chips all contain an 'IPX' controller, the
older 'hnd' OTP controller is not used.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:23 -07:00
Roland Vossen
72a27fb842 staging: brcm80211: removed wl_export.h
Code cleanup, reducing number of header files. Merged into brcmsmac_80211.h.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:22 -07:00
Roland Vossen
da4ef2aea5 staging: brcm80211: removed wl_dbg.h
Code cleanup. Reducing number of header files. Merged into wlc_types.h.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:22 -07:00
Roland Vossen
5706e3de27 staging: brcm80211: renamed files to get rid of wl_ file name prefix
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:21 -07:00
Roland Vossen
8817f75429 staging: brcm80211: removed wl_ (vendor specific acronym)
Replaced by brcms_, which is short hand for 'Broadcom softmac'.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:21 -07:00
Franky Lin
b64f7a6675 staging: brcm80211: clean up wl_iw.h in fullmac
Remove #include lines in wl_iw.h

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:20 -07:00
Franky Lin
583c3827f1 staging: brcm80211: clean up wl_cfg80211.h in fullmac
Remove #include lines in wl_cfg80211.h

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:19 -07:00
Franky Lin
96a0ec20d7 staging: brcm80211: remove sdioh.h from fullmac
Remove unused head file

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:19 -07:00
Franky Lin
0df4604ed0 staging: brmc80211: remove sdio.h from fullmac
Use standard sdio.h from mmc core instead of private one

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:18 -07:00
Franky Lin
597600ad92 staging: brcm80211: combine sbsdpcmdev.h and sbsdio.h
Combine two head files both for sdio sb configuration in fullmac

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:17 -07:00
Franky Lin
86c0184387 staging: brcm80211: absorb msgtrace.h in fullmac
Absorb msgtrace.h into dhd_common.c

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:16 -07:00
Franky Lin
b49b14d2e3 staging: brcm80211: absorb bcmsdpcm.h in fullmac
Absorb bcmsdpcm.h into dhd_sdio.c

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:16 -07:00
Franky Lin
7c6100ee08 staging: brcm80211: clean up dhd.h in fullmac
Remove #include lines in dhd.h

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:40:15 -07:00
Franky Lin
4bccf92c5a staging: brcm80211: absorb bcmcdc.h into dhd_cdc.c
Merge bcmcdc.h into dhd_cdc.c in fullmac as it's only used by
dhd_cdc.c

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:05 -07:00
Franky Lin
a4181fb7ef staging: brcm80211: remove BCMEMBEDIMAGE related codes from fullmac
Remove BCMEMBEDIMAGE related codes in fullmac driver as we don't
need this in firmware download routine.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:04 -07:00
Arend van Spriel
ac9e1c0e69 staging: brcm80211: remove phy_version.h
Removed the file phy_version.h from the driver sources. It was not
used. For keeping track of the phy version, which is a separately
developed component, one definition has been kept and placed in
wlc_phy_int.h.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:04 -07:00
Roland Vossen
1f7a0c7c00 staging: brcm80211: macro cleanup
Code cleanup. Replaced bcopy() by memcpy(). Removed redundant PAD
macro definitions.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:03 -07:00
Roland Vossen
d33fcc301d staging: brcm80211: moved sbdma.h into brcmsmac/bcmdma.h
Code cleanup. Removed fullmac dependencies on this file.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:03 -07:00
Roland Vossen
745c9e6ebc staging: brcm80211: deleted sbconfig.h, renamed sbcc.h
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:02 -07:00
Roland Vossen
d5f27a8f89 staging: brcm80211: replaced typedef si_t with struct si_pub
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:01 -07:00
Arend van Spriel
fd24b0fdae staging: brcm80211: remove pci core defintion files
The source file nicpci.c is the only file left which needs the
pci core register definitions. These definitions have been added
to the source file so the include files can be removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:00 -07:00
Arend van Spriel
8543df3a1f staging: brcm80211: remove dependency on pci core difinitions from aiutils.c
The file aiutils.c included the register definition includes for the
PCI and PCIe core. This was for two functions which have been partly
moved to nicpci.c. This means that nicpci.h is the only include file
to provide interface to aiutils.c for PCI core related functions.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:37:00 -07:00
Arend van Spriel
a607d3c2bc staging: brcm80211: add braces to SI_INFO macro definition
The additional braces allow the casted parameter to be indirected
immediately. Here is an example to clarify:
	x = SI_INFO(y);    => z = SI_INFO(y)->field_a;
	z = x->field_a;

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:59 -07:00
Arend van Spriel
63182f6119 staging: brcm80211: remove unused functions from nicpci.c
Several functions are defined but not used. These have been removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:58 -07:00
Arend van Spriel
e4eb686452 staging: brcm80211: remove functions from nicpci.h
Couple of functions in the header file are actually only used by
nicpci.c itself and as such made static and removed from the header
file.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:58 -07:00
Arend van Spriel
60204bef36 staging: brcm80211: move PCI related header files to appropriate driver folder
The include file pcicfg.h is now only required by brcmfmac driver. Similarly,
nicpci.h is only required by brcmsmac driver. These header files have been
moved to the appropriate driver specific folder.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:57 -07:00
Arend van Spriel
4b1681163c staging: brcm80211: remove usage of pcicfg.h from brcmsmac driver
All PCI related definitions needed by the brcmsmac driver are going to
be consolidated in single header file nicpci.h. This commit removes
need to include pcicfg.h in brcmsmac driver sources.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:57 -07:00
Roland Vossen
e40514c200 staging: brcm80211: cleaned bcmdefs.h
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:56 -07:00
Roland Vossen
31c9f6d970 staging: brcm80211: moved header files to more specific directory
Code cleanup. Header files only used by the softmac were moved to the
brcmsmac dir, same approach for fullmac header files.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:56 -07:00
Roland Vossen
b6fe70c3aa staging: brcm80211: cleaned sb* header files
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:55 -07:00
Arend van Spriel
23d77de3a1 staging: brcm80211: remove inclusion of bcmsrom_fmt.h
The header file bcmsrom_fmt.h contains a lot of macro definitions
used by bcmsrom.c and one type definition used by wlc_phy_int.h.
The defintions have been moved appropriately and the include file
bcmsrom_fmt.h is removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:55 -07:00
Arend van Spriel
d70462f5d6 staging: brcm80211: remove extern variable definitions in bcmsrom.c
The file bcmsrom.c defined two global externals. As these were also
not used these have been removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:54 -07:00
Arend van Spriel
a4f031d35e staging: brcm80211: remove usage of bcmsrom_tbl.h
The include file bcmsrom_tbl.h was only included by bcmsrom.c. The
required definitions have been move to bcmsrom.c and bcmsrom_tbl.h
has subsequenly been removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:54 -07:00
Arend van Spriel
7885471758 staging: brcm80211: remove SDIO related definitions from nicpci.h
The header file nicpci.h is now only used by brcmsmac driver, which
does not support SDIO. The conditional defintions have been removed
from the header file.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:53 -07:00
Roland Vossen
d0a0941b0a staging: brcm80211: removed include/proto dir
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:53 -07:00
Roland Vossen
a019382eec staging: brcm80211: cleaned bcmeth.h and bcmevent.h
Code cleanup. Deleted unused definitions and moved others into less
generic files.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:52 -07:00
Roland Vossen
5ca06e0632 staging: brcm80211: removed 802.11.h
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:52 -07:00
Roland Vossen
9152bf26bc staging: brcm80211: emptied include/802.11.h
Code cleanup. Removed unused definitions. Moved other definitions to less
generic locations.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:52 -07:00
Roland Vossen
78539a2147 staging: brcm80211: removed unused stuff from proto/802.11.h
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:51 -07:00
Roland Vossen
f1c7a08a5f staging: brcm80211: merged two header files into dhd_sdio.c
Code cleanup. Decreasing number of header files.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:51 -07:00
Roland Vossen
70963f98ee staging: brcm80211: removed 'hnd' from everything but function names
Code cleanup. 'hnd' is a company specific acronym.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-07 12:36:50 -07:00