Added possibility to register a callback when MSD is detected

Former-commit-id: 59714fd

Author: maidnl

libraries/UsbHostMsd/UsbHostMsd.cpp

@@ -25,16 +25,7 @@ extern "C" uint8_t usb_host_msd_get_default_lun();
 extern "C" uint8_t usb_host_msd_get_lun_num();
 extern "C" uint32_t usb_host_msd_get_num_of_blocks(uint8_t lun);
 extern "C" uint32_t usb_host_msd_get_block_size(uint8_t lun);
-
-
-#define CBW_SIGNATURE   0x43425355
-#define CSW_SIGNATURE   0x53425355
-
-#define DEVICE_TO_HOST  0x80
-#define HOST_TO_DEVICE  0x00
-
-#define GET_MAX_LUN             (0xFE)
-#define BO_MASS_STORAGE_RESET   (0xFF)
+extern "C" void usb_host_msd_attach_mnt_cbk(void (*fnc)(void));
 
 
 /* -------------------------------------------------------------------------- */
@@ -243,3 +234,6 @@ const char *USBHostMSD::get_type() const {
     return "USBMSD";
 }
 
+bool USBHostMSD::attach_detected_callback(void (*cbk)()) {
+    usb_host_msd_attach_mnt_cbk(cbk);
+}

libraries/UsbHostMsd/UsbHostMsd.h

@@ -46,6 +46,7 @@ class USBHostMSD : public BlockDevice {
     virtual const char *get_type() const override;
     virtual bool select_lun(uint8_t lun);
     virtual uint8_t get_lun_num();
+    bool attach_detected_callback(void (*cbk)());
 
 private:
     uint8_t get_lun();

libraries/UsbHostMsd/examples/USB_HOST_MSD/USB_HOST_MSD.ino

@@ -26,16 +26,18 @@
 USBHostMSD block_device; 
 FATFileSystem fs(TEST_FS_NAME);
 
-extern "C" void log_init();
-extern "C" int mylogadd(const char *fmt, ...) ;
-extern "C" void empty_log();
-
 std::string root_folder       = std::string("/") + std::string(TEST_FS_NAME);
 std::string folder_test_name  = root_folder + std::string("/") + std::string(TEST_FOLDER_NAME);
 std::string file_test_name    = folder_test_name + std::string("/") + std::string(TEST_FILE); 
 
+/* this callback will be called when a Mass Storage Device is plugged in */
+void device_attached_callback(void) {
+  Serial.println();
+  Serial.println("++++ Mass Storage Device detected ++++");
+  Serial.println();
+}
+
 void setup() {
-  log_init();
   /*
    *  SERIAL INITIALIZATION
    */
@@ -44,8 +46,13 @@ void setup() {
 
   }
 
+  Serial.println();
   Serial.println("*** USB HOST Mass Storage Device example ***");
- 
+  Serial.println();
+  
+  /* attache the callback so that when the device is inserted the device_attached_callback
+     will be automatically called */
+  block_device.attach_detected_callback(device_attached_callback);
   /* list to store all directory in the root */
   std::vector<std::string> dir_list;
 
@@ -62,7 +69,6 @@ void setup() {
           Serial.print(".");
           if(count % 30 == 0) {
             Serial.println();
-            empty_log();
           }
         }
         count++;
@@ -105,7 +111,9 @@ void setup() {
       }
       else if(ent->d_type == DT_DIR) {
         Serial.print("- [Fold]: ");
-        dir_list.push_back(ent->d_name);
+        if(ent->d_name[0] != '.') { /* avoid hidden folders (.Trash might contain a lot of files) */
+          dir_list.push_back(ent->d_name);
+        }
       }
       Serial.println(ent->d_name);
       dirIndex++;
@@ -118,6 +126,10 @@ void setup() {
     while(1);
   }
 
+  if(dirIndex == 0) {
+    Serial.println("Empty SDCARD");
+  }
+
   bool found_test_folder = false;
 
   /* 
@@ -144,7 +156,6 @@ void setup() {
         }
         else if(ent->d_type == DT_DIR) {
           Serial.print("   - [Fold]: ");
-          dir_list.push_back(ent->d_name);
         }
         Serial.println(ent->d_name);
       }
@@ -291,9 +302,7 @@ void setup() {
       Serial.println(file_test_name.c_str());
     }
   }  
-  if(dirIndex == 0) {
-    Serial.println("Empty SDCARD");
-  }
+  
 }
 
 void loop() {

libraries/UsbHostMsd/tu_msc.c

@@ -67,7 +67,11 @@ uint32_t usb_host_msd_get_block_size(uint8_t lun) {
   return 0; 
 }
 
+static void (*mount_fnc)(void) = NULL;
 
+void usb_host_msd_attach_mnt_cbk(void (*fnc)(void)) {
+  mount_fnc = fnc;
+}
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
@@ -121,6 +125,10 @@ void tuh_msc_mount_cb(uint8_t dev_addr) {
       }
     }
     device_address = dev_addr;
+
+    if(mount_fnc != NULL) {
+      mount_fnc();
+    }
   }