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

filemanager cache file fixes for suspend/resume

This commit is contained in:
Jorj Bauer 2018-02-07 12:34:24 -05:00
parent 99d0c8e72c
commit fd51162ede
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apple/applevm.cpp
View File

@ -94,6 +94,7 @@ void AppleVM::Resume(const char *fn)
#else
printf("Unable to open resume file\n");
#endif
g_filemanager->closeFile(fh);
return;
}
@ -101,6 +102,7 @@ void AppleVM::Resume(const char *fn)
for (int i=0; i<strlen(suspendHdr); i++) {
if (g_filemanager->readByte(fh) != suspendHdr[i]) {
/* Failed to read correct header; abort */
g_filemanager->closeFile(fh);
return;
}
}
@ -110,7 +112,9 @@ void AppleVM::Resume(const char *fn)
disk6->Deserialize(fh) &&
hd32->Deserialize(fh)
) {
#ifndef TEENSYDUINO
#ifdef TEENSYDUINO
Serial.println("Deserialization successful");
#else
printf("All deserialized successfully\n");
#endif
} else {
@ -121,7 +125,6 @@ void AppleVM::Resume(const char *fn)
}
g_filemanager->closeFile(fh);
}
// fixme: make member vars

18
teensy/teensy-filemanager.cpp
View File

@ -9,7 +9,7 @@
SdFatSdio sd;
File file;
uint8_t rawFd;
int8_t rawFd;
File rawFile;
TeensyFileManager::TeensyFileManager()
@ -270,14 +270,16 @@ bool TeensyFileManager::_prepCache(int8_t fd)
// Not our cached file, or we have no cached file
if (rawFd != -1) {
// Close the old one if we had one
Serial.println("closing old cache file");
Serial.print("closing old cache file ");
Serial.println(rawFd);
rawFile.close();
rawFd = -1;
}
Serial.println("opening new cache file");
// Open the new one
if (!sd.open(cachedNames[fd], O_RDWR | O_CREAT)) {
rawFile = sd.open(cachedNames[fd], O_RDWR | O_CREAT);
if (!rawFile) {
Serial.print("_prepCache: failed to open ");
Serial.println(cachedNames[fd]);
return false;
@ -304,8 +306,10 @@ uint8_t TeensyFileManager::readByteAt(int8_t fd, uint32_t pos)
_prepCache(fd);
if (!rawFile.seek(pos)) {
Serial.println("readByteAt: seek failed");
return false;
Serial.print("readByteAt: seek failed to pos ");
Serial.println(pos);
Serial.println("Trying to continue anyway");
// return false;
}
uint8_t b;
return (rawFile.read(&b, 1) == 1);
@ -342,12 +346,14 @@ uint8_t TeensyFileManager::readByte(int8_t fd)
uint32_t pos = fileSeekPositions[fd];
if (!rawFile.seek(pos)) {
Serial.println("readByteAt: seek failed");
Serial.print("readByte: seek failed to byte ");
Serial.println(pos);
return false;
}
uint8_t b;
rawFile.read(&b, 1);
fileSeekPositions[fd]++;
// FIXME: check v == 1 & handle error
return b;