diff options
author | 2022-03-25 15:02:54 +0100 | |
---|---|---|
committer | 2022-03-30 15:45:35 +0200 | |
commit | 33bdc1469b3bc84ab1b811329f05c75f4801a7de (patch) | |
tree | 354dd6678a442adc26be3572fac9b27e1d21d1d4 /src/lib/formats/upd765_dsk.cpp | |
parent | 023486a37ff70f9be765495c07ff3fe0b9c47bc1 (diff) |
Constify the floppy image handling interface
Diffstat (limited to 'src/lib/formats/upd765_dsk.cpp')
-rw-r--r-- | src/lib/formats/upd765_dsk.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/formats/upd765_dsk.cpp b/src/lib/formats/upd765_dsk.cpp index 630bd3da172..1a90bcdacec 100644 --- a/src/lib/formats/upd765_dsk.cpp +++ b/src/lib/formats/upd765_dsk.cpp @@ -17,7 +17,7 @@ #include <cstring> -upd765_format::upd765_format(const format *_formats) : file_header_skip_bytes(0), file_footer_skip_bytes(0), formats(_formats) +upd765_format::upd765_format(const format *_formats) : formats(_formats) { } @@ -34,13 +34,13 @@ int upd765_format::find_size(util::random_read &io, uint32_t form_factor, const if(!variants.empty() && !has_variant(variants, f.variant)) continue; - if(size == file_header_skip_bytes + (uint64_t) compute_track_size(f) * f.track_count * f.head_count + file_footer_skip_bytes) + if(size == compute_track_size(f) * f.track_count * f.head_count) return i; } return -1; } -int upd765_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) +int upd765_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { int type = find_size(io, form_factor, variants); @@ -85,7 +85,7 @@ void upd765_format::build_sector_description(const format &f, uint8_t *sectdata, } } -floppy_image_format_t::desc_e* upd765_format::get_desc_fm(const format &f, int ¤t_size, int &end_gap_index) +floppy_image_format_t::desc_e* upd765_format::get_desc_fm(const format &f, int ¤t_size, int &end_gap_index) const { static floppy_image_format_t::desc_e desc[26] = { /* 00 */ { FM, 0xff, f.gap_4a }, @@ -130,7 +130,7 @@ floppy_image_format_t::desc_e* upd765_format::get_desc_fm(const format &f, int & return desc; } -floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index) +floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index) const { static floppy_image_format_t::desc_e desc[29] = { /* 00 */ { MFM, 0x4e, 0 }, @@ -184,7 +184,7 @@ floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int return desc; } -bool upd765_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) +bool upd765_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const { int type = find_size(io, form_factor, variants); if(type == -1) @@ -232,7 +232,7 @@ bool upd765_format::load(util::random_read &io, uint32_t form_factor, const std: for(int head=0; head < f.head_count; head++) { build_sector_description(f, sectdata, sectors, track, head); size_t actual; - io.read_at(file_header_skip_bytes + (track*f.head_count + head)*track_size, sectdata, track_size, actual); + io.read_at((track*f.head_count + head)*track_size, sectdata, track_size, actual); generate_track(desc, track, head, sectors, f.sector_count, total_size, image); } @@ -246,7 +246,7 @@ bool upd765_format::supports_save() const return true; } -bool upd765_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) +bool upd765_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) const { // Count the number of formats int formats_count; @@ -363,7 +363,7 @@ bool upd765_format::save(util::random_read_write &io, const std::vector<uint32_t return true; } -void upd765_format::check_compatibility(floppy_image *image, std::vector<int> &candidates) +void upd765_format::check_compatibility(floppy_image *image, std::vector<int> &candidates) const { // Extract the sectors auto bitstream = generate_bitstream_from_track(0, 0, formats[candidates[0]].cell_size, image); @@ -413,7 +413,7 @@ void upd765_format::check_compatibility(floppy_image *image, std::vector<int> &c } -void upd765_format::extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head) +void upd765_format::extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head) const { // Extract the sectors auto bitstream = generate_bitstream_from_track(track, head, f.cell_size, image); |