Merge branch 'bugfix/fix_link_err_for_vol_range' into 'master'

jason-mao · jason-mao · commit 48ad8b7e3794 · 2025-08-04T10:27:37.000+08:00
bugfix(esp_codec_dev): Fix link error for multiple definition of vol_range

See merge request adf/esp-adf-internal!1429
diff --git a/components/esp_codec_dev/CHANGELOG.md b/components/esp_codec_dev/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.3.7
+
+### Bug Fixed
+
+- Fixed link error for `vol_range` redefinition.
+
 ## v1.3.6
 
 ### Feature
diff --git a/components/esp_codec_dev/device/aw88298/aw88298.c b/components/esp_codec_dev/device/aw88298/aw88298.c
@@ -24,7 +24,7 @@ typedef struct {
    Volume control register 0x0C description:
        0xC0 - '-96dB' ... 0x00 - '+0dB'
 */
-const esp_codec_dev_vol_range_t vol_range = {
+static const esp_codec_dev_vol_range_t vol_range = {
     .min_vol =
     {
         .vol = 0xC0,
diff --git a/components/esp_codec_dev/device/es8156/es8156.c b/components/esp_codec_dev/device/es8156/es8156.c
@@ -27,7 +27,7 @@ typedef struct {
    Volume control register 0x14 description:
        0x00 - '-95.5dB' ... 0xFF - '+32dB'
 */
-const esp_codec_dev_vol_range_t vol_range = {
+static const esp_codec_dev_vol_range_t vol_range = {
     .min_vol =
     {
         .vol = 0x0,

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ typedef struct {`
`24`	`24`	`Volume control register 0x0C description:`
`25`	`25`	`0xC0 - '-96dB' ... 0x00 - '+0dB'`
`26`	`26`	`*/`
`27`		`-const esp_codec_dev_vol_range_t vol_range = {`
	`27`	`+static const esp_codec_dev_vol_range_t vol_range = {`
`28`	`28`	`.min_vol =`
`29`	`29`	`{`
`30`	`30`	`.vol = 0xC0,`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ typedef struct {`
`27`	`27`	`Volume control register 0x14 description:`
`28`	`28`	`0x00 - '-95.5dB' ... 0xFF - '+32dB'`
`29`	`29`	`*/`
`30`		`-const esp_codec_dev_vol_range_t vol_range = {`
	`30`	`+static const esp_codec_dev_vol_range_t vol_range = {`
`31`	`31`	`.min_vol =`
`32`	`32`	`{`
`33`	`33`	`.vol = 0x0,`