Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move SFDP to blockdevice #13917

Merged
merged 3 commits into from
Dec 10, 2020
Merged

Move SFDP to blockdevice #13917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2fbdc
Move SFDP into blockdevice where it belongs to
LDong-Arm Nov 18, 2020
23702ff
Update include paths to SFDP.h
LDong-Arm Nov 18, 2020
562b31c
Move SFDP unit tests
LDong-Arm Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion drivers/device_key/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions storage/blockdevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_include_directories(mbed-storage-blockdevice
.
./include
./include/blockdevice
./include/blockdevice/internal
)

target_sources(mbed-storage-blockdevice
Expand All @@ -44,5 +45,6 @@ target_sources(mbed-storage-blockdevice
source/ObservingBlockDevice.cpp
source/ProfilingBlockDevice.cpp
source/ReadOnlyBlockDevice.cpp
source/SFDP.cpp
source/SlicingBlockDevice.cpp
)
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_OSPIF/include/QSPIF/OSPIFBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 drivers/include/drivers/internal/SFDP.h → ...evice/include/blockdevice/internal/SFDP.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/source/SFDP.cpp → storage/blockdevice/source/SFDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/tests/UNITTESTS/SFDP/test_sfdp.cpp → ...device/tests/UNITTESTS/SFDP/test_sfdp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions drivers/tests/UNITTESTS/SFDP/unittest.cmake → ...evice/tests/UNITTESTS/SFDP/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down