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

Revert "Move BlockDevice classes inside mbed namespace"

pull/7757/head
Martin Kojtal 2018-08-10 14:49:51 +01:00 committed by GitHub
parent 2a824a1ceb
commit ff67a96e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 30 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/filesystem/FileSystem.h
View File

@ -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 */

6
features/filesystem/bd/BlockDevice.h
View File

@ -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 @@ public:
}
};
/** @}*/
} // namespace mbed
#endif

4
features/filesystem/bd/BufferedBlockDevice.cpp
View File

@ -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

5
features/filesystem/bd/BufferedBlockDevice.h
View File

@ -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 @@ protected:
};
/** @}*/
} // namespace mbed
#endif

6
features/filesystem/bd/ChainingBlockDevice.cpp
View File

@ -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

6
features/filesystem/bd/ChainingBlockDevice.h
View File

@ -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 @@ protected:
uint32_t _init_ref_count;
};
/** @}*/
} // namespace mbed
#endif

7
features/filesystem/bd/ExhaustibleBlockDevice.cpp
View File

@ -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

5
features/filesystem/bd/ExhaustibleBlockDevice.h
View File

@ -24,9 +24,6 @@
#include "BlockDevice.h"
namespace mbed {
/** \addtogroup filesystem */
/** @{*/
/** Heap backed block device which simulates failures
*
@ -160,7 +157,5 @@ private:
uint32_t _init_ref_count;
};
/** @}*/
} // namespace mbed
#endif

9
features/filesystem/bd/FlashSimBlockDevice.cpp
View File

@ -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

7
features/filesystem/bd/FlashSimBlockDevice.h
View File

@ -24,10 +24,6 @@
#include "BlockDevice.h"
namespace mbed {
/** \addtogroup filesystem */
/** @{*/
enum {
BD_ERROR_NOT_ERASED = -3201,
};
@ -142,7 +138,4 @@ private:
uint32_t _init_ref_count;
};
/** @}*/
} // namespace mbed
#endif

8
features/filesystem/bd/HeapBlockDevice.cpp
View File

@ -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

8
features/filesystem/bd/HeapBlockDevice.h
View File

@ -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 @@ private:
uint32_t _init_ref_count;
};
/** @}*/
} // namespace mbed
#endif

9
features/filesystem/bd/MBRBlockDevice.cpp
View File

@ -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

6
features/filesystem/bd/MBRBlockDevice.h
View File

@ -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 @@ protected:
uint32_t _init_ref_count;
};
/** @}*/
} // namespace mbed
#endif

4
features/filesystem/bd/ObservingBlockDevice.cpp
View File

@ -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

6
features/filesystem/bd/ObservingBlockDevice.h
View File

@ -26,9 +26,6 @@
#include "PlatformMutex.h"
#include "Callback.h"
namespace mbed {
/** \addtogroup filesystem */
/** @{*/
class ObservingBlockDevice : public BlockDevice
{
@ -144,7 +141,6 @@ private:
mbed::Callback<void(BlockDevice *)> _change;
};
/** @}*/
} // namespace mbed
#endif

3
features/filesystem/bd/ProfilingBlockDevice.cpp
View File

@ -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

6
features/filesystem/bd/ProfilingBlockDevice.h
View File

@ -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 @@ private:
bd_size_t _erase_count;
};
/** @}*/
} // namespace mbed
#endif

5
features/filesystem/bd/ReadOnlyBlockDevice.cpp
View File

@ -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

6
features/filesystem/bd/ReadOnlyBlockDevice.h
View File

@ -25,9 +25,6 @@
#include "BlockDevice.h"
#include "PlatformMutex.h"
namespace mbed {
/** \addtogroup filesystem */
/** @{*/
class ReadOnlyBlockDevice : public BlockDevice
{
@ -136,7 +133,6 @@ private:
BlockDevice *_bd;
};
/** @}*/
} // namespace mbed
#endif

4
features/filesystem/bd/SlicingBlockDevice.cpp
View File

@ -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

7
features/filesystem/bd/SlicingBlockDevice.h
View File

@ -23,10 +23,7 @@
#define MBED_SLICING_BLOCK_DEVICE_H
#include "BlockDevice.h"
namespace mbed {
/** \addtogroup filesystem */
/** @{*/
#include "mbed.h"
/** Block device for mapping to a slice of another block device
@ -170,7 +167,5 @@ protected:
bd_size_t _stop;
};
/** @}*/
} // namespace mbed
#endif

3
features/filesystem/fat/FATFileSystem.cpp
View File

@ -27,10 +27,7 @@
#include "FATFileSystem.h"
#include <errno.h>
#include <stdlib.h>
////// Error handling /////
using namespace mbed;
static int fat_error_remap(FRESULT res)
{

13
features/filesystem/fat/FATFileSystem.h
View File

@ -29,6 +29,7 @@
#include <stdint.h>
#include "PlatformMutex.h"
/**
* FATFileSystem based on ChaN's Fat Filesystem library v0.8
*/
@ -39,7 +40,7 @@ public:
* @param name Name to add filesystem to tree as
* @param bd BlockDevice to mount, may be passed instead to mount call
*/
FATFileSystem(const char *name = NULL, mbed::BlockDevice *bd = NULL);
FATFileSystem(const char *name = NULL, BlockDevice *bd = NULL);
virtual ~FATFileSystem();
/** Formats a logical drive, FDISK partitioning rule.
@ -58,14 +59,14 @@ public:
*
* @return 0 on success, negative error code on failure
*/
static int format(mbed::BlockDevice *bd, mbed::bd_size_t cluster_size = 0);
static int format(BlockDevice *bd, bd_size_t cluster_size = 0);
/** Mounts a filesystem to a block device
*
* @param bd BlockDevice to mount to
* @return 0 on success, negative error code on failure
*/
virtual int mount(mbed::BlockDevice *bd);
virtual int mount(BlockDevice *bd);
/** Unmounts a filesystem from the underlying block device
*
@ -90,7 +91,7 @@ public:
*
* @return 0 on success, negative error code on failure
*/
virtual int reformat(mbed::BlockDevice *bd, int allocation_unit);
virtual int reformat(BlockDevice *bd, int allocation_unit);
/** Reformats a filesystem, results in an empty and mounted filesystem
*
@ -100,7 +101,7 @@ public:
* Default: NULL
* @return 0 on success, negative error code on failure
*/
virtual int reformat(mbed::BlockDevice *bd = NULL)
virtual int reformat(BlockDevice *bd = NULL)
{
// required for virtual inheritance shenanigans
return reformat(bd, 0);
@ -266,7 +267,7 @@ private:
protected:
virtual void lock();
virtual void unlock();
virtual int mount(mbed::BlockDevice *bd, bool mount);
virtual int mount(BlockDevice *bd, bool mount);
};
#endif

1
features/filesystem/littlefs/LittleFileSystem.cpp
View File

@ -21,7 +21,6 @@ extern "C" {
#include "lfs_util.h"
}
using namespace mbed;
////// Conversion functions //////
static int lfs_toerror(int err)

10
features/filesystem/littlefs/LittleFileSystem.h
View File

@ -51,7 +51,7 @@ public:
* The lookahead buffer requires only 1 bit per block so it can be quite
* large with little ram impact. Should be a multiple of 32.
*/
LittleFileSystem(const char *name=NULL, mbed::BlockDevice *bd=NULL,
LittleFileSystem(const char *name=NULL, BlockDevice *bd=NULL,
lfs_size_t read_size=MBED_LFS_READ_SIZE,
lfs_size_t prog_size=MBED_LFS_PROG_SIZE,
lfs_size_t block_size=MBED_LFS_BLOCK_SIZE,
@ -81,7 +81,7 @@ public:
* The lookahead buffer requires only 1 bit per block so it can be quite
* large with little ram impact. Should be a multiple of 32.
*/
static int format(mbed::BlockDevice *bd,
static int format(BlockDevice *bd,
lfs_size_t read_size=MBED_LFS_READ_SIZE,
lfs_size_t prog_size=MBED_LFS_PROG_SIZE,
lfs_size_t block_size=MBED_LFS_BLOCK_SIZE,
@ -92,7 +92,7 @@ public:
* @param bd BlockDevice to mount to
* @return 0 on success, negative error code on failure
*/
virtual int mount(mbed::BlockDevice *bd);
virtual int mount(BlockDevice *bd);
/** Unmounts a filesystem from the underlying block device
*
@ -110,7 +110,7 @@ public:
*
* @return 0 on success, negative error code on failure
*/
virtual int reformat(mbed::BlockDevice *bd);
virtual int reformat(BlockDevice *bd);
/** Remove a file from the filesystem.
*
@ -267,7 +267,7 @@ protected:
private:
lfs_t _lfs; // _the actual filesystem
struct lfs_config _config;
mbed::BlockDevice *_bd; // the block device
BlockDevice *_bd; // the block device
// default parameters
const lfs_size_t _read_size;

1
features/filesystem/mbed_filesystem.h
View File

@ -29,6 +29,7 @@
// BlockDevice classes
#include "bd/BlockDevice.h"
#include "bd/BlockDevice.h"
#include "bd/ChainingBlockDevice.h"
#include "bd/SlicingBlockDevice.h"
#include "bd/HeapBlockDevice.h"