wifi: update wifi driver to support country code

PD# 169693

update driver to support country code

Change-Id: If1adc58dd70fab2397a620d4aa8e647fecfdd63a

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 2de72801d3e990bc9a0bf268cbcf318720582740..f1aae8aa4111a46222df768c8d3f8beaacfb6fd0 100644 (file)
--- 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",           ""},\r
        {BCM4330_CHIP_ID,       4,      FW_TYPE_G,      FALSE,  "bcm40183b2",           ""},\r
        {BCM4330_CHIP_ID,       4,      FW_TYPE_AG,     FALSE,  "bcm40183b2_ag",        ""},\r
-       {BCM43430_CHIP_ID,      0,      DONT_CARE,      FALSE,  "bcm43438a0",           ""},\r
-       {BCM43430_CHIP_ID,      1,      DONT_CARE,      FALSE,  "bcm43438a1",           ""},\r
-       {BCM43430_CHIP_ID,      2,      DONT_CARE,      FALSE,  "bcm43436b0",           ""},\r
+       {BCM43430_CHIP_ID,      0,      DONT_CARE,      FALSE,  "bcm43438a0",           "nvram_ap6212.txt"},\r
+       {BCM43430_CHIP_ID,      1,      DONT_CARE,      FALSE,  "bcm43438a1",           "nvram_ap6212a.txt"},\r
+       {BCM43430_CHIP_ID,      2,      DONT_CARE,      FALSE,  "bcm43436b0",           "nvram_ap6236.txt"},\r
        {BCM43012_CHIP_ID,      1,      DONT_CARE,      TRUE,   "bcm43013b0",           ""},\r
        {BCM4334_CHIP_ID,       3,      DONT_CARE,      FALSE,  "bcm4334b1_ag",         ""},\r
        {BCM43340_CHIP_ID,      2,      DONT_CARE,      FALSE,  "bcm43341b0_ag",        ""},\r
        {BCM43341_CHIP_ID,      2,      DONT_CARE,      FALSE,  "bcm43341b0_ag",        ""},\r
        {BCM4324_CHIP_ID,       5,      DONT_CARE,      FALSE,  "bcm43241b4_ag",        ""},\r
        {BCM4335_CHIP_ID,       2,      DONT_CARE,      FALSE,  "bcm4339a0_ag",         ""},\r
-       {BCM4339_CHIP_ID,       1,      DONT_CARE,      FALSE,  "bcm4339a0_ag",         ""},\r
-       {BCM4345_CHIP_ID,       6,      DONT_CARE,      FALSE,  "bcm43455c0_ag",        ""},\r
+       {BCM4339_CHIP_ID,       1,      DONT_CARE,      FALSE,  "bcm4339a0_ag",         "nvram_ap6335.txt"},\r
+       {BCM4345_CHIP_ID,       6,      DONT_CARE,      FALSE,  "bcm43455c0_ag",        "nvram_ap6255.txt"},\r
        {BCM43454_CHIP_ID,      6,      DONT_CARE,      FALSE,  "bcm43455c0_ag",        ""},\r
-       {BCM4345_CHIP_ID,       9,      DONT_CARE,      FALSE,  "bcm43456c5_ag",        ""},\r
+       {BCM4345_CHIP_ID,       9,      DONT_CARE,      FALSE,  "bcm43456c5_ag",        "nvram_ap6256.txt"},\r
        {BCM43454_CHIP_ID,      9,      DONT_CARE,      FALSE,  "bcm43455c5_ag",        ""},\r
        {BCM4354_CHIP_ID,       1,      DONT_CARE,      FALSE,  "bcm4354a1_ag",         ""},\r
-       {BCM4354_CHIP_ID,       2,      DONT_CARE,      FALSE,  "bcm4356a2_ag",         ""},\r
+       {BCM4354_CHIP_ID,       2,      DONT_CARE,      FALSE,  "bcm4356a2_ag",         "nvram_ap6356.txt"},\r
        {BCM4356_CHIP_ID,       2,      DONT_CARE,      FALSE,  "bcm4356a2_ag",         ""},\r
        {BCM4371_CHIP_ID,       2,      DONT_CARE,      FALSE,  "bcm4356a2_ag",         ""},\r
        {BCM43569_CHIP_ID,      3,      DONT_CARE,      FALSE,  "bcm4358a3_ag",         ""},\r
        {BCM4359_CHIP_ID,       5,      DONT_CARE,      FALSE,  "bcm4359b1_ag",         ""},\r
-       {BCM4359_CHIP_ID,       9,      DONT_CARE,      FALSE,  "bcm4359c0_ag",         ""},\r
+       {BCM4359_CHIP_ID,       9,      DONT_CARE,      FALSE,  "bcm4359c0_ag",         "nvram_ap6398.txt"},\r
        {BCM4362_CHIP_ID,       0,      DONT_CARE,      TRUE,   "bcm43752a0_ag",        ""},\r
 #endif\r
 #ifdef BCMPCIE\r
@@ -632,7 +632,7 @@ dhd_conf_set_conf_name_by_chip(dhd_pub_t *dhd, char *conf_path)
                }\r
                i--;\r
        }\r
-       name_ptr = conf_path[i];\r
+       name_ptr = &conf_path[i];\r
 \r
        for (i = 0;  i < sizeof(chip_name_map)/sizeof(chip_name_map[0]);  i++) {\r
                const cihp_name_map_t* row = &chip_name_map[i];\r

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 06232d9a99f5bd62b7da08dd0c8423115f54ccb5..f62c8efec3dc6ecd851c2859c1c3f07bfdcaf8de 100644 (file)
--- 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;