Cleaned up various things, mostly where .c_str() is unnecessary.

See GitHub #15895 for various examples.

Author: cuavas

scripts/src/bus.lua

@@ -2547,10 +2547,8 @@ if BUSES["HP_DIO"] then
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98544.h",
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98550.cpp",
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98550.h",
-		MAME_DIR .. "src/devices/bus/hp_dio/hp98603a.cpp",
-		MAME_DIR .. "src/devices/bus/hp_dio/hp98603a.h",
-		MAME_DIR .. "src/devices/bus/hp_dio/hp98603b.cpp",
-		MAME_DIR .. "src/devices/bus/hp_dio/hp98603b.h",
+		MAME_DIR .. "src/devices/bus/hp_dio/hp98603.cpp",
+		MAME_DIR .. "src/devices/bus/hp_dio/hp98603.h",
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98620.cpp",
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98620.h",
 		MAME_DIR .. "src/devices/bus/hp_dio/hp98624.cpp",

src/devices/bus/a2bus/a2corvus.cpp

@@ -42,30 +42,56 @@
 
 #include "emu.h"
 #include "a2corvus.h"
+
+#include "machine/corvushd.h"
 #include "imagedev/harddriv.h"
 
-/***************************************************************************
-    PARAMETERS
-***************************************************************************/
+
+namespace {
 
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device, "a2corvus", "Corvus Flat Cable interface")
-
 #define CORVUS_ROM_REGION  "corvus_rom"
-#define CORVUS_HD_TAG      "corvushd"
 
 
 ROM_START( corvus )
 	ROM_REGION(0x800, CORVUS_ROM_REGION, 0)
 	ROM_LOAD( "a4.7.u10", 0x0000, 0x0800, CRC(1cf6e32a) SHA1(dbd6efeb3b54c0523b8b4eda8b3d737413f6a91a) )
 ROM_END
 
-/***************************************************************************
-    FUNCTION PROTOTYPES
-***************************************************************************/
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class a2bus_corvus_device:
+	public device_t,
+	public device_a2bus_card_interface
+{
+public:
+	// construction/destruction
+	a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+
+	// overrides of standard a2bus slot functions
+	virtual uint8_t read_c0nx(uint8_t offset) override;
+	virtual void write_c0nx(uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(uint8_t offset) override;
+	virtual uint8_t read_c800(uint16_t offset) override;
+	virtual bool take_c800() const override { return true; }
+
+	required_region_ptr<uint8_t> m_rom;
+	required_device<corvus_hdc_device> m_corvushd;
+};
 
 //-------------------------------------------------
 //  device_add_mconfig - add device configuration
@@ -96,7 +122,8 @@ const tiny_rom_entry *a2bus_corvus_device::device_rom_region() const
 a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, type, tag, owner, clock),
 	device_a2bus_card_interface(mconfig, *this),
-	m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
+	m_rom(*this, CORVUS_ROM_REGION),
+	m_corvushd(*this, "corvushd")
 {
 }
 
@@ -111,7 +138,6 @@ a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const ch
 
 void a2bus_corvus_device::device_start()
 {
-	m_rom = device().machine().root_device().memregion(this->subtag(CORVUS_ROM_REGION).c_str())->base();
 }
 
 void a2bus_corvus_device::device_reset()
@@ -161,7 +187,7 @@ void a2bus_corvus_device::write_c0nx(uint8_t offset, uint8_t data)
 uint8_t a2bus_corvus_device::read_cnxx(uint8_t offset)
 {
 	// one slot image at the end of the ROM, it appears
-	return m_rom[offset+0x700];
+	return m_rom[offset + 0x700];
 }
 
 /*-------------------------------------------------
@@ -172,3 +198,8 @@ uint8_t a2bus_corvus_device::read_c800(uint16_t offset)
 {
 	return m_rom[offset & 0x7ff];
 }
+
+} // anonymous namespace
+
+
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_CORVUS, device_a2bus_card_interface, a2bus_corvus_device, "a2corvus", "Corvus Flat Cable interface")

src/devices/bus/a2bus/a2corvus.h

@@ -15,42 +15,7 @@
 #pragma once
 
 #include "a2bus.h"
-#include "machine/corvushd.h"
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-class a2bus_corvus_device:
-	public device_t,
-	public device_a2bus_card_interface
-{
-public:
-	// construction/destruction
-	a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
-	virtual void device_start() override ATTR_COLD;
-	virtual void device_reset() override ATTR_COLD;
-	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
-	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
-
-	// overrides of standard a2bus slot functions
-	virtual uint8_t read_c0nx(uint8_t offset) override;
-	virtual void write_c0nx(uint8_t offset, uint8_t data) override;
-	virtual uint8_t read_cnxx(uint8_t offset) override;
-	virtual uint8_t read_c800(uint16_t offset) override;
-	virtual bool take_c800() const override { return true; }
-
-	required_device<corvus_hdc_device> m_corvushd;
-
-private:
-	uint8_t *m_rom;
-};
-
-// device type definition
-DECLARE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device)
+
+DECLARE_DEVICE_TYPE(A2BUS_CORVUS, device_a2bus_card_interface)
 
 #endif // MAME_BUS_A2BUS_A2CORVUS_H

src/devices/bus/a2bus/a2diskiing.cpp

@@ -11,25 +11,20 @@
 #include "emu.h"
 #include "a2diskiing.h"
 
+#include "machine/wozfdc.h"
+#include "imagedev/floppy.h"
+
 #include "formats/ap2_dsk.h"
 #include "formats/as_dsk.h"
 #include "formats/fs_prodos.h"
 
-/***************************************************************************
-    PARAMETERS
-***************************************************************************/
+
+namespace {
 
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(A2BUS_DISKIING, a2bus_diskiing_device, "a2diskiing", "Apple Disk II NG controller (16-sector)")
-DEFINE_DEVICE_TYPE(A2BUS_DISKIING13, a2bus_diskiing13_device, "diskii13", "Apple Disk II NG controller (13-sector)")
-DEFINE_DEVICE_TYPE(A2BUS_APPLESURANCE, a2bus_applesurance_device, "a2surance", "Applesurance Diagnostic Controller")
-DEFINE_DEVICE_TYPE(A2BUS_AGAT7_FDC, a2bus_agat7flop_device, "agat7_flop", "Agat-7 140K floppy card")
-DEFINE_DEVICE_TYPE(A2BUS_AGAT9_FDC, a2bus_agat9flop_device, "agat9_flop", "Agat-9 140K floppy card")
-
-#define WOZFDC_TAG         "wozfdc"
 #define DISKII_ROM_REGION  "diskii_rom"
 
 static void a2_floppies(device_slot_interface &device)
@@ -62,6 +57,104 @@ ROM_START( agat9 )
 	ROM_LOAD( "shugart9.rom", 0x0000, 0x0100, CRC(964a0ce2) SHA1(bf955189ebffe874c20ef649a3db8177dc16af61) )
 ROM_END
 
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class diskiing_device:
+	public device_t,
+	public device_a2bus_card_interface
+{
+protected:
+	// construction/destruction
+	diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+
+	// overrides of standard a2bus slot functions
+	virtual uint8_t read_c0nx(uint8_t offset) override;
+	virtual void write_c0nx(uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(uint8_t offset) override;
+	virtual void reset_from_bus() override;
+
+	required_region_ptr<uint8_t> m_rom;
+	required_device<diskii_fdc_device> m_wozfdc;
+	required_device_array<floppy_connector, 2> m_floppy;
+
+private:
+	static void floppy_formats(format_registration &fr);
+};
+
+class a2bus_diskiing_device: public diskiing_device
+{
+public:
+	a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
+
+class a2bus_diskiing13_device: public diskiing_device
+{
+public:
+	a2bus_diskiing13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+
+private:
+	static void floppy_formats(format_registration &fr);
+};
+
+class a2bus_applesurance_device: public diskiing_device
+{
+public:
+	a2bus_applesurance_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+
+	virtual void device_reset() override ATTR_COLD;
+
+	virtual uint8_t read_cnxx(uint8_t offset) override;
+	virtual uint8_t read_c800(uint16_t offset) override;
+
+	virtual void write_c800(uint16_t offset, uint8_t data) override
+	{
+		if (offset == 0x7ff)
+		{
+			m_c800_bank = data & 1;
+		}
+	}
+
+	virtual bool take_c800() const override { return true; }
+
+	virtual void reset_from_bus() override;
+
+private:
+	int m_c800_bank;
+};
+
+class a2bus_agat7flop_device : public diskiing_device
+{
+public:
+	a2bus_agat7flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+};
+
+class a2bus_agat9flop_device : public diskiing_device
+{
+public:
+	a2bus_agat9flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+};
+
 void diskiing_device::floppy_formats(format_registration &fr)
 {
 	fr.add(FLOPPY_A213S_FORMAT);
@@ -136,9 +229,9 @@ const tiny_rom_entry *a2bus_agat9flop_device::device_rom_region() const
 diskiing_device::diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, type, tag, owner, clock),
 	device_a2bus_card_interface(mconfig, *this),
-	m_wozfdc(*this, WOZFDC_TAG),
-	m_floppy(*this, "%u", 0U),
-	m_rom(nullptr)
+	m_rom(*this, DISKII_ROM_REGION),
+	m_wozfdc(*this, "wozfdc"),
+	m_floppy(*this, "%u", 0U)
 {
 }
 
@@ -174,7 +267,6 @@ a2bus_agat9flop_device::a2bus_agat9flop_device(const machine_config &mconfig, co
 
 void diskiing_device::device_start()
 {
-	m_rom = device().machine().root_device().memregion(this->subtag(DISKII_ROM_REGION).c_str())->base();
 }
 
 void diskiing_device::device_reset()
@@ -217,7 +309,7 @@ uint8_t diskiing_device::read_cnxx(uint8_t offset)
 
 uint8_t a2bus_applesurance_device::read_cnxx(uint8_t offset)
 {
-	return m_rom[offset+0x800];
+	return m_rom[offset + 0x800];
 }
 
 uint8_t a2bus_applesurance_device::read_c800(uint16_t offset)
@@ -232,7 +324,7 @@ uint8_t a2bus_applesurance_device::read_c800(uint16_t offset)
 		return m_rom[offset];
 	}
 
-	return m_rom[offset+0x800];
+	return m_rom[offset + 0x800];
 }
 
 void a2bus_applesurance_device::device_reset()
@@ -246,3 +338,12 @@ void a2bus_applesurance_device::reset_from_bus()
 	m_c800_bank = 1;
 	diskiing_device::reset_from_bus();
 }
+
+} // anonymous namespace
+
+
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_DISKIING,     device_a2bus_card_interface, a2bus_diskiing_device, "a2diskiing", "Apple Disk II NG controller (16-sector)")
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_DISKIING13,   device_a2bus_card_interface, a2bus_diskiing13_device, "diskii13", "Apple Disk II NG controller (13-sector)")
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_APPLESURANCE, device_a2bus_card_interface, a2bus_applesurance_device, "a2surance", "Applesurance Diagnostic Controller")
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_AGAT7_FDC,    device_a2bus_card_interface, a2bus_agat7flop_device, "agat7_flop", "Agat-7 140K floppy card")
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_AGAT9_FDC,    device_a2bus_card_interface, a2bus_agat9flop_device, "agat9_flop", "Agat-9 140K floppy card")