6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-23 18:29:16 +00:00
Code Issues Projects Releases Wiki Activity

Guess that all C16-style files are 'half wave'.

Browse Source
This commit is contained in:
Thomas Harte 2025-01-06 17:26:25 -05:00
parent 2cd6c4238b
commit 45f3ef6920
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Storage/Tape/Formats/CommodoreTAP.cpp
View File

@ -23,6 +23,7 @@ CommodoreTAP::Serialiser::Serialiser(const std::string &file_name) :
if(!is_c64 && !is_c16) {
throw ErrorNotCommodoreTAP;
}
type_ = is_c16 ? FileType::C16 : FileType::C64;
// Get and check the file version.
version_ = file_.get8();
@ -31,18 +32,8 @@ CommodoreTAP::Serialiser::Serialiser(const std::string &file_name) :
}
// Read clock rate-implying bytes.
enum Platform: uint8_t {
C64 = 0,
Vic20 = 1,
C16 = 2,
};
const auto platform = Platform(file_.get8());
enum VideoStandard: uint8_t {
PAL = 0,
NTSC1 = 1,
NTSC2 = 2,
};
const auto video = VideoStandard(file_.get8());
platform_ = Platform(file_.get8());
video_ = VideoStandard(file_.get8());
file_.seek(1, SEEK_CUR);
// Read file size.
@ -51,12 +42,12 @@ CommodoreTAP::Serialiser::Serialiser(const std::string &file_name) :
// Pick clock rate.
current_pulse_.length.clock_rate = static_cast<unsigned int>(
[&] {
switch(platform) {
case Vic20: return video == PAL ? 1'108'000 : 1'022'000; // TODO: these are inexact.
case C64: return video == PAL ? 985'248 : 1'022'727;
case C16: return video == PAL ? 886'722 : 894'886;
switch(platform_) { // TODO: Vic-20 numbers are inexact.
case Platform::Vic20: return video_ == VideoStandard::PAL ? 1'108'000 : 1'022'000;
case Platform::C64: return video_ == VideoStandard::PAL ? 985'248 : 1'022'727;
case Platform::C16: return video_ == VideoStandard::PAL ? 886'722 : 894'886;
}
}() * 1 //(half_waves() ? 1 : 2)
}() * (half_waves() ? 1 : 2)
);
reset();
}

16
Storage/Tape/Formats/CommodoreTAP.hpp
View File

@ -44,12 +44,26 @@ private:
Storage::FileHolder file_;
uint32_t file_size_;
enum class FileType {
C16, C64,
} type_;
enum class Platform: uint8_t {
C64 = 0,
Vic20 = 1,
C16 = 2,
} platform_;
enum class VideoStandard: uint8_t {
PAL = 0,
NTSC1 = 1,
NTSC2 = 2,
} video_;
uint8_t version_;
bool updated_layout() const {
return version_ >= 1;
}
bool half_waves() const {
return version_ >= 2;
return type_ == FileType::C16;
// return version_ >= 2;
}
Pulse current_pulse_;