Apple-2-Tools/Epple-II
1
0
Fork 0
mirror of https://github.com/cmosher01/Epple-II.git synced 2024-06-02 10:41:33 +00:00
Code Issues Projects Releases Wiki Activity

remove throws; fix drive speed test for new track lengths

Browse Source
This commit is contained in:
Christopher A. Mosher 2019-01-02 20:20:09 -05:00
parent d5ed80aa70
commit eba0a8f4fd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wozfile.cpp
View File

@ -125,7 +125,7 @@ bool WozFile::load(const std::string& filePath) {
in.read((char*)&woz2, sizeof(woz2)); in.read((char*)&woz2, sizeof(woz2));
if (woz2 != 0x325A4F57u) { if (woz2 != 0x325A4F57u) {
printf("WOZ2 magic bytes missing."); printf("WOZ2 magic bytes missing.");
throw "WOZ2 magic bytes missing"; return false;
} }
printf("WOZ2 magic bytes present\n"); printf("WOZ2 magic bytes present\n");
@ -133,7 +133,7 @@ bool WozFile::load(const std::string& filePath) {
in.read((char*)&sanity, sizeof(sanity)); in.read((char*)&sanity, sizeof(sanity));
if (sanity != 0x0A0D0AFFu) { if (sanity != 0x0A0D0AFFu) {
printf("FF 0A 0D 0A bytes corrupt.\n"); printf("FF 0A 0D 0A bytes corrupt.\n");
throw "FF 0A 0D 0A bytes corrupt"; return false;
} }
std::uint32_t crc_given; std::uint32_t crc_given;
@ -154,13 +154,13 @@ bool WozFile::load(const std::string& filePath) {
printf("INFO version %d\n", *buf); printf("INFO version %d\n", *buf);
if (*buf != 2) { if (*buf != 2) {
printf("File is not WOZ2 version.\n"); printf("File is not WOZ2 version.\n");
throw "File is not WOZ2 version"; return false;
} }
five_25 = (buf[1]==1); five_25 = (buf[1]==1);
printf("Disk type: %s\n", five_25 ? "5.25" : buf[1]==2 ? "3.5" : "?"); printf("Disk type: %s\n", five_25 ? "5.25" : buf[1]==2 ? "3.5" : "?");
if (!five_25) { if (!five_25) {
printf("Only 5 1/4\" disk images are supported.\n"); printf("Only 5 1/4\" disk images are supported.\n");
throw "Only 5 1/4\" disk images are supported"; return false;
} }
this->writable = !(buf[2]==1); this->writable = !(buf[2]==1);
printf("Write protected?: %s\n", this->writable ? "No" : "Yes"); printf("Write protected?: %s\n", this->writable ? "No" : "Yes");
@ -217,7 +217,8 @@ bool WozFile::load(const std::string& filePath) {
break; break;
case 0x534B5254: { // TRKS case 0x534B5254: { // TRKS
if (chunk_size < C_QTRACK*8) { if (chunk_size < C_QTRACK*8) {
throw "TRKS chunk doesn't have 160 track entries"; printf("ERROR: TRKS chunk doesn't have 160 track entries.\n");
return false;
} }
std::uint8_t* buf = new std::uint8_t[chunk_size]; std::uint8_t* buf = new std::uint8_t[chunk_size];
in.read((char*)buf, chunk_size); in.read((char*)buf, chunk_size);
@ -724,7 +725,8 @@ std::uint32_t WozFile::calcNewTrackLengthBits(const std::uint8_t qt) {
} }
// corner case: no existing tracks at all // corner case: no existing tracks at all
if (!t1 && !t2) { if (!t1 && !t2) {
return 0xC5C0u; // 0xC780 yields COPY ][ PLUS disk speed of 200ms
return 0xC780u;
} }
// nominal case: average flanking tracks // nominal case: average flanking tracks
if (t1 && t2) { if (t1 && t2) {