summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author ajrhacker <ajrhacker@users.noreply.github.com>2019-08-05 19:21:35 -0400
committer GitHub <noreply@github.com>2019-08-05 19:21:35 -0400
commit60ea7d96ee14ab4b1427d4fa89cf0e21e011366a (patch)
treea189e06ad873b9d7536a99050ca665b73f0b2e17
parentd80fa68db679ed39e03d0076063e0cefe63d18ca (diff)
parent22f96480b14e1a9f70cbf78c36cc36356d33146a (diff)
Merge pull request #5445 from groessler/m20-floppy-write-support
add write support for Olivetti M20 floppy images
-rw-r--r--src/lib/formats/m20_dsk.cpp48
-rw-r--r--src/tools/floptool.cpp4
2 files changed, 46 insertions, 6 deletions
diff --git a/src/lib/formats/m20_dsk.cpp b/src/lib/formats/m20_dsk.cpp
index a831547e6e7..cdd0e230db7 100644
--- a/src/lib/formats/m20_dsk.cpp
+++ b/src/lib/formats/m20_dsk.cpp
@@ -37,7 +37,7 @@ const char *m20_format::extensions() const
bool m20_format::supports_save() const
{
- return false;
+ return true;
}
int m20_format::identify(io_generic *io, uint32_t form_factor)
@@ -49,13 +49,13 @@ int m20_format::identify(io_generic *io, uint32_t form_factor)
bool m20_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
{
- for(int track = 0; track < 35; track++)
- for(int head = 0; head < 2; head ++) {
+ for (int track = 0; track < 35; track++)
+ for (int head = 0; head < 2; head ++) {
bool mfm = track || head;
desc_pc_sector sects[16];
uint8_t sectdata[16*256];
io_generic_read(io, sectdata, 16*256*(track*2+head), 16*256);
- for(int i=0; i<16; i++) {
+ for (int i = 0; i < 16; i++) {
int j = i/2 + (i & 1 ? 0 : 8);
sects[i].track = track;
sects[i].head = head;
@@ -78,7 +78,45 @@ bool m20_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
bool m20_format::save(io_generic *io, floppy_image *image)
{
- return false;
+ 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));
+
+ for (int i = 0; i < 16; i++)
+ {
+ io_generic_write(io, sectors[i + 1].data, file_offset, 128);
+ file_offset += 256; //128;
+ }
+
+ // rest are mfm tracks
+ for (int track = 0; track < track_count; track++)
+ {
+ for (int head = 0; head < head_count; head++)
+ {
+ // 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));
+
+ for (int i = 0; i < 16; i++)
+ {
+ io_generic_write(io, sectors[i + 1].data, file_offset, 256);
+ file_offset += 256;
+ }
+ }
+ }
+
+ return true;
}
const floppy_format_type FLOPPY_M20_FORMAT = &floppy_image_format_creator<m20_format>;
diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp
index 7c2f9d23e56..f07e6ec9ad2 100644
--- a/src/tools/floptool.cpp
+++ b/src/tools/floptool.cpp
@@ -53,6 +53,7 @@
#include "formats/dvk_mx_dsk.h"
#include "formats/aim_dsk.h"
+#include "formats/m20_dsk.h"
static floppy_format_type floppy_formats[] = {
@@ -96,7 +97,8 @@ static floppy_format_type floppy_formats[] = {
FLOPPY_HPI_FORMAT,
FLOPPY_DVK_MX_FORMAT,
- FLOPPY_AIM_FORMAT
+ FLOPPY_AIM_FORMAT,
+ FLOPPY_M20_FORMAT
};
void CLIB_DECL ATTR_PRINTF(1,2) logerror(const char *format, ...)