Merge branch 'contrib/github_pr_10950' into 'master'

esp_system: Add reset reasons for USB_UART and USB_JTAG (GitHub PR)

Closes IDFGH-9601

See merge request espressif/esp-idf!22675

components/esp_system/include/esp_system.h

@@ -33,6 +33,7 @@ typedef enum {
     ESP_RST_DEEPSLEEP,  //!< Reset after exiting deep sleep mode
     ESP_RST_BROWNOUT,   //!< Brownout reset (software or hardware)
     ESP_RST_SDIO,       //!< Reset over SDIO
+    ESP_RST_USB,        //!< Reset by USB peripheral
 } esp_reset_reason_t;
 
 /**

components/esp_system/port/soc/esp32c3/reset_reason.c

@@ -53,6 +53,10 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
     case RESET_REASON_SYS_BROWN_OUT:
         return ESP_RST_BROWNOUT;
 
+    case RESET_REASON_CORE_USB_UART:
+    case RESET_REASON_CORE_USB_JTAG:
+        return ESP_RST_USB;
+
     default:
         return ESP_RST_UNKNOWN;
     }

components/esp_system/port/soc/esp32c6/reset_reason.c

@@ -50,6 +50,10 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
     case RESET_REASON_SYS_BROWN_OUT:
         return ESP_RST_BROWNOUT;
 
+    case RESET_REASON_CORE_USB_UART:
+    case RESET_REASON_CORE_USB_JTAG:
+        return ESP_RST_USB;
+
     default:
         return ESP_RST_UNKNOWN;
     }

components/esp_system/port/soc/esp32h2/reset_reason.c

@@ -50,6 +50,10 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
     case RESET_REASON_SYS_BROWN_OUT:
         return ESP_RST_BROWNOUT;
 
+    case RESET_REASON_CORE_USB_UART:
+    case RESET_REASON_CORE_USB_JTAG:
+        return ESP_RST_USB;
+
     default:
         return ESP_RST_UNKNOWN;
     }

components/esp_system/port/soc/esp32h4/reset_reason.c

@@ -50,6 +50,10 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
     case RESET_REASON_SYS_BROWN_OUT:
         return ESP_RST_BROWNOUT;
 
+    case RESET_REASON_CORE_USB_UART:
+    case RESET_REASON_CORE_USB_JTAG:
+        return ESP_RST_USB;
+
     default:
         return ESP_RST_UNKNOWN;
     }

components/esp_system/port/soc/esp32s3/reset_reason.c

@@ -50,6 +50,10 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
     case RESET_REASON_SYS_BROWN_OUT:
         return ESP_RST_BROWNOUT;
 
+    case RESET_REASON_CORE_USB_UART:
+    case RESET_REASON_CORE_USB_JTAG:
+        return ESP_RST_USB;
+
     default:
         return ESP_RST_UNKNOWN;
     }