wifi: add set_firmware_path, update version to 4.01

This commit is contained in:
hwg
2012-04-05 13:35:40 +08:00
parent bb5929996f
commit b37e1f56cc
4 changed files with 37 additions and 2 deletions

View File

@@ -10,7 +10,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DBCMDRIVER \
DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \
dhd_linux_sched.o bcmwifi.o dhd_sdio.o bcmevent.o dhd_bta.o hndpmu.o \
bcmsdh.o dhd_cdc.o bcmsdh_linux.o dhd_common.o linux_osl.o wl_iw.o \
bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o wldev_common.o wl_android.o
bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o wldev_common.o wl_android.o fw_path.o
obj-$(CONFIG_RKWIFI) += bcmdhd.o
bcmdhd-objs += $(DHDOFILES)

View File

@@ -169,6 +169,7 @@ const bcm_iovar_t dhd_iovars[] = {
{NULL, 0, 0, 0, 0 }
};
extern void set_firmware_path(void);
struct dhd_cmn *
dhd_common_init(osl_t *osh)
{
@@ -203,6 +204,9 @@ dhd_common_init(osl_t *osh)
#ifdef SOFTAP
fw_path2[0] = '\0';
#endif
set_firmware_path();
return cmn;
}

View File

@@ -0,0 +1,31 @@
//
// fw_path.c
//
#include <typedefs.h>
#include <linuxver.h>
#include <osl.h>
extern char fw_path[];
extern char nv_path[];
void set_firmware_path(void)
{
#ifdef CONFIG_RK903
strcpy(fw_path, "/system/etc/firmware/fw_RK903.bin");
strcpy(nv_path, "/system/etc/firmware/nvram_RK903.txt");
return;
#endif
#ifdef CONFIG_RK901
strcpy(fw_path, "/system/etc/firmware/fw_RK901.bin");
strcpy(nv_path, "/system/etc/firmware/nvram_RK901.txt");
return;
#endif
#ifdef CONFIG_BCM4330
strcpy(fw_path, "/system/etc/firmware/fw_bcm4330.bin");
strcpy(nv_path, "/system/etc/firmware/nvram_4330.txt");
return;
#endif
}

View File

@@ -4,7 +4,7 @@
/*
* Broadcom BCM4330 driver version.
*/
#define BCMDHD_DRV_VERSION "4.00"
#define BCMDHD_DRV_VERSION "4.01"
/* Set INIT_COUNTRY_CODE
* "US" ---> 11 channels, this is default setting.