From 006b95f38460decd73474b77c4fd9e9eb84a4409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20M=C3=BAdry?= <adam.mudry@espressif.com>
Date: Tue, 16 Sep 2025 14:46:27 +0200
Subject: [PATCH] fix: Update cherryusb_host and examples using esp_tinyusb and
 usb_host_msc

---
 .../peripherals/usb/device/tusb_hid/main/idf_component.yml | 2 +-
 .../usb/device/tusb_midi/main/idf_component.yml            | 2 +-
 .../peripherals/usb/device/tusb_msc/main/idf_component.yml | 2 +-
 .../peripherals/usb/device/tusb_ncm/main/idf_component.yml | 2 +-
 examples/peripherals/usb/host/cherryusb_host/main/msc.c    | 7 ++++++-
 examples/peripherals/usb/host/msc/main/idf_component.yml   | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml b/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml
index 03340b8fe0..e1a93a262e 100644
--- a/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml
+++ b/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml
@@ -1,4 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp_tinyusb:
-    version: "^2.0.0"
+    version: "^2.0.1~1"
diff --git a/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml b/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml
index 03340b8fe0..e1a93a262e 100644
--- a/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml
+++ b/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml
@@ -1,4 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp_tinyusb:
-    version: "^2.0.0"
+    version: "^2.0.1~1"
diff --git a/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml b/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml
index 03340b8fe0..e1a93a262e 100644
--- a/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml
+++ b/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml
@@ -1,4 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp_tinyusb:
-    version: "^2.0.0"
+    version: "^2.0.1~1"
diff --git a/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml b/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml
index 03340b8fe0..e1a93a262e 100644
--- a/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml
+++ b/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml
@@ -1,4 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp_tinyusb:
-    version: "^2.0.0"
+    version: "^2.0.1~1"
diff --git a/examples/peripherals/usb/host/cherryusb_host/main/msc.c b/examples/peripherals/usb/host/cherryusb_host/main/msc.c
index 97f897c812..346851eea6 100644
--- a/examples/peripherals/usb/host/cherryusb_host/main/msc.c
+++ b/examples/peripherals/usb/host/cherryusb_host/main/msc.c
@@ -273,7 +273,12 @@ esp_err_t msc_host_vfs_register(struct usbh_msc *msc_class,
     strcpy(vfs->base_path, base_path);
     vfs->pdrv = pdrv;
 
-    ret = esp_vfs_fat_register(base_path, drive, mount_config->max_files, &fs);
+    esp_vfs_fat_conf_t conf = {
+        .base_path = base_path,
+        .fat_drive = drive,
+        .max_files = mount_config->max_files,
+    };
+    ret = esp_vfs_fat_register_cfg(&conf, &fs);
     ESP_GOTO_ON_ERROR(ret, fail, TAG, "Failed to register filesystem, error=%s", esp_err_to_name(ret));
     vfs->fs = fs;
 
diff --git a/examples/peripherals/usb/host/msc/main/idf_component.yml b/examples/peripherals/usb/host/msc/main/idf_component.yml
index 198a93bbf4..df732fdb80 100644
--- a/examples/peripherals/usb/host/msc/main/idf_component.yml
+++ b/examples/peripherals/usb/host/msc/main/idf_component.yml
@@ -1,4 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
   idf: ">=4.4"
-  usb_host_msc: "^1.1.1"
+  usb_host_msc: "^1.1.4"