summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-07-20 14:43:13 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-07-20 14:43:13 +0000
commit215096c140cb70bfdd26546ac43720bb0799d2e7 (patch)
treebb48673f0352837b90e4716840448a4696070bc5 /src/lib/formats
parentc7b15e2689c662b7332d5fe1c231e39beb810ba7 (diff)
Renamed FLOPPY_OPTION* to LEGACY_FLOPPY_OPTION* (no whatsnew)
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/ami_dsk.c12
-rw-r--r--src/lib/formats/ami_dsk.h4
-rw-r--r--src/lib/formats/ap2_dsk.c10
-rw-r--r--src/lib/formats/ap2_dsk.h2
-rw-r--r--src/lib/formats/ap_dsk35.c18
-rw-r--r--src/lib/formats/ap_dsk35.h4
-rw-r--r--src/lib/formats/atari_dsk.c6
-rw-r--r--src/lib/formats/atari_dsk.h2
-rw-r--r--src/lib/formats/atarist_dsk.c12
-rw-r--r--src/lib/formats/atarist_dsk.h2
-rw-r--r--src/lib/formats/coco_dsk.c12
-rw-r--r--src/lib/formats/coco_dsk.h2
-rw-r--r--src/lib/formats/comx35_dsk.c6
-rw-r--r--src/lib/formats/comx35_dsk.h2
-rw-r--r--src/lib/formats/cpis_dsk.c6
-rw-r--r--src/lib/formats/cpis_dsk.h2
-rw-r--r--src/lib/formats/flopimg.c4
-rw-r--r--src/lib/formats/flopimg.h29
-rw-r--r--src/lib/formats/hect_dsk.c10
-rw-r--r--src/lib/formats/hect_dsk.h2
-rw-r--r--src/lib/formats/msx_dsk.c8
-rw-r--r--src/lib/formats/msx_dsk.h2
-rw-r--r--src/lib/formats/nes_dsk.c6
-rw-r--r--src/lib/formats/nes_dsk.h2
-rw-r--r--src/lib/formats/oric_dsk.c8
-rw-r--r--src/lib/formats/oric_dsk.h2
-rw-r--r--src/lib/formats/pc_dsk.c6
-rw-r--r--src/lib/formats/pc_dsk.h2
-rw-r--r--src/lib/formats/smx_dsk.c6
-rw-r--r--src/lib/formats/smx_dsk.h2
-rw-r--r--src/lib/formats/sorc_dsk.c6
-rw-r--r--src/lib/formats/sorc_dsk.h2
-rw-r--r--src/lib/formats/svi_dsk.c8
-rw-r--r--src/lib/formats/svi_dsk.h2
-rw-r--r--src/lib/formats/thom_dsk.c16
-rw-r--r--src/lib/formats/thom_dsk.h2
-rw-r--r--src/lib/formats/ti99_dsk.c8
-rw-r--r--src/lib/formats/ti99_dsk.h2
-rw-r--r--src/lib/formats/trd_dsk.c6
-rw-r--r--src/lib/formats/trd_dsk.h2
-rw-r--r--src/lib/formats/trs_dsk.c8
-rw-r--r--src/lib/formats/trs_dsk.h2
-rw-r--r--src/lib/formats/vt_dsk.c6
-rw-r--r--src/lib/formats/vt_dsk.h2
-rw-r--r--src/lib/formats/vtech1_dsk.c6
-rw-r--r--src/lib/formats/vtech1_dsk.h2
-rw-r--r--src/lib/formats/z80ne_dsk.c6
-rw-r--r--src/lib/formats/z80ne_dsk.h2
48 files changed, 139 insertions, 140 deletions
diff --git a/src/lib/formats/ami_dsk.c b/src/lib/formats/ami_dsk.c
index a9dc98af7b4..0e6b44245a5 100644
--- a/src/lib/formats/ami_dsk.c
+++ b/src/lib/formats/ami_dsk.c
@@ -69,8 +69,8 @@ static FLOPPY_CONSTRUCT( amiga_dsk_construct )
*****************************************************************************/
-FLOPPY_OPTIONS_START( amiga )
- FLOPPY_OPTION(
+LEGACY_FLOPPY_OPTIONS_START( amiga )
+ LEGACY_FLOPPY_OPTION(
ami_dsk,
"adf",
"Amiga floppy disk image",
@@ -81,10 +81,10 @@ FLOPPY_OPTIONS_START( amiga )
TRACKS([80])
SECTORS([11]/22)
)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
-FLOPPY_OPTIONS_START( amiga_only )
- FLOPPY_OPTION(
+LEGACY_FLOPPY_OPTIONS_START( amiga_only )
+ LEGACY_FLOPPY_OPTION(
ami_dsk,
"adf",
"Amiga floppy disk image",
@@ -95,4 +95,4 @@ FLOPPY_OPTIONS_START( amiga_only )
TRACKS([80])
SECTORS([11]/22)
)
-FLOPPY_OPTIONS_END0
+LEGACY_FLOPPY_OPTIONS_END0
diff --git a/src/lib/formats/ami_dsk.h b/src/lib/formats/ami_dsk.h
index ef88560cd1f..79eb92bee4a 100644
--- a/src/lib/formats/ami_dsk.h
+++ b/src/lib/formats/ami_dsk.h
@@ -11,7 +11,7 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(amiga);
-FLOPPY_OPTIONS_EXTERN(amiga_only);
+LEGACY_FLOPPY_OPTIONS_EXTERN(amiga);
+LEGACY_FLOPPY_OPTIONS_EXTERN(amiga_only);
#endif /*AMI_DSK_H_*/
diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c
index f9d0443e5a8..7be7150ad28 100644
--- a/src/lib/formats/ap2_dsk.c
+++ b/src/lib/formats/ap2_dsk.c
@@ -489,23 +489,23 @@ static UINT32 apple2_get_track_size(floppy_image_legacy *floppy, int head, int t
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( apple2 )
- FLOPPY_OPTION( apple2_do, "do,dsk,bin", "Apple ][ DOS order disk image", apple2_dsk_identify, apple2_do_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( apple2 )
+ LEGACY_FLOPPY_OPTION( apple2_do, "do,dsk,bin", "Apple ][ DOS order disk image", apple2_dsk_identify, apple2_do_construct, NULL,
HEADS([1])
TRACKS([35])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([0]))
- FLOPPY_OPTION( apple2_po, "po,dsk,bin", "Apple ][ ProDOS order disk image", apple2_dsk_identify, apple2_po_construct, NULL,
+ LEGACY_FLOPPY_OPTION( apple2_po, "po,dsk,bin", "Apple ][ ProDOS order disk image", apple2_dsk_identify, apple2_po_construct, NULL,
HEADS([1])
TRACKS([35])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([0]))
- FLOPPY_OPTION( apple2_nib, "dsk,nib", "Apple ][ Nibble order disk image", apple2_nib_identify, apple2_nib_construct, NULL,
+ LEGACY_FLOPPY_OPTION( apple2_nib, "dsk,nib", "Apple ][ Nibble order disk image", apple2_nib_identify, apple2_nib_construct, NULL,
HEADS([1])
TRACKS([35])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([0]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h
index bee72f9dfac..73610d5810d 100644
--- a/src/lib/formats/ap2_dsk.h
+++ b/src/lib/formats/ap2_dsk.h
@@ -28,6 +28,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(apple2);
+LEGACY_FLOPPY_OPTIONS_EXTERN(apple2);
#endif /* AP2_DISK_H */
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index f7ea7191127..f76e9c1606a 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -1155,33 +1155,33 @@ static FLOPPY_CONSTRUCT(apple35_2img_construct)
-FLOPPY_OPTIONS_START( apple35_mac )
- FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( apple35_mac )
+ LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL,
HEADS([1]-2)
TRACKS([80])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([0]))
- FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL,
+ LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL,
HEADS([1]-2)
TRACKS([80])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([0]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
-FLOPPY_OPTIONS_START( apple35_iigs )
- FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( apple35_iigs )
+ LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL,
HEADS([1]-2)
TRACKS([80])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([0]))
- FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL,
+ LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL,
HEADS([1]-2)
TRACKS([80])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([0]))
- FLOPPY_OPTION( apple35_2img, "2img,2mg", "Apple ][gs 2IMG disk image", apple35_2img_identify, apple35_2img_construct, NULL,
+ LEGACY_FLOPPY_OPTION( apple35_2img, "2img,2mg", "Apple ][gs 2IMG disk image", apple35_2img_identify, apple35_2img_construct, NULL,
HEADS([1]-2)
TRACKS([80])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([0]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h
index 62460b8ab2d..e1d308f0f4c 100644
--- a/src/lib/formats/ap_dsk35.h
+++ b/src/lib/formats/ap_dsk35.h
@@ -18,8 +18,8 @@ int apple35_sectors_per_track(floppy_image_legacy *image, int track);
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(apple35_mac);
-FLOPPY_OPTIONS_EXTERN(apple35_iigs);
+LEGACY_FLOPPY_OPTIONS_EXTERN(apple35_mac);
+LEGACY_FLOPPY_OPTIONS_EXTERN(apple35_iigs);
#endif /* AP_DSK35_H */
diff --git a/src/lib/formats/atari_dsk.c b/src/lib/formats/atari_dsk.c
index 440b96b9786..3e721adc0ff 100644
--- a/src/lib/formats/atari_dsk.c
+++ b/src/lib/formats/atari_dsk.c
@@ -20,8 +20,8 @@ static FLOPPY_CONSTRUCT( atari_dsk_construct )
return FLOPPY_ERROR_SUCCESS;
}
-FLOPPY_OPTIONS_START( atari_only )
- FLOPPY_OPTION(
+LEGACY_FLOPPY_OPTIONS_START( atari_only )
+ LEGACY_FLOPPY_OPTION(
atari_dsk,
"atr,dsk,xfd",
"Atari floppy disk image",
@@ -30,4 +30,4 @@ FLOPPY_OPTIONS_START( atari_only )
NULL,
NULL
)
-FLOPPY_OPTIONS_END0
+LEGACY_FLOPPY_OPTIONS_END0
diff --git a/src/lib/formats/atari_dsk.h b/src/lib/formats/atari_dsk.h
index 683e67599eb..c7dbc4ee7a8 100644
--- a/src/lib/formats/atari_dsk.h
+++ b/src/lib/formats/atari_dsk.h
@@ -11,6 +11,6 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(atari_only);
+LEGACY_FLOPPY_OPTIONS_EXTERN(atari_only);
#endif /* ATARI_DSK_H */
diff --git a/src/lib/formats/atarist_dsk.c b/src/lib/formats/atarist_dsk.c
index f4ea8497d1d..797ca32aac4 100644
--- a/src/lib/formats/atarist_dsk.c
+++ b/src/lib/formats/atarist_dsk.c
@@ -74,9 +74,9 @@ static FLOPPY_CONSTRUCT( atarist_st_construct )
FLOPPY_CONSTRUCT(atarist_dsk_construct)
-------------------------------------------------*/
-FLOPPY_OPTIONS_START( atarist )
- FLOPPY_OPTION( atarist, "st", "Atari ST floppy disk image", atarist_st_identify, atarist_st_construct, NULL, NULL )
-/* FLOPPY_OPTION( atarist, "stt", "Atari ST floppy disk image", atarist_stt_identify, atarist_stt_construct, NULL, NULL )
- FLOPPY_OPTION( atarist, "msa", "Atari ST floppy disk image", atarist_msa_identify, atarist_msa_construct, NULL, NULL )
- FLOPPY_OPTION( atarist, "dim", "Atari ST floppy disk image", atarist_dim_identify, atarist_dim_construct, NULL, NULL )*/
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( atarist )
+ LEGACY_FLOPPY_OPTION( atarist, "st", "Atari ST floppy disk image", atarist_st_identify, atarist_st_construct, NULL, NULL )
+/* LEGACY_FLOPPY_OPTION( atarist, "stt", "Atari ST floppy disk image", atarist_stt_identify, atarist_stt_construct, NULL, NULL )
+ LEGACY_FLOPPY_OPTION( atarist, "msa", "Atari ST floppy disk image", atarist_msa_identify, atarist_msa_construct, NULL, NULL )
+ LEGACY_FLOPPY_OPTION( atarist, "dim", "Atari ST floppy disk image", atarist_dim_identify, atarist_dim_construct, NULL, NULL )*/
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/atarist_dsk.h b/src/lib/formats/atarist_dsk.h
index 6ed71f7b58d..b6da0616cd0 100644
--- a/src/lib/formats/atarist_dsk.h
+++ b/src/lib/formats/atarist_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(atarist);
+LEGACY_FLOPPY_OPTIONS_EXTERN(atarist);
#endif /* ATARIST_DSK_H */
diff --git a/src/lib/formats/coco_dsk.c b/src/lib/formats/coco_dsk.c
index c1f8a5a87a0..6b05e1ed5ce 100644
--- a/src/lib/formats/coco_dsk.c
+++ b/src/lib/formats/coco_dsk.c
@@ -1169,30 +1169,30 @@ FLOPPY_IDENTIFY(coco_dmk_identify)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( coco )
- FLOPPY_OPTION( coco_jvc, "dsk", "CoCo JVC disk image", coco_jvc_identify, coco_jvc_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( coco )
+ LEGACY_FLOPPY_OPTION( coco_jvc, "dsk", "CoCo JVC disk image", coco_jvc_identify, coco_jvc_construct, NULL,
HEADS([1]-2)
TRACKS([35]-255)
SECTORS(1-[18]-255)
SECTOR_LENGTH(128/[256]/512/1024)
FIRST_SECTOR_ID(0-[1]))
- FLOPPY_OPTION( coco_os9, "os9", "CoCo OS-9 disk image", coco_os9_identify, coco_os9_construct, NULL,
+ LEGACY_FLOPPY_OPTION( coco_os9, "os9", "CoCo OS-9 disk image", coco_os9_identify, coco_os9_construct, NULL,
HEADS([1]-2)
TRACKS([35]-255)
SECTORS(1-[18]-255)
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION( coco_vdk, "vdk", "CoCo VDK disk image", coco_vdk_identify, coco_vdk_construct, NULL,
+ LEGACY_FLOPPY_OPTION( coco_vdk, "vdk", "CoCo VDK disk image", coco_vdk_identify, coco_vdk_construct, NULL,
HEADS([1]-2)
TRACKS([35]-255)
SECTORS([18])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION( coco_dmk, "dsk,dmk", "CoCo DMK disk image", coco_dmk_identify, coco_dmk_construct, NULL,
+ LEGACY_FLOPPY_OPTION( coco_dmk, "dsk,dmk", "CoCo DMK disk image", coco_dmk_identify, coco_dmk_construct, NULL,
HEADS([1]-2)
TRACKS([35]-255)
SECTORS(1-[18])
SECTOR_LENGTH(128/[256]/512/1024/2048/4096/8192)
INTERLEAVE(0-[6]-17)
FIRST_SECTOR_ID(0-[1]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/coco_dsk.h b/src/lib/formats/coco_dsk.h
index b217650e7bb..a54d5d44aac 100644
--- a/src/lib/formats/coco_dsk.h
+++ b/src/lib/formats/coco_dsk.h
@@ -14,7 +14,7 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(coco);
+LEGACY_FLOPPY_OPTIONS_EXTERN(coco);
FLOPPY_IDENTIFY(coco_dmk_identify);
FLOPPY_CONSTRUCT(coco_dmk_construct);
diff --git a/src/lib/formats/comx35_dsk.c b/src/lib/formats/comx35_dsk.c
index bd29a3e31cb..22510f2b70a 100644
--- a/src/lib/formats/comx35_dsk.c
+++ b/src/lib/formats/comx35_dsk.c
@@ -73,6 +73,6 @@ static FLOPPY_CONSTRUCT( comx35_dsk_construct )
FLOPPY_OPTIONS( comx35 )
-------------------------------------------------*/
-FLOPPY_OPTIONS_START( comx35 )
- FLOPPY_OPTION( comx35, "img", "COMX35 floppy disk image", comx35_dsk_identify, comx35_dsk_construct, NULL, NULL )
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( comx35 )
+ LEGACY_FLOPPY_OPTION( comx35, "img", "COMX35 floppy disk image", comx35_dsk_identify, comx35_dsk_construct, NULL, NULL )
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/comx35_dsk.h b/src/lib/formats/comx35_dsk.h
index 1daffb3b8d1..1fce5f3174f 100644
--- a/src/lib/formats/comx35_dsk.h
+++ b/src/lib/formats/comx35_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(comx35);
+LEGACY_FLOPPY_OPTIONS_EXTERN(comx35);
#endif /* COMX35_DSK_H */
diff --git a/src/lib/formats/cpis_dsk.c b/src/lib/formats/cpis_dsk.c
index 0f1a26646f1..4e0f0ba5ba1 100644
--- a/src/lib/formats/cpis_dsk.c
+++ b/src/lib/formats/cpis_dsk.c
@@ -86,8 +86,8 @@ static FLOPPY_CONSTRUCT(compis_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( compis )
- FLOPPY_OPTION( compis_dsk, "dsk", "Compis floppy disk image", compis_dsk_identify, compis_dsk_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( compis )
+ LEGACY_FLOPPY_OPTION( compis_dsk, "dsk", "Compis floppy disk image", compis_dsk_identify, compis_dsk_construct, NULL,
TRACKS(40/[80])
SECTORS(8/[9]/15))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h
index b16aa07a844..4b654b5002e 100644
--- a/src/lib/formats/cpis_dsk.h
+++ b/src/lib/formats/cpis_dsk.h
@@ -14,6 +14,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(compis);
+LEGACY_FLOPPY_OPTIONS_EXTERN(compis);
#endif /* CPIS_DSK_H */
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 55a3b63414b..7ed5d88aec7 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -930,5 +930,5 @@ const char *floppy_error(floperr_t err)
}
-FLOPPY_OPTIONS_START(default)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START(default)
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index f9bce0a6547..f9d9c7e011e 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -113,32 +113,32 @@ FLOPPY_CONSTRUCT(d88_dsk_construct);
FLOPPY_IDENTIFY(fdi_dsk_identify);
FLOPPY_CONSTRUCT(fdi_dsk_construct);
-#define FLOPPY_OPTIONS_NAME(name) floppyoptions_##name
+#define LEGACY_FLOPPY_OPTIONS_NAME(name) floppyoptions_##name
-#define FLOPPY_OPTIONS_START(name) \
+#define LEGACY_FLOPPY_OPTIONS_START(name) \
const struct FloppyFormat floppyoptions_##name[] = \
{ \
-#define FLOPPY_OPTIONS_END0 \
+#define LEGACY_FLOPPY_OPTIONS_END0 \
{ NULL } \
};
-#define FLOPPY_OPTIONS_EXTERN(name) \
+#define LEGACY_FLOPPY_OPTIONS_EXTERN(name) \
extern const struct FloppyFormat floppyoptions_##name[] \
-#define FLOPPY_OPTION(name, extensions_, description_, identify_, construct_, destruct_, ranges_)\
+#define LEGACY_FLOPPY_OPTION(name, extensions_, description_, identify_, construct_, destruct_, ranges_)\
{ #name, extensions_, description_, identify_, construct_, destruct_, ranges_ }, \
-#define FLOPPY_OPTIONS_END \
- FLOPPY_OPTION( fdi, "fdi", "Formatted Disk Image", fdi_dsk_identify, fdi_dsk_construct, NULL, NULL) \
- FLOPPY_OPTION( td0, "td0", "Teledisk floppy disk image", td0_dsk_identify, td0_dsk_construct, td0_dsk_destruct, NULL) \
- FLOPPY_OPTION( imd, "imd", "IMD floppy disk image", imd_dsk_identify, imd_dsk_construct, NULL, NULL) \
- FLOPPY_OPTION( cqm, "cqm,dsk", "CopyQM floppy disk image", cqm_dsk_identify, cqm_dsk_construct, NULL, NULL) \
- FLOPPY_OPTION( dsk, "dsk", "DSK floppy disk image", dsk_dsk_identify, dsk_dsk_construct, NULL, NULL) \
- FLOPPY_OPTION( d88, "d77,d88,1dd", "D88 Floppy Disk image", d88_dsk_identify, d88_dsk_construct, NULL, NULL) \
- FLOPPY_OPTIONS_END0
+#define LEGACY_FLOPPY_OPTIONS_END \
+ LEGACY_FLOPPY_OPTION( fdi, "fdi", "Formatted Disk Image", fdi_dsk_identify, fdi_dsk_construct, NULL, NULL) \
+ LEGACY_FLOPPY_OPTION( td0, "td0", "Teledisk floppy disk image", td0_dsk_identify, td0_dsk_construct, td0_dsk_destruct, NULL) \
+ LEGACY_FLOPPY_OPTION( imd, "imd", "IMD floppy disk image", imd_dsk_identify, imd_dsk_construct, NULL, NULL) \
+ LEGACY_FLOPPY_OPTION( cqm, "cqm,dsk", "CopyQM floppy disk image", cqm_dsk_identify, cqm_dsk_construct, NULL, NULL) \
+ LEGACY_FLOPPY_OPTION( dsk, "dsk", "DSK floppy disk image", dsk_dsk_identify, dsk_dsk_construct, NULL, NULL) \
+ LEGACY_FLOPPY_OPTION( d88, "d77,d88,1dd", "D88 Floppy Disk image", d88_dsk_identify, d88_dsk_construct, NULL, NULL) \
+ LEGACY_FLOPPY_OPTIONS_END0
-FLOPPY_OPTIONS_EXTERN(default);
+LEGACY_FLOPPY_OPTIONS_EXTERN(default);
#define PARAM_END '\0'
#define PARAM_HEADS 'H'
@@ -213,6 +213,5 @@ UINT64 floppy_image_size(floppy_image_legacy *floppy);
/* misc */
const char *floppy_error(floperr_t err);
-
#endif /* FLOPIMG_H */
diff --git a/src/lib/formats/hect_dsk.c b/src/lib/formats/hect_dsk.c
index 9a704c538a3..3a5630bc9d6 100644
--- a/src/lib/formats/hect_dsk.c
+++ b/src/lib/formats/hect_dsk.c
@@ -89,8 +89,8 @@ static FLOPPY_CONSTRUCT(hector_disc2_dsk800_construct)
return basicdsk_construct(floppy, &geometry);
}
-FLOPPY_OPTIONS_START( hector_disc2 )
- FLOPPY_OPTION( hector_dsk, "HE2", "hector disc2 floppy disk image 200K", hector_disc2_dsk200_identify, hector_disc2_dsk200_construct, NULL, NULL)
- FLOPPY_OPTION( hector_dsk, "HE7", "hector disc2 floppy disk image 720K", hector_disc2_dsk720_identify, hector_disc2_dsk720_construct, NULL, NULL)
- FLOPPY_OPTION( hector_dsk, "HE8", "hector disc2 floppy disk image 800K", hector_disc2_dsk800_identify, hector_disc2_dsk800_construct, NULL, NULL)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( hector_disc2 )
+ LEGACY_FLOPPY_OPTION( hector_dsk, "HE2", "hector disc2 floppy disk image 200K", hector_disc2_dsk200_identify, hector_disc2_dsk200_construct, NULL, NULL)
+ LEGACY_FLOPPY_OPTION( hector_dsk, "HE7", "hector disc2 floppy disk image 720K", hector_disc2_dsk720_identify, hector_disc2_dsk720_construct, NULL, NULL)
+ LEGACY_FLOPPY_OPTION( hector_dsk, "HE8", "hector disc2 floppy disk image 800K", hector_disc2_dsk800_identify, hector_disc2_dsk800_construct, NULL, NULL)
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/hect_dsk.h b/src/lib/formats/hect_dsk.h
index a98c4233a55..ad2fcf750cf 100644
--- a/src/lib/formats/hect_dsk.h
+++ b/src/lib/formats/hect_dsk.h
@@ -14,6 +14,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(hector_disc2);
+LEGACY_FLOPPY_OPTIONS_EXTERN(hector_disc2);
#endif /* HECT_DSK_H */
diff --git a/src/lib/formats/msx_dsk.c b/src/lib/formats/msx_dsk.c
index 17cf288ef2b..cfd623cc319 100644
--- a/src/lib/formats/msx_dsk.c
+++ b/src/lib/formats/msx_dsk.c
@@ -9,17 +9,17 @@
#include "msx_dsk.h"
#include "formats/basicdsk.h"
-FLOPPY_OPTIONS_START(msx)
- FLOPPY_OPTION(msx, "dsk", "MSX SS", basicdsk_identify_default, basicdsk_construct_default, NULL,
+LEGACY_FLOPPY_OPTIONS_START(msx)
+ LEGACY_FLOPPY_OPTION(msx, "dsk", "MSX SS", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([80])
SECTORS([9])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION(msx, "dsk", "MSX DS", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ LEGACY_FLOPPY_OPTION(msx, "dsk", "MSX DS", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([2])
TRACKS([80])
SECTORS([9])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([1]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h
index 63914366e9c..bd06127a333 100644
--- a/src/lib/formats/msx_dsk.h
+++ b/src/lib/formats/msx_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(msx);
+LEGACY_FLOPPY_OPTIONS_EXTERN(msx);
#endif /* MSX_DSK_H */
diff --git a/src/lib/formats/nes_dsk.c b/src/lib/formats/nes_dsk.c
index 5beeab15f73..99878833f27 100644
--- a/src/lib/formats/nes_dsk.c
+++ b/src/lib/formats/nes_dsk.c
@@ -59,8 +59,8 @@ static FLOPPY_CONSTRUCT( nes_dsk_construct )
NES floppy options
*****************************************************************************/
-FLOPPY_OPTIONS_START( nes_only )
- FLOPPY_OPTION(
+LEGACY_FLOPPY_OPTIONS_START( nes_only )
+ LEGACY_FLOPPY_OPTION(
fds_dsk,
"fds",
"NES floppy disk image",
@@ -69,4 +69,4 @@ FLOPPY_OPTIONS_START( nes_only )
NULL,
NULL
)
-FLOPPY_OPTIONS_END0
+LEGACY_FLOPPY_OPTIONS_END0
diff --git a/src/lib/formats/nes_dsk.h b/src/lib/formats/nes_dsk.h
index 4ef5a5c7d92..391ba221034 100644
--- a/src/lib/formats/nes_dsk.h
+++ b/src/lib/formats/nes_dsk.h
@@ -11,6 +11,6 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(nes_only);
+LEGACY_FLOPPY_OPTIONS_EXTERN(nes_only);
#endif /*NES_DSK_H_*/
diff --git a/src/lib/formats/oric_dsk.c b/src/lib/formats/oric_dsk.c
index 8d6fe7f8d25..142c4118d7b 100644
--- a/src/lib/formats/oric_dsk.c
+++ b/src/lib/formats/oric_dsk.c
@@ -305,12 +305,12 @@ static FLOPPY_CONSTRUCT(oric_dsk_construct)
}
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( oric )
- FLOPPY_OPTION( oricmfm, "dsk", "Oric MFM floppy disk image", oric_dsk_identify, oric_dsk_construct, NULL, NULL)
- FLOPPY_OPTION( oric, "dsk", "Oric disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
+LEGACY_FLOPPY_OPTIONS_START( oric )
+ LEGACY_FLOPPY_OPTION( oricmfm, "dsk", "Oric MFM floppy disk image", oric_dsk_identify, oric_dsk_construct, NULL, NULL)
+ LEGACY_FLOPPY_OPTION( oric, "dsk", "Oric disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([2])
TRACKS([80])
SECTORS([9])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([1]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h
index 58fc8336d91..851544da3d2 100644
--- a/src/lib/formats/oric_dsk.h
+++ b/src/lib/formats/oric_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(oric);
+LEGACY_FLOPPY_OPTIONS_EXTERN(oric);
#endif /* ORIC_DSK_H */
diff --git a/src/lib/formats/pc_dsk.c b/src/lib/formats/pc_dsk.c
index 9489d875cb1..237a2138749 100644
--- a/src/lib/formats/pc_dsk.c
+++ b/src/lib/formats/pc_dsk.c
@@ -129,9 +129,9 @@ static FLOPPY_CONSTRUCT(pc_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( pc )
- FLOPPY_OPTION( pc_dsk, "dsk,ima,img,ufi,360", "PC floppy disk image", pc_dsk_identify, pc_dsk_construct, NULL,
+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, NULL,
HEADS([1]-2)
TRACKS(40/[80])
SECTORS(8/[9]/10/15/18/36))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h
index 1180f0bb228..9b3c6df076b 100644
--- a/src/lib/formats/pc_dsk.h
+++ b/src/lib/formats/pc_dsk.h
@@ -14,6 +14,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(pc);
+LEGACY_FLOPPY_OPTIONS_EXTERN(pc);
#endif /* PC_DSK_H */
diff --git a/src/lib/formats/smx_dsk.c b/src/lib/formats/smx_dsk.c
index fde1b51eb48..0e198c13f90 100644
--- a/src/lib/formats/smx_dsk.c
+++ b/src/lib/formats/smx_dsk.c
@@ -154,6 +154,6 @@ static FLOPPY_CONSTRUCT(smx_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( specimx )
- FLOPPY_OPTION( smx_dsk, "odi", "Specialist MX floppy disk image", smx_dsk_identify, smx_dsk_construct, NULL, NULL)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( specimx )
+ LEGACY_FLOPPY_OPTION( smx_dsk, "odi", "Specialist MX floppy disk image", smx_dsk_identify, smx_dsk_construct, NULL, NULL)
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h
index 19149f3e229..8e80d12e4ef 100644
--- a/src/lib/formats/smx_dsk.h
+++ b/src/lib/formats/smx_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(specimx);
+LEGACY_FLOPPY_OPTIONS_EXTERN(specimx);
#endif /* SVI_DSK_H */
diff --git a/src/lib/formats/sorc_dsk.c b/src/lib/formats/sorc_dsk.c
index 6124f5e0a6a..00bb0325f46 100644
--- a/src/lib/formats/sorc_dsk.c
+++ b/src/lib/formats/sorc_dsk.c
@@ -152,6 +152,6 @@ static FLOPPY_CONSTRUCT(exi_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( exidy )
- FLOPPY_OPTION( exi_dsk, "dsk", "Exidy Sorcerer floppy disk image", exi_dsk_identify, exi_dsk_construct, NULL, NULL)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( exidy )
+ LEGACY_FLOPPY_OPTION( exi_dsk, "dsk", "Exidy Sorcerer floppy disk image", exi_dsk_identify, exi_dsk_construct, NULL, NULL)
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/sorc_dsk.h b/src/lib/formats/sorc_dsk.h
index 9e7c17c8ace..73eba255ee8 100644
--- a/src/lib/formats/sorc_dsk.h
+++ b/src/lib/formats/sorc_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(exidy);
+LEGACY_FLOPPY_OPTIONS_EXTERN(exidy);
#endif /* EXI_DSK_H */
diff --git a/src/lib/formats/svi_dsk.c b/src/lib/formats/svi_dsk.c
index abb73da3ff1..0d97c59e0c1 100644
--- a/src/lib/formats/svi_dsk.c
+++ b/src/lib/formats/svi_dsk.c
@@ -160,12 +160,12 @@ static FLOPPY_CONSTRUCT(svi_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( svi318 )
- FLOPPY_OPTION( svi_dsk, "dsk", "SVI-318 floppy disk image", svi_dsk_identify, svi_dsk_construct, NULL, NULL)
- FLOPPY_OPTION( svi_cpm, "dsk", "SVI-728 DSDD CP/M disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
+LEGACY_FLOPPY_OPTIONS_START( svi318 )
+ LEGACY_FLOPPY_OPTION( svi_dsk, "dsk", "SVI-318 floppy disk image", svi_dsk_identify, svi_dsk_construct, NULL, NULL)
+ LEGACY_FLOPPY_OPTION( svi_cpm, "dsk", "SVI-728 DSDD CP/M disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([2])
TRACKS([40])
SECTORS([17])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
index 9a1c55460b1..a1798d5331e 100644
--- a/src/lib/formats/svi_dsk.h
+++ b/src/lib/formats/svi_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(svi318);
+LEGACY_FLOPPY_OPTIONS_EXTERN(svi318);
#endif /* SVI_DSK_H */
diff --git a/src/lib/formats/thom_dsk.c b/src/lib/formats/thom_dsk.c
index c31fdf099be..837471e06fd 100644
--- a/src/lib/formats/thom_dsk.c
+++ b/src/lib/formats/thom_dsk.c
@@ -348,44 +348,44 @@ static FLOPPY_CONSTRUCT(qdd_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START(thomson)
+LEGACY_FLOPPY_OPTIONS_START(thomson)
- FLOPPY_OPTION(fdmfm2, "fd", "Thomson FD (MFM) 80 tracks disk image (3\"1/2 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ LEGACY_FLOPPY_OPTION(fdmfm2, "fd", "Thomson FD (MFM) 80 tracks disk image (3\"1/2 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([80])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION(fdmfm, "fd", "Thomson FD (MFM) 40 tracks disk image (5\"1/4 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ LEGACY_FLOPPY_OPTION(fdmfm, "fd", "Thomson FD (MFM) 40 tracks disk image (5\"1/4 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION(fd2, "fd", "Thomson FD (FM) 80 tracks disk image (3\"1/2 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ LEGACY_FLOPPY_OPTION(fd2, "fd", "Thomson FD (FM) 80 tracks disk image (3\"1/2 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([80])
SECTORS([16])
SECTOR_LENGTH([128])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION(fd, "fd", "Thomson FD (FM) 40 tracks disk image (5\"1/4 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ LEGACY_FLOPPY_OPTION(fd, "fd", "Thomson FD (FM) 40 tracks disk image (5\"1/4 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([16])
SECTOR_LENGTH([128])
FIRST_SECTOR_ID([1]))
- FLOPPY_OPTION(sap,"sap", "Thomson SAP floppy disk image", sap_dsk_identify, sap_dsk_construct, NULL, NULL)
+ LEGACY_FLOPPY_OPTION(sap,"sap", "Thomson SAP floppy disk image", sap_dsk_identify, sap_dsk_construct, NULL, NULL)
- FLOPPY_OPTION(qdd,"qd", "Thomson QDD floppy disk image (2\"8 SD)", qdd_dsk_identify, qdd_dsk_construct, NULL,
+ LEGACY_FLOPPY_OPTION(qdd,"qd", "Thomson QDD floppy disk image (2\"8 SD)", qdd_dsk_identify, qdd_dsk_construct, NULL,
HEADS([1])
TRACKS([1])
SECTORS([400])
SECTOR_LENGTH([128])
FIRST_SECTOR_ID([0]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/thom_dsk.h b/src/lib/formats/thom_dsk.h
index 1935baac4d9..92e0972a3bf 100644
--- a/src/lib/formats/thom_dsk.h
+++ b/src/lib/formats/thom_dsk.h
@@ -9,6 +9,6 @@
- .sap one-side double-density 5"1/4, 3"1/2
*/
-FLOPPY_OPTIONS_EXTERN(thomson);
+LEGACY_FLOPPY_OPTIONS_EXTERN(thomson);
#endif
diff --git a/src/lib/formats/ti99_dsk.c b/src/lib/formats/ti99_dsk.c
index bc48618d096..5adbde4775f 100644
--- a/src/lib/formats/ti99_dsk.c
+++ b/src/lib/formats/ti99_dsk.c
@@ -2021,16 +2021,16 @@ static FLOPPY_CONSTRUCT(ti99_tdf_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( ti99 )
- FLOPPY_OPTION( ti99_sdf, "dsk", "TI99 sector dump (v9t9)", ti99_sdf_identify, ti99_sdf_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( ti99 )
+ LEGACY_FLOPPY_OPTION( ti99_sdf, "dsk", "TI99 sector dump (v9t9)", ti99_sdf_identify, ti99_sdf_construct, NULL,
HEADS([1]-2)
TRACKS(35-[40]-80)
SECTORS(8/9/16/[18]/36)
SECTOR_LENGTH([256])
FIRST_SECTOR_ID(0))
- FLOPPY_OPTION( ti99_tdf, "dsk,dtk", "TI99 track dump (pc99)", ti99_tdf_identify, ti99_tdf_construct, NULL,
+ LEGACY_FLOPPY_OPTION( ti99_tdf, "dsk,dtk", "TI99 track dump (pc99)", ti99_tdf_identify, ti99_tdf_construct, NULL,
TRACKS(35-[40]-80)
SECTORS(8/9/16/[18]/36)
SECTOR_LENGTH([256])
FIRST_SECTOR_ID(0))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
index f0ee227bb11..55612c6123a 100644
--- a/src/lib/formats/ti99_dsk.h
+++ b/src/lib/formats/ti99_dsk.h
@@ -12,7 +12,7 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(ti99);
+LEGACY_FLOPPY_OPTIONS_EXTERN(ti99);
void ti99_set_80_track_drives(int use80);
diff --git a/src/lib/formats/trd_dsk.c b/src/lib/formats/trd_dsk.c
index 55d56381066..0d9c757d715 100644
--- a/src/lib/formats/trd_dsk.c
+++ b/src/lib/formats/trd_dsk.c
@@ -44,7 +44,7 @@ static FLOPPY_CONSTRUCT(trd_dsk_construct)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( trd )
- FLOPPY_OPTION( trd_dsk, "trd", "TRD floppy disk image", trd_dsk_identify, trd_dsk_construct, NULL, NULL)
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_START( trd )
+ LEGACY_FLOPPY_OPTION( trd_dsk, "trd", "TRD floppy disk image", trd_dsk_identify, trd_dsk_construct, NULL, NULL)
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
index d778aa56d0d..9b753d75a74 100644
--- a/src/lib/formats/trd_dsk.h
+++ b/src/lib/formats/trd_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(trd);
+LEGACY_FLOPPY_OPTIONS_EXTERN(trd);
#endif /* TRD_DSK_H */
diff --git a/src/lib/formats/trs_dsk.c b/src/lib/formats/trs_dsk.c
index 31b9d384394..1151a238070 100644
--- a/src/lib/formats/trs_dsk.c
+++ b/src/lib/formats/trs_dsk.c
@@ -64,14 +64,14 @@ static FLOPPY_CONSTRUCT( trs80_jv1_construct )
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( trs80 )
- FLOPPY_OPTION( trs80_jv1, "dsk", "TRS-80 JV1 disk image", trs80_jv1_identify, trs80_jv1_construct, NULL,
+LEGACY_FLOPPY_OPTIONS_START( trs80 )
+ LEGACY_FLOPPY_OPTION( trs80_jv1, "dsk", "TRS-80 JV1 disk image", trs80_jv1_identify, trs80_jv1_construct, NULL,
TRACKS([35]-255))
- FLOPPY_OPTION( trs80_dmk, "dsk,dmk", "TRS-80 DMK disk image", coco_dmk_identify, coco_dmk_construct, NULL,
+ LEGACY_FLOPPY_OPTION( trs80_dmk, "dsk,dmk", "TRS-80 DMK disk image", coco_dmk_identify, coco_dmk_construct, NULL,
HEADS([1]-2)
TRACKS([35]-255)
SECTORS(1-[10]-18)
SECTOR_LENGTH(128/[256]/512/1024/2048/4096/8192)
INTERLEAVE(0-[6]-17)
FIRST_SECTOR_ID([0]-1))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/trs_dsk.h b/src/lib/formats/trs_dsk.h
index 6e589c8c6a3..b4ac0d853e8 100644
--- a/src/lib/formats/trs_dsk.h
+++ b/src/lib/formats/trs_dsk.h
@@ -13,6 +13,6 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN( trs80 );
+LEGACY_FLOPPY_OPTIONS_EXTERN( trs80 );
#endif /* TRS_DSK_H */
diff --git a/src/lib/formats/vt_dsk.c b/src/lib/formats/vt_dsk.c
index a14d6fea1d9..c4d1fdf91d8 100644
--- a/src/lib/formats/vt_dsk.c
+++ b/src/lib/formats/vt_dsk.c
@@ -44,11 +44,11 @@ static FLOPPY_CONSTRUCT(vz_construct)
}
-FLOPPY_OPTIONS_START(vz)
- FLOPPY_OPTION(vtech1, "dsk", "Laser/VZ disk image", vz_identify, vz_construct, NULL,
+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]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/vt_dsk.h b/src/lib/formats/vt_dsk.h
index 4fce0f9cbb5..f0fecd2ec68 100644
--- a/src/lib/formats/vt_dsk.h
+++ b/src/lib/formats/vt_dsk.h
@@ -11,6 +11,6 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(vz);
+LEGACY_FLOPPY_OPTIONS_EXTERN(vz);
#endif /* VT_DSK_H */
diff --git a/src/lib/formats/vtech1_dsk.c b/src/lib/formats/vtech1_dsk.c
index 7a6d4a1176d..8e542e9cc06 100644
--- a/src/lib/formats/vtech1_dsk.c
+++ b/src/lib/formats/vtech1_dsk.c
@@ -20,8 +20,8 @@ static FLOPPY_CONSTRUCT( vtech1_dsk_construct )
return FLOPPY_ERROR_SUCCESS;
}
-FLOPPY_OPTIONS_START( vtech1_only )
- FLOPPY_OPTION(
+LEGACY_FLOPPY_OPTIONS_START( vtech1_only )
+ LEGACY_FLOPPY_OPTION(
vtech1_dsk,
"dsk",
"Laser floppy disk image",
@@ -30,4 +30,4 @@ FLOPPY_OPTIONS_START( vtech1_only )
NULL,
NULL
)
-FLOPPY_OPTIONS_END0
+LEGACY_FLOPPY_OPTIONS_END0
diff --git a/src/lib/formats/vtech1_dsk.h b/src/lib/formats/vtech1_dsk.h
index 0b11eae5108..f85cc160af8 100644
--- a/src/lib/formats/vtech1_dsk.h
+++ b/src/lib/formats/vtech1_dsk.h
@@ -11,6 +11,6 @@
#include "flopimg.h"
-FLOPPY_OPTIONS_EXTERN(vtech1_only);
+LEGACY_FLOPPY_OPTIONS_EXTERN(vtech1_only);
#endif /* VTECH1_DSK_H */
diff --git a/src/lib/formats/z80ne_dsk.c b/src/lib/formats/z80ne_dsk.c
index 73547c30dad..720687d8272 100644
--- a/src/lib/formats/z80ne_dsk.c
+++ b/src/lib/formats/z80ne_dsk.c
@@ -826,7 +826,7 @@ FLOPPY_IDENTIFY(z80ne_dmk_identify)
/* ----------------------------------------------------------------------- */
-FLOPPY_OPTIONS_START( z80ne )
+LEGACY_FLOPPY_OPTIONS_START( z80ne )
/*
* Single side
* Single density
@@ -838,11 +838,11 @@ FLOPPY_OPTIONS_START( z80ne )
* 3125 byte/track unformatted
* Rotation speed 300 rpm (5 rps)
*/
- FLOPPY_OPTION( z80ne_dmk, "zmk", "Z80NE DMK disk image", z80ne_dmk_identify, z80ne_dmk_construct, NULL,
+ LEGACY_FLOPPY_OPTION( z80ne_dmk, "zmk", "Z80NE DMK disk image", z80ne_dmk_identify, z80ne_dmk_construct, NULL,
HEADS([1])
TRACKS([40])
SECTORS([10])
SECTOR_LENGTH([256])
INTERLEAVE([1])
FIRST_SECTOR_ID([0]))
-FLOPPY_OPTIONS_END
+LEGACY_FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/z80ne_dsk.h b/src/lib/formats/z80ne_dsk.h
index baa8b9cdadf..9a3d0dee9b9 100644
--- a/src/lib/formats/z80ne_dsk.h
+++ b/src/lib/formats/z80ne_dsk.h
@@ -14,7 +14,7 @@
/**************************************************************************/
-FLOPPY_OPTIONS_EXTERN(z80ne);
+LEGACY_FLOPPY_OPTIONS_EXTERN(z80ne);
FLOPPY_IDENTIFY(z80ne_dmk_identify);
FLOPPY_CONSTRUCT(z80ne_dmk_construct);