Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7859cd9 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: clean up firmware download code in fullmac 



In brcmfmac the firmware download related code scatter all around.
And some old dead code which is not following the standard firmware
routine is still present. This patch limits the firmware download
related code only in dhd_sdio.c and removes the rest.

Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0f370346

drivers/staging/brcm80211/brcmfmac/bcmchip.h

+3 −0
Original line number Diff line number Diff line
@@ -25,5 +25,8 @@ 
/* ARM Cortex M3 core, ID 0x82a */

#define BCM4329_CORE_ARM_BASE		0x18002000

#define BCM4329_RAMSIZE			0x48000

/* firmware name */

#define BCM4329_FW_NAME			"brcm/bcm4329-fullmac-4.bin"

#define BCM4329_NV_NAME			"brcm/bcm4329-fullmac-4.txt"



#endif				/* _bcmchip_h_ */

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func); 
static int brcmf_sdioh_get_cisaddr(struct sdioh_info *sd, u32 regaddr);

extern int brcmf_sdioh_reset_comm(struct mmc_card *card);



extern PBCMSDH_SDMMC_INSTANCE gInstance;



uint sd_f2_blocksize = 512;	/* Default blocksize */



uint sd_msglevel = 0x01;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h

+2 −0
Original line number Diff line number Diff line
@@ -133,4 +133,6 @@ typedef struct _BCMSDH_SDMMC_INSTANCE { 
	u32 host_claimed;

} BCMSDH_SDMMC_INSTANCE, *PBCMSDH_SDMMC_INSTANCE;



extern PBCMSDH_SDMMC_INSTANCE gInstance;



#endif				/* __BCMSDH_SDMMC_H__ */

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −9
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ 
#define WL_KF_RES_5	(1 << 5)	/* Reserved for backward compat */

#define WL_IBSS_PEER_GROUP_KEY	(1 << 6)	/* Indicates a group key for a IBSS PEER */



/* optionally set by a module_param_string() */

#define MOD_PARAM_PATHLEN	2048



/* For supporting multiple interfaces */

#define DHD_MAX_IFS	16

#define DHD_DEL_IF	-0xe
@@ -819,9 +816,6 @@ extern uint brcmf_pktgen_len; 
#define BRCMF_MAX_PKTGEN_LEN 1800

#endif



extern char brcmf_fw_path[MOD_PARAM_PATHLEN];

extern char brcmf_nv_path[MOD_PARAM_PATHLEN];



extern u32 g_assert_type;

extern const bcmevent_name_t bcmevent_names[];

extern const int bcmevent_names_size;
@@ -912,9 +906,6 @@ extern int brcmf_os_ioctl_resp_wait(dhd_pub_t *pub, uint *condition, 
extern int brcmf_os_ioctl_resp_wake(dhd_pub_t *pub);

extern unsigned int brcmf_os_get_ioctl_resp_timeout(void);

extern void brcmf_os_set_ioctl_resp_timeout(unsigned int timeout_msec);

extern void *brcmf_os_open_image(char *filename);

extern int brcmf_os_get_image_block(char *buf, int len, void *image);

extern void brcmf_os_close_image(void *image);

extern void brcmf_os_sdlock_sndup_rxq(dhd_pub_t *pub);

extern void brcmf_customer_gpio_wlan_ctrl(int onoff);

extern int brcmf_custom_get_mac_address(unsigned char *buf);

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+0 −8
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ extern uint brcmf_watchdog_ms; 
extern int dhd_bus_register(void);

extern void dhd_bus_unregister(void);



/* Download firmware image and nvram image */

extern bool dhd_bus_download_firmware(struct dhd_bus *bus,

				      char *fw_path, char *nv_path);



/* Stop bus module: clear pending frames, disable data flow */

extern void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex);
@@ -75,10 +71,6 @@ extern void dhd_bus_clearcounts(dhd_pub_t *dhdp); 
/* return the dongle chipid */

extern uint dhd_bus_chip(struct dhd_bus *bus);



/* Set user-specified nvram parameters. */

extern void dhd_bus_set_nvram_params(struct dhd_bus *bus,

				     const char *nvram_params);



extern void *dhd_bus_pub(struct dhd_bus *bus);

extern void *dhd_bus_txq(struct dhd_bus *bus);

extern uint dhd_bus_hdrlen(struct dhd_bus *bus);