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

Commit dabedab9 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: rename nvram.[ch] for upcoming firmware handling functions 



The firmware processing will be modified to use asynchronous request
firmware api. In preparation this patch is simple rename of source
and header file to which the functionality will be added.

Reviewed-by: default avatarDaniel (Deognyoun) Kim <dekim@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f33d7a91

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ brcmfmac-objs += \ 
		bcdc.o \

		dhd_common.o \

		dhd_linux.o \

		nvram.o \

		firmware.o \

		btcoex.o

brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \

		dhd_sdio.o \

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

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <soc.h>

#include "sdio_host.h"

#include "chip.h"

#include "nvram.h"

#include "firmware.h"



#define DCMD_RESP_TIMEOUT  2000	/* In milli second */
@@ -3287,7 +3287,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus, 


	brcmf_dbg(TRACE, "Enter\n");



	vars = brcmf_nvram_strip(nv, &varsz);

	vars = brcmf_fw_nvram_strip(nv, &varsz);



	if (vars == NULL)

		return -EINVAL;
@@ -3300,7 +3300,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus, 
	else if (!brcmf_sdio_verifymemory(bus->sdiodev, address, vars, varsz))

		err = -EIO;



	brcmf_nvram_free(vars);

	brcmf_fw_nvram_free(vars);



	return err;

}

drivers/net/wireless/brcm80211/brcmfmac/nvram.c→drivers/net/wireless/brcm80211/brcmfmac/firmware.c

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/firmware.h>



#include "dhd_dbg.h"

#include "nvram.h"

#include "firmware.h"



enum nvram_parser_state {

	IDLE,
@@ -187,7 +187,7 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp, 
 * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.

 * End of buffer is completed with token identifying length of buffer.

 */

void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length)

void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length)

{

	struct nvram_parser nvp;

	u32 pad;
@@ -219,7 +219,7 @@ void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length) 
	return nvp.nvram;

}



void brcmf_nvram_free(void *nvram)

void brcmf_fw_nvram_free(void *nvram)

{

	kfree(nvram);

}

drivers/net/wireless/brcm80211/brcmfmac/nvram.h→drivers/net/wireless/brcm80211/brcmfmac/firmware.h

+5 −5
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#ifndef BRCMFMAC_NVRAM_H

#define BRCMFMAC_NVRAM_H

#ifndef BRCMFMAC_FIRMWARE_H

#define BRCMFMAC_FIRMWARE_H





void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length);

void brcmf_nvram_free(void *nvram);

void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length);

void brcmf_fw_nvram_free(void *nvram);





#endif /* BRCMFMAC_NVRAM_H */
 
#endif /* BRCMFMAC_FIRMWARE_H */