diff options
Diffstat (limited to 'src/lib/formats/vt_dsk.cpp')
-rw-r--r-- | src/lib/formats/vt_dsk.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/formats/vt_dsk.cpp b/src/lib/formats/vt_dsk.cpp index 92f652ba98d..202ec784187 100644 --- a/src/lib/formats/vt_dsk.cpp +++ b/src/lib/formats/vt_dsk.cpp @@ -35,7 +35,7 @@ void vtech_common_format::wbyte(std::vector<uint32_t> &buffer, uint32_t &pos, ui wbit(buffer, pos, (byte >> i) & 1); } -void vtech_common_format::image_to_flux(const std::vector<uint8_t> &bdata, floppy_image *image) +void vtech_common_format::image_to_flux(const std::vector<uint8_t> &bdata, floppy_image &image) { static const uint8_t sector_map[16] = { 0x0, 0xb, 0x6, 0x1, 0xc, 0x7, 0x2, 0xd, 0x8, 0x3, 0xe, 0x9, 0x4, 0xf, 0xa, 0x5 @@ -43,9 +43,9 @@ void vtech_common_format::image_to_flux(const std::vector<uint8_t> &bdata, flopp for(int track = 0; track != 40; track ++) { uint32_t pos = 0; - std::vector<uint32_t> &buffer = image->get_buffer(track, 0); + std::vector<uint32_t> &buffer = image.get_buffer(track, 0); buffer.clear(); - image->set_write_splice_position(track, 0, 0); + image.set_write_splice_position(track, 0, 0); // One window of pad at the start to avoid problems with the write splice wbit(buffer, pos, 0); @@ -82,12 +82,12 @@ void vtech_common_format::image_to_flux(const std::vector<uint8_t> &bdata, flopp } } -std::vector<uint8_t> vtech_common_format::flux_to_image(floppy_image *image) +std::vector<uint8_t> vtech_common_format::flux_to_image(const floppy_image &image) { std::vector<uint8_t> bdata(16*256*40, 0); for(int track = 0; track != 40; track++) { - auto buffer = image->get_buffer(track, 0); + const auto &buffer = image.get_buffer(track, 0); int sz = buffer.size(); if(sz < 128) continue; @@ -192,32 +192,32 @@ std::vector<uint8_t> vtech_common_format::flux_to_image(floppy_image *image) } -const char *vtech_bin_format::name() const +const char *vtech_bin_format::name() const noexcept { return "vtech_bin"; } -const char *vtech_bin_format::description() const +const char *vtech_bin_format::description() const noexcept { return "VTech sector disk image"; } -const char *vtech_bin_format::extensions() const +const char *vtech_bin_format::extensions() const noexcept { return "bin"; } -const char *vtech_dsk_format::name() const +const char *vtech_dsk_format::name() const noexcept { return "vtech_dsk"; } -const char *vtech_dsk_format::description() const +const char *vtech_dsk_format::description() const noexcept { return "VTech dsk image"; } -const char *vtech_dsk_format::extensions() const +const char *vtech_dsk_format::extensions() const noexcept { return "dsk"; } @@ -261,7 +261,7 @@ int vtech_dsk_format::identify(util::random_read &io, uint32_t form_factor, cons return count_sh >= 30*16 && count_sd >= 30*16 ? FIFID_STRUCT : 0; } -bool vtech_bin_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const +bool vtech_bin_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { uint64_t size; if(io.length(size) || (size != 40*16*256)) @@ -272,11 +272,11 @@ bool vtech_bin_format::load(util::random_read &io, uint32_t form_factor, const s io.read_at(0, bdata.data(), size, actual); image_to_flux(bdata, image); - image->set_form_variant(floppy_image::FF_525, floppy_image::SSSD); + image.set_form_variant(floppy_image::FF_525, floppy_image::SSSD); return true; } -bool vtech_dsk_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) const +bool vtech_dsk_format::load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const { uint64_t size; if(io.length(size)) @@ -342,14 +342,14 @@ bool vtech_dsk_format::load(util::random_read &io, uint32_t form_factor, const s } image_to_flux(bdatax, image); - image->set_form_variant(floppy_image::FF_525, floppy_image::SSSD); + image.set_form_variant(floppy_image::FF_525, floppy_image::SSSD); return true; } -bool vtech_bin_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) const +bool vtech_bin_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { int tracks, heads; - image->get_maximal_geometry(tracks, heads); + image.get_maximal_geometry(tracks, heads); if(tracks < 40) return false; @@ -359,10 +359,10 @@ bool vtech_bin_format::save(util::random_read_write &io, const std::vector<uint3 return true; } -bool vtech_dsk_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, floppy_image *image) const +bool vtech_dsk_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { int tracks, heads; - image->get_maximal_geometry(tracks, heads); + image.get_maximal_geometry(tracks, heads); if(tracks < 40) return false; |