ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert of namespace mbed 

Currently breaking backwards compatibility, including CI dependencies
pull/7774/head
Christopher Haster 2018-08-21 12:33:32 -05:00
parent a821b69cd9
commit 662c4a64af
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPIFBlockDevice.cpp
View File

@ -22,6 +22,7 @@
#include "mbed_trace.h" #include "mbed_trace.h"
#define TRACE_GROUP "SPIF" #define TRACE_GROUP "SPIF"
using namespace mbed;
/* Default SPIF Parameters */ /* Default SPIF Parameters */
/****************************/ /****************************/
@ -71,8 +72,6 @@
#define IS_MEM_READY_MAX_RETRIES 10000 #define IS_MEM_READY_MAX_RETRIES 10000
namespace mbed {
enum spif_default_instructions { enum spif_default_instructions {
SPIF_NOP = 0x00, // No operation SPIF_NOP = 0x00, // No operation
SPIF_PP = 0x02, // Page Program data SPIF_PP = 0x02, // Page Program data
@ -1031,6 +1030,4 @@ static unsigned int local_math_power(int base, int exp)
return result; return result;
} }
} //namespace mbed

8
SPIFBlockDevice.h
View File

@ -20,8 +20,6 @@
#include "DigitalOut.h" #include "DigitalOut.h"
#include "BlockDevice.h" #include "BlockDevice.h"
namespace mbed {
/** Enum spif standard error codes /** Enum spif standard error codes
* *
* @enum qpif_bd_error * @enum qpif_bd_error
@ -256,9 +254,9 @@ private:
private: private:
// Master side hardware // Master side hardware
SPI _spi; mbed::SPI _spi;
// Enable CS control (low/high) for SPI driver operatios // Enable CS control (low/high) for SPI driver operatios
DigitalOut _cs; mbed::DigitalOut _cs;
// Mutex is used to protect Flash device for some SPI Driver commands that must be done sequentially with no other commands in between // Mutex is used to protect Flash device for some SPI Driver commands that must be done sequentially with no other commands in between
// e.g. (1)Set Write Enable, (2)Program, (3)Wait Memory Ready // e.g. (1)Set Write Enable, (2)Program, (3)Wait Memory Ready
@ -294,6 +292,4 @@ private:
bool _is_initialized; bool _is_initialized;
}; };
} //namespace mbed
#endif /* MBED_SPIF_BLOCK_DEVICE_H */ #endif /* MBED_SPIF_BLOCK_DEVICE_H */