debug logs added

Former-commit-id: 29022d6

Author: maidnl

cores/arduino/usb/USB.cpp

@@ -380,7 +380,7 @@ extern "C" __attribute((weak)) void tud_hid_set_report_cb(uint8_t instance, uint
     (void) buffer;
     (void) bufsize;
 }
-extern "C" int mylogadd(const char *fmt, ...) ;
+
 
 extern "C" __attribute((weak))  int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize) {
 

libraries/BlockDevices/MBRBlockDevice.cpp

@@ -20,6 +20,8 @@
 #include <algorithm>
 #include <string.h>
 
+//#define DEBUG_MSD
+extern "C" int mylogadd(const char *fmt, ...) ;
 //namespace mbed {
 
 // On disk structures, all entries are little endian
@@ -287,10 +289,23 @@ int MBRBlockDevice::init()
 
     // Get partition attributes
     sector = std::max<uint32_t>(_bd->get_erase_size(), 512);
+    #ifdef DEBUG_MSD
+    mylogadd("MBR sectort %i", sector);
+    #endif
+
     _type = table->entries[_part - 1].type;
     _offset = fromle32(table->entries[_part - 1].lba_offset) * sector;
+    #ifdef DEBUG_MSD
+    mylogadd("MBR _offset %i", _offset);
+    #endif
+
     _size   = fromle32(table->entries[_part - 1].lba_size)   * sector;
 
+    #ifdef DEBUG_MSD
+    mylogadd("MBR _size %i", _size);
+    #endif
+    
+
     // Check that block addresses are valid
     if (!_bd->is_valid_erase(_offset, _size)) {
         err = BD_ERROR_INVALID_PARTITION;
@@ -342,7 +357,9 @@ int MBRBlockDevice::read(void *b, bd_addr_t addr, bd_size_t size)
     if (!is_valid_read(addr, size)) {
         return BD_ERROR_DEVICE_ERROR;
     }
-
+    #ifdef DEBUG_MSD
+    mylogadd("MBR READ %i, %i", addr + _offset, size);
+    #endif
     return _bd->read(b, addr + _offset, size);
 }
 
@@ -355,7 +372,9 @@ int MBRBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
     if (!is_valid_program(addr, size)) {
         return BD_ERROR_DEVICE_ERROR;
     }
-
+    #ifdef DEBUG_MSD
+    mylogadd("MBR WRITE %i, %i", addr + _offset, size);
+    #endif
     return _bd->program(b, addr + _offset, size);
 }
 

libraries/BlockDevices/QSPIFlashBlockDevice.cpp

@@ -21,6 +21,8 @@
 
 #ifdef HAS_QSPI
 
+
+extern "C" int mylogadd(const char *fmt, ...) ;
 /* -------------------------------------------------------------------------- */
 /*                               CONSTRUCTOR                                  */
 /* -------------------------------------------------------------------------- */
@@ -91,16 +93,20 @@ int QSPIFlashBlockDevice::program(const void *buffer, bd_addr_t addr, bd_size_t
    return write(buffer, addr, _size);
 }
 
+#ifdef DEBUG_MSD
+extern "C" int mylogadd(const char *fmt, ...) ;
+#endif
+
 /* -------------------------------------------------------------------------- */
 /*                                  OPEN                                      */
 /* -------------------------------------------------------------------------- */
 int QSPIFlashBlockDevice::open() {
    fsp_err_t rv = (fsp_err_t)BLOCK_DEVICE_OK;
-   static bool opened = false;
-
+   
    if(!opened) {
-
+      
       opened = true;
+
       R_IOPORT_PinCfg(NULL, g_pin_cfg[ck].pin,  (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_QSPI));
       R_IOPORT_PinCfg(NULL, g_pin_cfg[cs].pin,  (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_QSPI));
       R_IOPORT_PinCfg(NULL, g_pin_cfg[io0].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_QSPI));
@@ -191,17 +197,19 @@ int QSPIFlashBlockDevice::read(void *buffer, bd_addr_t add, bd_size_t _size) {
 
    if(!opened) {
       rv = (fsp_err_t)open();
-   }
-
-   if(rv != BLOCK_DEVICE_OK) {
-      return rv;
+      if(rv != BLOCK_DEVICE_OK) {
+         return rv;
+      }
    }
 
    if(buffer == nullptr) {
       rv = FSP_ERR_INVALID_ARGUMENT;
    }
    else {
       if(is_address_correct(add+_size-1)) {
+         #ifdef DEBUG_MSD
+         mylogadd("QSPI READ %i, %i", add, _size);
+         #endif
          rv = (fsp_err_t)BLOCK_DEVICE_OK;
          int64_t internal_size = _size;
          uint32_t byte_left_in_bank = read_block_size - read_block_size % add;
@@ -231,6 +239,8 @@ int QSPIFlashBlockDevice::read(void *buffer, bd_addr_t add, bd_size_t _size) {
    return (int)rv; 
 }
 
+#define INTERNAL_BLOCK_SIZE 256
+
 /* -------------------------------------------------------------------------- */
 /* WRITE 'size' byte form buffer to the "logical" address specified by 'addr' 
    NOTE: buffer MUST be equal or greater than 'size'                          */
@@ -240,20 +250,21 @@ int QSPIFlashBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _si
 
    if(!opened) {
       rv = (fsp_err_t)open();
+      if(rv != BLOCK_DEVICE_OK) {
+         return rv;
+      }
    }
 
-   if(rv != BLOCK_DEVICE_OK) {
-      return rv;
-   }
-
-
    if(buffer == nullptr) {
       rv = FSP_ERR_INVALID_ARGUMENT;
    }
    else {
       if(is_address_correct(add+_size-1)) {
+         #ifdef DEBUG_MSD
+         mylogadd("QSPI WRITE %i, %i", add, _size);
+         #endif
          int64_t internal_size = _size;
-         uint32_t bytes_left_in_page = write_block_size - (add % write_block_size);
+         uint32_t bytes_left_in_page = INTERNAL_BLOCK_SIZE - (add % INTERNAL_BLOCK_SIZE);
          uint8_t *source = (uint8_t *)buffer;
          rv = FSP_SUCCESS;
          while(internal_size > 0 && rv == FSP_SUCCESS) {
@@ -277,7 +288,7 @@ int QSPIFlashBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _si
             internal_size -= bytes_to_write;
             source += bytes_to_write;
             add += bytes_to_write;
-            bytes_left_in_page = write_block_size;
+            bytes_left_in_page = INTERNAL_BLOCK_SIZE;
             if(rv == FSP_SUCCESS)
                rv = get_flash_status();
          }
@@ -302,13 +313,11 @@ int QSPIFlashBlockDevice::erase(bd_addr_t add, bd_size_t _size) {
 
    if(!opened) {
       rv = (fsp_err_t)open();
+      if(rv != BLOCK_DEVICE_OK) {
+         return rv;
+      }
    }
 
-   if(rv != BLOCK_DEVICE_OK) {
-      return rv;
-   }
-
-
    if(is_address_correct(add+_size-1)) {
       int64_t internal_size = _size;
       /* get the starting address of the block */