diff options
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/bcmsrom.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index e0899c86a0bc..c776a7691b8a 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c @@ -780,21 +780,23 @@ static const sromvar_t perpath_pci_sromvars[] = { {NULL, 0, 0, 0, 0} }; -static int initvars_srom_si(si_t *sih, void *curmap, char **vars, uint *count); +static int initvars_srom_si(struct si_pub *sih, void *curmap, char **vars, + uint *count); static void _initvars_srom_pci(u8 sromrev, u16 *srom, uint off, varbuf_t *b); -static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count); -static int initvars_flash_si(si_t *sih, char **vars, uint *count); -static int sprom_read_pci(si_t *sih, u16 *sprom, +static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars, + uint *count); +static int initvars_flash_si(struct si_pub *sih, char **vars, uint *count); +static int sprom_read_pci(struct si_pub *sih, u16 *sprom, uint wordoff, u16 *buf, uint nwords, bool check_crc); #if defined(BCMNVRAMR) -static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz); +static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz); #endif -static u16 srom_cc_cmd(si_t *sih, void *ccregs, u32 cmd, +static u16 srom_cc_cmd(struct si_pub *sih, void *ccregs, u32 cmd, uint wordoff, u16 data); static int initvars_table(char *start, char *end, char **vars, uint *count); -static int initvars_flash(si_t *sih, char **vp, +static int initvars_flash(struct si_pub *sih, char **vp, uint len); /* Initialization of varbuf structure */ @@ -862,7 +864,7 @@ static int varbuf_append(varbuf_t *b, const char *fmt, ...) * Initialize local vars from the right source for this platform. * Return 0 on success, nonzero on error. */ -int srom_var_init(si_t *sih, uint bustype, void *curmap, +int srom_var_init(struct si_pub *sih, uint bustype, void *curmap, char **vars, uint *count) { uint len; @@ -896,7 +898,7 @@ int srom_var_init(si_t *sih, uint bustype, void *curmap, * not in the bus cores. */ static u16 -srom_cc_cmd(si_t *sih, void *ccregs, u32 cmd, +srom_cc_cmd(struct si_pub *sih, void *ccregs, u32 cmd, uint wordoff, u16 data) { chipcregs_t *cc = (chipcregs_t *) ccregs; @@ -941,7 +943,7 @@ static inline void htol16_buf(u16 *buf, unsigned int size) * Return 0 on success, nonzero on error. */ static int -sprom_read_pci(si_t *sih, u16 *sprom, uint wordoff, +sprom_read_pci(struct si_pub *sih, u16 *sprom, uint wordoff, u16 *buf, uint nwords, bool check_crc) { int err = 0; @@ -998,7 +1000,7 @@ sprom_read_pci(si_t *sih, u16 *sprom, uint wordoff, } #if defined(BCMNVRAMR) -static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz) +static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz) { u8 *otp; uint sz = OTP_SZ_MAX / 2; /* size in words */ @@ -1066,7 +1068,7 @@ static int initvars_table(char *start, char *end, * of the table upon enter and to the end of the table upon exit when success. * Return 0 on success, nonzero on error. */ -static int initvars_flash(si_t *sih, char **base, uint len) +static int initvars_flash(struct si_pub *sih, char **base, uint len) { char *vp = *base; char *flash; @@ -1124,7 +1126,7 @@ static int initvars_flash(si_t *sih, char **base, uint len) * Initialize nonvolatile variable table from flash. * Return 0 on success, nonzero on error. */ -static int initvars_flash_si(si_t *sih, char **vars, uint *count) +static int initvars_flash_si(struct si_pub *sih, char **vars, uint *count) { char *vp, *base; int err; @@ -1304,7 +1306,8 @@ static void _initvars_srom_pci(u8 sromrev, u16 *srom, uint off, varbuf_t *b) * Initialize nonvolatile variable table from sprom. * Return 0 on success, nonzero on error. */ -static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) +static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars, + uint *count) { u16 *srom, *sromwindow; u8 sromrev = 0; @@ -1437,7 +1440,8 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) } -static int initvars_srom_si(si_t *sih, void *curmap, char **vars, uint *varsz) +static int initvars_srom_si(struct si_pub *sih, void *curmap, char **vars, + uint *varsz) { /* Search flash nvram section for srom variables */ return initvars_flash_si(sih, vars, varsz); |