esp32/usb: Fix building with USB CDC disabled.

agatti · agatti · commit 40306666da47 · 2025-07-25T22:48:35.000+02:00
This commit fixes the build issues in the ESP32 port that arise when
explicitly disabling USB CDC support.

The USB support code gated the USB serial number retrieval behind the
USB CDC support definition, even though all USB devices must be able to
be queried for their serial number.

Signed-off-by: Alessandro Gatti &lt;a.gatti@frob.it&gt;
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
@@ -28,13 +28,16 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if MICROPY_HW_USB_CDC
-#include "esp_rom_gpio.h"
+#if MICROPY_HW_ENABLE_USBDEV
+
 #include "esp_mac.h"
-#include "esp_private/usb_phy.h"
 
 #include "shared/tinyusb/mp_usbd.h"
 
+#if MICROPY_HW_USB_CDC
+#include "esp_rom_gpio.h"
+#include "esp_private/usb_phy.h"
+
 static usb_phy_handle_t phy_hdl;
 
 
@@ -69,6 +72,8 @@ void usb_usj_mode(void) {
 }
 #endif
 
+#endif // MICROPY_HW_USB_CDC
+
 void mp_usbd_port_get_serial_number(char *serial_buf) {
     // use factory default MAC as serial ID
     uint8_t mac[8];
@@ -77,4 +82,4 @@ void mp_usbd_port_get_serial_number(char *serial_buf) {
     mp_usbd_hex_str(serial_buf, mac, sizeof(mac));
 }
 
-#endif // MICROPY_HW_USB_CDC
+#endif // MICROPY_HW_ENABLE_USBDEV
