Apple-2-HW
/
aiie
mirror of https://github.com/JorjBauer/aiie.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

convert to SdFat-beta for long filename support (but conflicts with Audio.h, sadly)

This commit is contained in:
Jorj Bauer 2020-08-02 20:34:48 -04:00
parent 0c7c3dd83e
commit cd170396e1
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
teensy/teensy-filemanager.cpp
View File

@ -4,6 +4,13 @@
#include <string.h> // strcpy #include <string.h> // strcpy
#include "teensy-println.h" #include "teensy-println.h"
/* FIXME globals */
static SdFat sd;
static File cacheFile;
static File outerDir;
TeensyFileManager::TeensyFileManager() TeensyFileManager::TeensyFileManager()
{ {
numCached = 0; numCached = 0;
@ -11,7 +18,7 @@ TeensyFileManager::TeensyFileManager()
// FIXME: used to have 'enabled = sd.begin()' here, but we weren't // FIXME: used to have 'enabled = sd.begin()' here, but we weren't
// using the enabled flag, so I've removed it to save the RAM for // using the enabled flag, so I've removed it to save the RAM for
// now; but eventually we need better error handling here // now; but eventually we need better error handling here
SD.begin(BUILTIN_SDCARD); sd.begin(SdioConfig(FIFO_SDIO));
} }
TeensyFileManager::~TeensyFileManager() TeensyFileManager::~TeensyFileManager()
@ -72,8 +79,6 @@ const char *TeensyFileManager::fileName(int8_t fd)
return cachedNames[fd]; return cachedNames[fd];
} }
File outerDir;
void TeensyFileManager::closeDir() void TeensyFileManager::closeDir()
{ {
// FIXME: this should Threads::Scope lock, but it's being called // FIXME: this should Threads::Scope lock, but it's being called
@ -90,9 +95,14 @@ int16_t TeensyFileManager::readDir(const char *where, const char *suffix, char *
if (startIdx == 0 || !outerDir) { if (startIdx == 0 || !outerDir) {
if (outerDir) if (outerDir)
closeDir(); closeDir();
outerDir = SD.open(where, FILE_READ); char buf[255];
if (!outerDir) strcpy(buf, where);
if (strlen(buf) > 1 && buf[strlen(buf)-1] == '/') {
buf[strlen(buf)-1] = 0;
}
if (!outerDir.open(buf, O_RDONLY)) {
return -1; return -1;
}
if (strcmp(where, "/")) { // FIXME: is this correct for the root? if (strcmp(where, "/")) { // FIXME: is this correct for the root?
strcpy(outputFN, "../"); strcpy(outputFN, "../");
return 0; return 0;
@ -101,17 +111,14 @@ int16_t TeensyFileManager::readDir(const char *where, const char *suffix, char *
outputFN[0] = '\0'; outputFN[0] = '\0';
while (1) { File e;
File e = outerDir.openNextFile(); while (e.openNext(&outerDir, O_RDONLY)) {
if (!e) {
// No more - all done.
closeDir();
return -1;
}
// Skip MAC fork files // Skip MAC fork files
// FIXME: strncpy // FIXME: strncpy
strcpy(outputFN, e.name()); // and we need maxlen-1 for trailing '/' on directories strcpy(outputFN, e.name()); // and we need maxlen-1 for trailing '/' on directories
e.getName(outputFN, maxlen-1); // -1 for trailing '/' on directories
if (outputFN[0] == '.') { if (outputFN[0] == '.') {
e.close(); e.close();
continue; continue;
@ -153,7 +160,10 @@ int16_t TeensyFileManager::readDir(const char *where, const char *suffix, char *
return startIdx; return startIdx;
} }
/* NOTREACHED */ /* Reached the end of the files */
closeDir();
return -1;
} }
bool TeensyFileManager::_prepCache(int8_t fd) bool TeensyFileManager::_prepCache(int8_t fd)
@ -169,7 +179,7 @@ bool TeensyFileManager::_prepCache(int8_t fd)
} }
// Open the new one // Open the new one
cacheFile = SD.open(cachedNames[fd], FILE_WRITE); cacheFile.open(cachedNames[fd], O_RDWR);
if (!cacheFile) { if (!cacheFile) {
return false; return false;
} }
@ -201,7 +211,8 @@ bool TeensyFileManager::setSeekPosition(int8_t fd, uint32_t pos)
// FIXME: this should be private // FIXME: this should be private
void TeensyFileManager::seekToEnd(int8_t fd) void TeensyFileManager::seekToEnd(int8_t fd)
{ {
File f = SD.open(cachedNames[fd], FILE_READ); File f;
f.open(cachedNames[fd], O_RDONLY);
if (!f) { if (!f) {
return; return;
} }

3
teensy/teensy-filemanager.h
View File

@ -3,7 +3,7 @@
#include "filemanager.h" #include "filemanager.h"
#include <stdint.h> #include <stdint.h>
#include <SD.h> #include <SdFat.h>
#include <SPI.h> #include <SPI.h>
class TeensyFileManager : public FileManager { class TeensyFileManager : public FileManager {
@ -35,7 +35,6 @@ class TeensyFileManager : public FileManager {
int8_t numCached; int8_t numCached;
int8_t cacheFd; int8_t cacheFd;
File cacheFile;
}; };
#endif #endif