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

Adjusted to make sure that the very end of a tape is properly measured.

Browse Source
This commit is contained in:
Thomas Harte 2017-06-08 21:33:35 -04:00
parent bc0d70b2f7
commit b07af2660d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Storage/Tape/Parsers/ZX8081.cpp
View File

@ -18,7 +18,10 @@ void Parser::process_pulse(Storage::Tape::Tape::Pulse pulse) {
if(pulse_is_high == pulse_was_high_) return;
pulse_was_high_ = pulse_is_high;
post_pulse();
}
void Parser::post_pulse() {
const float expected_pulse_length = 150.0f / 1000000.0f;
const float expected_gap_length = 1300.0f / 1000000.0f;
float pulse_time = pulse_time_.get_float();
@ -38,6 +41,13 @@ void Parser::process_pulse(Storage::Tape::Tape::Pulse pulse) {
}
}
void Parser::mark_end() {
// Push the last thing detected, and post an 'unrecognised' to ensure
// the queue empties out.
post_pulse();
push_wave(WaveType::Unrecognised);
}
void Parser::inspect_waves(const std::vector<WaveType> &waves) {
// A long gap is a file gap.
if(waves[0] == WaveType::LongGap) {
@ -77,7 +87,7 @@ int Parser::get_next_byte(const std::shared_ptr<Storage::Tape::Tape> &tape) {
int c = 8;
int result = 0;
while(c--) {
if(tape->is_at_end()) return -1;
if(is_at_end(tape)) return -1;
SymbolType symbol = get_next_symbol(tape);
if(symbol == SymbolType::FileGap) {
return_symbol(symbol);
@ -92,20 +102,20 @@ int Parser::get_next_byte(const std::shared_ptr<Storage::Tape::Tape> &tape) {
}
std::shared_ptr<std::vector<uint8_t>> Parser::get_next_file_data(const std::shared_ptr<Storage::Tape::Tape> &tape) {
if(tape->is_at_end()) return nullptr;
if(is_at_end(tape)) return nullptr;
SymbolType symbol = get_next_symbol(tape);
if(symbol != SymbolType::FileGap) {
return nullptr;
}
while(symbol == SymbolType::FileGap && !tape->is_at_end()) {
while(symbol == SymbolType::FileGap && !is_at_end(tape)) {
symbol = get_next_symbol(tape);
}
if(tape->is_at_end()) return nullptr;
if(is_at_end(tape)) return nullptr;
return_symbol(symbol);
std::shared_ptr<std::vector<uint8_t>> result(new std::vector<uint8_t>);
int byte;
while(!tape->is_at_end()) {
while(!is_at_end(tape)) {
byte = get_next_byte(tape);
if(byte == -1) return result;
result->push_back((uint8_t)byte);

4
Storage/Tape/Parsers/ZX8081.hpp
View File

@ -48,7 +48,11 @@ class Parser: public Storage::Tape::Parser<WaveType, SymbolType> {
private:
bool pulse_was_high_;
Time pulse_time_;
void post_pulse();
void process_pulse(Storage::Tape::Tape::Pulse pulse);
void mark_end();
void inspect_waves(const std::vector<WaveType> &waves);
std::shared_ptr<std::vector<uint8_t>> get_next_file_data(const std::shared_ptr<Storage::Tape::Tape> &tape);