6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-26 19:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Introduces flush_tracks to Drive, while switching its interface to using Track::Address and adjusting associated integer types.

Browse Source
This commit is contained in:
Thomas Harte
2017-10-06 21:45:12 -04:00
parent f623bff5c3
commit 97a2be71e3
29 changed files with 150 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Storage/Disk/DiskImage/Formats/G64.cpp
+6 -6
View File
@@ -28,22 +28,22 @@ G64::G64(const char *file_name) :
maximum_track_size_ = fgetc16le();
}
unsigned int G64::get_head_position_count() {
int G64::get_head_position_count() {
// give at least 84 tracks, to yield the normal geometry but,
// if there are more, shove them in
return number_of_tracks_ > 84 ? number_of_tracks_ : 84;
}
std::shared_ptr<Track> G64::get_track_at_position(unsigned int head, unsigned int position) {
std::shared_ptr<Track> G64::get_track_at_position(Track::Address address) {
std::shared_ptr<Track> resulting_track;
// if there's definitely no track here, return the empty track
// (TODO: should be supplying one with an index hole?)
if(position >= number_of_tracks_) return resulting_track;
if(head >= 1) return resulting_track;
if(address.position >= number_of_tracks_) return resulting_track;
if(address.head >= 1) return resulting_track;
// seek to this track's entry in the track table
fseek(file_, (long)((position * 4) + 0xc), SEEK_SET);
fseek(file_, (long)((address.position * 4) + 0xc), SEEK_SET);
// read the track offset
uint32_t track_offset;
@@ -64,7 +64,7 @@ std::shared_ptr<Track> G64::get_track_at_position(unsigned int head, unsigned in
fread(&track_contents[0], 1, track_length, file_);
// seek to this track's entry in the speed zone table
fseek(file_, (long)((position * 4) + 0x15c), SEEK_SET);
fseek(file_, (long)((address.position * 4) + 0x15c), SEEK_SET);
// read the speed zone offsrt
uint32_t speed_zone_offset;