diff options
author | Vas Crabb <vas@vastheman.com> | 2017-03-03 17:24:02 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2017-03-03 17:24:11 +1100 |
commit | c6ef2746d4958359899d5d4b44e8507aeca343d0 (patch) | |
tree | 522958f28827678e9c94687ee45574554a2a42be | |
parent | 4ed7fbda1152551bc1e7e52d066b3f18efe3ea40 (diff) |
Start cleaning up duplicate shortnames
25 files changed, 223 insertions, 144 deletions
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp index 3cb4d468ba9..61a56ba0ddd 100644 --- a/src/devices/bus/abcbus/abc890.cpp +++ b/src/devices/bus/abcbus/abc890.cpp @@ -194,8 +194,7 @@ abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char * } abc890_t::abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__), - device_abcbus_card_interface(mconfig, *this) + abc890_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__) { } diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 588cf8b77df..489aac9e92c 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -744,25 +744,7 @@ ioport_constructor abc850_floppy_t::device_input_ports() const //------------------------------------------------- luxor_55_21046_t::luxor_55_21046_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__), - device_abcbus_card_interface(mconfig, *this), - m_maincpu(*this, Z80_TAG), - m_dma(*this, Z80DMA_TAG), - m_fdc(*this, SAB1793_TAG), - m_floppy0(*this, SAB1793_TAG":0"), - m_floppy1(*this, SAB1793_TAG":1"), - m_floppy(nullptr), - m_sw1(*this, "SW1"), - m_sw2(*this, "SW2"), - m_sw3(*this, "SW3"), - m_cs(false), - m_status(0), - m_out(0), - m_inp(0), - m_fdc_irq(0), - m_dma_irq(0), - m_busy(0), - m_force_busy(0) + luxor_55_21046_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__) { } @@ -810,7 +792,7 @@ abc838_device::abc838_device(const machine_config &mconfig, const char *tag, dev } abc850_floppy_t::abc850_floppy_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - luxor_55_21046_t(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__) + luxor_55_21046_t(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "abc850flop", __FILE__) { } diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index f1815714a7f..8feed1090a2 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -6,10 +6,10 @@ *********************************************************************/ -#pragma once +#ifndef MAME_BUS_ABCBUS_LUX21046_H +#define MAME_BUS_ABCBUS_LUX21046_H -#ifndef __LUXOR_55_21046__ -#define __LUXOR_55_21046__ +#pragma once #include "abcbus.h" #include "cpu/z80/z80.h" @@ -52,7 +52,6 @@ class luxor_55_21046_t : public device_t, { public: // construction/destruction - luxor_55_21046_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); luxor_55_21046_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides @@ -80,6 +79,8 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: + luxor_55_21046_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -196,4 +197,4 @@ extern const device_type ABC850_FLOPPY; -#endif +#endif // MAME_BUS_ABCBUS_LUX21046_H diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 602d1f4b37e..4c13a5cb151 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -24,7 +24,7 @@ //************************************************************************** const device_type C1526 = device_creator<c1526_t>; -const device_type MPS802 = device_creator<c1526_t>; +const device_type MPS802 = C1526; const device_type C4023 = device_creator<c4023_t>; diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 41f809f0a0e..93822d01ae3 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -379,24 +379,33 @@ void omti8621_device::device_reset() const device_type ISA16_OMTI8621 = device_creator<omti8621_pc_device>; omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock) + : omti8621_device(mconfig, ISA16_OMTI8621, "OMTI 8621 ESDI/floppy controller (ISA)", tag, owner, clock, "omti8621isa", __FILE__) { } const device_type ISA16_OMTI8621_APOLLO = device_creator<omti8621_apollo_device>; omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock) + : omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, "OMTI 8621 ESDI/floppy controller (Apollo)", tag, owner, clock, "omti8621ap", __FILE__) { } -omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, type, "OMTI 8621 ESDI/floppy controller", tag, owner, clock, "omti8621", __FILE__), - device_isa16_card_interface(mconfig, *this), - m_fdc(*this, OMTI_FDC_TAG), - m_iobase(*this, "IO_BASE"), - m_biosopts(*this, "BIOS_OPTS"), jumper(0), omti_state(0), status_port(0), config_port(0), mask_port(0), command_length(0), command_index(0), command_status(0), data_buffer(nullptr), - data_length(0), data_index(0), diskaddr_ecc_error(0), diskaddr_format_bad_track(0), m_timer(nullptr), m_installed(false) +omti8621_device::omti8621_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) + , device_isa16_card_interface(mconfig, *this) + , m_fdc(*this, OMTI_FDC_TAG) + , m_iobase(*this, "IO_BASE") + , m_biosopts(*this, "BIOS_OPTS") + , jumper(0), omti_state(0), status_port(0), config_port(0), mask_port(0), command_length(0), command_index(0), command_status(0), data_buffer(nullptr) + , data_length(0), data_index(0), diskaddr_ecc_error(0), diskaddr_format_bad_track(0), m_timer(nullptr), m_installed(false) { } diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index 6ad1e4fb0d1..2c031f1113e 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -10,10 +10,10 @@ * */ -#pragma once +#ifndef MAME_BUS_ISA_OMTI8621_H +#define MAME_BUS_ISA_OMTI8621_H -#ifndef ISA_OMTI8621_H_ -#define ISA_OMTI8621_H_ +#pragma once #include "isa.h" #include "machine/pc_fdc.h" @@ -32,9 +32,6 @@ class omti_disk_image_device; class omti8621_device : public device_t, public device_isa16_card_interface { public: - omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - ~omti8621_device() {} - DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); @@ -49,6 +46,16 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: + omti8621_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -153,4 +160,4 @@ extern const device_type ISA16_OMTI8621_APOLLO; //############################################################### -#endif /* OMTI8621_H_ */ +#endif // MAME_BUS_ISA_OMTI8621_H diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index a916b40163e..8dda45a4535 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -308,15 +308,12 @@ const device_type ISA8_SC499 = device_creator<sc499_device>; IMPLEMENTATION ***************************************************************************/ -// device type definition -const device_type SC499 = device_creator<sc499_device>; - //------------------------------------------------- // sc499_device - constructor //------------------------------------------------- sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__), + : device_t(mconfig, ISA8_SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__), device_isa8_card_interface(mconfig, *this), m_iobase(*this, "IO_BASE"), m_irqdrq(*this, "IRQ_DRQ"), m_data(0), m_command(0), m_status(0), m_control(0), m_has_cartridge(0), m_is_writable(0), m_current_command(0), m_first_block_hack(0), m_nasty_readahead(0), m_read_block_pending(0), diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 1b0238d77ab..3452f2eddf3 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -162,7 +162,7 @@ isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config } isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64", __FILE__), + device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64isa", __FILE__), device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp index 1252e81f785..6c7490a43af 100644 --- a/src/devices/machine/40105.cpp +++ b/src/devices/machine/40105.cpp @@ -33,7 +33,7 @@ //************************************************************************** const device_type CD40105 = device_creator<cmos_40105_device>; -const device_type HC40105 = device_creator<cmos_40105_device>; +const device_type HC40105 = CD40105; //************************************************************************** diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index ec4e631ca42..a939bc75551 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -511,16 +511,29 @@ void ibm5160_mb_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock, "ibm5160_mb", __FILE__), - m_maincpu(*owner, "maincpu"), - m_pic8259(*this, "pic8259"), - m_dma8237(*this, "dma8237"), - m_pit8253(*this, "pit8253"), - m_ppi8255(*this, "ppi8255"), - m_speaker(*this, "speaker"), - m_isabus(*this, "isa"), - m_pc_kbdc(*this, "pc_kbdc"), - m_ram(*this, ":" RAM_TAG) + : ibm5160_mb_device(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock, "ibm5160_mb", __FILE__) +{ +} + +ibm5160_mb_device::ibm5160_mb_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source) + : device_t(mconfig, IBM5160_MOTHERBOARD, name, tag, owner, clock, shortname, source) + , m_maincpu(*owner, "maincpu") + , m_pic8259(*this, "pic8259") + , m_dma8237(*this, "dma8237") + , m_pit8253(*this, "pit8253") + , m_ppi8255(*this, "ppi8255") + , m_speaker(*this, "speaker") + , m_isabus(*this, "isa") + , m_pc_kbdc(*this, "pc_kbdc") + , m_ram(*this, ":" RAM_TAG) { } @@ -615,8 +628,8 @@ machine_config_constructor ibm5150_mb_device::device_mconfig_additions() const //------------------------------------------------- ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ibm5160_mb_device(mconfig, tag, owner, clock), - m_cassette(*this, "cassette") + : ibm5160_mb_device(mconfig, IBM5150_MOTHERBOARD, "IBM5150_MOTHERBOARD", tag, owner, clock, "ibm5150_mb", __FILE__) + , m_cassette(*this, "cassette") { } @@ -830,7 +843,7 @@ ioport_constructor ec1841_mb_device::device_input_ports() const //------------------------------------------------- ec1841_mb_device::ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ibm5160_mb_device(mconfig, tag, owner, clock) + : ibm5160_mb_device(mconfig, EC1841_MOTHERBOARD, "EC1841_MOTHERBOARD", tag, owner, clock, "ec1841_mb", __FILE__) { } @@ -880,7 +893,7 @@ READ8_MEMBER ( ec1841_mb_device::pc_ppi_portc_r ) } pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ibm5160_mb_device(mconfig, tag, owner, clock) + : ibm5160_mb_device(mconfig, PCNOPPI_MOTHERBOARD, "PCNOPPI_MOTHERBOARD", tag, owner, clock, "pcnoppi_mb", __FILE__) { } diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index abd6c78974d..0e12bff5119 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -32,6 +32,7 @@ class ibm5160_mb_device : public device_t public: // construction/destruction ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + // inline configuration static void static_set_cputag(device_t &device, const char *tag); @@ -41,19 +42,21 @@ public: DECLARE_ADDRESS_MAP(map, 8); protected: + ibm5160_mb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; public: - required_device<cpu_device> m_maincpu; - required_device<pic8259_device> m_pic8259; - required_device<am9517a_device> m_dma8237; - required_device<pit8253_device> m_pit8253; - optional_device<i8255_device> m_ppi8255; - required_device<speaker_sound_device> m_speaker; - required_device<isa8_device> m_isabus; - optional_device<pc_kbdc_device> m_pc_kbdc; - required_device<ram_device> m_ram; + required_device<cpu_device> m_maincpu; + required_device<pic8259_device> m_pic8259; + required_device<am9517a_device> m_dma8237; + required_device<pit8253_device> m_pit8253; + optional_device<i8255_device> m_ppi8255; + required_device<speaker_sound_device> m_speaker; + required_device<isa8_device> m_isabus; + optional_device<pc_kbdc_device> m_pc_kbdc; + required_device<ram_device> m_ram; /* U73 is an LS74 - dual flip flop */ /* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */ diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index 4bdcbf81963..62f012f201f 100644 --- a/src/devices/machine/i8155.cpp +++ b/src/devices/machine/i8155.cpp @@ -20,7 +20,7 @@ // device type definitions const device_type I8155 = device_creator<i8155_device>; -const device_type I8156 = device_creator<i8155_device>; +const device_type I8156 = I8155; //************************************************************************** diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp index 522c27a18d4..d5da10ecf78 100644 --- a/src/devices/machine/i8255.cpp +++ b/src/devices/machine/i8255.cpp @@ -64,7 +64,7 @@ enum //************************************************************************** const device_type I8255 = device_creator<i8255_device>; -const device_type I8255A = device_creator<i8255_device>; +const device_type I8255A = I8255; //************************************************************************** diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp index 1effb4ac144..fbbfd603773 100644 --- a/src/devices/machine/mm74c922.cpp +++ b/src/devices/machine/mm74c922.cpp @@ -24,7 +24,7 @@ //************************************************************************** const device_type MM74C922 = device_creator<mm74c922_device>; -const device_type MM74C923 = device_creator<mm74c922_device>; +const device_type MM74C923 = MM74C922; diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp index c8b66fcf3f4..fb57669f284 100644 --- a/src/devices/machine/ncr5380n.cpp +++ b/src/devices/machine/ncr5380n.cpp @@ -31,7 +31,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device) ADDRESS_MAP_END ncr5380n_device::ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "ncr5380", __FILE__), tm(nullptr), status(0), istatus(0), m_mode(0), + : nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "ncr5380_new", __FILE__), tm(nullptr), status(0), istatus(0), m_mode(0), m_outdata(0), m_busstatus(0), m_dmalatch(0), m_icommand(0), m_tcommand(0), clock_conv(0), sync_offset(0), sync_period(0), bus_id(0), select_timeout(0), seq(0), tcount(0), mode(0), state(0), irq(false), drq(false), m_irq_handler(*this), diff --git a/src/devices/video/bufsprite.cpp b/src/devices/video/bufsprite.cpp index 4a3e4033d63..b7cd1302158 100644 --- a/src/devices/video/bufsprite.cpp +++ b/src/devices/video/bufsprite.cpp @@ -21,3 +21,58 @@ const device_type BUFFERED_SPRITERAM8 = device_creator<buffered_spriteram8_devic const device_type BUFFERED_SPRITERAM16 = device_creator<buffered_spriteram16_device>; const device_type BUFFERED_SPRITERAM32 = device_creator<buffered_spriteram32_device>; const device_type BUFFERED_SPRITERAM64 = device_creator<buffered_spriteram64_device>; + + +template <typename _Type> +buffered_spriteram_device<_Type>::buffered_spriteram_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) + , m_spriteram(*this, DEVICE_SELF) +{ +} + + +template <typename _Type> +void buffered_spriteram_device<_Type>::device_start() +{ + if (m_spriteram != nullptr) + { + m_buffered.resize(m_spriteram.bytes() / sizeof(_Type)); + save_item(NAME(m_buffered)); + } +} + + + +buffered_spriteram8_device::buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : buffered_spriteram_device<u8>(mconfig, BUFFERED_SPRITERAM8, "Buffered 8-bit Sprite RAM", tag, owner, clock, "buffered_spriteram8", __FILE__) +{ +} + + + +buffered_spriteram16_device::buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : buffered_spriteram_device<u16>(mconfig, BUFFERED_SPRITERAM16, "Buffered 16-bit Sprite RAM", tag, owner, clock, "buffered_spriteram16", __FILE__) +{ +} + + + +buffered_spriteram32_device::buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : buffered_spriteram_device<u32>(mconfig, BUFFERED_SPRITERAM32, "Buffered 32-bit Sprite RAM", tag, owner, clock, "buffered_spriteram32", __FILE__) +{ +} + + + +buffered_spriteram64_device::buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : buffered_spriteram_device<u64>(mconfig, BUFFERED_SPRITERAM64, "Buffered 64-bit Sprite RAM", tag, owner, clock, "buffered_spriteram64", __FILE__) +{ +} diff --git a/src/devices/video/bufsprite.h b/src/devices/video/bufsprite.h index 7e5fdc2e1aa..f96c1744b8a 100644 --- a/src/devices/video/bufsprite.h +++ b/src/devices/video/bufsprite.h @@ -8,10 +8,10 @@ *********************************************************************/ -#pragma once +#ifndef MAME_DEVICES_VIDEO_BUFSPRITE_H +#define MAME_DEVICES_VIDEO_BUFSPRITE_H -#ifndef __BUFSPRITE_H__ -#define __BUFSPRITE_H__ +#pragma once @@ -53,9 +53,15 @@ class buffered_spriteram_device : public device_t { public: // construction - buffered_spriteram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, type, "Buffered Sprite RAM", tag, owner, clock, "buffered_spriteram", __FILE__), - m_spriteram(*this, DEVICE_SELF) { } + buffered_spriteram_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source); // getters _Type *live() const { return m_spriteram; } @@ -80,19 +86,12 @@ public: protected: // first-time setup - virtual void device_start() override - { - if (m_spriteram != nullptr) - { - m_buffered.resize(m_spriteram.bytes() / sizeof(_Type)); - save_item(NAME(m_buffered)); - } - } + virtual void device_start() override; private: // internal state required_shared_ptr<_Type> m_spriteram; - std::vector<_Type> m_buffered; + std::vector<_Type> m_buffered; }; @@ -102,8 +101,7 @@ class buffered_spriteram8_device : public buffered_spriteram_device<uint8_t> { public: // construction - buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : buffered_spriteram_device<uint8_t>(mconfig, BUFFERED_SPRITERAM8, tag, owner, clock) { } + buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; @@ -113,8 +111,7 @@ class buffered_spriteram16_device : public buffered_spriteram_device<uint16_t> { public: // construction - buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : buffered_spriteram_device<uint16_t>(mconfig, BUFFERED_SPRITERAM16, tag, owner, clock) { } + buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; @@ -124,8 +121,7 @@ class buffered_spriteram32_device : public buffered_spriteram_device<uint32_t> { public: // construction - buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : buffered_spriteram_device<uint32_t>(mconfig, BUFFERED_SPRITERAM32, tag, owner, clock) { } + buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; @@ -135,9 +131,8 @@ class buffered_spriteram64_device : public buffered_spriteram_device<uint64_t> { public: // construction - buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : buffered_spriteram_device<uint64_t>(mconfig, BUFFERED_SPRITERAM64, tag, owner, clock) { } + buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; -#endif /* __BUFSPRITE_H__ */ +#endif // MAME_DEVICES_VIDEO_BUFSPRITE_H diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp index 432f886c59b..21fb8f66513 100644 --- a/src/devices/video/hd61830.cpp +++ b/src/devices/video/hd61830.cpp @@ -18,7 +18,7 @@ //************************************************************************** const device_type HD61830 = device_creator<hd61830_device>; -const device_type HD61830B = device_creator<hd61830_device>; +const device_type HD61830B = HD61830; // default address map diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp index 6f720fc0f0d..632314a49dd 100644 --- a/src/devices/video/msm6222b.cpp +++ b/src/devices/video/msm6222b.cpp @@ -34,7 +34,7 @@ msm6222b_device::msm6222b_device(const machine_config &mconfig, const char *tag, } msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b", __FILE__) + msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b01", __FILE__) { // load the fixed cgrom m_cgrom.set_tag("cgrom"); diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp index 7e1af926245..d25d6ea9d61 100644 --- a/src/devices/video/sed1200.cpp +++ b/src/devices/video/sed1200.cpp @@ -37,22 +37,22 @@ sed1200_device::sed1200_device(const machine_config &mconfig, device_type type, } sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock, "sed1200", __FILE__) + sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock, "sed1200da", __FILE__) { } sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock, "sed1200", __FILE__) + sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock, "sed1200fa", __FILE__) { } sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock, "sed1200", __FILE__) + sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock, "sed1200db", __FILE__) { } sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200", __FILE__) + sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200fb", __FILE__) { } diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp index abc913ebedf..88b99b84f60 100644 --- a/src/frontend/mame/clifront.cpp +++ b/src/frontend/mame/clifront.cpp @@ -1496,13 +1496,15 @@ void cli_frontend::execute_commands(const char *exename) // find the command for (auto & info_command : info_commands) + { if (strcmp(m_options.command(), info_command.option) == 0) { // parse any relevant INI files before proceeding const char *sysname = m_options.system_name(); - (this->*info_command.function)((sysname[0] == 0) ? "*" : sysname); + (this->*info_command.function)((sysname[0] == 0) ? nullptr : sysname); return; } + } if (!m_osd.execute_command(m_options.command())) // if we get here, we don't know what has been requested diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index 14afa787bb1..9fecd3af229 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -165,24 +165,25 @@ void gottlieb_sound_r0_device::device_start() //------------------------------------------------- gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__), - device_mixer_interface(mconfig, *this), - m_audiocpu(*this, "audiocpu"), - m_riot(*this, "riot"), - m_votrax(*this, "votrax"), - //m_populate_votrax(false), - m_last_speech_clock(0) + : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__) { } -gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, bool populate_votrax) - : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__), - device_mixer_interface(mconfig, *this), - m_audiocpu(*this, "audiocpu"), - m_riot(*this, "riot"), - m_votrax(*this, "votrax"), - //m_populate_votrax(populate_votrax), - m_last_speech_clock(0) +gottlieb_sound_r1_device::gottlieb_sound_r1_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source) + : device_t(mconfig, type, "Gottlieb Sound rev. 1", tag, owner, clock, shortname, source) + , device_mixer_interface(mconfig, *this) + , m_audiocpu(*this, "audiocpu") + , m_riot(*this, "riot") + , m_votrax(*this, "votrax") + , m_last_speech_clock(0) { } @@ -388,7 +389,7 @@ void gottlieb_sound_r1_device::device_start() //------------------------------------------------- gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : gottlieb_sound_r1_device(mconfig, tag, owner, clock, true) + : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1_WITH_VOTRAX, "Gottlieb Sound rev. 1 with Votrax", tag, owner, clock, "gotsndr1vt", __FILE__) { } diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h index 78625e293fc..722c256e6a7 100644 --- a/src/mame/audio/gottlieb.h +++ b/src/mame/audio/gottlieb.h @@ -75,7 +75,6 @@ class gottlieb_sound_r1_device : public device_t, public device_mixer_interface public: // construction/destruction gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, bool populate_votrax); // read/write DECLARE_WRITE8_MEMBER( write ); @@ -88,6 +87,16 @@ public: DECLARE_WRITE_LINE_MEMBER( votrax_request ); protected: + gottlieb_sound_r1_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source); + // device-level overrides virtual machine_config_constructor device_mconfig_additions() const override; virtual ioport_constructor device_input_ports() const override; diff --git a/src/mame/video/neogeo_spr.cpp b/src/mame/video/neogeo_spr.cpp index 89ad9aab742..91c3348d93c 100644 --- a/src/mame/video/neogeo_spr.cpp +++ b/src/mame/video/neogeo_spr.cpp @@ -11,18 +11,17 @@ // pure virtual functions //const device_type NEOGEO_SPRITE_BASE = device_creator<neosprite_base_device>; -/* -neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, NEOGEO_SPRITE_BASE, "NeoGeo Sprites", tag, owner, clock, "neospritebase", __FILE__), - m_bppshift(4) -{ - -} -*/ - -neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, device_type type) - : device_t(mconfig, type, "Neogeo Sprites", tag, owner, clock, "neosprite", __FILE__), - m_bppshift(4) +neosprite_base_device::neosprite_base_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) + , m_bppshift(4) { } @@ -653,7 +652,7 @@ void neosprite_base_device::set_pens(const pen_t* pens) const device_type NEOGEO_SPRITE_REGULAR = device_creator<neosprite_regular_device>; neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_REGULAR) + : neosprite_base_device(mconfig, NEOGEO_SPRITE_REGULAR, "Neo-Geo Sprites (regular)", tag, owner, clock, "neosprite_reg", __FILE__) { } @@ -701,8 +700,8 @@ inline void neosprite_regular_device::draw_pixel(int romaddr, uint32_t* dst, con const device_type NEOGEO_SPRITE_OPTIMZIED = device_creator<neosprite_optimized_device>; neosprite_optimized_device::neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_OPTIMZIED), - m_spritegfx8(nullptr) + : neosprite_base_device(mconfig, NEOGEO_SPRITE_OPTIMZIED, "Neo-Geo Sprites (optimized)", tag, owner, clock, "neosprite_opt", __FILE__) + , m_spritegfx8(nullptr) { } @@ -778,7 +777,7 @@ const device_type NEOGEO_SPRITE_MIDAS = device_creator<neosprite_midas_device>; neosprite_midas_device::neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_MIDAS) + : neosprite_base_device(mconfig, NEOGEO_SPRITE_MIDAS, "MIDAS Sprites", tag, owner, clock, "midassprite", __FILE__) { m_bppshift = 8; } diff --git a/src/mame/video/neogeo_spr.h b/src/mame/video/neogeo_spr.h index 0b3906dca2a..8c040c4f903 100644 --- a/src/mame/video/neogeo_spr.h +++ b/src/mame/video/neogeo_spr.h @@ -21,9 +21,6 @@ class neosprite_base_device : public device_t { public: - neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, device_type type); -// neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual void optimize_sprite_data(); virtual void set_optimized_sprite_data(uint8_t* sprdata, uint32_t mask); @@ -80,6 +77,16 @@ public: int m_bppshift; // 4 for 4bpp gfx (NeoGeo) 8 for 8bpp gfx (Midas) protected: + neosprite_base_device( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + uint32_t clock, + const char *shortname, + const char *source); + virtual void device_start() override; virtual void device_reset() override; uint32_t get_region_mask(uint8_t* rgn, uint32_t rgn_size); |