diff options
author | 2021-01-21 15:08:56 +0100 | |
---|---|---|
committer | 2021-01-22 00:02:30 +0100 | |
commit | bd2db8dcc6c14638c02b8f88e691ae94a3a28f3d (patch) | |
tree | 8a31c8993323cf09185666f0fba09c651057c60e /src/lib/formats/m20_dsk.cpp | |
parent | 1a76ae1e0a53ad6658c195b6e38d1a1d0ad477fe (diff) |
flopimg: Change the extracted bitstreams into vector<bool>
flopimg: Change the extracted sectors into vector<vector<uint8_t>>
flopimg: Add a Mac sector extraction
apple 3.5 gcr: Generalize track creation/extraction
apple 3.5 gcr: Add a pure sector format
Diffstat (limited to 'src/lib/formats/m20_dsk.cpp')
-rw-r--r-- | src/lib/formats/m20_dsk.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/formats/m20_dsk.cpp b/src/lib/formats/m20_dsk.cpp index 871e721b1bb..60b2ae58176 100644 --- a/src/lib/formats/m20_dsk.cpp +++ b/src/lib/formats/m20_dsk.cpp @@ -78,22 +78,18 @@ bool m20_format::load(io_generic *io, uint32_t form_factor, const std::vector<ui bool m20_format::save(io_generic *io, const std::vector<uint32_t> &variants, floppy_image *image) { - uint8_t bitstream[500000/8]; - uint8_t sector_data[50000]; - desc_xs sectors[256]; - int track_size; uint64_t file_offset = 0; int track_count, head_count; track_count = 35; head_count = 2; //FIXME: use image->get_actual_geometry(track_count, head_count) instead // initial fm track - generate_bitstream_from_track(0, 0, 4000, bitstream, track_size, image); - extract_sectors_from_bitstream_fm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data)); + auto bitstream = generate_bitstream_from_track(0, 0, 4000, image); + auto sectors = extract_sectors_from_bitstream_fm_pc(bitstream); for (int i = 0; i < 16; i++) { - io_generic_write(io, sectors[i + 1].data, file_offset, 128); + io_generic_write(io, sectors[i + 1].data(), file_offset, 128); file_offset += 256; //128; } @@ -105,12 +101,12 @@ bool m20_format::save(io_generic *io, const std::vector<uint32_t> &variants, flo // skip track 0, head 0 if (track == 0) { if (head_count == 1) break; else head++; } - generate_bitstream_from_track(track, head, 2000, bitstream, track_size, image); - extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data)); + bitstream = generate_bitstream_from_track(track, head, 2000, image); + sectors = extract_sectors_from_bitstream_mfm_pc(bitstream); for (int i = 0; i < 16; i++) { - io_generic_write(io, sectors[i + 1].data, file_offset, 256); + io_generic_write(io, sectors[i + 1].data(), file_offset, 256); file_offset += 256; } } |