diff options
| author | Rongjun Chen <rongjun.chen@amlogic.com> | 2018-07-06 17:21:25 +0800 |
|---|---|---|
| committer | Rongjun Chen <rongjun.chen@amlogic.com> | 2018-07-06 17:21:25 +0800 |
| commit | ef31f6cde5693a005810d445cbf1f43f2f754b07 (patch) | |
| tree | 5c6e0059ba5b6191555aa1c51169f899d6079e9e | |
| parent | 1ebe56b2e3bc8a838695ba731b2f75a52bd0225f (diff) | |
| download | dhd-driver-ef31f6cde5693a005810d445cbf1f43f2f754b07.tar.gz | |
wifi: update wifi driver to support country code
PD# 169693
update driver to support country code
Change-Id: If1adc58dd70fab2397a620d4aa8e647fecfdd63a
| -rw-r--r-- | bcmdhd.1.579.77.41.1.cn/dhd_config.c | 18 | ||||
| -rw-r--r-- | bcmdhd.1.579.77.41.1.cn/dhd_config.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_config.c b/bcmdhd.1.579.77.41.1.cn/dhd_config.c index 2de7280..f1aae8a 100644 --- a/bcmdhd.1.579.77.41.1.cn/dhd_config.c +++ b/bcmdhd.1.579.77.41.1.cn/dhd_config.c @@ -64,27 +64,27 @@ const cihp_name_map_t chip_name_map [] = { {BCM43362_CHIP_ID, 1, DONT_CARE, FALSE, "bcm40181a2", ""},
{BCM4330_CHIP_ID, 4, FW_TYPE_G, FALSE, "bcm40183b2", ""},
{BCM4330_CHIP_ID, 4, FW_TYPE_AG, FALSE, "bcm40183b2_ag", ""},
- {BCM43430_CHIP_ID, 0, DONT_CARE, FALSE, "bcm43438a0", ""},
- {BCM43430_CHIP_ID, 1, DONT_CARE, FALSE, "bcm43438a1", ""},
- {BCM43430_CHIP_ID, 2, DONT_CARE, FALSE, "bcm43436b0", ""},
+ {BCM43430_CHIP_ID, 0, DONT_CARE, FALSE, "bcm43438a0", "nvram_ap6212.txt"},
+ {BCM43430_CHIP_ID, 1, DONT_CARE, FALSE, "bcm43438a1", "nvram_ap6212a.txt"},
+ {BCM43430_CHIP_ID, 2, DONT_CARE, FALSE, "bcm43436b0", "nvram_ap6236.txt"},
{BCM43012_CHIP_ID, 1, DONT_CARE, TRUE, "bcm43013b0", ""},
{BCM4334_CHIP_ID, 3, DONT_CARE, FALSE, "bcm4334b1_ag", ""},
{BCM43340_CHIP_ID, 2, DONT_CARE, FALSE, "bcm43341b0_ag", ""},
{BCM43341_CHIP_ID, 2, DONT_CARE, FALSE, "bcm43341b0_ag", ""},
{BCM4324_CHIP_ID, 5, DONT_CARE, FALSE, "bcm43241b4_ag", ""},
{BCM4335_CHIP_ID, 2, DONT_CARE, FALSE, "bcm4339a0_ag", ""},
- {BCM4339_CHIP_ID, 1, DONT_CARE, FALSE, "bcm4339a0_ag", ""},
- {BCM4345_CHIP_ID, 6, DONT_CARE, FALSE, "bcm43455c0_ag", ""},
+ {BCM4339_CHIP_ID, 1, DONT_CARE, FALSE, "bcm4339a0_ag", "nvram_ap6335.txt"},
+ {BCM4345_CHIP_ID, 6, DONT_CARE, FALSE, "bcm43455c0_ag", "nvram_ap6255.txt"},
{BCM43454_CHIP_ID, 6, DONT_CARE, FALSE, "bcm43455c0_ag", ""},
- {BCM4345_CHIP_ID, 9, DONT_CARE, FALSE, "bcm43456c5_ag", ""},
+ {BCM4345_CHIP_ID, 9, DONT_CARE, FALSE, "bcm43456c5_ag", "nvram_ap6256.txt"},
{BCM43454_CHIP_ID, 9, DONT_CARE, FALSE, "bcm43455c5_ag", ""},
{BCM4354_CHIP_ID, 1, DONT_CARE, FALSE, "bcm4354a1_ag", ""},
- {BCM4354_CHIP_ID, 2, DONT_CARE, FALSE, "bcm4356a2_ag", ""},
+ {BCM4354_CHIP_ID, 2, DONT_CARE, FALSE, "bcm4356a2_ag", "nvram_ap6356.txt"},
{BCM4356_CHIP_ID, 2, DONT_CARE, FALSE, "bcm4356a2_ag", ""},
{BCM4371_CHIP_ID, 2, DONT_CARE, FALSE, "bcm4356a2_ag", ""},
{BCM43569_CHIP_ID, 3, DONT_CARE, FALSE, "bcm4358a3_ag", ""},
{BCM4359_CHIP_ID, 5, DONT_CARE, FALSE, "bcm4359b1_ag", ""},
- {BCM4359_CHIP_ID, 9, DONT_CARE, FALSE, "bcm4359c0_ag", ""},
+ {BCM4359_CHIP_ID, 9, DONT_CARE, FALSE, "bcm4359c0_ag", "nvram_ap6398.txt"},
{BCM4362_CHIP_ID, 0, DONT_CARE, TRUE, "bcm43752a0_ag", ""},
#endif
#ifdef BCMPCIE
@@ -632,7 +632,7 @@ dhd_conf_set_conf_name_by_chip(dhd_pub_t *dhd, char *conf_path) }
i--;
}
- name_ptr = conf_path[i];
+ name_ptr = &conf_path[i];
for (i = 0; i < sizeof(chip_name_map)/sizeof(chip_name_map[0]); i++) {
const cihp_name_map_t* row = &chip_name_map[i];
diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_config.h b/bcmdhd.1.579.77.41.1.cn/dhd_config.h index 06232d9..f62c8ef 100644 --- a/bcmdhd.1.579.77.41.1.cn/dhd_config.h +++ b/bcmdhd.1.579.77.41.1.cn/dhd_config.h @@ -18,7 +18,7 @@ #define FW_TYPE_AG 1 #define FW_PATH_AUTO_SELECT 1 -//#define CONFIG_PATH_AUTO_SELECT +#define CONFIG_PATH_AUTO_SELECT extern char firmware_path[MOD_PARAM_PATHLEN]; #if defined(BCMSDIO) || defined(BCMPCIE) extern uint dhd_rxbound; |