Skip to content

Commit 662c4a6

Browse files
committed
Revert of namespace mbed
Currently breaking backwards compatibility, including CI dependencies
1 parent a821b69 commit 662c4a6

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

SPIFBlockDevice.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include "mbed_trace.h"
2424
#define TRACE_GROUP "SPIF"
25+
using namespace mbed;
2526

2627
/* Default SPIF Parameters */
2728
/****************************/
@@ -71,8 +72,6 @@
7172

7273
#define IS_MEM_READY_MAX_RETRIES 10000
7374

74-
namespace mbed {
75-
7675
enum spif_default_instructions {
7776
SPIF_NOP = 0x00, // No operation
7877
SPIF_PP = 0x02, // Page Program data
@@ -1031,6 +1030,4 @@ static unsigned int local_math_power(int base, int exp)
10311030
return result;
10321031
}
10331032

1034-
} //namespace mbed
1035-
10361033

SPIFBlockDevice.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include "DigitalOut.h"
2121
#include "BlockDevice.h"
2222

23-
namespace mbed {
24-
2523
/** Enum spif standard error codes
2624
*
2725
* @enum qpif_bd_error
@@ -256,9 +254,9 @@ class SPIFBlockDevice : public BlockDevice {
256254

257255
private:
258256
// Master side hardware
259-
SPI _spi;
257+
mbed::SPI _spi;
260258
// Enable CS control (low/high) for SPI driver operatios
261-
DigitalOut _cs;
259+
mbed::DigitalOut _cs;
262260

263261
// Mutex is used to protect Flash device for some SPI Driver commands that must be done sequentially with no other commands in between
264262
// e.g. (1)Set Write Enable, (2)Program, (3)Wait Memory Ready
@@ -294,6 +292,4 @@ class SPIFBlockDevice : public BlockDevice {
294292
bool _is_initialized;
295293
};
296294

297-
} //namespace mbed
298-
299295
#endif /* MBED_SPIF_BLOCK_DEVICE_H */

0 commit comments

Comments
 (0)