Inline USB start/stop callback tasks

dhebbeker · dhebbeker · commit 01ed8932c5ec · 2025-03-04T21:57:17.000+01:00
diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
@@ -99,19 +99,6 @@ static void switchToUSBMode()
     MSC.mediaPresent(true);
 }
 
-static void usb_stopped_cb(void *const pvParameters)
-{
-    switchToApplicationMode();
-    listFiles("/");
-    vTaskDelete(nullptr);
-}
-
-static void usb_started_cb(void *const pvParameters)
-{
-    switchToUSBMode();
-    vTaskDelete(nullptr);
-}
-
 static bool usbIsRunning = false;
 static void usbStoppedCallback(void *, esp_event_base_t, int32_t, void *)
 {
@@ -120,12 +107,14 @@ static void usbStoppedCallback(void *, esp_event_base_t, int32_t, void *)
         return;
     }
     usbIsRunning = false;
-    xTaskCreate(usb_stopped_cb, "USB_Stopped_CB", 4096, nullptr, 5, nullptr);
+    switchToApplicationMode();
+    listFiles("/");
 }
+
 static void usbStartedCallback(void *, esp_event_base_t, int32_t, void *)
 {
     usbIsRunning = true;
-    xTaskCreate(usb_started_cb, "USB_Started_CB", 4096, nullptr, 5, nullptr);
+    switchToUSBMode();
 }
 
 const esp_partition_t *check_ffat_partition(const char *label); // defined in FFat.cpp

Original file line number	Diff line number	Diff line change
`@@ -99,19 +99,6 @@ static void switchToUSBMode()`
`99`	`99`	`MSC.mediaPresent(true);`
`100`	`100`	`}`
`101`	`101`
`102`		`-static void usb_stopped_cb(void *const pvParameters)`
`103`		`-{`
`104`		`- switchToApplicationMode();`
`105`		`- listFiles("/");`
`106`		`- vTaskDelete(nullptr);`
`107`		`-}`
`108`		`-`
`109`		`-static void usb_started_cb(void *const pvParameters)`
`110`		`-{`
`111`		`- switchToUSBMode();`
`112`		`- vTaskDelete(nullptr);`
`113`		`-}`
`114`		`-`
`115`	`102`	`static bool usbIsRunning = false;`
`116`	`103`	`static void usbStoppedCallback(void , esp_event_base_t, int32_t, void )`
`117`	`104`	`{`
`@@ -120,12 +107,14 @@ static void usbStoppedCallback(void , esp_event_base_t, int32_t, void )`
`120`	`107`	`return;`
`121`	`108`	`}`
`122`	`109`	`usbIsRunning = false;`
`123`		`- xTaskCreate(usb_stopped_cb, "USB_Stopped_CB", 4096, nullptr, 5, nullptr);`
	`110`	`+ switchToApplicationMode();`
	`111`	`+ listFiles("/");`
`124`	`112`	`}`
	`113`	`+`
`125`	`114`	`static void usbStartedCallback(void , esp_event_base_t, int32_t, void )`
`126`	`115`	`{`
`127`	`116`	`usbIsRunning = true;`
`128`		`- xTaskCreate(usb_started_cb, "USB_Started_CB", 4096, nullptr, 5, nullptr);`
	`117`	`+ switchToUSBMode();`
`129`	`118`	`}`
`130`	`119`
`131`	`120`	`const esp_partition_t check_ffat_partition(const char label); // defined in FFat.cpp`