From c7d7b25caa8e87841d8b5c9a30baab89cec7145e Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 26 May 2021 14:39:05 -0400 Subject: Better fix for vt_dsk.h header name clash --- scripts/src/tools.lua | 4 +- src/tools/imgtool/formats/vt_dsk.cpp | 57 ----------------------------- src/tools/imgtool/formats/vt_dsk.h | 18 --------- src/tools/imgtool/formats/vt_dsk_legacy.cpp | 57 +++++++++++++++++++++++++++++ src/tools/imgtool/formats/vt_dsk_legacy.h | 18 +++++++++ src/tools/imgtool/modules/vzdos.cpp | 2 +- 6 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 src/tools/imgtool/formats/vt_dsk.cpp delete mode 100644 src/tools/imgtool/formats/vt_dsk.h create mode 100644 src/tools/imgtool/formats/vt_dsk_legacy.cpp create mode 100644 src/tools/imgtool/formats/vt_dsk_legacy.h diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 1f1e4215ce8..999ff594407 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -679,8 +679,8 @@ files { MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.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", diff --git a/src/tools/imgtool/formats/vt_dsk.cpp b/src/tools/imgtool/formats/vt_dsk.cpp deleted file mode 100644 index a0949ec2575..00000000000 --- a/src/tools/imgtool/formats/vt_dsk.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Juergen Buchmueller -/********************************************************************* - - formats/vt_dsk.c - - VTech Laser/VZ disk images - -*********************************************************************/ - -#include -#include -#include -#include "formats/vt_dsk.h" -#include "formats/basicdsk.h" - -static FLOPPY_IDENTIFY(vz_identify) -{ - uint64_t size = floppy_image_size(floppy); - *vote = ((size == 98560) || (size == 99200) || (size == 99184)) ? 100 : 0; - return FLOPPY_ERROR_SUCCESS; -} - -static FLOPPY_CONSTRUCT(vz_construct) -{ - struct basicdsk_geometry geometry; - memset(&geometry, 0, sizeof(geometry)); - - if (params) - { - 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 = params->lookup_int(PARAM_FIRST_SECTOR_ID); - geometry.sector_length = params->lookup_int(PARAM_SECTOR_LENGTH); - } - else - { - geometry.heads = 1; - geometry.tracks = 40; - geometry.sectors = 16; - geometry.first_sector_id = 0; - geometry.sector_length = floppy_image_size(floppy)/geometry.tracks/geometry.sectors; - } - - return basicdsk_construct(floppy, &geometry); -} - - -extern LEGACY_FLOPPY_OPTIONS_START(vz) - LEGACY_FLOPPY_OPTION(vtech1, "dsk", "Laser/VZ disk image", vz_identify, vz_construct, NULL, - HEADS([1]) - TRACKS([40]) - SECTORS([16]) - SECTOR_LENGTH([154]) - FIRST_SECTOR_ID([0])) -LEGACY_FLOPPY_OPTIONS_END diff --git a/src/tools/imgtool/formats/vt_dsk.h b/src/tools/imgtool/formats/vt_dsk.h deleted file mode 100644 index a3f9a86b44e..00000000000 --- a/src/tools/imgtool/formats/vt_dsk.h +++ /dev/null @@ -1,18 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Juergen Buchmueller -/********************************************************************* - - formats/vt_dsk.h - - Tandy Color Computer / Dragon disk images - -*********************************************************************/ - -#ifndef VT_DSK_H -#define VT_DSK_H - -#include "formats/flopimg.h" - -LEGACY_FLOPPY_OPTIONS_EXTERN(vz); - -#endif /* VT_DSK_H */ diff --git a/src/tools/imgtool/formats/vt_dsk_legacy.cpp b/src/tools/imgtool/formats/vt_dsk_legacy.cpp new file mode 100644 index 00000000000..0d68db7cb33 --- /dev/null +++ b/src/tools/imgtool/formats/vt_dsk_legacy.cpp @@ -0,0 +1,57 @@ +// license:GPL-2.0+ +// copyright-holders:Juergen Buchmueller +/********************************************************************* + + formats/vt_dsk_legacy.cpp + + VTech Laser/VZ disk images (legacy support) + +*********************************************************************/ + +#include +#include +#include +#include "formats/vt_dsk_legacy.h" +#include "formats/basicdsk.h" + +static FLOPPY_IDENTIFY(vz_identify) +{ + uint64_t size = floppy_image_size(floppy); + *vote = ((size == 98560) || (size == 99200) || (size == 99184)) ? 100 : 0; + return FLOPPY_ERROR_SUCCESS; +} + +static FLOPPY_CONSTRUCT(vz_construct) +{ + struct basicdsk_geometry geometry; + memset(&geometry, 0, sizeof(geometry)); + + if (params) + { + 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 = params->lookup_int(PARAM_FIRST_SECTOR_ID); + geometry.sector_length = params->lookup_int(PARAM_SECTOR_LENGTH); + } + else + { + geometry.heads = 1; + geometry.tracks = 40; + geometry.sectors = 16; + geometry.first_sector_id = 0; + geometry.sector_length = floppy_image_size(floppy)/geometry.tracks/geometry.sectors; + } + + return basicdsk_construct(floppy, &geometry); +} + + +LEGACY_FLOPPY_OPTIONS_START(vz) + LEGACY_FLOPPY_OPTION(vtech1, "dsk", "Laser/VZ disk image", vz_identify, vz_construct, NULL, + HEADS([1]) + TRACKS([40]) + SECTORS([16]) + SECTOR_LENGTH([154]) + FIRST_SECTOR_ID([0])) +LEGACY_FLOPPY_OPTIONS_END diff --git a/src/tools/imgtool/formats/vt_dsk_legacy.h b/src/tools/imgtool/formats/vt_dsk_legacy.h new file mode 100644 index 00000000000..3f31b107f4e --- /dev/null +++ b/src/tools/imgtool/formats/vt_dsk_legacy.h @@ -0,0 +1,18 @@ +// license:GPL-2.0+ +// copyright-holders:Juergen Buchmueller +/********************************************************************* + + formats/vt_dsk_legacy.h + + VTech Laser/VZ disk images (legacy support) + +*********************************************************************/ + +#ifndef VT_DSK_LEGACY_H +#define VT_DSK_LEGACY_H + +#include "formats/flopimg.h" + +LEGACY_FLOPPY_OPTIONS_EXTERN(vz); + +#endif /* VT_DSK_LEGACY_H */ diff --git a/src/tools/imgtool/modules/vzdos.cpp b/src/tools/imgtool/modules/vzdos.cpp index 4ccbc801253..135df100119 100644 --- a/src/tools/imgtool/modules/vzdos.cpp +++ b/src/tools/imgtool/modules/vzdos.cpp @@ -14,7 +14,7 @@ #include #include "imgtool.h" #include "formats/imageutl.h" -#include "formats/vt_dsk.h" +#include "formats/vt_dsk_legacy.h" #include "iflopimg.h" /* -- cgit v1.2.3