summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/afs_dsk.cpp60
-rw-r--r--src/lib/formats/afs_dsk.h37
-rw-r--r--src/lib/formats/fsd_dsk.cpp31
3 files changed, 110 insertions, 18 deletions
diff --git a/src/lib/formats/afs_dsk.cpp b/src/lib/formats/afs_dsk.cpp
new file mode 100644
index 00000000000..5e1ff5aa66c
--- /dev/null
+++ b/src/lib/formats/afs_dsk.cpp
@@ -0,0 +1,60 @@
+// license:GPL-2.0+
+// copyright-holders:Nigel Barnes
+/***************************************************************************
+
+ Acorn FileStore
+
+ Disk image formats
+
+***************************************************************************/
+
+#include "afs_dsk.h"
+
+
+afs_format::afs_format() : wd177x_format(formats)
+{
+}
+
+const char *afs_format::name() const
+{
+ return "afs";
+}
+
+const char *afs_format::description() const
+{
+ return "Acorn FileStore disk image";
+}
+
+const char *afs_format::extensions() const
+{
+ return "adl,img";
+}
+
+int afs_format::identify(io_generic *io, UINT32 form_factor)
+{
+ int type = find_size(io, form_factor);
+
+ if (type != -1)
+ return 50;
+ return 0;
+}
+
+int afs_format::get_image_offset(const format &f, int head, int track)
+{
+ if (f.sector_base_id == -1)
+ return (track * f.head_count + head) * compute_track_size(f);
+ else
+ return (f.track_count * head + track) * compute_track_size(f);
+}
+
+const afs_format::format afs_format::formats[] =
+{
+ { // 640K 3 1/2 inch 80 track double sided double density (interleaved) - gaps unverified
+ floppy_image::FF_35, floppy_image::DSQD, floppy_image::MFM,
+ 2000, 16, 80, 2, 256, {}, -1, { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 }, 60, 22, 43
+ },
+ {}
+};
+
+
+const floppy_format_type FLOPPY_AFS_FORMAT = &floppy_image_format_creator<afs_format>;
diff --git a/src/lib/formats/afs_dsk.h b/src/lib/formats/afs_dsk.h
new file mode 100644
index 00000000000..e8e7190f7cd
--- /dev/null
+++ b/src/lib/formats/afs_dsk.h
@@ -0,0 +1,37 @@
+// license:GPL-2.0+
+// copyright-holders:Nigel Barnes
+/***************************************************************************
+
+ Acorn FileStore
+
+ Disk image formats
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __AFS_DSK_H__
+#define __AFS_DSK_H__
+
+#include "wd177x_dsk.h"
+
+
+class afs_format : public wd177x_format
+{
+public:
+ afs_format();
+
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual int get_image_offset(const format &f, int head, int track) override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+
+private:
+ static const format formats[];
+};
+
+
+extern const floppy_format_type FLOPPY_AFS_FORMAT;
+
+#endif // __AFS_DSK_H__
diff --git a/src/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp
index 6fec1c9754e..0896c47d8ac 100644
--- a/src/lib/formats/fsd_dsk.cpp
+++ b/src/lib/formats/fsd_dsk.cpp
@@ -92,6 +92,7 @@ int fsd_format::identify(io_generic *io, UINT32 form_factor)
if (memcmp(h, "FSD", 3) == 0) {
return 100;
}
+ LOG_FORMATS("fsd: no match\n");
return 0;
}
@@ -112,18 +113,18 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
//popmessage("Loading image of '%s'\n", title);
- desc_pc_sector sects[10];
+ desc_pc_sector sects[256];
UINT8 total_tracks = img[pos++];
UINT8 tnum, hnum, snum, ssize, error;
hnum = 0;
- //osd_printf_verbose("%d Tracks\n", total_tracks+1);
- //osd_printf_verbose("Tr.# No.S Sec.# Tr.ID Head# SecID IDsiz REsiz Error\n");
+ LOG_FORMATS("%02d Tracks\n", total_tracks+1);
+ LOG_FORMATS("Tr.# No.S Sec.# Tr.ID Head# SecID IDsiz REsiz Error\n");
for(int curr_track=0; curr_track <= total_tracks; curr_track++)
{
UINT8 track = img[pos++];
UINT8 spt = img[pos++];
- //osd_printf_verbose("%x %x\n", track, spt);
+ LOG_FORMATS("%02X %02X\n", track, spt);
if (spt > 0) // formatted
{
UINT8 readable = img[pos++];
@@ -145,22 +146,16 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
sects[i].bad_crc = (error & 0x0e) == 0x0e;
sects[i].data = &img[pos];
pos += sects[i].actual_size;
- //osd_printf_verbose("Read %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, error);
+ LOG_FORMATS("Read %02X %02X %02X %02X %02X %02X %02X\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, error);
}
else
{
- throw emu_fatalerror("fsd_format: Unsupported unreadable sector on track %d sector %d head %d", track, i, hnum);
-
- // Unreadable sectors not supported!!
- //sects[i].track = track;
- //sects[i].head = 0;
- //sects[i].sector = i;
- //sects[i].size = 0;
- //sects[i].actual_size = 0;
- //sects[i].deleted = false;
- //sects[i].bad_crc = false;
- //sects[i].data = nullptr;
- //osd_printf_verbose("Unread %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, 0);
+ LOG_FORMATS("Unreadable sector on track %02d sector %02X head %02d", track, i, hnum);
+ sects[i].actual_size = 0;
+ sects[i].deleted = false;
+ sects[i].bad_crc = false;
+ sects[i].data = nullptr;
+ LOG_FORMATS("Unread %02X %02X %02X %02X %02X %02X %02X\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, 0);
}
}
}
@@ -170,7 +165,7 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
sects[0].head = hnum;
sects[0].sector = 0;
sects[0].size = 0;
- //osd_printf_verbose("Unform %x %x %x %x %x %x %x\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, 0);
+ LOG_FORMATS("Unform %02X %02X %02X %02X %02X %02X %02X\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, 0);
}
build_wd_track_fm(curr_track, hnum, image, 50000, spt, sects, 10, 40, 10);
}