Restore legacy pc_dsk floppy support for imgtool only

scripts/src/tools.lua

@@ -681,6 +681,8 @@ files {
 	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h",
 	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp",
 	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h",
+	MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp",
+	MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.h",
 	MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp",

src/tools/imgtool/formats/pc_dsk_legacy.cpp

@@ -0,0 +1,138 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+/*********************************************************************
+
+    formats/pc_dsk_legacy.cpp
+
+    PC disk images (legacy support for imgtool)
+
+*********************************************************************/
+
+#include "formats/pc_dsk_legacy.h"
+#include "formats/basicdsk.h"
+
+struct pc_disk_sizes
+{
+	uint32_t image_size;
+	int sectors;
+	int heads;
+};
+
+
+
+static const struct pc_disk_sizes disk_sizes[] =
+{
+	{ 8*1*40*512,  8, 1},   /* 5 1/4 inch double density single sided */
+	{ 8*2*40*512,  8, 2},   /* 5 1/4 inch double density */
+	{ 9*1*40*512,  9, 1},   /* 5 1/4 inch double density single sided */
+	{ 9*2*40*512,  9, 2},   /* 5 1/4 inch double density */
+	{10*2*40*512, 10, 2},   /* 5 1/4 inch double density single sided */
+	{ 9*2*80*512,  9, 2},   /* 80 tracks 5 1/4 inch drives rare in PCs */
+	{ 9*2*80*512,  9, 2},   /* 3 1/2 inch double density */
+	{15*2*80*512, 15, 2},   /* 5 1/4 inch high density (or japanese 3 1/2 inch high density) */
+	{18*2*80*512, 18, 2},   /* 3 1/2 inch high density */
+	{21*2*80*512, 21, 2},   /* 3 1/2 inch high density DMF */
+	{36*2*80*512, 36, 2}    /* 3 1/2 inch enhanced density */
+};
+
+
+
+static floperr_t pc_dsk_compute_geometry(floppy_image_legacy *floppy, struct basicdsk_geometry *geometry)
+{
+	int i;
+	uint64_t size;
+
+	memset(geometry, 0, sizeof(*geometry));
+	size = floppy_image_size(floppy);
+
+	for (i = 0; i < std::size(disk_sizes); i++)
+	{
+		if (disk_sizes[i].image_size == size)
+		{
+			geometry->sectors = disk_sizes[i].sectors;
+			geometry->heads = disk_sizes[i].heads;
+			geometry->sector_length = 512;
+			geometry->first_sector_id = 1;
+			geometry->tracks = (int) (size / disk_sizes[i].sectors / disk_sizes[i].heads / geometry->sector_length);
+			return FLOPPY_ERROR_SUCCESS;
+		}
+	}
+
+	if (size >= 0x1a)
+	{
+		/*
+		 * get info from boot sector.
+		 * not correct on all disks
+		 */
+		uint8_t scl, spt, heads;
+		floppy_image_read(floppy, &scl, 0x0c, 1);
+		floppy_image_read(floppy, &spt, 0x18, 1);
+		floppy_image_read(floppy, &heads, 0x1A, 1);
+
+		if (size == ((uint64_t) scl) * spt * heads * 0x200)
+		{
+			geometry->sectors = spt;
+			geometry->heads = heads;
+			geometry->sector_length = 512;
+			geometry->first_sector_id = 1;
+			geometry->tracks = scl;
+			return FLOPPY_ERROR_SUCCESS;
+		}
+	}
+
+	return FLOPPY_ERROR_SUCCESS;
+}
+
+
+
+static FLOPPY_IDENTIFY(pc_dsk_identify)
+{
+	floperr_t err;
+	struct basicdsk_geometry geometry;
+
+	err = pc_dsk_compute_geometry(floppy, &geometry);
+	if (err)
+		return err;
+
+	*vote = geometry.heads ? 100 : 0;
+	return FLOPPY_ERROR_SUCCESS;
+}
+
+
+
+static FLOPPY_CONSTRUCT(pc_dsk_construct)
+{
+	floperr_t err;
+	struct basicdsk_geometry geometry;
+
+	if (params)
+	{
+		/* create */
+		memset(&geometry, 0, sizeof(geometry));
+		geometry.heads = params->lookup_int(PARAM_HEADS);
+		geometry.tracks = params->lookup_int(PARAM_TRACKS);
+		geometry.sectors = params->lookup_int(PARAM_SECTORS);
+		geometry.first_sector_id = 1;
+		geometry.sector_length = 512;
+	}
+	else
+	{
+		/* open */
+		err = pc_dsk_compute_geometry(floppy, &geometry);
+		if (err)
+			return err;
+	}
+
+	return basicdsk_construct(floppy, &geometry);
+}
+
+
+
+/* ----------------------------------------------------------------------- */
+
+LEGACY_FLOPPY_OPTIONS_START( pc )
+	LEGACY_FLOPPY_OPTION( pc_dsk, "dsk,ima,img,ufi,360",        "PC floppy disk image", pc_dsk_identify, pc_dsk_construct, nullptr,
+		HEADS([1]-2)
+		TRACKS(40/[80])
+		SECTORS(8/[9]/10/15/18/36))
+LEGACY_FLOPPY_OPTIONS_END

src/tools/imgtool/formats/pc_dsk_legacy.h

@@ -0,0 +1,21 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+/*********************************************************************
+
+    formats/pc_dsk_legacy.h
+
+    PC disk images (legacy support for imgtool)
+
+*********************************************************************/
+
+#ifndef PC_DSK_LEGACY_H
+#define PC_DSK_LEGACY_H
+
+#include "formats/flopimg.h"
+
+
+/**************************************************************************/
+
+LEGACY_FLOPPY_OPTIONS_EXTERN(pc);
+
+#endif /* PC_DSK_LEGACY_H */

src/tools/imgtool/modules/pc_flop.cpp

@@ -10,7 +10,7 @@
 
 #include "imgtool.h"
 #include "formats/imageutl.h"
-#include "formats/pc_dsk.h"
+#include "formats/pc_dsk_legacy.h"
 #include "fat.h"
 #include "iflopimg.h"
 
@@ -163,7 +163,7 @@ void pc_floppy_get_info(const imgtool_class *imgclass, uint32_t state, union img
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case IMGTOOLINFO_PTR_MAKE_CLASS:                    info->make_class = imgtool_floppy_make_class; break;
 		case IMGTOOLINFO_PTR_FLOPPY_CREATE:                 info->create = fat_image_create; break;
-		case IMGTOOLINFO_PTR_FLOPPY_FORMAT:                 info->p = nullptr; break;
+		case IMGTOOLINFO_PTR_FLOPPY_FORMAT:                 info->p = (void *) floppyoptions_pc; break;
 		case IMGTOOLINFO_PTR_READ_BLOCK:                    info->read_block = fat_image_readblock; break;
 		case IMGTOOLINFO_PTR_WRITE_BLOCK:                   info->write_block = fat_image_writeblock; break;
 		case IMGTOOLINFO_PTR_GET_GEOMETRY:                  info->get_geometry = fat_image_get_geometry; break;