Skip to content

Commit 69ac772

Browse files
gekysimonqhughes
geky
authored and
simonqhughes
committed
Updated filesystem tests to use FATFileSystem + SDBlockDevice
1 parent 0f95265 commit 69ac772

File tree

2 files changed

+58
-30
lines changed

2 files changed

+58
-30
lines changed

‎features/TESTS/filesystem/basic/basic.cpp

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
*/
4747

4848
#include "mbed.h"
49-
#include "SDFileSystem.h"
49+
#include "FATFileSystem.h"
50+
#include "SDBlockDevice.h"
5051
#include "test_env.h"
5152
#include "fsfat_debug.h"
5253
#include "fsfat_test.h"
@@ -78,22 +79,28 @@ using namespace utest::v1;
7879
#if defined(DEVICE_SPI) && defined(FSFAT_SDCARD_INSTALLED)
7980

8081
#if defined(TARGET_KL25Z)
81-
SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
82+
SDBlockDevice sd(PTD2, PTD3, PTD1, PTD0);
83+
FATFileSystem fs("sd", &sd);
8284

8385
#elif defined(TARGET_KL46Z) || defined(TARGET_KL43Z)
84-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
86+
SDBlockDevice sd(PTD6, PTD7, PTD5, PTD4);
87+
FATFileSystem fs("sd", &sd);
8588

8689
#elif defined(TARGET_K64F) || defined(TARGET_K66F)
87-
SDFileSystem sd(PTE3, PTE1, PTE2, PTE4, "sd");
90+
SDBlockDevice sd(PTE3, PTE1, PTE2, PTE4);
91+
FATFileSystem fs("sd", &sd);
8892

8993
#elif defined(TARGET_K22F)
90-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
94+
SDBlockDevice sd(PTD6, PTD7, PTD5, PTD4);
95+
FATFileSystem fs("sd", &sd);
9196

9297
#elif defined(TARGET_K20D50M)
93-
SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
98+
SDBlockDevice sd(PTD2, PTD3, PTD1, PTC2);
99+
FATFileSystem fs("sd", &sd);
94100

95101
#elif defined(TARGET_nRF51822)
96-
SDFileSystem sd(p12, p13, p15, p14, "sd");
102+
SDBlockDevice sd(p12, p13, p15, p14);
103+
FATFileSystem fs("sd", &sd);
97104

98105
#elif defined(TARGET_NUCLEO_F030R8) || \
99106
defined(TARGET_NUCLEO_F070RB) || \
@@ -109,29 +116,36 @@ SDFileSystem sd(p12, p13, p15, p14, "sd");
109116
defined(TARGET_NUCLEO_L053R8) || \
110117
defined(TARGET_NUCLEO_L073RZ) || \
111118
defined(TARGET_NUCLEO_L152RE)
112-
SDFileSystem sd(D11, D12, D13, D10, "sd");
119+
SDBlockDevice sd(D11, D12, D13, D10);
120+
FATFileSystem fs("sd", &sd);
113121

114122
#elif defined(TARGET_DISCO_F051R8) || \
115123
defined(TARGET_NUCLEO_L031K6)
116-
SDFileSystem sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS, "sd");
124+
SDBlockDevice sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS);
125+
FATFileSystem fs("sd", &sd);
117126

118127
#elif defined(TARGET_LPC2368)
119-
SDFileSystem sd(p11, p12, p13, p14, "sd");
128+
SDBlockDevice sd(p11, p12, p13, p14);
129+
FATFileSystem fs("sd", &sd);
120130

121131
#elif defined(TARGET_LPC11U68)
122-
SDFileSystem sd(D11, D12, D13, D10, "sd");
132+
SDBlockDevice sd(D11, D12, D13, D10);
133+
FATFileSystem fs("sd", &sd);
123134

124135
#elif defined(TARGET_LPC1549)
125-
SDFileSystem sd(D11, D12, D13, D10, "sd");
136+
SDBlockDevice sd(D11, D12, D13, D10);
137+
FATFileSystem fs("sd", &sd);
126138

127139
#elif defined(TARGET_RZ_A1H)
128-
SDFileSystem sd(P8_5, P8_6, P8_3, P8_4, "sd");
140+
SDBlockDevice sd(P8_5, P8_6, P8_3, P8_4);
141+
FATFileSystem fs("sd", &sd);
129142

130143
#elif defined(TARGET_LPC11U37H_401)
131-
SDFileSystem sd(SDMOSI, SDMISO, SDSCLK, SDSSEL, "sd");
144+
SDBlockDevice sd(SDMOSI, SDMISO, SDSCLK, SDSSEL);
145+
FATFileSystem fs("sd", &sd);
132146

133147
#else
134-
#error "[NOT SUPPORTED] Instantiate SDFileSystem sd(p11, p12, p13, p14, "sd") with the correct pin specification for target"
148+
#error "[NOT SUPPORTED] Instantiate SDBlockDevice sd(p11, p12, p13, p14) with the correct pin specification for target"
135149
#endif
136150

137151

‎features/TESTS/filesystem/fopen/fopen.cpp

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
*/
2323

2424
#include "mbed.h"
25-
#include "SDFileSystem.h"
25+
#include "SDBlockDevice.h"
26+
#include "FATFileSystem.h"
2627
#include "fsfat_debug.h"
2728
#include "fsfat_test.h"
2829
#include "utest/utest.h"
@@ -65,22 +66,28 @@ using namespace utest::v1;
6566
static char fsfat_fopen_utest_msg_g[FSFAT_UTEST_MSG_BUF_SIZE];
6667

6768
#if defined(TARGET_KL25Z)
68-
SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
69+
SDBlockDevice sd(PTD2, PTD3, PTD1, PTD0);
70+
FATFileSystem fs("sd", &sd);
6971

7072
#elif defined(TARGET_KL46Z) || defined(TARGET_KL43Z)
71-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
73+
SDBlockDevice sd(PTD6, PTD7, PTD5, PTD4);
74+
FATFileSystem fs("sd", &sd);
7275

7376
#elif defined(TARGET_K64F) || defined(TARGET_K66F)
74-
SDFileSystem sd(PTE3, PTE1, PTE2, PTE4, "sd");
77+
SDBlockDevice sd(PTE3, PTE1, PTE2, PTE4);
78+
FATFileSystem fs("sd", &sd);
7579

7680
#elif defined(TARGET_K22F)
77-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
81+
SDBlockDevice sd(PTD6, PTD7, PTD5, PTD4);
82+
FATFileSystem fs("sd", &sd);
7883

7984
#elif defined(TARGET_K20D50M)
80-
SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
85+
SDBlockDevice sd(PTD2, PTD3, PTD1, PTC2);
86+
FATFileSystem fs("sd", &sd);
8187

8288
#elif defined(TARGET_nRF51822)
83-
SDFileSystem sd(p12, p13, p15, p14, "sd");
89+
SDBlockDevice sd(p12, p13, p15, p14);
90+
FATFileSystem fs("sd", &sd);
8491

8592
#elif defined(TARGET_NUCLEO_F030R8) || \
8693
defined(TARGET_NUCLEO_F070RB) || \
@@ -96,30 +103,37 @@ SDFileSystem sd(p12, p13, p15, p14, "sd");
96103
defined(TARGET_NUCLEO_L053R8) || \
97104
defined(TARGET_NUCLEO_L073RZ) || \
98105
defined(TARGET_NUCLEO_L152RE)
99-
SDFileSystem sd(D11, D12, D13, D10, "sd");
106+
SDBlockDevice sd(D11, D12, D13, D10);
107+
FATFileSystem fs("sd", &sd);
100108

101109

102110
#elif defined(TARGET_DISCO_F051R8) || \
103111
defined(TARGET_NUCLEO_L031K6)
104-
SDFileSystem sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS, "sd");
112+
SDBlockDevice sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS);
113+
FATFileSystem fs("sd", &sd);
105114

106115
#elif defined(TARGET_LPC2368)
107-
SDFileSystem sd(p11, p12, p13, p14, "sd");
116+
SDBlockDevice sd(p11, p12, p13, p14);
117+
FATFileSystem fs("sd", &sd);
108118

109119
#elif defined(TARGET_LPC11U68)
110-
SDFileSystem sd(D11, D12, D13, D10, "sd");
120+
SDBlockDevice sd(D11, D12, D13, D10);
121+
FATFileSystem fs("sd", &sd);
111122

112123
#elif defined(TARGET_LPC1549)
113-
SDFileSystem sd(D11, D12, D13, D10, "sd");
124+
SDBlockDevice sd(D11, D12, D13, D10);
125+
FATFileSystem fs("sd", &sd);
114126

115127
#elif defined(TARGET_RZ_A1H)
116-
SDFileSystem sd(P8_5, P8_6, P8_3, P8_4, "sd");
128+
SDBlockDevice sd(P8_5, P8_6, P8_3, P8_4);
129+
FATFileSystem fs("sd", &sd);
117130

118131
#elif defined(TARGET_LPC11U37H_401)
119-
SDFileSystem sd(SDMOSI, SDMISO, SDSCLK, SDSSEL, "sd");
132+
SDBlockDevice sd(SDMOSI, SDMISO, SDSCLK, SDSSEL);
133+
FATFileSystem fs("sd", &sd);
120134

121135
#else
122-
#error "[NOT SUPPORTED] Instantiate SDFileSystem sd(p11, p12, p13, p14, "sd") with the correct pin specification for target"
136+
#error "[NOT SUPPORTED] Instantiate SDBlockDevice sd(p11, p12, p13, p14) with the correct pin specification for target"
123137
#endif
124138

125139

0 commit comments

Comments
 (0)