Commit 6e3c7128 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: move sdio related macros to sdio_host.h 



dhd_bus.h will be used as the shared header file for common layer
and bus layer. It should not contain any sdio specific macros.
This patch moves them to sdio_host.h as part of the fullmac bus
interface refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2447ffb0

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
		sdiodev->bus_if = bus_if;

		bus_if->bus_priv = sdiodev;

		bus_if->type = SDIO_BUS;

		bus_if->align = BRCMF_SDALIGN;

		dev_set_drvdata(&func->card->dev, sdiodev);



		atomic_set(&sdiodev->suspend, false);

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ struct brcmf_bus { 
	bool drvr_up;		/* Status flag of driver up/down */

	unsigned long tx_realloc;	/* Tx packets realloced for headroom */

	struct dngl_stats dstats;	/* Stats for dongle-based data */

	u8 align;		/* bus alignment requirement */

};



/* Forward decls for struct brcmf_pub (see below) */

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+0 −6
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ 
#ifndef _BRCMF_BUS_H_

#define _BRCMF_BUS_H_



/* Packet alignment for most efficient SDIO (can change based on platform) */

#define BRCMF_SDALIGN	(1 << 6)



/* watchdog polling interval in ms */

#define BRCMF_WD_POLL_MS	10



/*

 * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

 */

drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

+4 −3
Original line number Diff line number Diff line
@@ -82,13 +82,14 @@ struct brcmf_proto_bdc_header { 




#define RETRIES 2 /* # of retries to retrieve matching dcmd response */

#define BUS_HEADER_LEN	(16+BRCMF_SDALIGN) /* Must be atleast SDPCM_RESERVE

#define BUS_HEADER_LEN	(16+64)		/* Must be atleast SDPCM_RESERVE

					 * (amount of header tha might be added)

					 * plus any space that might be needed

					 * for alignment padding.

					 * for bus alignment padding.

					 */

#define ROUND_UP_MARGIN	2048	/* Biggest SDIO block size possible for

#define ROUND_UP_MARGIN	2048	/* Biggest bus block size possible for

				 * round off at the end of buffer

				 * Currently is SDIO

				 */



struct brcmf_proto {

drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr) 
				 "event_msgs" + '\0' + bitvec  */

	uint up = 0;

	char buf[128], *ptr;

	u32 dongle_align = BRCMF_SDALIGN;

	u32 dongle_align = drvr->bus_if->align;

	u32 glom = 0;

	u32 roaming = 1;

	uint bcn_timeout = 3;

CRA Git | Maintained and supported by SUSTech CRA and CCSE