Merge branch 'fix/usb-hal-dwc-host-channel-num' into 'master'

igi540 · igi540 · commit d53b0a91113d · 2025-02-26T21:19:51.000+08:00
fix(usb/hal/dwc): Correct host channel number calculation

See merge request espressif/esp-idf!37173
diff --git a/components/hal/esp32p4/include/hal/usb_dwc_ll.h b/components/hal/esp32p4/include/hal/usb_dwc_ll.h
@@ -362,7 +362,7 @@ static inline unsigned usb_dwc_ll_ghwcfg_get_hsphy_type(usb_dwc_dev_t *hw)
 
 static inline unsigned usb_dwc_ll_ghwcfg_get_channel_num(usb_dwc_dev_t *hw)
 {
-    return hw->ghwcfg2_reg.numhstchnl;
+    return hw->ghwcfg2_reg.numhstchnl + 1;
 }
 
 // --------------------------- HPTXFSIZ Register -------------------------------
diff --git a/components/hal/esp32s2/include/hal/usb_dwc_ll.h b/components/hal/esp32s2/include/hal/usb_dwc_ll.h
@@ -361,7 +361,7 @@ static inline unsigned usb_dwc_ll_ghwcfg_get_hsphy_type(usb_dwc_dev_t *hw)
 
 static inline unsigned usb_dwc_ll_ghwcfg_get_channel_num(usb_dwc_dev_t *hw)
 {
-    return hw->ghwcfg2_reg.numhstchnl;
+    return hw->ghwcfg2_reg.numhstchnl + 1;
 }
 
 // --------------------------- HPTXFSIZ Register -------------------------------
diff --git a/components/hal/esp32s3/include/hal/usb_dwc_ll.h b/components/hal/esp32s3/include/hal/usb_dwc_ll.h
@@ -361,7 +361,7 @@ static inline unsigned usb_dwc_ll_ghwcfg_get_hsphy_type(usb_dwc_dev_t *hw)
 
 static inline unsigned usb_dwc_ll_ghwcfg_get_channel_num(usb_dwc_dev_t *hw)
 {
-    return hw->ghwcfg2_reg.numhstchnl;
+    return hw->ghwcfg2_reg.numhstchnl + 1;
 }
 
 // --------------------------- HPTXFSIZ Register -------------------------------

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ static inline unsigned usb_dwc_ll_ghwcfg_get_hsphy_type(usb_dwc_dev_t *hw)`
`362`	`362`
`363`	`363`	`static inline unsigned usb_dwc_ll_ghwcfg_get_channel_num(usb_dwc_dev_t *hw)`
`364`	`364`	`{`
`365`		`- return hw->ghwcfg2_reg.numhstchnl;`
	`365`	`+ return hw->ghwcfg2_reg.numhstchnl + 1;`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`// --------------------------- HPTXFSIZ Register -------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ static inline unsigned usb_dwc_ll_ghwcfg_get_hsphy_type(usb_dwc_dev_t *hw)`
`361`	`361`
`362`	`362`	`static inline unsigned usb_dwc_ll_ghwcfg_get_channel_num(usb_dwc_dev_t *hw)`
`363`	`363`	`{`
`364`		`- return hw->ghwcfg2_reg.numhstchnl;`
	`364`	`+ return hw->ghwcfg2_reg.numhstchnl + 1;`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`// --------------------------- HPTXFSIZ Register -------------------------------`