summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/imgtool/formats
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/imgtool/formats')
-rw-r--r--src/tools/imgtool/formats/coco_dsk.cpp8
-rw-r--r--src/tools/imgtool/formats/coco_dsk.h2
-rw-r--r--src/tools/imgtool/formats/pc_dsk_legacy.cpp140
-rw-r--r--src/tools/imgtool/formats/pc_dsk_legacy.h21
-rw-r--r--src/tools/imgtool/formats/vt_dsk_legacy.cpp (renamed from src/tools/imgtool/formats/vt_dsk.cpp)13
-rw-r--r--src/tools/imgtool/formats/vt_dsk_legacy.h (renamed from src/tools/imgtool/formats/vt_dsk.h)12
6 files changed, 179 insertions, 17 deletions
diff --git a/src/tools/imgtool/formats/coco_dsk.cpp b/src/tools/imgtool/formats/coco_dsk.cpp
index 6f509c92767..33363b2245e 100644
--- a/src/tools/imgtool/formats/coco_dsk.cpp
+++ b/src/tools/imgtool/formats/coco_dsk.cpp
@@ -8,14 +8,14 @@
*********************************************************************/
-#include <string.h>
-#include <time.h>
-#include <assert.h>
+#include <cstring>
+#include <ctime>
+#include <cassert>
#include "formats/coco_dsk.h"
#include "formats/basicdsk.h"
#include "formats/imageutl.h"
-#include "coretmpl.h"
+#include "opresolv.h"
#include <algorithm>
/* -----------------------------------------------------------------------
diff --git a/src/tools/imgtool/formats/coco_dsk.h b/src/tools/imgtool/formats/coco_dsk.h
index 797911d40a1..bf9bccc5621 100644
--- a/src/tools/imgtool/formats/coco_dsk.h
+++ b/src/tools/imgtool/formats/coco_dsk.h
@@ -11,7 +11,7 @@
#ifndef COCO_DSK_H
#define COCO_DSK_H
-#include "formats/flopimg.h"
+#include "formats/flopimg_legacy.h"
/**************************************************************************/
diff --git a/src/tools/imgtool/formats/pc_dsk_legacy.cpp b/src/tools/imgtool/formats/pc_dsk_legacy.cpp
new file mode 100644
index 00000000000..771f0de8638
--- /dev/null
+++ b/src/tools/imgtool/formats/pc_dsk_legacy.cpp
@@ -0,0 +1,140 @@
+// 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"
+
+#include "opresolv.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
diff --git a/src/tools/imgtool/formats/pc_dsk_legacy.h b/src/tools/imgtool/formats/pc_dsk_legacy.h
new file mode 100644
index 00000000000..14cb33f389d
--- /dev/null
+++ b/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_legacy.h"
+
+
+/**************************************************************************/
+
+LEGACY_FLOPPY_OPTIONS_EXTERN(pc);
+
+#endif /* PC_DSK_LEGACY_H */
diff --git a/src/tools/imgtool/formats/vt_dsk.cpp b/src/tools/imgtool/formats/vt_dsk_legacy.cpp
index 02f74668b0f..6cf57856574 100644
--- a/src/tools/imgtool/formats/vt_dsk.cpp
+++ b/src/tools/imgtool/formats/vt_dsk_legacy.cpp
@@ -2,18 +2,19 @@
// copyright-holders:Juergen Buchmueller
/*********************************************************************
- formats/vt_dsk.c
+ formats/vt_dsk_legacy.cpp
- VTech Laser/VZ disk images
+ VTech Laser/VZ disk images (legacy support)
*********************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "formats/vt_dsk.h"
+#include "formats/vt_dsk_legacy.h"
#include "formats/basicdsk.h"
+#include "opresolv.h"
+
+#include <cstring>
+
static FLOPPY_IDENTIFY(vz_identify)
{
uint64_t size = floppy_image_size(floppy);
diff --git a/src/tools/imgtool/formats/vt_dsk.h b/src/tools/imgtool/formats/vt_dsk_legacy.h
index a3f9a86b44e..fe8f0ddf6a3 100644
--- a/src/tools/imgtool/formats/vt_dsk.h
+++ b/src/tools/imgtool/formats/vt_dsk_legacy.h
@@ -2,17 +2,17 @@
// copyright-holders:Juergen Buchmueller
/*********************************************************************
- formats/vt_dsk.h
+ formats/vt_dsk_legacy.h
- Tandy Color Computer / Dragon disk images
+ VTech Laser/VZ disk images (legacy support)
*********************************************************************/
-#ifndef VT_DSK_H
-#define VT_DSK_H
+#ifndef VT_DSK_LEGACY_H
+#define VT_DSK_LEGACY_H
-#include "formats/flopimg.h"
+#include "formats/flopimg_legacy.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(vz);
-#endif /* VT_DSK_H */
+#endif /* VT_DSK_LEGACY_H */