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

Clarified meaning of is_high_ flag and ensured it is honoured properly.

Browse Source
This commit is contained in:
Thomas Harte 2017-07-17 21:36:05 -04:00
parent 130d598ec9
commit 35296017b5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Storage/Tape/Formats/TZX.cpp
View File

@ -16,7 +16,7 @@ const unsigned int StandardTZXClock = 3500000;
TZX::TZX(const char *file_name) : TZX::TZX(const char *file_name) :
Storage::FileHolder(file_name), Storage::FileHolder(file_name),
is_high_(false) { next_is_high_(false) {
// Check for signature followed by a 0x1a // Check for signature followed by a 0x1a
char identifier[7]; char identifier[7];
@ -36,6 +36,7 @@ TZX::TZX(const char *file_name) :
void TZX::virtual_reset() { void TZX::virtual_reset() {
clear(); clear();
set_is_at_end(false); set_is_at_end(false);
next_is_high_ = false;
fseek(file_, 0x0a, SEEK_SET); fseek(file_, 0x0a, SEEK_SET);
} }
@ -136,9 +137,9 @@ void TZX::get_generalised_segment(uint32_t output_symbols, uint8_t max_pulses_pe
// Mutate initial output level. // Mutate initial output level.
switch(symbol.flags & 3) { switch(symbol.flags & 3) {
case 0: break; case 0: break;
case 1: is_high_ ^= true; break; case 1: next_is_high_ ^= true; break;
case 2: is_high_ = true; break; case 2: next_is_high_ = false; break;
case 3: is_high_ = false; break; case 3: next_is_high_ = true; break;
} }
// Output waves. // Output waves.
@ -151,8 +152,8 @@ void TZX::get_generalised_segment(uint32_t output_symbols, uint8_t max_pulses_pe
} }
void TZX::post_pulse(unsigned int length) { void TZX::post_pulse(unsigned int length) {
is_high_ ^= true; emplace_back(next_is_high_ ? Tape::Pulse::High : Tape::Pulse::Low, Storage::Time(length, StandardTZXClock));
emplace_back(is_high_ ? Tape::Pulse::High : Tape::Pulse::Low, Storage::Time(length, StandardTZXClock)); next_is_high_ ^= true;
} }
void TZX::get_standard_speed_data_block() { void TZX::get_standard_speed_data_block() {

2
Storage/Tape/Formats/TZX.hpp
View File

@ -35,7 +35,7 @@ class TZX: public PulseQueuedTape, public Storage::FileHolder {
void virtual_reset(); void virtual_reset();
void get_next_pulses(); void get_next_pulses();
bool is_high_; bool next_is_high_;
void get_standard_speed_data_block(); void get_standard_speed_data_block();
void get_turbo_speed_data_block(); void get_turbo_speed_data_block();