diff options
Diffstat (limited to 'src/devices/bus/a2bus')
-rw-r--r-- | src/devices/bus/a2bus/a2diskiing.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/a2bus/a2diskiing.h | 4 | ||||
-rw-r--r-- | src/devices/bus/a2bus/agat_fdc.cpp | 9 | ||||
-rw-r--r-- | src/devices/bus/a2bus/agat_fdc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/a2bus/corvfdc01.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/a2bus/corvfdc01.h | 2 | ||||
-rw-r--r-- | src/devices/bus/a2bus/corvfdc02.cpp | 9 | ||||
-rw-r--r-- | src/devices/bus/a2bus/corvfdc02.h | 2 |
8 files changed, 32 insertions, 28 deletions
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 3a41fe04890..1ff619bd6e0 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -48,13 +48,21 @@ ROM_START( applesurance ) ROM_LOAD( "applesurance 3.0 - 2732.bin", 0x000000, 0x001000, CRC(64eafec7) SHA1(723dc6cd32de5a0f27af7503764185ac58904c05) ) ROM_END -FLOPPY_FORMATS_MEMBER( diskiing_device::floppy_formats ) - FLOPPY_A216S_FORMAT, FLOPPY_RWTS18_FORMAT, FLOPPY_EDD_FORMAT, FLOPPY_WOZ_FORMAT, FLOPPY_NIB_FORMAT -FLOPPY_FORMATS_END +void diskiing_device::floppy_formats(format_registration &fr) +{ + fr.add(FLOPPY_A216S_FORMAT); + fr.add(FLOPPY_RWTS18_FORMAT); + fr.add(FLOPPY_EDD_FORMAT); + fr.add(FLOPPY_WOZ_FORMAT); + fr.add(FLOPPY_NIB_FORMAT); +} -FLOPPY_FORMATS_MEMBER( a2bus_diskiing13_device::floppy_formats ) - FLOPPY_EDD_FORMAT, FLOPPY_WOZ_FORMAT, FLOPPY_NIB_FORMAT -FLOPPY_FORMATS_END +void a2bus_diskiing13_device::floppy_formats(format_registration &fr) +{ + fr.add(FLOPPY_EDD_FORMAT); + fr.add(FLOPPY_WOZ_FORMAT); + fr.add(FLOPPY_NIB_FORMAT); +} //------------------------------------------------- // device_add_mconfig - add device configuration diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h index 3d24babe0a3..94025b0854f 100644 --- a/src/devices/bus/a2bus/a2diskiing.h +++ b/src/devices/bus/a2bus/a2diskiing.h @@ -47,7 +47,7 @@ protected: const uint8_t *m_rom; private: - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); }; class a2bus_diskiing_device: public diskiing_device @@ -66,7 +66,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); }; class a2bus_applesurance_device: public diskiing_device diff --git a/src/devices/bus/a2bus/agat_fdc.cpp b/src/devices/bus/a2bus/agat_fdc.cpp index 33b4ff87339..6867b4ef6d5 100644 --- a/src/devices/bus/a2bus/agat_fdc.cpp +++ b/src/devices/bus/a2bus/agat_fdc.cpp @@ -63,10 +63,11 @@ ROM_END // device_add_mconfig - add device configuration //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( a2bus_agat_fdc_device::floppy_formats ) - FLOPPY_DS9_FORMAT, - FLOPPY_AIM_FORMAT -FLOPPY_FORMATS_END +void a2bus_agat_fdc_device::floppy_formats(format_registration &fr) +{ + fr.add(FLOPPY_DS9_FORMAT); + fr.add(FLOPPY_AIM_FORMAT); +} static void agat_floppies(device_slot_interface &device) { diff --git a/src/devices/bus/a2bus/agat_fdc.h b/src/devices/bus/a2bus/agat_fdc.h index fe2b787655b..b2f0e72adff 100644 --- a/src/devices/bus/a2bus/agat_fdc.h +++ b/src/devices/bus/a2bus/agat_fdc.h @@ -41,7 +41,7 @@ public: void d15_o_b(uint8_t data); void d15_o_c(uint8_t data); - DECLARE_FLOPPY_FORMATS(floppy_formats); + static void floppy_formats(format_registration &fr); protected: // construction/destruction diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 2f1684c1da7..212f49ed20b 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -27,10 +27,6 @@ DEFINE_DEVICE_TYPE(A2BUS_CORVFDC01, a2bus_corvfdc01_device, "crvfdc01", "Corvus #define FDC01_ROM_REGION "fdc01_rom" #define FDC01_FDC_TAG "fdc01_fdc" -FLOPPY_FORMATS_MEMBER( a2bus_corvfdc01_device::corv_floppy_formats ) - FLOPPY_IMD_FORMAT -FLOPPY_FORMATS_END - static void corv_floppies(device_slot_interface &device) { device.option_add("8sssd", FLOPPY_8_SSSD); @@ -88,10 +84,10 @@ void a2bus_corvfdc01_device::device_add_mconfig(machine_config &config) FD1793(config, m_wdfdc, 16_MHz_XTAL / 8); m_wdfdc->intrq_wr_callback().set(FUNC(a2bus_corvfdc01_device::intrq_w)); m_wdfdc->drq_wr_callback().set(FUNC(a2bus_corvfdc01_device::drq_w)); - FLOPPY_CONNECTOR(config, m_con1, corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats); - FLOPPY_CONNECTOR(config, m_con2, corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats); - FLOPPY_CONNECTOR(config, m_con3, corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats); - FLOPPY_CONNECTOR(config, m_con4, corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats); + FLOPPY_CONNECTOR(config, m_con1, corv_floppies, "8sssd", floppy_image_device::default_fm_floppy_formats); + FLOPPY_CONNECTOR(config, m_con2, corv_floppies, "8sssd", floppy_image_device::default_fm_floppy_formats); + FLOPPY_CONNECTOR(config, m_con3, corv_floppies, "8sssd", floppy_image_device::default_fm_floppy_formats); + FLOPPY_CONNECTOR(config, m_con4, corv_floppies, "8sssd", floppy_image_device::default_fm_floppy_formats); } //------------------------------------------------- diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h index b08574ad19f..5c92107fcbe 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -53,8 +53,6 @@ private: DECLARE_WRITE_LINE_MEMBER(intrq_w); DECLARE_WRITE_LINE_MEMBER(drq_w); - DECLARE_FLOPPY_FORMATS(corv_floppy_formats); - uint8_t *m_rom; uint8_t m_fdc_local_status, m_fdc_local_command; floppy_image_device *m_curfloppy; diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index e1c30bae9d0..0afb2de8aed 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -29,10 +29,11 @@ DEFINE_DEVICE_TYPE(A2BUS_CORVFDC02, a2bus_corvfdc02_device, "crvfdc02", "Corvus #define FDC02_ROM_REGION "fdc02_rom" #define FDC02_FDC_TAG "fdc02_fdc" -FLOPPY_FORMATS_MEMBER( a2bus_corvfdc02_device::corv_floppy_formats ) - FLOPPY_CONCEPT_525DSDD_FORMAT, - FLOPPY_IMD_FORMAT -FLOPPY_FORMATS_END +void a2bus_corvfdc02_device::corv_floppy_formats(format_registration &fr) +{ + fr.add_mfm_containers(); + fr.add(FLOPPY_CONCEPT_525DSDD_FORMAT); +} static void corv_floppies(device_slot_interface &device) { diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index 1a54fe9caba..6f196bda67b 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -54,7 +54,7 @@ private: DECLARE_WRITE_LINE_MEMBER(intrq_w); DECLARE_WRITE_LINE_MEMBER(drq_w); - DECLARE_FLOPPY_FORMATS(corv_floppy_formats); + static void corv_floppy_formats(format_registration &fr); uint8_t *m_rom; uint8_t m_fdc_local_status, m_fdc_local_command; |