This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new f6b8cc1407 wireless/bcm430xx: rename chip minor id to 'x'
f6b8cc1407 is described below
commit f6b8cc140752c1ea35a9e10d32824eb701956ffe
Author: chao.an <anc...@xiaomi.com>
AuthorDate: Tue Jun 14 14:36:58 2022 +0800
wireless/bcm430xx: rename chip minor id to 'x'
rename 4301x chip minor id to 'x' to compatible more versions of variant of
bcm430xx
Signed-off-by: chao.an <anc...@xiaomi.com>
---
drivers/wireless/ieee80211/bcm43xxx/Kconfig | 6 +++---
drivers/wireless/ieee80211/bcm43xxx/Make.defs | 4 ++--
.../{bcmf_chip_43013.c => bcmf_chip_4301x.c} | 20 ++++++++++----------
drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c | 10 ++++++----
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c | 11 ++++++-----
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h | 3 ++-
6 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/drivers/wireless/ieee80211/bcm43xxx/Kconfig
b/drivers/wireless/ieee80211/bcm43xxx/Kconfig
index 53b76b52c0..768a59d4b9 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/Kconfig
+++ b/drivers/wireless/ieee80211/bcm43xxx/Kconfig
@@ -11,8 +11,8 @@ config IEEE80211_BROADCOM_HAVE_CLM
bool
default n
-config IEEE80211_BROADCOM_BCM43013
- bool "Broadcom 43013 chip support"
+config IEEE80211_BROADCOM_BCM4301X
+ bool "Broadcom 4301x chip support"
depends on IEEE80211_BROADCOM_FULLMAC
default n
select IEEE80211_BROADCOM_HAVE_CLM
@@ -37,7 +37,7 @@ config IEEE80211_BROADCOM_BCM43455
config IEEE80211_BROADCOM_FWFILES
bool "Firmware files"
default y
- depends on IEEE80211_BROADCOM_BCM43013 || \
+ depends on IEEE80211_BROADCOM_BCM4301X || \
IEEE80211_BROADCOM_BCM43362 || \
IEEE80211_BROADCOM_BCM43438 || \
IEEE80211_BROADCOM_BCM43455
diff --git a/drivers/wireless/ieee80211/bcm43xxx/Make.defs
b/drivers/wireless/ieee80211/bcm43xxx/Make.defs
index b2632c5c23..42e345e912 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/Make.defs
+++ b/drivers/wireless/ieee80211/bcm43xxx/Make.defs
@@ -33,8 +33,8 @@ ifeq ($(CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO),y)
CSRCS += bcmf_sdpcm.c
endif
-ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM43013),y)
-CSRCS += bcmf_chip_43013.c
+ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM4301X),y)
+CSRCS += bcmf_chip_4301x.c
endif
ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM43362),y)
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c
b/drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
similarity index 82%
rename from drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c
rename to drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
index 90133d7d78..7fdbea81ef 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c
+ * drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -37,15 +37,15 @@
* Public Data
****************************************************************************/
-extern const char bcm43013_nvram_image[];
-extern const unsigned int bcm43013_nvram_image_len;
+extern const char bcm4301x_nvram_image[];
+extern const unsigned int bcm4301x_nvram_image_len;
#ifndef CONFIG_IEEE80211_BROADCOM_FWFILES
-extern const uint8_t bcm43013_firmware_image[];
-extern const unsigned int bcm43013_firmware_image_len;
+extern const uint8_t bcm4301x_firmware_image[];
+extern const unsigned int bcm4301x_firmware_image_len;
#endif
-const struct bcmf_sdio_chip bcmf_43013_config_sdio =
+const struct bcmf_sdio_chip bcmf_4301x_config_sdio =
{
/* General chip stats */
@@ -69,12 +69,12 @@ const struct bcmf_sdio_chip bcmf_43013_config_sdio =
/* TODO find something smarter than using image_len references */
- .nvram_image = (FAR uint8_t *)bcm43013_nvram_image,
- .nvram_image_size = (FAR unsigned int *)&bcm43013_nvram_image_len,
+ .nvram_image = (FAR uint8_t *)bcm4301x_nvram_image,
+ .nvram_image_size = (FAR unsigned int *)&bcm4301x_nvram_image_len,
#ifndef CONFIG_IEEE80211_BROADCOM_FWFILES
- .firmware_image = (FAR uint8_t *)bcm43013_firmware_image,
- .firmware_image_size = (FAR unsigned int *)&bcm43013_firmware_image_len,
+ .firmware_image = (FAR uint8_t *)bcm4301x_firmware_image,
+ .firmware_image_size = (FAR unsigned int *)&bcm4301x_firmware_image_len,
#endif
};
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c
b/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c
index 5ad5c93121..53707a1da0 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c
@@ -439,13 +439,14 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s
*sbus)
switch (sbus->cur_chip_id)
{
-#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \
+#if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
+ case SDIO_DEVICE_ID_BROADCOM_43012:
+ case SDIO_DEVICE_ID_BROADCOM_43013:
case SDIO_DEVICE_ID_BROADCOM_43362:
case SDIO_DEVICE_ID_BROADCOM_43430:
- case SDIO_DEVICE_ID_BROADCOM_43013:
/* Disable ARMCM3 core and reset SOCRAM core to set device in
* firmware upload mode
*/
@@ -523,13 +524,14 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s
*sbus)
switch (sbus->cur_chip_id)
{
-#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \
+#if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
+ case SDIO_DEVICE_ID_BROADCOM_43012:
+ case SDIO_DEVICE_ID_BROADCOM_43013:
case SDIO_DEVICE_ID_BROADCOM_43362:
case SDIO_DEVICE_ID_BROADCOM_43430:
- case SDIO_DEVICE_ID_BROADCOM_43013:
up_mdelay(10);
bcmf_core_reset(sbus, WLAN_ARMCM3_CORE_ID, 0, 0, 0);
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
index ec11996c44..fa200d4ff7 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
@@ -75,8 +75,8 @@
/* Supported chip configurations */
-#ifdef CONFIG_IEEE80211_BROADCOM_BCM43013
- extern const struct bcmf_sdio_chip bcmf_43013_config_sdio;
+#ifdef CONFIG_IEEE80211_BROADCOM_BCM4301X
+ extern const struct bcmf_sdio_chip bcmf_4301x_config_sdio;
#endif
#ifdef CONFIG_IEEE80211_BROADCOM_BCM43362
extern const struct bcmf_sdio_chip bcmf_43362_config_sdio;
@@ -816,10 +816,11 @@ int bcmf_chipinitialize(FAR struct bcmf_sdio_dev_s *sbus)
switch (chipid)
{
-#ifdef CONFIG_IEEE80211_BROADCOM_BCM43013
+#ifdef CONFIG_IEEE80211_BROADCOM_BCM4301X
+ case SDIO_DEVICE_ID_BROADCOM_43012:
case SDIO_DEVICE_ID_BROADCOM_43013:
- wlinfo("bcm43013 chip detected\n");
- sbus->chip = (struct bcmf_sdio_chip *)&bcmf_43013_config_sdio;
+ wlinfo("bcm%d chip detected\n", chipid);
+ sbus->chip = (struct bcmf_sdio_chip *)&bcmf_4301x_config_sdio;
break;
#endif
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h
b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h
index e97cc66052..936135d386 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h
@@ -36,6 +36,7 @@
/* SDIO device ID */
+#define SDIO_DEVICE_ID_BROADCOM_43012 43012
#define SDIO_DEVICE_ID_BROADCOM_43013 43013
#define SDIO_DEVICE_ID_BROADCOM_43143 43143
#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324
@@ -86,7 +87,7 @@ enum
CHIPCOMMON_CORE_ID = 0,
DOT11MAC_CORE_ID,
SDIOD_CORE_ID,
-#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \
+#if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
WLAN_ARMCM3_CORE_ID,
