CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Focus on getting flash access working properly

Browse Source
This commit is contained in:
Tim Keller
2021-10-19 19:03:00 +00:00
parent 8f6a390c36
commit d89e38d3bf
4 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/fs/FS.cpp
View File

@@ -54,6 +54,14 @@ void FS::VerifyResource() {
resourcesValid = true;
}
void FS::Mount() {
flashDriver.Wakeup();
}
void FS::UnMount() {
flashDriver.Sleep();
}
int FS::FileOpen(lfs_file_t* file_p, const char* fileName, const int flags) {
return lfs_file_open(&lfs, file_p, fileName, flags);
}
@@ -96,8 +104,8 @@ int FS::DirCreate(const char* path) {
return lfs_mkdir(&lfs, path);
}
int FS::Stat(const char* path, lfs_info* info){
return lfs_stat(&lfs,path,info);
int FS::Stat(const char* path, lfs_info* info) {
return lfs_stat(&lfs, path, info);
}
// Delete directory and all files inside

47
src/components/fs/FS.h
View File

@@ -13,6 +13,9 @@ namespace Pinetime {
void Init();
void LVGLFileSystemInit();
void Mount();
void UnMount();
int FileOpen(lfs_file_t* file_p, const char* fileName, const int flags);
int FileClose(lfs_file_t* file_p);
int FileRead(lfs_file_t* file_p, uint8_t* buff, uint32_t size);
@@ -32,31 +35,30 @@ namespace Pinetime {
void VerifyResource();
private:
Pinetime::Drivers::SpiNorFlash& flashDriver;
/*
* External Flash MAP (4 MBytes)
*
* 0x000000 +---------------------------------------+
* | Bootloader Assets |
* | 256 KBytes |
* | |
* 0x040000 +---------------------------------------+
* | OTA |
* | 464 KBytes |
* | |
* | |
* | |
* 0x0B4000 +---------------------------------------+
* | File System |
* | |
* | |
* | |
* | |
* 0x400000 +---------------------------------------+
*
*/
* External Flash MAP (4 MBytes)
*
* 0x000000 +---------------------------------------+
* | Bootloader Assets |
* | 256 KBytes |
* | |
* 0x040000 +---------------------------------------+
* | OTA |
* | 464 KBytes |
* | |
* | |
* | |
* 0x0B4000 +---------------------------------------+
* | File System |
* | |
* | |
* | |
* | |
* 0x400000 +---------------------------------------+
*
*/
static constexpr size_t startAddress = 0x0B4000;
static constexpr size_t size = 0x34C000;
static constexpr size_t blockSize = 4096;
@@ -70,7 +72,6 @@ namespace Pinetime {
static int SectorErase(const struct lfs_config* c, lfs_block_t block);
static int SectorProg(const struct lfs_config* c, lfs_block_t block, lfs_off_t off, const void* buffer, lfs_size_t size);
static int SectorRead(const struct lfs_config* c, lfs_block_t block, lfs_off_t off, void* buffer, lfs_size_t size);
};
}
}