6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-07 23:25:00 +00:00
Code Issues Projects Releases Wiki Activity

This may be feeding bits in the wrong direction or calculting the wrong parity or doing something else amiss but should now be correct as to bytes.

Browse Source
This commit is contained in:
Thomas Harte
2016-10-11 07:57:10 -04:00
parent df01c78039
commit 70f004efbb
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Storage/Tape/Formats/OricTAP.cpp
View File

@@ -67,30 +67,41 @@ Tape::Pulse OricTAP::virtual_get_next_pulse()
case LeadIn: case LeadIn:
next_byte = 0x16; next_byte = 0x16;
_phase_counter++; _phase_counter++;
if(_phase_counter == 259) // TODO if(_phase_counter == 256) // 256 artificial bytes plus the three in the file = 259
{ {
_next_phase = Header; _next_phase = Header;
} }
break; break;
case Header: case Header:
// Counts are relative to:
// [0, 2]: value 0x16
// 3: value '$'
// [4, 5]: "two bytes unused" (on the Oric 1)
// 6: program type
// 7: auto indicator
// [8, 9]: end address of data
// [10, 11]: start address of data
// 12: "unused" (on the Oric 1)
// [13...]: filename, up to NULL byte
next_byte = (uint8_t)fgetc(_file); next_byte = (uint8_t)fgetc(_file);
// TODO if(_phase_counter == 8) _data_end_address = (uint16_t)(next_byte << 8);
if(_phase_counter == 4) _body_length = next_byte; if(_phase_counter == 9) _data_end_address |= next_byte;
if(_phase_counter == 6) _body_length |= (uint16_t)next_byte << 8; if(_phase_counter == 10) _data_start_address = (uint16_t)(next_byte << 8);
if(_phase_counter == 11) _data_start_address |= next_byte;
_phase_counter++; _phase_counter++;
if(_phase_counter == 10) // TODO if(_phase_counter > 12 && !next_byte) // advance after the filename-ending NULL byte
{ {
_next_phase = Pause; _next_phase = Data;
} }
break; break;
case Data: case Data:
next_byte = (uint8_t)fgetc(_file); next_byte = (uint8_t)fgetc(_file);
_phase_counter++; _phase_counter++;
if(_phase_counter == _body_length) if(_phase_counter == (_data_end_address - _data_start_address))
{ {
_phase_counter = 0; _phase_counter = 0;
if((size_t)ftell(_file) == _file_length) if((size_t)ftell(_file) == _file_length)
@@ -104,15 +115,6 @@ Tape::Pulse OricTAP::virtual_get_next_pulse()
} }
break; break;
case Pause:
_phase_counter++;
if(_phase_counter == 2)
{
_phase_counter = 0;
_next_phase = Data;
}
break;
case End: case End:
break; break;
} }
@@ -133,12 +135,6 @@ Tape::Pulse OricTAP::virtual_get_next_pulse()
switch(_phase) switch(_phase)
{ {
case Pause:
pulse.type = Pulse::High; // TODO
pulse.length.length = 20; // TODO
_bit_count = 13;
return pulse;
case End: case End:
pulse.type = Pulse::Zero; pulse.type = Pulse::Zero;
pulse.length.length = 4800; pulse.length.length = 4800;

4
Storage/Tape/Formats/OricTAP.hpp
View File

@@ -48,9 +48,9 @@ class OricTAP: public Tape {
int _phase_counter; int _phase_counter;
enum Phase { enum Phase {
LeadIn, Header, Pause, Data, End LeadIn, Header, Data, End
} _phase, _next_phase; } _phase, _next_phase;
uint16_t _body_length; uint16_t _data_end_address, _data_start_address;
}; };
} }