diff options
Diffstat (limited to 'src/lib/formats/wd177x_dsk.cpp')
-rw-r--r-- | src/lib/formats/wd177x_dsk.cpp | 316 |
1 files changed, 195 insertions, 121 deletions
diff --git a/src/lib/formats/wd177x_dsk.cpp b/src/lib/formats/wd177x_dsk.cpp index 69915f0f396..e5b02f02e32 100644 --- a/src/lib/formats/wd177x_dsk.cpp +++ b/src/lib/formats/wd177x_dsk.cpp @@ -1,48 +1,79 @@ // license:BSD-3-Clause -// copyright-holders:Olivier Galibert +// copyright-holders:Olivier Galibert, 68bit /********************************************************************* - formats/wd177x_dsk.h + formats/wd177x_dsk.cpp helper for simple wd177x-formatted disk images *********************************************************************/ -#include "emu.h" // emu_fatalerror #include "formats/wd177x_dsk.h" +#include "ioprocs.h" + +#include "osdcore.h" // osd_printf_* + +#include <cstring> + + wd177x_format::wd177x_format(const format *_formats) { formats = _formats; } +// Default implementation. May be overwritten by subclasses to handle tracks +// that vary from the default, such as a FM encoded track on a largely MFM +// encoded disk, or a track with an different sector IDs etc. Only the track +// encoding is used from the returned format, the number of track_count is not +// accessed. +const wd177x_format::format &wd177x_format::get_track_format(const format &f, int head, int track) const +{ + return f; +} + /* Default implementation for find_size. May be overwritten by subclasses. */ -int wd177x_format::find_size(io_generic *io, uint32_t form_factor) +int wd177x_format::find_size(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { - uint64_t size = io_generic_size(io); + uint64_t size; + if(io.length(size)) + return -1; + for(int i=0; formats[i].form_factor; i++) { const format &f = formats[i]; if(form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor) continue; + if(!variants.empty() && !has_variant(variants, f.variant)) + continue; + uint64_t format_size = 0; + for(int track=0; track < f.track_count; track++) { + for(int head=0; head < f.head_count; head++) { + const format &tf = get_track_format(f, head, track); + format_size += compute_track_size(tf); + } + } - if(size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count) + if(size == format_size) return i; } + return -1; } -int wd177x_format::identify(io_generic *io, uint32_t form_factor) +int wd177x_format::identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const { - int type = find_size(io, form_factor); + int const type = find_size(io, form_factor, variants); if(type != -1) - return 50; + return FIFID_SIZE; + return 0; } -int wd177x_format::compute_track_size(const format &f) const +// A track specific format is to be supplied. +int wd177x_format::compute_track_size(const format &f) { int track_size; if(f.sector_base_size) @@ -55,6 +86,7 @@ int wd177x_format::compute_track_size(const format &f) const return track_size; } +// A track specific format is to be supplied. void wd177x_format::build_sector_description(const format &f, uint8_t *sectdata, desc_s *sectors, int track, int head) const { if(f.sector_base_id == -1) { @@ -78,7 +110,8 @@ void wd177x_format::build_sector_description(const format &f, uint8_t *sectdata, } } -floppy_image_format_t::desc_e* wd177x_format::get_desc_fm(const format &f, int ¤t_size, int &end_gap_index) +// A track specific format is to be supplied. +floppy_image_format_t::desc_e* wd177x_format::get_desc_fm(const format &f, int ¤t_size, int &end_gap_index) const { static floppy_image_format_t::desc_e desc[23] = { /* 00 */ { FM, 0xff, 0 }, @@ -125,7 +158,8 @@ floppy_image_format_t::desc_e* wd177x_format::get_desc_fm(const format &f, int & return desc; } -floppy_image_format_t::desc_e* wd177x_format::get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index) +// A track specific format is to be supplied. +floppy_image_format_t::desc_e* wd177x_format::get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index) const { static floppy_image_format_t::desc_e desc[25] = { /* 00 */ { MFM, 0x4e, 0 }, @@ -174,66 +208,75 @@ floppy_image_format_t::desc_e* wd177x_format::get_desc_mfm(const format &f, int return desc; } -bool wd177x_format::load(io_generic *io, uint32_t form_factor, floppy_image *image) +bool wd177x_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); + int const type = find_size(io, form_factor, variants); if(type == -1) return false; const format &f = formats[type]; - floppy_image_format_t::desc_e *desc; - int current_size; - int end_gap_index; + int max_tracks, max_heads; + image.get_maximal_geometry(max_tracks, max_heads); - switch (f.encoding) - { - case floppy_image::FM: - desc = get_desc_fm(f, current_size, end_gap_index); - break; - case floppy_image::MFM: - default: - desc = get_desc_mfm(f, current_size, end_gap_index); - break; + if(f.track_count > max_tracks) { + osd_printf_error("wd177x_format: Number of tracks in image file too high for floppy drive (%d > %d)\n", f.track_count, max_tracks); + return false; } - int total_size = 200000000/f.cell_size; - int remaining_size = total_size - current_size; - if(remaining_size < 0) - throw emu_fatalerror("wd177x_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size); - - // Fixup the end gap - desc[end_gap_index].p2 = remaining_size / 16; - desc[end_gap_index + 1].p2 = remaining_size & 15; - desc[end_gap_index + 1].p1 >>= 16-(remaining_size & 15); + for(int track=0; track < f.track_count; track++) + for(int head=0; head < f.head_count; head++) { + uint8_t sectdata[40*512]; + desc_s sectors[40]; + floppy_image_format_t::desc_e *desc; + int current_size; + int end_gap_index; + const format &tf = get_track_format(f, head, track); + + switch (tf.encoding) + { + case floppy_image::FM: + desc = get_desc_fm(tf, current_size, end_gap_index); + break; + case floppy_image::MFM: + default: + desc = get_desc_mfm(tf, current_size, end_gap_index); + break; + } - int track_size = compute_track_size(f); + int total_size = 200000000/tf.cell_size; + int remaining_size = total_size - current_size; + if(remaining_size < 0) { + osd_printf_error("wd177x_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size); + return false; + } - uint8_t sectdata[40*512]; - desc_s sectors[40]; + // Fixup the end gap + desc[end_gap_index].p2 = remaining_size / 16; + desc[end_gap_index + 1].p2 = remaining_size & 15; + desc[end_gap_index + 1].p1 >>= 16-(remaining_size & 15); - for(int track=0; track < f.track_count; track++) - for(int head=0; head < f.head_count; head++) { - if (f.encoding == floppy_image::FM) - desc[14].p1 = get_track_dam_fm(f, head, track); + if (tf.encoding == floppy_image::FM) + desc[14].p1 = get_track_dam_fm(tf, head, track); else - desc[16].p1 = get_track_dam_mfm(f, head, track); + desc[16].p1 = get_track_dam_mfm(tf, head, track); - build_sector_description(f, sectdata, sectors, track, head); - io_generic_read(io, sectdata, get_image_offset(f, head, track), track_size); - generate_track(desc, track, head, sectors, f.sector_count, total_size, image); + build_sector_description(tf, sectdata, sectors, track, head); + int track_size = compute_track_size(tf); + /*auto const [err, actual] =*/ read_at(io, get_image_offset(f, head, track), sectdata, track_size); // FIXME: check for errors and premature EOF + generate_track(desc, track, head, sectors, tf.sector_count, total_size, image); } - image->set_variant(f.variant); + image.set_form_variant(f.form_factor, f.variant); return true; } -bool wd177x_format::supports_save() const +bool wd177x_format::supports_save() const noexcept { return true; } -bool wd177x_format::save(io_generic *io, floppy_image *image) +bool wd177x_format::save(util::random_read_write &io, const std::vector<uint32_t> &variants, const floppy_image &image) const { // Count the number of formats int formats_count; @@ -252,9 +295,9 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) // Build the list of all formats for the immediately superior cell size int cur_cell_size = 0; candidates.clear(); - for(int i=0; i != formats_count; i++) { - if(image->get_form_factor() == floppy_image::FF_UNKNOWN || - image->get_form_factor() == formats[i].form_factor) { + for(int i=0; i < formats_count; i++) { + if(image.get_form_factor() == floppy_image::FF_UNKNOWN || + image.get_form_factor() == formats[i].form_factor) { if(formats[i].cell_size == cur_cell_size) candidates.push_back(i); else if((!cur_cell_size || formats[i].cell_size < cur_cell_size) && @@ -273,7 +316,7 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) if(candidates.empty()) break; - // Filter with track 0 head 0 + // Filter check_compatibility(image, candidates); // Nobody matches, try with the next cell size @@ -291,9 +334,9 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) // Otherwise, find the best int tracks, heads; - image->get_actual_geometry(tracks, heads); + image.get_actual_geometry(tracks, heads); chosen_candidate = candidates[0]; - for(unsigned int i=1; i != candidates.size(); i++) { + for(unsigned int i=1; i < candidates.size(); i++) { const format &cc = formats[chosen_candidate]; const format &cn = formats[candidates[i]]; @@ -334,19 +377,20 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) if(chosen_candidate == -1) chosen_candidate = 0; - const format &f = formats[chosen_candidate]; - int track_size = compute_track_size(f); uint8_t sectdata[40*512]; desc_s sectors[40]; - for(int track=0; track < f.track_count; track++) + for(int track=0; track < f.track_count; track++) { for(int head=0; head < f.head_count; head++) { - build_sector_description(f, sectdata, sectors, track, head); - extract_sectors(image, f, sectors, track, head); - io_generic_write(io, sectdata, get_image_offset(f, head, track), track_size); + const format &tf = get_track_format(f, head, track); + build_sector_description(tf, sectdata, sectors, track, head); + extract_sectors(image, tf, sectors, track, head); + int track_size = compute_track_size(tf); + /*auto const [err, actual] =*/ write_at(io, get_image_offset(f, head, track), sectdata, track_size); // FIXME: check for errors } + } return true; } @@ -355,105 +399,135 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) Default implementation of the image offset computation. May be overwritten by subclasses. */ -int wd177x_format::get_image_offset(const format &f, int head, int track) +int wd177x_format::get_image_offset(const format &f, int head, int track) const { - return (track * f.head_count + head) * compute_track_size(f); + int offset = 0; + + for(int trk=0; trk < track; trk++) { + for(int hd=0; hd < f.head_count; hd++) { + const format &tf = get_track_format(f, hd, trk); + offset += compute_track_size(tf); + } + } + + for(int hd=0; hd < head; hd++) { + const format &tf = get_track_format(f, hd, track); + offset += compute_track_size(tf); + } + + + return offset; } -int wd177x_format::get_track_dam_fm(const format &f, int head, int track) +// A track specific format is to be supplied. +int wd177x_format::get_track_dam_fm(const format &f, int head, int track) const { // everything marked as data by default return FM_DAM; } -int wd177x_format::get_track_dam_mfm(const format &f, int head, int track) +// A track specific format is to be supplied. +int wd177x_format::get_track_dam_mfm(const format &f, int head, int track) const { // everything marked as data by default return MFM_DAM; } -void wd177x_format::check_compatibility(floppy_image *image, std::vector<int> &candidates) +void wd177x_format::check_compatibility(const floppy_image &image, std::vector<int> &candidates) const { - uint8_t bitstream[500000/8]; - uint8_t sectdata[50000]; - desc_xs sectors[256]; - int track_size; - - // Extract the sectors - generate_bitstream_from_track(0, 0, formats[candidates[0]].cell_size, bitstream, track_size, image); - - switch (formats[candidates[0]].encoding) - { - case floppy_image::FM: - extract_sectors_from_bitstream_fm_pc(bitstream, track_size, sectors, sectdata, sizeof(sectdata)); - break; - case floppy_image::MFM: - extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sectdata, sizeof(sectdata)); - break; - } - // Check compatibility with every candidate, copy in-place int *ok_cands = &candidates[0]; - for(unsigned int i=0; i != candidates.size(); i++) { + for(unsigned int i=0; i < candidates.size(); i++) { const format &f = formats[candidates[i]]; - int ns = 0; - for(int j=0; j<256; j++) - if(sectors[j].data) { - int sid; - if(f.sector_base_id == -1) { - for(sid=0; sid < f.sector_count; sid++) - if(f.per_sector_id[sid] == j) - break; - } else - sid = j - f.sector_base_id; - if(sid < 0 || sid > f.sector_count) - goto fail; - if(f.sector_base_size) { - if(sectors[j].size != f.sector_base_size) - goto fail; - } else { - if(sectors[j].size != f.per_sector_size[sid]) - goto fail; + + int max_tracks, max_heads; + image.get_maximal_geometry(max_tracks, max_heads); + + // Fail if floppy drive can't handle track or head count + if(f.track_count > max_tracks || f.head_count > max_heads) { + goto fail; + } + + for(int track=0; track < f.track_count; track++) { + for(int head=0; head < f.head_count; head++) { + const format &tf = get_track_format(f, head, track); + + auto bitstream = generate_bitstream_from_track(track, head, tf.cell_size, image); + std::vector<std::vector<uint8_t>> sectors; + + switch (tf.encoding) + { + case floppy_image::FM: + sectors = extract_sectors_from_bitstream_fm_pc(bitstream); + break; + case floppy_image::MFM: + sectors = extract_sectors_from_bitstream_mfm_pc(bitstream); + break; } - ns++; + int ns = 0; + for(int j=0; j<int(sectors.size()); j++) + if(!sectors[j].empty()) { + int sid; + if(tf.sector_base_id == -1) { + for(sid=0; sid < tf.sector_count; sid++) + if(tf.per_sector_id[sid] == j) + break; + } else + sid = j - tf.sector_base_id; + if(sid < 0 || sid > tf.sector_count) + goto fail; + if(tf.sector_base_size) { + if(sectors[j].size() != tf.sector_base_size) + goto fail; + } else { + if(sectors[j].size() != tf.per_sector_size[sid]) + goto fail; + } + ns++; + } + + if(ns > tf.sector_count) + goto fail; + + // Be permissive of some missing sectors in later tracks + if(ns < tf.sector_count && track < 2) + goto fail; } - if(ns == f.sector_count) - *ok_cands++ = candidates[i]; + } + *ok_cands++ = candidates[i]; fail: ; } candidates.resize(ok_cands - &candidates[0]); } -void wd177x_format::extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head) +// A track specific format is to be supplied. +void wd177x_format::extract_sectors(const floppy_image &image, const format &f, desc_s *sdesc, int track, int head) { - uint8_t bitstream[500000/8]; - uint8_t sectdata[50000]; - desc_xs sectors[256]; - int track_size; - // Extract the sectors - generate_bitstream_from_track(track, head, f.cell_size, bitstream, track_size, image); + auto bitstream = generate_bitstream_from_track(track, head, f.cell_size, image); + std::vector<std::vector<uint8_t>> sectors; switch (f.encoding) { case floppy_image::FM: - extract_sectors_from_bitstream_fm_pc(bitstream, track_size, sectors, sectdata, sizeof(sectdata)); + sectors = extract_sectors_from_bitstream_fm_pc(bitstream); break; case floppy_image::MFM: - extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sectdata, sizeof(sectdata)); + sectors = extract_sectors_from_bitstream_mfm_pc(bitstream); break; } for(int i=0; i<f.sector_count; i++) { desc_s &ds = sdesc[i]; - desc_xs &xs = sectors[ds.sector_id]; - if(!xs.data) + if(ds.sector_id >= sectors.size() || sectors[ds.sector_id].empty()) memset((void *)ds.data, 0, ds.size); - else if(xs.size < ds.size) { - memcpy((void *)ds.data, xs.data, xs.size); - memset((uint8_t *)ds.data + xs.size, 0, xs.size - ds.size); + + else if(sectors[ds.sector_id].size() < ds.size) { + memcpy((void *)ds.data, sectors[ds.sector_id].data(), sectors[ds.sector_id].size()); + memset((uint8_t *)ds.data + sectors[ds.sector_id].size(), 0, ds.size - sectors[ds.sector_id].size()); + } else - memcpy((void *)ds.data, xs.data, ds.size); + memcpy((void *)ds.data, sectors[ds.sector_id].data(), ds.size); } } |