Revert "Move BlockDevice classes inside mbed namespace"

0xc0170 · web-flow · commit ff67a96e1769 · 2018-08-10T14:49:51.000+01:00
diff --git a/features/filesystem/FileSystem.h b/features/filesystem/FileSystem.h
@@ -23,7 +23,7 @@
 #include "platform/FileHandle.h"
 #include "platform/DirHandle.h"
 #include "platform/FileSystemLike.h"
-#include "bd/BlockDevice.h"
+#include "BlockDevice.h"
 
 namespace mbed {
 /** \addtogroup filesystem */
diff --git a/features/filesystem/bd/BlockDevice.h b/features/filesystem/bd/BlockDevice.h
@@ -17,12 +17,8 @@
 #ifndef MBED_BLOCK_DEVICE_H
 #define MBED_BLOCK_DEVICE_H
 
-#include "platform/platform.h"
 #include <stdint.h>
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Enum of standard error codes
  *
@@ -223,7 +219,5 @@ class BlockDevice
     }
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/BufferedBlockDevice.cpp b/features/filesystem/bd/BufferedBlockDevice.cpp
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <string.h>
 
-namespace mbed {
-
 static inline uint32_t align_down(bd_size_t val, bd_size_t size)
 {
     return val / size * size;
@@ -241,5 +239,3 @@ bd_size_t BufferedBlockDevice::size() const
 {
     return _bd->size();
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/BufferedBlockDevice.h b/features/filesystem/bd/BufferedBlockDevice.h
@@ -24,9 +24,6 @@
 
 #include "BlockDevice.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Block device for allowing minimal read and program sizes (of 1) for the underlying BD,
  *  using a buffer on the heap.
@@ -166,7 +163,5 @@ class BufferedBlockDevice : public BlockDevice {
 
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/ChainingBlockDevice.cpp b/features/filesystem/bd/ChainingBlockDevice.cpp
@@ -15,10 +15,8 @@
  */
 
 #include "ChainingBlockDevice.h"
-#include "platform/mbed_critical.h"
-#include "platform/mbed_assert.h"
+#include "mbed_critical.h"
 
-namespace mbed {
 
 ChainingBlockDevice::ChainingBlockDevice(BlockDevice **bds, size_t bd_count)
     : _bds(bds), _bd_count(bd_count)
@@ -251,5 +249,3 @@ bd_size_t ChainingBlockDevice::size() const
 {
     return _size;
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/ChainingBlockDevice.h b/features/filesystem/bd/ChainingBlockDevice.h
@@ -23,10 +23,8 @@
 #define MBED_CHAINING_BLOCK_DEVICE_H
 
 #include "BlockDevice.h"
+#include "mbed.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Block device for chaining multiple block devices
  *  with the similar block sizes at sequential addresses
@@ -180,7 +178,5 @@ class ChainingBlockDevice : public BlockDevice
     uint32_t _init_ref_count;
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/ExhaustibleBlockDevice.cpp b/features/filesystem/bd/ExhaustibleBlockDevice.cpp
@@ -15,10 +15,9 @@
  */
 
 #include "ExhaustibleBlockDevice.h"
-#include "platform/mbed_critical.h"
-#include "platform/mbed_assert.h"
+#include "mbed.h"
+#include "mbed_critical.h"
 
-namespace mbed {
 
 ExhaustibleBlockDevice::ExhaustibleBlockDevice(BlockDevice *bd, uint32_t erase_cycles)
     : _bd(bd), _erase_array(NULL), _erase_cycles(erase_cycles), _init_ref_count(0)
@@ -142,5 +141,3 @@ bd_size_t ExhaustibleBlockDevice::size() const
 {
     return _bd->size();
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/ExhaustibleBlockDevice.h b/features/filesystem/bd/ExhaustibleBlockDevice.h
@@ -24,9 +24,6 @@
 
 #include "BlockDevice.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Heap backed block device which simulates failures
  *
@@ -160,7 +157,5 @@ class ExhaustibleBlockDevice : public BlockDevice
     uint32_t _init_ref_count;
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/FlashSimBlockDevice.cpp b/features/filesystem/bd/FlashSimBlockDevice.cpp
@@ -15,15 +15,12 @@
  */
 
 #include "FlashSimBlockDevice.h"
-#include "platform/mbed_critical.h"
-#include "platform/mbed_assert.h"
-
+#include "mbed_assert.h"
+#include "mbed_critical.h"
 #include <algorithm>
 #include <stdlib.h>
 #include <string.h>
 
-namespace mbed {
-
 static const bd_size_t min_blank_buf_size = 32;
 
 static inline uint32_t align_up(bd_size_t val, bd_size_t size)
@@ -163,5 +160,3 @@ int FlashSimBlockDevice::get_erase_value() const
 {
     return _erase_value;
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/FlashSimBlockDevice.h b/features/filesystem/bd/FlashSimBlockDevice.h
@@ -24,10 +24,6 @@
 
 #include "BlockDevice.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
-
 enum {
     BD_ERROR_NOT_ERASED       = -3201,
 };
@@ -142,7 +138,4 @@ class FlashSimBlockDevice : public BlockDevice {
     uint32_t _init_ref_count;
 };
 
-/** @}*/
-} // namespace mbed
-
 #endif
diff --git a/features/filesystem/bd/HeapBlockDevice.cpp b/features/filesystem/bd/HeapBlockDevice.cpp
@@ -15,13 +15,8 @@
  */
 
 #include "HeapBlockDevice.h"
-#include "platform/mbed_critical.h"
-#include "platform/mbed_assert.h"
+#include "mbed_critical.h"
 
-#include <stdlib.h>
-#include <string.h>
-
-namespace mbed {
 
 HeapBlockDevice::HeapBlockDevice(bd_size_t size, bd_size_t block)
     : _read_size(block), _program_size(block), _erase_size(block)
@@ -171,4 +166,3 @@ int HeapBlockDevice::erase(bd_addr_t addr, bd_size_t size)
     return 0;
 }
 
-} // namespace mbed
diff --git a/features/filesystem/bd/HeapBlockDevice.h b/features/filesystem/bd/HeapBlockDevice.h
@@ -23,11 +23,7 @@
 #define MBED_MEM_BLOCK_DEVICE_H
 
 #include "BlockDevice.h"
-
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
-
+#include "mbed.h"
 
 
 /** Lazily allocated heap-backed block device
@@ -157,7 +153,5 @@ class HeapBlockDevice : public BlockDevice
     uint32_t _init_ref_count;
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/MBRBlockDevice.cpp b/features/filesystem/bd/MBRBlockDevice.cpp
@@ -15,14 +15,9 @@
  */
 
 #include "MBRBlockDevice.h"
-#include "platform/mbed_critical.h"
-#include "platform/mbed_assert.h"
-
+#include "mbed_critical.h"
 #include <algorithm>
-#include <stdlib.h>
-#include <string.h>
 
-namespace mbed {
 
 // On disk structures, all entries are little endian
 MBED_PACKED(struct) mbr_entry {
@@ -345,5 +340,3 @@ int MBRBlockDevice::get_partition_number() const
 {
     return _part;
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/MBRBlockDevice.h b/features/filesystem/bd/MBRBlockDevice.h
@@ -23,10 +23,8 @@
 #define MBED_MBR_BLOCK_DEVICE_H
 
 #include "BlockDevice.h"
+#include "mbed.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Additional error codes used for MBR records
  */
@@ -257,7 +255,5 @@ class MBRBlockDevice : public BlockDevice
     uint32_t _init_ref_count;
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/ObservingBlockDevice.cpp b/features/filesystem/bd/ObservingBlockDevice.cpp
@@ -22,8 +22,8 @@
 
 #include "ObservingBlockDevice.h"
 #include "ReadOnlyBlockDevice.h"
+#include "mbed.h"
 
-namespace mbed {
 
 ObservingBlockDevice::ObservingBlockDevice(BlockDevice *bd)
     : _bd(bd)
@@ -110,5 +110,3 @@ bd_size_t ObservingBlockDevice::size() const
 {
     return _bd->size();
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/ObservingBlockDevice.h b/features/filesystem/bd/ObservingBlockDevice.h
@@ -26,9 +26,6 @@
 #include "PlatformMutex.h"
 #include "Callback.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 class ObservingBlockDevice : public BlockDevice
 {
@@ -144,7 +141,6 @@ class ObservingBlockDevice : public BlockDevice
     mbed::Callback<void(BlockDevice *)> _change;
 };
 
-/** @}*/
-} // namespace mbed
+
 
 #endif
diff --git a/features/filesystem/bd/ProfilingBlockDevice.cpp b/features/filesystem/bd/ProfilingBlockDevice.cpp
@@ -16,7 +16,6 @@
 
 #include "ProfilingBlockDevice.h"
 
-namespace mbed {
 
 ProfilingBlockDevice::ProfilingBlockDevice(BlockDevice *bd)
     : _bd(bd)
@@ -119,5 +118,3 @@ bd_size_t ProfilingBlockDevice::get_erase_count() const
 {
     return _erase_count;
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/ProfilingBlockDevice.h b/features/filesystem/bd/ProfilingBlockDevice.h
@@ -23,10 +23,8 @@
 #define MBED_PROFILING_BLOCK_DEVICE_H
 
 #include "BlockDevice.h"
+#include "mbed.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 /** Block device for measuring storage operations of another block device
  *
@@ -184,7 +182,5 @@ class ProfilingBlockDevice : public BlockDevice
     bd_size_t _erase_count;
 };
 
-/** @}*/
-} // namespace mbed
 
 #endif
diff --git a/features/filesystem/bd/ReadOnlyBlockDevice.cpp b/features/filesystem/bd/ReadOnlyBlockDevice.cpp
@@ -21,9 +21,8 @@
  */
 
 #include "ReadOnlyBlockDevice.h"
-#include "platform/mbed_error.h"
+#include "mbed_error.h"
 
-namespace mbed {
 
 ReadOnlyBlockDevice::ReadOnlyBlockDevice(BlockDevice *bd)
     : _bd(bd)
@@ -97,5 +96,3 @@ bd_size_t ReadOnlyBlockDevice::size() const
 {
     return _bd->size();
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/ReadOnlyBlockDevice.h b/features/filesystem/bd/ReadOnlyBlockDevice.h
@@ -25,9 +25,6 @@
 #include "BlockDevice.h"
 #include "PlatformMutex.h"
 
-namespace mbed {
-/** \addtogroup filesystem */
-/** @{*/
 
 class ReadOnlyBlockDevice : public BlockDevice
 {
@@ -136,7 +133,6 @@ class ReadOnlyBlockDevice : public BlockDevice
     BlockDevice *_bd;
 };
 
-/** @}*/
-} // namespace mbed
+
 
 #endif
diff --git a/features/filesystem/bd/SlicingBlockDevice.cpp b/features/filesystem/bd/SlicingBlockDevice.cpp
@@ -15,9 +15,7 @@
  */
 
 #include "SlicingBlockDevice.h"
-#include "platform/mbed_assert.h"
 
-namespace mbed {
 
 SlicingBlockDevice::SlicingBlockDevice(BlockDevice *bd, bd_addr_t start, bd_addr_t stop)
     : _bd(bd)
@@ -118,5 +116,3 @@ bd_size_t SlicingBlockDevice::size() const
 {
     return _stop - _start;
 }
-
-} // namespace mbed
diff --git a/features/filesystem/bd/SlicingBlockDevice.h b/features/filesystem/bd/SlicingBlockDevice.h
diff --git a/features/filesystem/fat/FATFileSystem.cpp b/features/filesystem/fat/FATFileSystem.cpp
diff --git a/features/filesystem/fat/FATFileSystem.h b/features/filesystem/fat/FATFileSystem.h
diff --git a/features/filesystem/littlefs/LittleFileSystem.cpp b/features/filesystem/littlefs/LittleFileSystem.cpp
diff --git a/features/filesystem/littlefs/LittleFileSystem.h b/features/filesystem/littlefs/LittleFileSystem.h
diff --git a/features/filesystem/mbed_filesystem.h b/features/filesystem/mbed_filesystem.h

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`#include <algorithm>`
`21`	`21`	`#include <string.h>`
`22`	`22`
`23`		`-namespace mbed {`
`24`		`-`
`25`	`23`	`static inline uint32_t align_down(bd_size_t val, bd_size_t size)`
`26`	`24`	`{`
`27`	`25`	`return val / size * size;`
`@@ -241,5 +239,3 @@ bd_size_t BufferedBlockDevice::size() const`
`241`	`239`	`{`
`242`	`240`	`return _bd->size();`
`243`	`241`	`}`
`244`		`-`
`245`		`-} // namespace mbed`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,8 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`#include "ChainingBlockDevice.h"`
`18`		`-#include "platform/mbed_critical.h"`
`19`		`-#include "platform/mbed_assert.h"`
	`18`	`+#include "mbed_critical.h"`
`20`	`19`
`21`		`-namespace mbed {`
`22`	`20`
`23`	`21`	`ChainingBlockDevice::ChainingBlockDevice(BlockDevice **bds, size_t bd_count)`
`24`	`22`	`: _bds(bds), _bd_count(bd_count)`
`@@ -251,5 +249,3 @@ bd_size_t ChainingBlockDevice::size() const`
`251`	`249`	`{`
`252`	`250`	`return _size;`
`253`	`251`	`}`
`254`		`-`
`255`		`-} // namespace mbed`