DataFlashBlockDevice: Makes default configuration to use mbed_lib.json settings

DataFlashBlockDevice parameters come from mbed_lib.json if not provided
explicitly.

Author: Veijo Pesonen

components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h

@@ -23,6 +23,21 @@
 #include "drivers/SPI.h"
 #include "drivers/DigitalOut.h"
 
+#ifndef MBED_CONF_DATAFLASH_SPI_MOSI
+#define MBED_CONF_DATAFLASH_SPI_MOSI NC
+#endif
+#ifndef MBED_CONF_DATAFLASH_SPI_MISO
+#define MBED_CONF_DATAFLASH_SPI_MISO NC
+#endif
+#ifndef MBED_CONF_DATAFLASH_SPI_CLK
+#define MBED_CONF_DATAFLASH_SPI_CLK NC
+#endif
+#ifndef MBED_CONF_DATAFLASH_SPI_CS
+#define MBED_CONF_DATAFLASH_SPI_CS NC
+#endif
+#ifndef MBED_CONF_DATAFLASH_SPI_FREQ
+#define MBED_CONF_DATAFLASH_SPI_FREQ 40000000
+#endif
 
 /** BlockDevice for DataFlash flash devices
  *
@@ -72,13 +87,14 @@ class DataFlashBlockDevice : public mbed::BlockDevice {
      *  @param csel     SPI chip select pin
      *  @param nowp     GPIO not-write-protect
      *  @param freq     Clock speed of the SPI bus (defaults to 40MHz)
+     *  @param nwp      Not-write-protected pin
      */
-    DataFlashBlockDevice(PinName mosi,
-                         PinName miso,
-                         PinName sclk,
-                         PinName csel,
+    DataFlashBlockDevice(PinName mosi = MBED_CONF_DATAFLASH_SPI_MOSI,
+                         PinName miso = MBED_CONF_DATAFLASH_SPI_MISO,
+                         PinName sclk = MBED_CONF_DATAFLASH_SPI_CLK,
+                         PinName csel = MBED_CONF_DATAFLASH_SPI_CS,
                          int freq = MBED_CONF_DATAFLASH_SPI_FREQ,
-                         PinName nowp = NC);
+                         PinName nwp = NC);
 
     /** Initialize a block device
      *

features/storage/system_storage/SystemStorage.cpp

@@ -82,12 +82,7 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
 
 #elif COMPONENT_DATAFLASH
 
-    static DataFlashBlockDevice default_bd(
-        MBED_CONF_DATAFLASH_SPI_MOSI,
-        MBED_CONF_DATAFLASH_SPI_MISO,
-        MBED_CONF_DATAFLASH_SPI_CLK,
-        MBED_CONF_DATAFLASH_SPI_CS
-    );
+    static DataFlashBlockDevice default_bd;
 
     return &default_bd;