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: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
2447ffb0bd
commit
6e3c712807
|
@ -488,6 +488,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
|
||||||
sdiodev->bus_if = bus_if;
|
sdiodev->bus_if = bus_if;
|
||||||
bus_if->bus_priv = sdiodev;
|
bus_if->bus_priv = sdiodev;
|
||||||
bus_if->type = SDIO_BUS;
|
bus_if->type = SDIO_BUS;
|
||||||
|
bus_if->align = BRCMF_SDALIGN;
|
||||||
dev_set_drvdata(&func->card->dev, sdiodev);
|
dev_set_drvdata(&func->card->dev, sdiodev);
|
||||||
|
|
||||||
atomic_set(&sdiodev->suspend, false);
|
atomic_set(&sdiodev->suspend, false);
|
||||||
|
|
|
@ -580,6 +580,7 @@ struct brcmf_bus {
|
||||||
bool drvr_up; /* Status flag of driver up/down */
|
bool drvr_up; /* Status flag of driver up/down */
|
||||||
unsigned long tx_realloc; /* Tx packets realloced for headroom */
|
unsigned long tx_realloc; /* Tx packets realloced for headroom */
|
||||||
struct dngl_stats dstats; /* Stats for dongle-based data */
|
struct dngl_stats dstats; /* Stats for dongle-based data */
|
||||||
|
u8 align; /* bus alignment requirement */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Forward decls for struct brcmf_pub (see below) */
|
/* Forward decls for struct brcmf_pub (see below) */
|
||||||
|
|
|
@ -17,12 +17,6 @@
|
||||||
#ifndef _BRCMF_BUS_H_
|
#ifndef _BRCMF_BUS_H_
|
||||||
#define _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)
|
* Exported from brcmf bus module (brcmf_usb, brcmf_sdio)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -82,13 +82,14 @@ struct brcmf_proto_bdc_header {
|
||||||
|
|
||||||
|
|
||||||
#define RETRIES 2 /* # of retries to retrieve matching dcmd response */
|
#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)
|
* (amount of header tha might be added)
|
||||||
* plus any space that might be needed
|
* 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
|
* round off at the end of buffer
|
||||||
|
* Currently is SDIO
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct brcmf_proto {
|
struct brcmf_proto {
|
||||||
|
|
|
@ -798,7 +798,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
|
||||||
"event_msgs" + '\0' + bitvec */
|
"event_msgs" + '\0' + bitvec */
|
||||||
uint up = 0;
|
uint up = 0;
|
||||||
char buf[128], *ptr;
|
char buf[128], *ptr;
|
||||||
u32 dongle_align = BRCMF_SDALIGN;
|
u32 dongle_align = drvr->bus_if->align;
|
||||||
u32 glom = 0;
|
u32 glom = 0;
|
||||||
u32 roaming = 1;
|
u32 roaming = 1;
|
||||||
uint bcn_timeout = 3;
|
uint bcn_timeout = 3;
|
||||||
|
|
|
@ -116,6 +116,12 @@
|
||||||
#define SUCCESS 0
|
#define SUCCESS 0
|
||||||
#define ERROR 1
|
#define ERROR 1
|
||||||
|
|
||||||
|
/* 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
|
||||||
|
|
||||||
struct brcmf_sdreg {
|
struct brcmf_sdreg {
|
||||||
int func;
|
int func;
|
||||||
int offset;
|
int offset;
|
||||||
|
|
Loading…
Reference in New Issue