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

Corrected some minor out-of-style breaks, and ensured that the name of ZX81 files is returned.

Browse Source
This commit is contained in:
Thomas Harte
2017-07-17 19:52:54 -04:00
parent 0350925c1e
commit 130d598ec9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Storage/Data/ZX8081.cpp
View File

@@ -50,8 +50,10 @@ static std::shared_ptr<File> ZX81FileFromData(const std::vector<uint8_t> &data)
// Look for a file name. // Look for a file name.
size_t data_pointer = 0; size_t data_pointer = 0;
std::vector<uint8_t> name_data;
int c = 11; int c = 11;
while(c < data.size() && c--) { while(c < data.size() && c--) {
name_data.push_back(data[data_pointer] & 0x3f);
if(data[data_pointer] & 0x80) break; if(data[data_pointer] & 0x80) break;
data_pointer++; data_pointer++;
} }
@@ -80,6 +82,7 @@ static std::shared_ptr<File> ZX81FileFromData(const std::vector<uint8_t> &data)
// TODO: check that the line numbers declared above exist (?) // TODO: check that the line numbers declared above exist (?)
std::shared_ptr<File> file(new File); std::shared_ptr<File> file(new File);
file->name = StringFromData(name_data, true);
file->data = data; file->data = data;
file->isZX81 = true; file->isZX81 = true;
return file; return file;

2
Storage/Data/ZX8081.hpp
View File

@@ -19,7 +19,7 @@ namespace ZX8081 {
struct File { struct File {
std::vector<uint8_t> data; std::vector<uint8_t> data;
std::string name; std::wstring name;
bool isZX81; bool isZX81;
}; };

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

@@ -29,14 +29,11 @@ void Parser::post_pulse() {
if(pulse_time > expected_gap_length * 1.25f) { if(pulse_time > expected_gap_length * 1.25f) {
push_wave(WaveType::LongGap); push_wave(WaveType::LongGap);
} } else if(pulse_time > expected_pulse_length * 1.25f) {
else if(pulse_time > expected_pulse_length * 1.25f) {
push_wave(WaveType::Gap); push_wave(WaveType::Gap);
} } else if(pulse_time >= expected_pulse_length * 0.75f && pulse_time <= expected_pulse_length * 1.25f) {
else if(pulse_time >= expected_pulse_length * 0.75f && pulse_time <= expected_pulse_length * 1.25f) {
push_wave(WaveType::Pulse); push_wave(WaveType::Pulse);
} } else {
else {
push_wave(WaveType::Unrecognised); push_wave(WaveType::Unrecognised);
} }
} }