Merge pull request #13917 from LDong-Arm/move_SFDP

0xc0170 · web-flow · commit be295e42a470 · 2020-12-10T13:03:23.000Z
Move SFDP to blockdevice
diff --git a/drivers/device_key/CMakeLists.txt b/drivers/device_key/CMakeLists.txt
@@ -12,7 +12,6 @@ target_include_directories(mbed-device_key
 target_sources(mbed-device_key
     INTERFACE
         source/DeviceKey.cpp
-        ../source/SFDP.cpp
 )
 
 target_link_libraries(mbed-device_key
diff --git a/storage/blockdevice/CMakeLists.txt b/storage/blockdevice/CMakeLists.txt
@@ -31,6 +31,7 @@ target_include_directories(mbed-storage-blockdevice
         .
         ./include
         ./include/blockdevice
+        ./include/blockdevice/internal
 )
 
 target_sources(mbed-storage-blockdevice
@@ -44,5 +45,6 @@ target_sources(mbed-storage-blockdevice
         source/ObservingBlockDevice.cpp
         source/ProfilingBlockDevice.cpp
         source/ReadOnlyBlockDevice.cpp
+        source/SFDP.cpp
         source/SlicingBlockDevice.cpp
 )
diff --git a/storage/blockdevice/COMPONENT_OSPIF/include/QSPIF/OSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_OSPIF/include/QSPIF/OSPIFBlockDevice.h
@@ -18,7 +18,7 @@
 #define MBED_OSPIF_BLOCK_DEVICE_H
 
 #include "drivers/OSPI.h"
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
diff --git a/storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "platform/Callback.h"
 #include "OSPIFBlockDevice.h"
 #include <string.h>
diff --git a/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
@@ -18,7 +18,7 @@
 #define MBED_QSPIF_BLOCK_DEVICE_H
 
 #include "drivers/QSPI.h"
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
diff --git a/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "platform/Callback.h"
 #include "QSPIFBlockDevice.h"
 #include <string.h>
diff --git a/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h b/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h
@@ -20,7 +20,7 @@
 #include "platform/SingletonPtr.h"
 #include "drivers/SPI.h"
 #include "drivers/DigitalOut.h"
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "blockdevice/BlockDevice.h"
 
 #ifndef MBED_CONF_SPIF_DRIVER_SPI_MOSI
diff --git a/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 #include "SPIFBlockDevice.h"
 #include "rtos/ThisThread.h"
 #include "mbed_critical.h"
diff --git a/storage/blockdevice/include/blockdevice/internal/SFDP.h b/storage/blockdevice/include/blockdevice/internal/SFDP.h
diff --git a/storage/blockdevice/source/SFDP.cpp b/storage/blockdevice/source/SFDP.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "platform/mbed_error.h"
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 
 #if (DEVICE_SPI || DEVICE_QSPI || DEVICE_OSPI)
 
diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/test_sfdp.cpp b/storage/blockdevice/tests/UNITTESTS/SFDP/test_sfdp.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "drivers/internal/SFDP.h"
+#include "blockdevice/internal/SFDP.h"
 
 class TestSFDP : public testing::Test {
 protected:
diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/SFDP/unittest.cmake
@@ -6,12 +6,12 @@ set(TEST_SUITE_NAME "SFDP")
 
 # Source files
 set(unittest-sources
-  ../drivers/source/SFDP.cpp
+  ../storage/blockdevice/source/SFDP.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  ../drivers/tests/UNITTESTS/SFDP/test_sfdp.cpp
+  ../storage/blockdevice/tests/UNITTESTS/SFDP/test_sfdp.cpp
   stubs/mbed_assert_stub.cpp
 )
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ target_include_directories(mbed-device_key`
`12`	`12`	`target_sources(mbed-device_key`
`13`	`13`	`INTERFACE`
`14`	`14`	`source/DeviceKey.cpp`
`15`		`- ../source/SFDP.cpp`
`16`	`15`	`)`
`17`	`16`
`18`	`17`	`target_link_libraries(mbed-device_key`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ target_include_directories(mbed-storage-blockdevice`
`31`	`31`	`.`
`32`	`32`	`./include`
`33`	`33`	`./include/blockdevice`
	`34`	`+ ./include/blockdevice/internal`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`target_sources(mbed-storage-blockdevice`
`@@ -44,5 +45,6 @@ target_sources(mbed-storage-blockdevice`
`44`	`45`	`source/ObservingBlockDevice.cpp`
`45`	`46`	`source/ProfilingBlockDevice.cpp`
`46`	`47`	`source/ReadOnlyBlockDevice.cpp`
	`48`	`+ source/SFDP.cpp`
`47`	`49`	`source/SlicingBlockDevice.cpp`
`48`	`50`	`)`