Merge pull request arduino#71 from bcmi-labs/mbr_fix_main

MBRBlockDevice fixes and cleanup

Author: facchinm

libraries/BlockDevices/BlockDevice.cpp

@@ -0,0 +1,26 @@
+/*
+  BlockDevice.cpp
+  Copyright (c) 2023 Arduino SA.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <QSPIFlashBlockDevice.h>
+
+BlockDevice *BlockDevice::get_default_instance()
+{
+    static QSPIFlashBlockDevice default_bd(PIN_QSPI_CLK, PIN_QSPI_SS, PIN_QSPI_D0, PIN_QSPI_D1, PIN_QSPI_D2, PIN_QSPI_D3); 
+    return &default_bd;
+}

libraries/BlockDevices/blockDevice.h renamed to libraries/BlockDevices/BlockDevice.h

@@ -1,5 +1,5 @@
 /* ########################################################################## */
-/* - File: blockDevice.h
+/* - File: BlockDevice.h
    - Copyright (c): 2022 Arduino srl.  All right reserved.
    - Author: Daniele Aimo ([email protected])
 
@@ -23,6 +23,7 @@
 #define ARDUINO_BLOCK_DEVICE
 #include "Arduino.h"
 #include <stdint.h>
+#include "../Storage/storage_common.h"
 
 #define  BLOCK_DEVICE_OK (0)
 #define  BD_ERROR_OK      (0)
@@ -34,7 +35,7 @@ typedef uint32_t bd_size_t;
 typedef pin_size_t pin_t;
 
 /* -------------------------------------------------------------------------- */
-/* Abstract Base blockDevice class (defines the INTERFACE for all the 
+/* Abstract Base BlockDevice class (defines the INTERFACE for all the 
    subclass)                                                                  */
 /* -------------------------------------------------------------------------- */   
 
@@ -52,6 +53,8 @@ class BlockDevice {
    BlockDevice(BlockDevice const&) = delete;
    void operator=(BlockDevice const&) = delete;
 
+   static BlockDevice *get_default_instance();
+
    virtual ~BlockDevice() = default; 
    /* initialize a block device */
    virtual int init() = 0;

libraries/BlockDevices/BufferedBlockDevice.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "BufferedBlockDevice.h"
-#include "../Storage/storage_common.h"
 #include <algorithm>
 #include <string.h>
 

libraries/BlockDevices/BufferedBlockDevice.h

@@ -21,7 +21,7 @@
 #ifndef ARDUINO_BUFFERED_BLOCK_DEVICE_H
 #define ARDUINO_BUFFERED_BLOCK_DEVICE_H
 
-#include "blockDevice.h"
+#include "BlockDevice.h"
 
 //namespace mbed {
 

libraries/BlockDevices/ChainingBlockDevice.cpp

@@ -17,7 +17,6 @@
 
 #include "ChainingBlockDevice.h"
 
-
 //namespace mbed {
 
 ChainingBlockDevice::ChainingBlockDevice(BlockDevice **bds, size_t bd_count)

libraries/BlockDevices/ChainingBlockDevice.h

@@ -21,8 +21,7 @@
 #ifndef ARDUINO_CHAINING_BLOCK_DEVICE_H
 #define ARDUINO_CHAINING_BLOCK_DEVICE_H
 
-#include "blockDevice.h"
-#include "../Storage/storage_common.h"
+#include "BlockDevice.h"
 #include <stdlib.h>
 
 //namespace mbed {

libraries/BlockDevices/DataFlashBlockDevice.h

@@ -23,7 +23,7 @@
 //#define DATA_FLASH_DEBUG
 
 /* base class for block devices */
-#include "blockDevice.h"
+#include "BlockDevice.h"
 
 /* Arduino.h to include the defines of the flash type LP or HP*/
 #include "Arduino.h"

libraries/BlockDevices/ExhaustibleBlockDevice.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "ExhaustibleBlockDevice.h"
-#include "../Storage/storage_common.h"
 
 //namespace mbed {
 

libraries/BlockDevices/ExhaustibleBlockDevice.h

@@ -21,7 +21,7 @@
 #ifndef ARDUINO_EXHAUSTIBLE_BLOCK_DEVICE_H
 #define ARDUINO_EXHAUSTIBLE_BLOCK_DEVICE_H
 
-#include "blockDevice.h"
+#include "BlockDevice.h"
 
 //namespace mbed {
 

libraries/BlockDevices/FlashSimBlockDevice.cpp

@@ -16,12 +16,10 @@
  */
 
 #include "FlashSimBlockDevice.h"
-#include "../Storage/storage_common.h"
 #include <algorithm>
 #include <stdlib.h>
 #include <string.h>
 
-
 //namespace mbed {
 
 static const bd_size_t min_blank_buf_size = 32;