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

Corrections: data segments now correctly announce their number of bits, and tracks aren't oversized.

Browse Source
This commit is contained in:
Thomas Harte 2018-04-28 15:47:50 -04:00
parent 7f03f5d02f
commit 5b35c88be2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Storage/Disk/DiskImage/Formats/AppleDSK.cpp
View File

@ -40,7 +40,6 @@ std::shared_ptr<Track> AppleDSK::get_track_at_position(Track::Address address) {
// In either case below, the code aims for exactly 50,000 bits per track. // In either case below, the code aims for exactly 50,000 bits per track.
if(sectors_per_track_ == 16) { if(sectors_per_track_ == 16) {
// Write the sectors. // Write the sectors.
for(uint8_t c = 0; c < 16; ++c) { for(uint8_t c = 0; c < 16; ++c) {
segments.push_back(Encodings::AppleGCR::six_and_two_sync(10)); segments.push_back(Encodings::AppleGCR::six_and_two_sync(10));
@ -50,9 +49,11 @@ std::shared_ptr<Track> AppleDSK::get_track_at_position(Track::Address address) {
segments.push_back(Encodings::AppleGCR::six_and_two_sync(10)); segments.push_back(Encodings::AppleGCR::six_and_two_sync(10));
} }
// Pad if necessary.
int encoded_length = (80 + 112 + 80 + 2848 + 80) * sectors_per_track_; int encoded_length = (80 + 112 + 80 + 2848 + 80) * sectors_per_track_;
segments.push_back(Encodings::AppleGCR::six_and_two_sync((50000 - encoded_length) >> 3)); if(encoded_length < 50000) {
segments.push_back(Encodings::AppleGCR::six_and_two_sync((50000 - encoded_length) >> 3));
}
} else { } else {
} }

3
Storage/Disk/Encodings/AppleGCR.cpp
View File

@ -135,6 +135,7 @@ Storage::Disk::PCMSegment AppleGCR::six_and_two_data(const uint8_t *source) {
Storage::Disk::PCMSegment segment; Storage::Disk::PCMSegment segment;
segment.data.resize(349); segment.data.resize(349);
segment.number_of_bits = static_cast<unsigned int>(segment.data.size() * 8);
// Add the prologue and epilogue. // Add the prologue and epilogue.
segment.data[0] = header_prologue[0]; segment.data[0] = header_prologue[0];
@ -174,7 +175,7 @@ Storage::Disk::PCMSegment AppleGCR::six_and_two_data(const uint8_t *source) {
// Map six-bit values up to full bytes. // Map six-bit values up to full bytes.
for(std::size_t c = 0; c < 343; ++c) { for(std::size_t c = 0; c < 343; ++c) {
segment.data[c] = six_and_two_mapping[segment.data[c]]; segment.data[3 + c] = six_and_two_mapping[segment.data[3 + c]];
} }
return segment; return segment;