Skip to content

Commit 0455a56

Browse files
committed
SDCARD: Fix namespaces
1 parent db20615 commit 0455a56

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

libraries/Portenta_SDCARD/SDMMCBlockDevice.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
#define SD_DBG 0 /*!< 1 - Enable debugging */
3131

32+
using namespace mbed;
33+
3234
/** Enum of standard error codes
3335
*
3436
* @enum bd_sd_error

libraries/Portenta_SDCARD/SDMMCBlockDevice.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "platform/PlatformMutex.h"
2424
#include "BSP.h"
2525

26-
using namespace mbed;
26+
//using namespace mbed;
2727

2828
/**
2929
* SDMMCBlockDevice class.
@@ -90,7 +90,7 @@ using namespace mbed;
9090
* @endcode
9191
*
9292
*/
93-
class SDMMCBlockDevice : public BlockDevice
93+
class SDMMCBlockDevice : public mbed::BlockDevice
9494
{
9595
public:
9696

@@ -121,7 +121,7 @@ class SDMMCBlockDevice : public BlockDevice
121121
* @param size Size to read in bytes, must be a multiple of read block size
122122
* @return 0 on success, negative error code on failure
123123
*/
124-
virtual int read(void *buffer, bd_addr_t addr, bd_size_t size);
124+
virtual int read(void *buffer, mbed::bd_addr_t addr, mbed::bd_size_t size);
125125

126126
/** Program blocks to a block device
127127
*
@@ -132,7 +132,7 @@ class SDMMCBlockDevice : public BlockDevice
132132
* @param size Size to write in bytes, must be a multiple of program block size
133133
* @return 0 on success, negative error code on failure
134134
*/
135-
virtual int program(const void *buffer, bd_addr_t addr, bd_size_t size);
135+
virtual int program(const void *buffer, mbed::bd_addr_t addr, mbed::bd_size_t size);
136136

137137
/** Erase blocks on a block device
138138
*
@@ -142,41 +142,41 @@ class SDMMCBlockDevice : public BlockDevice
142142
* @param size Size to erase in bytes, must be a multiple of erase block size
143143
* @return 0 on success, negative error code on failure
144144
*/
145-
virtual int erase(bd_addr_t addr, bd_size_t size);
145+
virtual int erase(mbed::bd_addr_t addr, mbed::bd_size_t size);
146146

147147
/** Get the size of a readable block
148148
*
149149
* @return Size of a readable block in bytes
150150
*/
151-
virtual bd_size_t get_read_size() const;
151+
virtual mbed::bd_size_t get_read_size() const;
152152

153153
/** Get the size of a programable block
154154
*
155155
* @return Size of a programable block in bytes
156156
*/
157-
virtual bd_size_t get_program_size() const;
157+
virtual mbed::bd_size_t get_program_size() const;
158158

159159
/** Get the size of a eraseable block
160160
*
161161
* @return Size of a eraseable block in bytes
162162
*/
163-
virtual bd_size_t get_erase_size() const;
163+
virtual mbed::bd_size_t get_erase_size() const;
164164

165165
/** Get the total size of the underlying device
166166
*
167167
* @return Size of the underlying device in bytes
168168
*/
169-
virtual bd_size_t size() const;
169+
virtual mbed::bd_size_t size() const;
170170

171171
virtual const char *get_type() const;
172172

173173
private:
174174
uint8_t _card_type;
175-
bd_size_t _read_size;
176-
bd_size_t _program_size;
177-
bd_size_t _erase_size;
178-
bd_size_t _block_size;
179-
bd_size_t _capacity_in_blocks;
175+
mbed::bd_size_t _read_size;
176+
mbed::bd_size_t _program_size;
177+
mbed::bd_size_t _erase_size;
178+
mbed::bd_size_t _block_size;
179+
mbed::bd_size_t _capacity_in_blocks;
180180
BSP_SD_CardInfo _current_card_info;
181181
uint8_t _sd_state;
182182
uint32_t _timeout;

libraries/Portenta_SDCARD/examples/TestSDCARD/sd.c

Lines changed: 0 additions & 1 deletion
This file was deleted.

libraries/Portenta_SDCARD/examples/TestSDCARD/sd.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)