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

Rejigged to correct: spaces go after bits, not after bytes.

Browse Source
This commit is contained in:
Thomas Harte 2017-06-06 18:29:15 -04:00
parent 7399f3d798
commit 4677cebf40
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Storage/Tape/Formats/ZX80O.cpp
View File

@ -41,7 +41,7 @@ void ZX80O::virtual_reset() {
fseek(file_, 0, SEEK_SET); fseek(file_, 0, SEEK_SET);
is_past_silence_ = false; is_past_silence_ = false;
is_high_ = true; is_high_ = true;
bit_pointer_ = 9; bit_pointer_ = wave_pointer_ = 0;
} }
bool ZX80O::is_at_end() { bool ZX80O::is_at_end() {
@ -61,14 +61,20 @@ Tape::Pulse ZX80O::virtual_get_next_pulse() {
} }
// For each byte, output 8 bits and then silence. // For each byte, output 8 bits and then silence.
if(bit_pointer_ == 9) { if(!bit_pointer_ && !wave_pointer_) {
byte_ = (uint8_t)fgetc(file_); byte_ = (uint8_t)fgetc(file_);
bit_pointer_ = 0; bit_pointer_ = 0;
wave_pointer_ = 0; wave_pointer_ = 0;
} }
// Bytes are stored MSB first. if(!wave_pointer_) {
if(bit_pointer_ < 8) { // post-waves silence (here actually a pre-waves silence) is 1300µs
pulse.length.length = 13;
pulse.length.clock_rate = 10000;
pulse.type = Pulse::Type::Zero;
wave_pointer_ ++;
} else {
// waves are of length 150µs // waves are of length 150µs
pulse.length.length = 3; pulse.length.length = 3;
pulse.length.clock_rate = 20000; pulse.length.clock_rate = 20000;
@ -76,27 +82,18 @@ Tape::Pulse ZX80O::virtual_get_next_pulse() {
if(is_high_) { if(is_high_) {
pulse.type = Pulse::Type::High; pulse.type = Pulse::Type::High;
is_high_ = false; is_high_ = false;
printf("-");
} else { } else {
pulse.type = Pulse::Type::Low; pulse.type = Pulse::Type::Low;
is_high_ = true; is_high_ = true;
printf("_");
// Bytes are stored MSB first.
int wave_count = (byte_ & (0x80 >> bit_pointer_)) ? 9 : 4; int wave_count = (byte_ & (0x80 >> bit_pointer_)) ? 9 : 4;
wave_pointer_++; wave_pointer_++;
if(wave_pointer_ == wave_count) { if(wave_pointer_ == wave_count + 1) {
bit_pointer_++; bit_pointer_ = (bit_pointer_ + 1)&7;
wave_pointer_ = 0; wave_pointer_ = 0;
} }
} }
} else {
// post-waves silence is 1300µs
pulse.length.length = 13;
pulse.length.clock_rate = 10000;
pulse.type = Pulse::Type::Zero;
bit_pointer_++;
printf("\n");
} }
return pulse; return pulse;