Added namespaces in various files

Oliver Wildtgrube · Oliver Wildtgrube · commit 5cb15e870237 · 2020-09-10T15:11:57.000+02:00
diff --git a/drivers/include/drivers/USBMSD.h b/drivers/include/drivers/USBMSD.h
@@ -76,7 +76,7 @@ class USBMSD: public USBDevice {
     * @param product_id Your product_id
     * @param product_release Your preoduct_release
     */
-    USBMSD(BlockDevice *bd, bool connect_blocking = true, uint16_t vendor_id = 0x0703, uint16_t product_id = 0x0104, uint16_t product_release = 0x0001);
+    USBMSD(mbed::BlockDevice *bd, bool connect_blocking = true, uint16_t vendor_id = 0x0703, uint16_t product_id = 0x0104, uint16_t product_release = 0x0001);
 
     /**
     * Fully featured constructor
@@ -95,7 +95,7 @@ class USBMSD: public USBDevice {
     * @param product_id Your product_id
     * @param product_release Your preoduct_release
     */
-    USBMSD(USBPhy *phy, BlockDevice *bd, uint16_t vendor_id, uint16_t product_id, uint16_t product_release);
+    USBMSD(USBPhy *phy, mbed::BlockDevice *bd, uint16_t vendor_id, uint16_t product_id, uint16_t product_release);
 
     /**
      * Destroy this object
@@ -263,7 +263,7 @@ class USBMSD: public USBDevice {
     events::Task<void(const setup_packet_t *)> _control_task;
     events::Task<void()> _configure_task;
 
-    BlockDevice *_bd;
+    mbed::BlockDevice *_bd;
     rtos::Mutex _mutex_init;
     rtos::Mutex _mutex;
 
diff --git a/drivers/source/usb/PolledQueue.cpp b/drivers/source/usb/PolledQueue.cpp
@@ -21,17 +21,17 @@
 #include "platform/Callback.h"
 
 
-PolledQueue::PolledQueue(mbed::Callback<void()> cb): _cb(cb)
+events::PolledQueue::PolledQueue(mbed::Callback<void()> cb): _cb(cb)
 {
 
 }
 
-PolledQueue::~PolledQueue()
+events::PolledQueue::~PolledQueue()
 {
 
 }
 
-void PolledQueue::dispatch()
+void events::PolledQueue::dispatch()
 {
     core_util_critical_section_enter();
     uint64_t buf[MBED_MAX_TASK_SIZE / sizeof(uint64_t)];
@@ -60,7 +60,7 @@ void PolledQueue::dispatch()
     core_util_critical_section_exit();
 }
 
-void PolledQueue::attach(mbed::Callback<void()> cb)
+void events::PolledQueue::attach(mbed::Callback<void()> cb)
 {
     core_util_critical_section_enter();
 
@@ -69,7 +69,7 @@ void PolledQueue::attach(mbed::Callback<void()> cb)
     core_util_critical_section_exit();
 }
 
-void PolledQueue::post(TaskBase *task)
+void events::PolledQueue::post(TaskBase *task)
 {
     core_util_critical_section_enter();
 
@@ -83,7 +83,7 @@ void PolledQueue::post(TaskBase *task)
     core_util_critical_section_exit();
 }
 
-void PolledQueue::cancel(TaskBase *task)
+void events::PolledQueue::cancel(TaskBase *task)
 {
     core_util_critical_section_enter();
 
diff --git a/drivers/source/usb/TaskBase.cpp b/drivers/source/usb/TaskBase.cpp
@@ -21,19 +21,19 @@
 #include "rtos/Semaphore.h"
 #include "platform/mbed_critical.h"
 
-TaskBase::TaskBase(TaskQueue *q)
+events::TaskBase::TaskBase(TaskQueue *q)
     : _queue(q), _posted(false), _start_count(0), _flush_sem(NULL)
 {
 
 }
 
-TaskBase::~TaskBase()
+events::TaskBase::~TaskBase()
 {
     cancel();
     wait();
 }
 
-void TaskBase::set(TaskQueue *q)
+void events::TaskBase::set(TaskQueue *q)
 {
     core_util_critical_section_enter();
 
@@ -44,7 +44,7 @@ void TaskBase::set(TaskQueue *q)
     core_util_critical_section_exit();
 }
 
-void TaskBase::cancel()
+void events::TaskBase::cancel()
 {
     core_util_critical_section_enter();
 
@@ -57,7 +57,7 @@ void TaskBase::cancel()
     core_util_critical_section_exit();
 }
 
-void TaskBase::wait()
+void events::TaskBase::wait()
 {
     // Fast path check for finished
     core_util_critical_section_enter();
@@ -82,7 +82,7 @@ void TaskBase::wait()
     sem.acquire();
 }
 
-bool TaskBase::ready()
+bool events::TaskBase::ready()
 {
     core_util_critical_section_enter();
 
@@ -92,7 +92,7 @@ bool TaskBase::ready()
     return is_ready;
 }
 
-bool TaskBase::finished()
+bool events::TaskBase::finished()
 {
     core_util_critical_section_enter();
 
@@ -102,12 +102,12 @@ bool TaskBase::finished()
     return is_finished;
 }
 
-void TaskBase::finish()
+void events::TaskBase::finish()
 {
     // Nothing to do
 }
 
-void TaskBase::post()
+void events::TaskBase::post()
 {
     core_util_critical_section_enter();
 
@@ -121,7 +121,7 @@ void TaskBase::post()
     core_util_critical_section_exit();
 }
 
-TaskBase::run_callback_t TaskBase::_start(void *buffer, uint32_t size)
+events::TaskBase::run_callback_t events::TaskBase::_start(void *buffer, uint32_t size)
 {
     // Each call to _start must result in a call to _finish
     MBED_ASSERT(_start_count < 0xFFFF);
@@ -131,7 +131,7 @@ TaskBase::run_callback_t TaskBase::_start(void *buffer, uint32_t size)
     return start(buffer, size);
 }
 
-void TaskBase::_finish()
+void events::TaskBase::_finish()
 {
     // Each call to _finish must be preceded by a call to _start
     MBED_ASSERT(_start_count > 0);
@@ -140,7 +140,7 @@ void TaskBase::_finish()
     finish();
 }
 
-void TaskBase::_wake_check()
+void events::TaskBase::_wake_check()
 {
     if (!finished()) {
         return;
diff --git a/drivers/source/usb/USBMSD.cpp b/drivers/source/usb/USBMSD.cpp
@@ -65,7 +65,7 @@ enum Status {
     CSW_ERROR,
 };
 
-USBMSD::USBMSD(BlockDevice *bd, bool connect_blocking, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
+USBMSD::USBMSD(mbed::BlockDevice *bd, bool connect_blocking, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
     : USBDevice(get_usb_phy(), vendor_id, product_id, product_release),
       _initialized(false), _media_removed(false),
       _addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0),
@@ -81,7 +81,7 @@ USBMSD::USBMSD(BlockDevice *bd, bool connect_blocking, uint16_t vendor_id, uint1
     }
 }
 
-USBMSD::USBMSD(USBPhy *phy, BlockDevice *bd, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
+USBMSD::USBMSD(USBPhy *phy, mbed::BlockDevice *bd, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
     : USBDevice(phy, vendor_id, product_id, product_release),
       _initialized(false), _media_removed(false),
       _addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0),
@@ -230,15 +230,15 @@ bool USBMSD::media_removed()
 
 int USBMSD::disk_read(uint8_t *data, uint64_t block, uint8_t count)
 {
-    bd_addr_t addr =  block * _bd->get_erase_size();
-    bd_size_t size = count * _bd->get_erase_size();
+    mbed::bd_addr_t addr =  block * _bd->get_erase_size();
+    mbed::bd_size_t size = count * _bd->get_erase_size();
     return _bd->read(data, addr, size);
 }
 
 int USBMSD::disk_write(const uint8_t *data, uint64_t block, uint8_t count)
 {
-    bd_addr_t addr =  block * _bd->get_erase_size();
-    bd_size_t size = count * _bd->get_erase_size();
+    mbed::bd_addr_t addr =  block * _bd->get_erase_size();
+    mbed::bd_size_t size = count * _bd->get_erase_size();
     int ret = _bd->erase(addr, size);
     if (ret != 0) {
         return ret;
diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/include/FlashIAP/FlashIAPBlockDevice.h b/storage/blockdevice/COMPONENT_FLASHIAP/include/FlashIAP/FlashIAPBlockDevice.h
@@ -134,7 +134,7 @@ class FlashIAPBlockDevice : public mbed::BlockDevice {
     *  @param size     Size to erase in bytes
     *  @return         True if erase is valid for underlying block device
     */
-    virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const;
+    virtual bool is_valid_erase(mbed::bd_addr_t addr, mbed::bd_size_t size) const;
 
 
 private:
diff --git a/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
@@ -53,7 +53,7 @@
  */
 enum qspif_bd_error {
     QSPIF_BD_ERROR_OK                    = 0,     /*!< no error */
-    QSPIF_BD_ERROR_DEVICE_ERROR          = BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
+    QSPIF_BD_ERROR_DEVICE_ERROR          = mbed::bd_error::BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
     QSPIF_BD_ERROR_PARSING_FAILED        = -4002, /* SFDP Parsing failed */
     QSPIF_BD_ERROR_READY_FAILED          = -4003, /* Wait for Mem Ready failed */
     QSPIF_BD_ERROR_WREN_FAILED           = -4004, /* Write Enable Failed */
@@ -289,7 +289,7 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
     qspi_status_t _qspi_set_frequency(int freq);
 
     // Update the 4-byte addressing extension register with the MSB of the address if it is in use
-    qspi_status_t _qspi_update_4byte_ext_addr_reg(bd_addr_t addr);
+    qspi_status_t _qspi_update_4byte_ext_addr_reg(mbed::bd_addr_t addr);
 
     /*********************************/
     /* Flash Configuration Functions */
diff --git a/storage/kvstore/kv_config/source/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp
@@ -144,7 +144,7 @@ int _storage_config_filesystem_common();
  *
  * @returns pointer to other block device.
  */
-BlockDevice *get_other_blockdevice();
+mbed::BlockDevice *get_other_blockdevice();
 
 static const char *filesystemstore_folder_path = NULL;
 
@@ -505,10 +505,10 @@ BlockDevice *_get_blockdevice_default(bd_addr_t start_address, bd_size_t size)
  * get_other_blockdevice() */
 BlockDevice *_get_blockdevice_other(bd_addr_t start_address, bd_size_t size)
 {
-    bd_addr_t aligned_end_address;
-    bd_addr_t aligned_start_address;
+    mbed::bd_addr_t aligned_end_address;
+    mbed::bd_addr_t aligned_start_address;
 
-    BlockDevice *bd = get_other_blockdevice();
+    mbed::BlockDevice *bd = get_other_blockdevice();
     if (bd == NULL) {
         tr_error("KV Config: \"other\" block device init fail");
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,17 @@`
`21`	`21`	`#include "platform/Callback.h"`
`22`	`22`
`23`	`23`
`24`		`-PolledQueue::PolledQueue(mbed::Callback<void()> cb): _cb(cb)`
	`24`	`+events::PolledQueue::PolledQueue(mbed::Callback<void()> cb): _cb(cb)`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`-PolledQueue::~PolledQueue()`
	`29`	`+events::PolledQueue::~PolledQueue()`
`30`	`30`	`{`
`31`	`31`
`32`	`32`	`}`
`33`	`33`
`34`		`-void PolledQueue::dispatch()`
	`34`	`+void events::PolledQueue::dispatch()`
`35`	`35`	`{`
`36`	`36`	`core_util_critical_section_enter();`
`37`	`37`	`uint64_t buf[MBED_MAX_TASK_SIZE / sizeof(uint64_t)];`
`@@ -60,7 +60,7 @@ void PolledQueue::dispatch()`
`60`	`60`	`core_util_critical_section_exit();`
`61`	`61`	`}`
`62`	`62`
`63`		`-void PolledQueue::attach(mbed::Callback<void()> cb)`
	`63`	`+void events::PolledQueue::attach(mbed::Callback<void()> cb)`
`64`	`64`	`{`
`65`	`65`	`core_util_critical_section_enter();`
`66`	`66`
`@@ -69,7 +69,7 @@ void PolledQueue::attach(mbed::Callback<void()> cb)`
`69`	`69`	`core_util_critical_section_exit();`
`70`	`70`	`}`
`71`	`71`
`72`		`-void PolledQueue::post(TaskBase *task)`
	`72`	`+void events::PolledQueue::post(TaskBase *task)`
`73`	`73`	`{`
`74`	`74`	`core_util_critical_section_enter();`
`75`	`75`
`@@ -83,7 +83,7 @@ void PolledQueue::post(TaskBase *task)`
`83`	`83`	`core_util_critical_section_exit();`
`84`	`84`	`}`
`85`	`85`
`86`		`-void PolledQueue::cancel(TaskBase *task)`
	`86`	`+void events::PolledQueue::cancel(TaskBase *task)`
`87`	`87`	`{`
`88`	`88`	`core_util_critical_section_enter();`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,19 @@`
`21`	`21`	`#include "rtos/Semaphore.h"`
`22`	`22`	`#include "platform/mbed_critical.h"`
`23`	`23`
`24`		`-TaskBase::TaskBase(TaskQueue *q)`
	`24`	`+events::TaskBase::TaskBase(TaskQueue *q)`
`25`	`25`	`: _queue(q), _posted(false), _start_count(0), _flush_sem(NULL)`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`}`
`29`	`29`
`30`		`-TaskBase::~TaskBase()`
	`30`	`+events::TaskBase::~TaskBase()`
`31`	`31`	`{`
`32`	`32`	`cancel();`
`33`	`33`	`wait();`
`34`	`34`	`}`
`35`	`35`
`36`		`-void TaskBase::set(TaskQueue *q)`
	`36`	`+void events::TaskBase::set(TaskQueue *q)`
`37`	`37`	`{`
`38`	`38`	`core_util_critical_section_enter();`
`39`	`39`
`@@ -44,7 +44,7 @@ void TaskBase::set(TaskQueue *q)`
`44`	`44`	`core_util_critical_section_exit();`
`45`	`45`	`}`
`46`	`46`
`47`		`-void TaskBase::cancel()`
	`47`	`+void events::TaskBase::cancel()`
`48`	`48`	`{`
`49`	`49`	`core_util_critical_section_enter();`
`50`	`50`
`@@ -57,7 +57,7 @@ void TaskBase::cancel()`
`57`	`57`	`core_util_critical_section_exit();`
`58`	`58`	`}`
`59`	`59`
`60`		`-void TaskBase::wait()`
	`60`	`+void events::TaskBase::wait()`
`61`	`61`	`{`
`62`	`62`	`// Fast path check for finished`
`63`	`63`	`core_util_critical_section_enter();`
`@@ -82,7 +82,7 @@ void TaskBase::wait()`
`82`	`82`	`sem.acquire();`
`83`	`83`	`}`
`84`	`84`
`85`		`-bool TaskBase::ready()`
	`85`	`+bool events::TaskBase::ready()`
`86`	`86`	`{`
`87`	`87`	`core_util_critical_section_enter();`
`88`	`88`
`@@ -92,7 +92,7 @@ bool TaskBase::ready()`
`92`	`92`	`return is_ready;`
`93`	`93`	`}`
`94`	`94`
`95`		`-bool TaskBase::finished()`
	`95`	`+bool events::TaskBase::finished()`
`96`	`96`	`{`
`97`	`97`	`core_util_critical_section_enter();`
`98`	`98`
`@@ -102,12 +102,12 @@ bool TaskBase::finished()`
`102`	`102`	`return is_finished;`
`103`	`103`	`}`
`104`	`104`
`105`		`-void TaskBase::finish()`
	`105`	`+void events::TaskBase::finish()`
`106`	`106`	`{`
`107`	`107`	`// Nothing to do`
`108`	`108`	`}`
`109`	`109`
`110`		`-void TaskBase::post()`
	`110`	`+void events::TaskBase::post()`
`111`	`111`	`{`
`112`	`112`	`core_util_critical_section_enter();`
`113`	`113`
`@@ -121,7 +121,7 @@ void TaskBase::post()`
`121`	`121`	`core_util_critical_section_exit();`
`122`	`122`	`}`
`123`	`123`
`124`		`-TaskBase::run_callback_t TaskBase::_start(void *buffer, uint32_t size)`
	`124`	`+events::TaskBase::run_callback_t events::TaskBase::_start(void *buffer, uint32_t size)`
`125`	`125`	`{`
`126`	`126`	`// Each call to _start must result in a call to _finish`
`127`	`127`	`MBED_ASSERT(_start_count < 0xFFFF);`
`@@ -131,7 +131,7 @@ TaskBase::run_callback_t TaskBase::_start(void *buffer, uint32_t size)`
`131`	`131`	`return start(buffer, size);`
`132`	`132`	`}`
`133`	`133`
`134`		`-void TaskBase::_finish()`
	`134`	`+void events::TaskBase::_finish()`
`135`	`135`	`{`
`136`	`136`	`// Each call to _finish must be preceded by a call to _start`
`137`	`137`	`MBED_ASSERT(_start_count > 0);`
`@@ -140,7 +140,7 @@ void TaskBase::_finish()`
`140`	`140`	`finish();`
`141`	`141`	`}`
`142`	`142`
`143`		`-void TaskBase::_wake_check()`
	`143`	`+void events::TaskBase::_wake_check()`
`144`	`144`	`{`
`145`	`145`	`if (!finished()) {`
`146`	`146`	`return;`