Skip to content
This repository was archived by the owner on Aug 19, 2021. It is now read-only.

Blockdevice moved to mbed namespace in mbed-os master #39

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/fat_filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "BlockDevice.h"
#include "FATFileSystem.h"

FATFileSystem* _filesystem_selector_FAT(const char* mount, BlockDevice* bd, unsigned int instance_num) {
FATFileSystem* _filesystem_selector_FAT(const char* mount, mbed::BlockDevice* bd, unsigned int instance_num) {
MBED_ALIGN(2*sizeof(uintptr_t)) static char fs_instances[MBED_CONF_STORAGE_SELECTOR_FILESYSTEM_INSTANCES * sizeof(FATFileSystem)];
return new(&(fs_instances[instance_num * sizeof(FATFileSystem)])) FATFileSystem(mount, bd);
}
2 changes: 1 addition & 1 deletion options/fat_filesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#include "BlockDevice.h"
#include "FATFileSystem.h"

FATFileSystem* _filesystem_selector_FAT(const char* mount, BlockDevice* bd, unsigned int instance_num);
FATFileSystem* _filesystem_selector_FAT(const char* mount, mbed::BlockDevice* bd, unsigned int instance_num);

#endif //STORAGE_SELECTOR_FAT_FILESYSTEM_H
4 changes: 2 additions & 2 deletions options/heap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "HeapBlockDevice.h"

HeapBlockDevice* _storage_selector_HEAP() {
static HeapBlockDevice bd(MBED_CONF_STORAGE_SELECTOR_HEAP_SIZE);
mbed::HeapBlockDevice* _storage_selector_HEAP() {
static mbed::HeapBlockDevice bd(MBED_CONF_STORAGE_SELECTOR_HEAP_SIZE);
return &bd;
}
2 changes: 1 addition & 1 deletion options/little_filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "BlockDevice.h"
#include "LittleFileSystem.h"

LittleFileSystem* _filesystem_selector_LITTLE(const char* mount, BlockDevice* bd, unsigned int instance_num) {
LittleFileSystem* _filesystem_selector_LITTLE(const char* mount, mbed::BlockDevice* bd, unsigned int instance_num) {
MBED_ALIGN(2*sizeof(uintptr_t)) static char fs_instances[MBED_CONF_STORAGE_SELECTOR_FILESYSTEM_INSTANCES * sizeof(LittleFileSystem)];
return new(&(fs_instances[instance_num * sizeof(LittleFileSystem)])) LittleFileSystem(mount, bd);
}
4 changes: 2 additions & 2 deletions storage-selector.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include "BlockDevice.h"
#include "filesystem/FileSystem.h"

BlockDevice* storage_selector();
mbed::BlockDevice* storage_selector();

#ifdef MBED_CONF_STORAGE_SELECTOR_FILESYSTEM

mbed::FileSystem* filesystem_selector(const char* mount, BlockDevice* bd, unsigned int instance_number = 1);
mbed::FileSystem* filesystem_selector(const char* mount, mbed::BlockDevice* bd, unsigned int instance_number = 1);

mbed::FileSystem* filesystem_selector(const char* mount = MBED_CONF_STORAGE_SELECTOR_MOUNT_POINT);

Expand Down