fix(usb_mode_detection): Fix USB mode detection on ESP32-C5 and ESP32-C61

Closes #1140

Author: radimkarnis

esptool/targets/esp32c5.py

@@ -60,7 +60,7 @@ class ESP32C5ROM(ESP32C6ROM):
     PCR_SYSCLK_XTAL_FREQ_V = 0x7F << 24
     PCR_SYSCLK_XTAL_FREQ_S = 24
 
-    UARTDEV_BUF_NO = 0x4085F51C  # Variable in ROM .bss which indicates the port in use
+    UARTDEV_BUF_NO = 0x4085F514  # Variable in ROM .bss which indicates the port in use
 
     FLASH_FREQUENCY = {
         "80m": 0xF,

esptool/targets/esp32c61.py

@@ -44,6 +44,19 @@ class ESP32C61ROM(ESP32C6ROM):
     EFUSE_SECURE_BOOT_EN_REG = EFUSE_BASE + 0x034
     EFUSE_SECURE_BOOT_EN_MASK = 1 << 26
 
+    # Variable in ROM .bss which indicates the port in use
+    @property
+    def UARTDEV_BUF_NO(self):
+        """Variable .bss.UartDev.buff_uart_no in ROM .bss
+        which indicates the port in use.
+        """
+        return 0x4084F5EC if self.get_chip_revision() <= 2 else 0x4084F5E4
+
+    @property
+    def UARTDEV_BUF_NO_USB_JTAG_SERIAL(self):
+        """The above var when USB-JTAG/Serial is used."""
+        return 3 if self.get_chip_revision() <= 2 else 4
+
     FLASH_FREQUENCY = {
         "80m": 0xF,
         "40m": 0x0,