diff options
author | 2015-11-15 13:07:26 +0100 | |
---|---|---|
committer | 2015-11-15 13:07:26 +0100 | |
commit | 5200f15ace282ad246bd38af900472db353ba241 (patch) | |
tree | 93532e9717e2284223243dcba1ffddeff479e790 /src | |
parent | 2844aa7b02e3e76abc6e6707ebba0d6fa1c092be (diff) | |
parent | 15f6df6d66146007b7052d5efaa4513cdfd4ac79 (diff) |
Merge remote-tracking branch 'remotes/mamedev/master'
Diffstat (limited to 'src')
684 files changed, 3880 insertions, 5322 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index 7012d11a81b..8f5fa929c2e 100644 --- a/src/devices/bus/a1bus/a1bus.cpp +++ b/src/devices/bus/a1bus/a1bus.cpp @@ -26,13 +26,15 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>; //------------------------------------------------- a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_a1bus_tag(nullptr), + m_a1bus_slottag(nullptr) { } a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr) { } @@ -75,16 +77,16 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), + device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this) + m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this) + m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } //------------------------------------------------- @@ -166,8 +168,8 @@ WRITE_LINE_MEMBER( a1bus_device::nmi_w ) { m_out_nmi_cb(state); } device_a1bus_card_interface::device_a1bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_a1bus(NULL), - m_a1bus_tag(NULL) + m_a1bus(nullptr), + m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr), m_next(nullptr) { } diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp index daa79b15ce5..7168133647c 100644 --- a/src/devices/bus/a1bus/a1cassette.cpp +++ b/src/devices/bus/a1bus/a1cassette.cpp @@ -59,14 +59,14 @@ const rom_entry *a1bus_cassette_device::device_rom_region() const a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__), device_a1bus_card_interface(mconfig, *this), - m_cassette(*this, "cassette") + m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0) { } a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a1bus_card_interface(mconfig, *this), - m_cassette(*this, "cassette") + m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0) { } diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp index f67470bb5db..362b712eb56 100644 --- a/src/devices/bus/a1bus/a1cffa.cpp +++ b/src/devices/bus/a1bus/a1cffa.cpp @@ -54,14 +54,14 @@ const rom_entry *a1bus_cffa_device::device_rom_region() const a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__), device_a1bus_card_interface(mconfig, *this), - m_ata(*this, CFFA_ATA_TAG) + m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false) { } a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a1bus_card_interface(mconfig, *this), - m_ata(*this, CFFA_ATA_TAG) + m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false) { } diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index 3a35c8ab253..3e701a636fd 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -88,7 +88,7 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device m_sn1(*this, SN1_TAG), m_sn2(*this, SN2_TAG), m_sn3(*this, SN3_TAG), - m_sn4(*this, SN4_TAG) + m_sn4(*this, SN4_TAG), m_latch0(0), m_latch1(0), m_latch2(0), m_latch3(0), m_has4thsn(false) { } diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index 6698ea4f68c..cb647b6476b 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -78,14 +78,14 @@ const rom_entry *a2bus_applicard_device::device_rom_region() const a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_z80(*this, Z80_TAG) + m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr) { } a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_z80(*this, Z80_TAG) + m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr) { } diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp index cd2eab4eea7..4bf2c21a40e 100644 --- a/src/devices/bus/a2bus/a2bus.cpp +++ b/src/devices/bus/a2bus/a2bus.cpp @@ -90,13 +90,13 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>; //------------------------------------------------- a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) { } a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) { } @@ -139,18 +139,18 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), + device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_inh_cb(*this) + m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0) { } a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_inh_cb(*this) + m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0) { } //------------------------------------------------- @@ -296,8 +296,8 @@ WRITE_LINE_MEMBER( a2bus_device::nmi_w ) { m_out_nmi_cb(state); } device_a2bus_card_interface::device_a2bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_a2bus(NULL), - m_a2bus_tag(NULL) + m_a2bus(nullptr), + m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr), m_slot(0), m_next(nullptr) { } diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index cc3b3585cac..8d91efea971 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -86,7 +86,7 @@ const rom_entry *a2bus_cffa2_6502_device::device_rom_region() const a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_ata(*this, CFFA2_ATA_TAG) + m_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false) { } diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index d3de7fdfee0..6e33d0be8fa 100644 --- a/src/devices/bus/a2bus/a2corvus.cpp +++ b/src/devices/bus/a2bus/a2corvus.cpp @@ -104,14 +104,14 @@ const rom_entry *a2bus_corvus_device::device_rom_region() const a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_corvushd(*this, CORVUS_HD_TAG) + m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr) { } a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_corvushd(*this, CORVUS_HD_TAG) + m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr) { } diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index ad8a860a69f..488b675a5f9 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -93,7 +93,7 @@ const rom_entry *a2bus_floppy_device::device_rom_region() const a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_fdc(*this, FDC_TAG) + m_fdc(*this, FDC_TAG), m_rom(nullptr) { } diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index de0f84c26db..474e228b6fa 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -73,7 +73,7 @@ a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, cons device_a2bus_card_interface(mconfig, *this), m_wozfdc(*this, WOZFDC_TAG), floppy0(*this, "0"), - floppy1(*this, "1") + floppy1(*this, "1"), m_rom(nullptr) { } diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index e3b4fcc3fc5..0cd70077cea 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -51,14 +51,14 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_dac(*this, DAC_TAG) + m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0) { } a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_dac(*this, DAC_TAG) + m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0) { } diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index 3f6d99ead9c..bf96dd7d16b 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -28,13 +28,15 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>; //------------------------------------------------- a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_a2eauxslot_tag(nullptr), + m_a2eauxslot_slottag(nullptr) { } a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr) { } @@ -77,16 +79,16 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), + device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this) + m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this) + m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } //------------------------------------------------- @@ -152,8 +154,8 @@ WRITE_LINE_MEMBER( a2eauxslot_device::nmi_w ) { m_out_nmi_cb(state); } device_a2eauxslot_card_interface::device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_a2eauxslot(NULL), - m_a2eauxslot_tag(NULL) + m_a2eauxslot(nullptr), + m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr), m_slot(0), m_next(nullptr) { } diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp index 17b7b2ceb0e..b7d6897b82d 100644 --- a/src/devices/bus/a2bus/a2eramworks3.cpp +++ b/src/devices/bus/a2bus/a2eramworks3.cpp @@ -30,13 +30,14 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>; a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__), - device_a2eauxslot_card_interface(mconfig, *this) + device_a2eauxslot_card_interface(mconfig, *this), + m_bank(0) { } a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2eauxslot_card_interface(mconfig, *this) + device_a2eauxslot_card_interface(mconfig, *this), m_bank(0) { } diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index a292eba7410..806773dc9bd 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -117,7 +117,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), - m_scsibus(*this, SCSI_BUS_TAG) + m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false), m_c0ne(0), m_c0nf(0) { } @@ -125,7 +125,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const ch device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), - m_scsibus(*this, SCSI_BUS_TAG) + m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false), m_c0ne(0), m_c0nf(0) { } diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index e9bb29d1243..b26fcaf3256 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -151,13 +151,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w) a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { } a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { } @@ -215,7 +215,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__), device_sound_interface(mconfig, *this), - m_write_irq(*this) + m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0) { } diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 210ba76a0d2..9832b3160e2 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -75,7 +75,7 @@ const rom_entry *a2bus_ramfactor_device::device_rom_region() const a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0) { } diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index 92dbff70520..79281f85ee2 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -63,7 +63,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char * device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ptm(*this, MIDI_PTM_TAG), - m_acia(*this, MIDI_ACIA_TAG), + m_acia(*this, MIDI_ACIA_TAG), m_acia_irq(false), m_ptm_irq(false) { } @@ -72,7 +72,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ptm(*this, MIDI_PTM_TAG), - m_acia(*this, MIDI_ACIA_TAG), + m_acia(*this, MIDI_ACIA_TAG), m_acia_irq(false), m_ptm_irq(false) { } diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 9dd792f6e45..749c14621fa 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -128,7 +128,7 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device m_ay1(*this, AY1_TAG), m_ay2(*this, AY2_TAG), m_ay3(*this, AY3_TAG), - m_ay4(*this, AY4_TAG) + m_ay4(*this, AY4_TAG), m_isPhasor(false), m_PhasorNative(false), m_porta1(0), m_porta2(0) { } diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index daede92b119..78da204e894 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -104,8 +104,8 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *ta m_dsw1(*this, "DSW1"), m_ctx(*this, PIC_CENTRONICS_TAG), m_ctx_data_in(*this, "ctx_data_in"), - m_ctx_data_out(*this, "ctx_data_out"), - m_started(false) + m_ctx_data_out(*this, "ctx_data_out"), m_rom(nullptr), + m_started(false), m_ack(0), m_irqenable(false), m_autostrobe(false), m_timer(nullptr) { } @@ -115,8 +115,8 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type ty m_dsw1(*this, "DSW1"), m_ctx(*this, PIC_CENTRONICS_TAG), m_ctx_data_in(*this, "ctx_data_in"), - m_ctx_data_out(*this, "ctx_data_out"), - m_started(false) + m_ctx_data_out(*this, "ctx_data_out"), m_rom(nullptr), + m_started(false), m_ack(0), m_irqenable(false), m_autostrobe(false), m_timer(nullptr) { } diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 5e9fc865718..d3958e41f89 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -110,7 +110,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), - m_scsibus(*this, SCSI_BUS_TAG) + m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false) { } @@ -118,7 +118,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char * device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), - m_scsibus(*this, SCSI_BUS_TAG) + m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false) { } diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index e7fe5cdff95..e7477c468c6 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -54,14 +54,14 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_z80(*this, Z80_TAG) + m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false) { } a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_z80(*this, Z80_TAG) + m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false) { } diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index 992ae8fa6c0..d7215435fda 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -132,7 +132,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), m_dsw2(*this, "DSW2"), - m_acia(*this, SSC_ACIA_TAG), + m_acia(*this, SSC_ACIA_TAG), m_rom(nullptr), m_started(false) { } @@ -142,7 +142,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type ty device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), m_dsw2(*this, "DSW2"), - m_acia(*this, SSC_ACIA_TAG), + m_acia(*this, SSC_ACIA_TAG), m_rom(nullptr), m_started(false) { } diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp index 38be337e8ba..d47e7770937 100644 --- a/src/devices/bus/a2bus/a2swyft.cpp +++ b/src/devices/bus/a2bus/a2swyft.cpp @@ -47,13 +47,13 @@ const rom_entry *a2bus_swyft_device::device_rom_region() const a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0) { } a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0) { } diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp index 34b2cac13c1..e8cc3d338c9 100644 --- a/src/devices/bus/a2bus/a2themill.cpp +++ b/src/devices/bus/a2bus/a2themill.cpp @@ -70,14 +70,14 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_6809(*this, M6809_TAG) + m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0) { } a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_6809(*this, M6809_TAG) + m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0) { } diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index d16feb82448..881acd496ce 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -79,14 +79,14 @@ const rom_entry *a2bus_thunderclock_device::device_rom_region() const a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG) + m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0) { } a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__), device_a2bus_card_interface(mconfig, *this), - m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG) + m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0) { } diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 62969c36dee..6f7722e46ea 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -140,8 +140,8 @@ const rom_entry *a2bus_ultratermenh_device::device_rom_region() const a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this), - m_crtc(*this, ULTRATERM_MC6845_NAME) + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0), + m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0) { } diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index d29c00d2006..4fc271c604f 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -174,8 +174,8 @@ const rom_entry *a2bus_aevm80_device::device_rom_region() const a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this), - m_crtc(*this, VIDEOTERM_MC6845_NAME), + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), + m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0), m_palette(*this, ":palette") { } diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index ff155f25acd..04c16505ed7 100644 --- a/src/devices/bus/a2bus/a2vulcan.cpp +++ b/src/devices/bus/a2bus/a2vulcan.cpp @@ -117,7 +117,7 @@ const rom_entry *a2bus_vulcangold_device::device_rom_region() const a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_ata(*this, VULCAN_ATA_TAG) + m_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false) { } diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index da958262e34..a095578372b 100644 --- a/src/devices/bus/a2bus/a2zipdrive.cpp +++ b/src/devices/bus/a2bus/a2zipdrive.cpp @@ -72,7 +72,7 @@ const rom_entry *a2bus_zipdrivebase_device::device_rom_region() const a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), - m_ata(*this, ZIPDRIVE_ATA_TAG) + m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0) { } diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index fc1adf2e269..de935ff7caa 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -117,7 +117,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de m_con1(*this, FDC01_FDC_TAG":0"), m_con2(*this, FDC01_FDC_TAG":1"), m_con3(*this, FDC01_FDC_TAG":2"), - m_con4(*this, FDC01_FDC_TAG":3") + m_con4(*this, FDC01_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_curfloppy(nullptr) { } @@ -128,7 +128,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, co m_con1(*this, FDC01_FDC_TAG":0"), m_con2(*this, FDC01_FDC_TAG":1"), m_con3(*this, FDC01_FDC_TAG":2"), - m_con4(*this, FDC01_FDC_TAG":3") + m_con4(*this, FDC01_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_curfloppy(nullptr) { } diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index eaad8725d1f..6e9c9bb9eca 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -87,7 +87,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de m_con1(*this, FDC02_FDC_TAG":0"), m_con2(*this, FDC02_FDC_TAG":1"), m_con3(*this, FDC02_FDC_TAG":2"), - m_con4(*this, FDC02_FDC_TAG":3") + m_con4(*this, FDC02_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_bufptr(0), m_curfloppy(nullptr), m_in_drq(false), m_timer(nullptr) { } @@ -98,7 +98,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, co m_con1(*this, FDC02_FDC_TAG":0"), m_con2(*this, FDC02_FDC_TAG":1"), m_con3(*this, FDC02_FDC_TAG":2"), - m_con4(*this, FDC02_FDC_TAG":3") + m_con4(*this, FDC02_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_bufptr(0), m_curfloppy(nullptr), m_in_drq(false), m_timer(nullptr) { } @@ -125,7 +125,7 @@ void a2bus_corvfdc02_device::device_reset() { m_fdc_local_status = 2; m_fdc_local_command = 0; - m_curfloppy = NULL; + m_curfloppy = nullptr; m_in_drq = false; m_timer->adjust(attotime::never); } diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp index c64719ba7e5..5357f3cc31d 100644 --- a/src/devices/bus/a2bus/laser128.cpp +++ b/src/devices/bus/a2bus/laser128.cpp @@ -44,14 +44,14 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0) { } a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0) { } diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index d044fbcdad2..b9d2a3e2931 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -179,7 +179,8 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ m_mcu(*this, MOUSE_MCU_TAG), m_mouseb(*this, MOUSE_BUTTON_TAG), m_mousex(*this, MOUSE_XAXIS_TAG), - m_mousey(*this, MOUSE_YAXIS_TAG) + m_mousey(*this, MOUSE_YAXIS_TAG), m_rom(nullptr), m_ddr_a(0), m_ddr_b(0), m_ddr_c(0), m_port_a_out(0), m_port_b_out(0), m_port_c_out(0), m_port_a_in(0), m_port_b_in(0), + m_port_c_in(0), m_timer_cnt(0), m_timer_ctl(0), m_mask_option(0), last_mx(0), last_my(0), count_x(0), count_y(0), m_timer(nullptr), m_read_timer(nullptr) { m_started = false; m_rom_bank = 0; @@ -192,7 +193,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char m_mcu(*this, MOUSE_MCU_TAG), m_mouseb(*this, MOUSE_BUTTON_TAG), m_mousex(*this, MOUSE_XAXIS_TAG), - m_mousey(*this, MOUSE_YAXIS_TAG) + m_mousey(*this, MOUSE_YAXIS_TAG), m_rom(nullptr), m_ddr_a(0), m_ddr_b(0), m_ddr_c(0), m_port_a_out(0), m_port_b_out(0), m_port_c_out(0), m_port_a_in(0), m_port_b_in(0), m_port_c_in(0), m_timer_cnt(0), m_timer_ctl(0), m_mask_option(0), last_mx(0), last_my(0), count_x(0), count_y(0), m_timer(nullptr), m_read_timer(nullptr) { m_started = false; m_rom_bank = 0; diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp index 3b05128e186..4616bf54ecf 100644 --- a/src/devices/bus/a2bus/ramcard128k.cpp +++ b/src/devices/bus/a2bus/ramcard128k.cpp @@ -30,13 +30,13 @@ const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>; a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0) { } a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0) { } diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index a25ba79423f..1d679b2be8c 100644 --- a/src/devices/bus/a2bus/ramcard16k.cpp +++ b/src/devices/bus/a2bus/ramcard16k.cpp @@ -30,13 +30,13 @@ const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>; a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0) { } a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_RAMCARD16K, "Apple II 16K Language Card", tag, owner, clock, "a2ram16k", __FILE__), - device_a2bus_card_interface(mconfig, *this) + device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0) { } diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 9b33d8fd511..9b8543613f2 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -126,7 +126,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf device_a2bus_card_interface(mconfig, *this), m_pia(*this, TIMEMASTER_PIA_TAG), m_msm5832(*this, TIMEMASTER_M5832_TAG), - m_dsw1(*this, "DSW1") + m_dsw1(*this, "DSW1"), m_rom(nullptr), m_irqa(false), m_irqb(false) { m_started = false; } @@ -136,7 +136,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf device_a2bus_card_interface(mconfig, *this), m_pia(*this, TIMEMASTER_PIA_TAG), m_msm5832(*this, TIMEMASTER_M5832_TAG), - m_dsw1(*this, "DSW1") + m_dsw1(*this, "DSW1"), m_rom(nullptr), m_irqa(false), m_irqb(false) { m_started = false; } diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index 6332492a6c2..92f3ff215b4 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -115,7 +115,7 @@ void device_a78_cart_interface::nvram_alloc(UINT32 size) a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A78_CART_SLOT, "Atari 7800 Cartridge Slot", tag, owner, clock, "a78_cart_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0), m_stick_type(0) { } diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 9185e49ac7c..2ec5b34e0e9 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -41,13 +41,13 @@ const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>; a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0) + { } a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__) -{ + : a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__), m_ram_bank(0) + { } diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index f642fcf611a..d7f2f41b7fd 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -68,13 +68,13 @@ a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0) + { } a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__) -{ + : a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__), m_bank(0) + { } a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -107,14 +107,14 @@ a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__) -{ + : a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__), m_bank(0) + { } a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__) -{ + : a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__), m_bank(0) + { } diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index 3c5eb3d0f24..4f4cecc9c8e 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -59,23 +59,23 @@ const device_type A78_XM = &device_creator<a78_xm_device>; a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_xbslot(*this, "xb_slot"), - m_pokey(*this, "xb_pokey") -{ + m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0) + { } a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a78_rom_device(mconfig, A78_XBOARD, "Atari 7800 XBoarD expansion", tag, owner, clock, "a78_xboard", __FILE__), m_xbslot(*this, "xb_slot"), - m_pokey(*this, "xb_pokey") -{ + m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0) + { } a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a78_xboard_device(mconfig, A78_XM, "Atari 7800 XM expansion module", tag, owner, clock, "a78_xm", __FILE__), - m_ym(*this, "xm_ym2151") -{ + m_ym(*this, "xm_ym2151"), m_ym_enabled(0) + { } diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index c378d869811..399b744ac5f 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -104,14 +104,14 @@ void device_a800_cart_interface::nvram_alloc(UINT32 size) a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) { } a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A800_CART_SLOT, "Atari 8bit Cartridge Slot", tag, owner, clock, "a800_cart_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) { } diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index fd64d077b50..42f8474037c 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -50,13 +50,13 @@ const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>; //------------------------------------------------- a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A8SIO_SLOT, "Atari 8 bit SIO Slot", tag, owner, clock, "a8sio_slot", __FILE__) - , device_slot_interface(mconfig, *this) + , device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) { } a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) { } @@ -102,7 +102,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, devic : device_t(mconfig, A8SIO, "Atari 8 biot SIO", tag, owner, clock, "a8sio", __FILE__) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) - , m_out_audio_in_cb(*this) + , m_out_audio_in_cb(*this), m_device(nullptr) { } @@ -110,7 +110,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, cons : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) - , m_out_audio_in_cb(*this) + , m_out_audio_in_cb(*this), m_device(nullptr) { } @@ -182,7 +182,7 @@ WRITE8_MEMBER( a8sio_device::audio_in_w ) device_a8sio_card_interface::device_a8sio_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device) , m_a8sio(NULL) - , m_a8sio_tag(NULL) + , m_a8sio_tag(NULL), m_a8sio_slottag(nullptr) { } diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 45d33173bac..74c7ddb935e 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -47,8 +47,8 @@ machine_config_constructor a8sio_cassette_device::device_mconfig_additions() con a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A8SIO_CASSETTE, "Atari 8 bit cassette", tag, owner, clock, "a8sio_cass", __FILE__) , device_a8sio_card_interface(mconfig, *this) - , m_cassette(*this, "cassette") - , m_old_cass_signal(0) + , m_cassette(*this, "cassette"), m_read_timer(nullptr) + , m_old_cass_signal(0) , m_signal_count(0) { } @@ -56,8 +56,8 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, cons a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_a8sio_card_interface(mconfig, *this) - , m_cassette(*this, "cassette") - , m_old_cass_signal(0) + , m_cassette(*this, "cassette"), m_read_timer(nullptr) + , m_old_cass_signal(0) , m_signal_count(0) { } diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp index 8f7ae76735f..5cdc7e72126 100644 --- a/src/devices/bus/a800/oss.cpp +++ b/src/devices/bus/a800/oss.cpp @@ -22,26 +22,27 @@ const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>; a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__), + m_bank(0) + { } a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__), m_bank(0) + { } a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__), m_bank(0) + { } a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__), m_bank(0) + { } diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp index f52a489bcf0..1a21ab92039 100644 --- a/src/devices/bus/a800/rom.cpp +++ b/src/devices/bus/a800/rom.cpp @@ -51,26 +51,26 @@ a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__) -{ + : a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__), m_bank(0) + { } a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__), m_bank(0) + { } a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__), m_bank(0) + { } a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__), m_bank(0) + { } @@ -81,8 +81,8 @@ a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconf a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__), m_bank(0) + { } diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp index 8e6a439d669..dd29f3ef595 100644 --- a/src/devices/bus/a800/sparta.cpp +++ b/src/devices/bus/a800/sparta.cpp @@ -19,8 +19,10 @@ const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__) -{ + : a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__), + m_bank(0), + m_subslot_enabled(0) + { } diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp index b5491e4e101..4bec92bc417 100644 --- a/src/devices/bus/abcbus/abcbus.cpp +++ b/src/devices/bus/abcbus/abcbus.cpp @@ -49,8 +49,8 @@ abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *tag, dev m_write_xint2(*this), m_write_xint3(*this), m_write_xint4(*this), - m_write_xint5(*this), - m_trrq(0) + m_write_xint5(*this), m_card(nullptr), m_irq(0), m_nmi(0), m_pren(0), + m_trrq(0), m_xint2(0), m_xint3(0), m_xint4(0), m_xint5(0) { } diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 7faeefb97c4..cf4f35121d1 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -285,7 +285,7 @@ abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *o m_floppy0(*this, FD1771_TAG ":0"), m_floppy1(*this, FD1771_TAG ":1"), m_dos_rom(*this, "dos"), - m_cs(false) + m_cs(false), m_status(0), m_data(0) { } diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 705a9e8035b..2f0831f98f5 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -413,7 +413,7 @@ luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, cons m_floppy1(*this, MB8876_TAG":1"), m_sw1(*this, "SW1"), m_s1(*this, "S1"), - m_cs(false), + m_cs(false), m_status(0), m_data(0), m_fdc_irq(0), m_fdc_drq(0), m_wait_enable(0), diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 67396d81139..57650980dc6 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -748,11 +748,11 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, cons m_fdc(*this, SAB1793_TAG), m_floppy0(*this, SAB1793_TAG":0"), m_floppy1(*this, SAB1793_TAG":1"), - m_floppy(NULL), + m_floppy(nullptr), m_sw1(*this, "SW1"), m_sw2(*this, "SW2"), m_sw3(*this, "SW3"), - m_cs(false), + m_cs(false), m_status(0), m_out(0), m_inp(0), m_fdc_irq(0), m_dma_irq(0), m_busy(0), @@ -768,11 +768,11 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, devi m_fdc(*this, SAB1793_TAG), m_floppy0(*this, SAB1793_TAG":0"), m_floppy1(*this, SAB1793_TAG":1"), - m_floppy(NULL), + m_floppy(nullptr), m_sw1(*this, "SW1"), m_sw2(*this, "SW2"), m_sw3(*this, "SW3"), - m_cs(false), + m_cs(false), m_status(0), m_out(0), m_inp(0), m_fdc_irq(0), m_dma_irq(0), m_busy(0), diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 375a5927c47..0a89215f58a 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -352,7 +352,7 @@ luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, cons m_sasi_io(0), m_sasi_cd(0), m_sasi_msg(0), - m_sasi_bsy(0), + m_sasi_bsy(0), m_inp(0), m_out(0), m_stat(0), m_sasi_data(0) { diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index c308cd8cf74..b7d9a5247f3 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -439,10 +439,10 @@ abc77_device::abc77_device(const machine_config &mconfig, const char *tag, devic m_x10(*this, "X10"), m_x11(*this, "X11"), m_dsw(*this, "DSW"), - m_txd(1), + m_txd(1), m_keylatch(0), m_keydown(1), - m_clock(0), - m_stb(1) + m_clock(0), m_hys(0), m_reset(0), + m_stb(1), m_j3(0), m_serial_timer(nullptr), m_reset_timer(nullptr) { } @@ -464,10 +464,10 @@ abc77_device::abc77_device(const machine_config &mconfig, device_type type, cons m_x10(*this, "X10"), m_x11(*this, "X11"), m_dsw(*this, "DSW"), - m_txd(1), + m_txd(1), m_keylatch(0), m_keydown(1), - m_clock(0), - m_stb(1) + m_clock(0), m_hys(0), m_reset(0), + m_stb(1), m_j3(0), m_serial_timer(nullptr), m_reset_timer(nullptr) { } diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index dd3cbbc7f51..511b1fe7c91 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -352,7 +352,7 @@ abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, co m_txd(1), m_clk(0), m_stb(1), - m_keydown(1) + m_keydown(1), m_serial_timer(nullptr) { } diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 63a3f0154f0..df8c2b2adce 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -487,7 +487,7 @@ inline void abc99_device::scan_mouse() abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "abc99", __FILE__), - abc_keyboard_interface(mconfig, *this), + abc_keyboard_interface(mconfig, *this), m_serial_timer(nullptr), m_mouse_timer(nullptr), m_maincpu(*this, I8035_Z2_TAG), m_mousecpu(*this, I8035_Z5_TAG), m_speaker(*this, "speaker"), diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp index dc9edd10bed..d10c1e6bc8b 100644 --- a/src/devices/bus/abckb/abckb.cpp +++ b/src/devices/bus/abckb/abckb.cpp @@ -47,7 +47,7 @@ abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig device_slot_interface(mconfig, *this), m_out_rx_handler(*this), m_out_trxc_handler(*this), - m_out_keydown_handler(*this) + m_out_keydown_handler(*this), m_card(nullptr) { } diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp index 110a1299188..0de506f751e 100644 --- a/src/devices/bus/adam/exp.cpp +++ b/src/devices/bus/adam/exp.cpp @@ -55,7 +55,7 @@ adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mco device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock, "adam_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), - m_write_irq(*this) + m_write_irq(*this), m_card(nullptr) { } diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index 7ea8a8b24a2..c7bb97e1184 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -92,7 +92,7 @@ powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const : device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "adam_ide", __FILE__), device_adam_expansion_slot_card_interface(mconfig, *this), m_ata(*this, ATA_TAG), - m_cent_data_out(*this, "cent_data_out") + m_cent_data_out(*this, "cent_data_out"), m_ata_data(0) { } diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp index 9407b7fbaf2..b7223aeb6a2 100644 --- a/src/devices/bus/adamnet/adamnet.cpp +++ b/src/devices/bus/adamnet/adamnet.cpp @@ -28,7 +28,8 @@ const device_type ADAMNET_SLOT = &device_creator<adamnet_slot_device>; //------------------------------------------------- device_adamnet_card_interface::device_adamnet_card_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) + : device_slot_card_interface(mconfig, device), + m_bus(nullptr) { } @@ -52,7 +53,7 @@ device_adamnet_card_interface::~device_adamnet_card_interface() //------------------------------------------------- adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock, "adamnet_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bus(nullptr) { } diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index cca1617dd43..2a2f674d0c3 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -123,7 +123,7 @@ adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_confi device_adamnet_card_interface(mconfig, *this), m_maincpu(*this, M6801_TAG), m_ddp0(*this, "cassette"), - m_ddp1(*this, "cassette2") + m_ddp1(*this, "cassette2"), m_wr0(0), m_wr1(0), m_track(0) { } diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp index 832e0cead45..6ff3be5ea3c 100644 --- a/src/devices/bus/apf/slot.cpp +++ b/src/devices/bus/apf/slot.cpp @@ -76,7 +76,7 @@ apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const device_t(mconfig, APF_CART_SLOT, "APF Cartridge Slot", tag, owner, clock, "apf_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(APF_STD) + m_type(APF_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/apricot/expansion.cpp b/src/devices/bus/apricot/expansion.cpp index 7fe2b2a721c..90983c8cc31 100644 --- a/src/devices/bus/apricot/expansion.cpp +++ b/src/devices/bus/apricot/expansion.cpp @@ -69,7 +69,7 @@ apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config m_ext1_handler(*this), m_ext2_handler(*this), m_int2_handler(*this), - m_int3_handler(*this) + m_int3_handler(*this), m_cpu_tag(nullptr), m_iop_tag(nullptr) { } diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp index b93e7fd211c..9114c16e8ad 100644 --- a/src/devices/bus/arcadia/slot.cpp +++ b/src/devices/bus/arcadia/slot.cpp @@ -66,7 +66,7 @@ arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig device_t(mconfig, EA2001_CART_SLOT, "Emerson Arcadia Cartridge Slot", tag, owner, clock, "arcadia_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(ARCADIA_STD) + m_type(ARCADIA_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp index 28017230f0d..2d6e7eb51b3 100644 --- a/src/devices/bus/astrocde/exp.cpp +++ b/src/devices/bus/astrocde/exp.cpp @@ -38,7 +38,7 @@ device_astrocade_card_interface::~device_astrocade_card_interface() astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE_EXP_SLOT, "Bally Astrocade expansion", tag, owner, clock, "astrocde_exp", __FILE__), device_slot_interface(mconfig, *this), - m_card_mounted(false) + m_card_mounted(false), m_card(nullptr) { } diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index d8067daa062..201a4d1afe6 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -35,13 +35,13 @@ astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const } astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__) -{ + : astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__), m_base_bank(0) + { } astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__) -{ + : astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__), m_base_bank(0) + { } diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 5345d90b7fb..99f6e2609b2 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -66,7 +66,7 @@ astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mco device_t(mconfig, ASTROCADE_CART_SLOT, "Bally Astrocade Cartridge Slot", tag, owner, clock, "astrocade_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(ASTROCADE_STD) + m_type(ASTROCADE_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index 5839ea00196..83a2bbc082e 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -62,13 +62,13 @@ const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>; //------------------------------------------------- bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_SLOT, "Hitachi MB-6890 Slot", tag, owner, clock, "bml3bus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } @@ -111,18 +111,18 @@ void bml3bus_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), + device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this) + m_out_firq_cb(*this), m_cputag(nullptr) { } bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_nmi_cb(*this), m_out_irq_cb(*this), - m_out_firq_cb(*this) + m_out_firq_cb(*this), m_cputag(nullptr) { } //------------------------------------------------- @@ -203,8 +203,8 @@ WRITE_LINE_MEMBER( bml3bus_device::firq_w ) { m_out_firq_cb(state); } device_bml3bus_card_interface::device_bml3bus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_bml3bus(NULL), - m_bml3bus_tag(NULL) + m_bml3bus(nullptr), + m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr), m_slot(0), m_next(nullptr) { } diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index f07e95c8bba..0b0d4f519e2 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -74,7 +74,7 @@ WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w ) bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_KANJI, "Hitachi MP-9740 Kanji Character ROM Card", tag, owner, clock, "bml3kanji", __FILE__), - device_bml3bus_card_interface(mconfig, *this) + device_bml3bus_card_interface(mconfig, *this), m_kanji_addr(0), m_rom(nullptr) { } diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 64db414fa21..7770f53f0e2 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -113,7 +113,7 @@ bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, cons m_floppy0(*this, "fdc:0"), m_floppy1(*this, "fdc:1"), m_floppy2(*this, "fdc:2"), - m_floppy3(*this, "fdc:3") + m_floppy3(*this, "fdc:3"), m_rom(nullptr) { } diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index f87e0604476..039a7b1dfa4 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -140,7 +140,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w) bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BML3BUS_MP1805, "Hitachi MP-1805 Floppy Controller Card", tag, owner, clock, "bml3mp1805", __FILE__), device_bml3bus_card_interface(mconfig, *this), - m_mc6843(*this, "mc6843") + m_mc6843(*this, "mc6843"), m_rom(nullptr) { } diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp index b094283a862..55852f67c8e 100644 --- a/src/devices/bus/bw2/exp.cpp +++ b/src/devices/bus/bw2/exp.cpp @@ -53,7 +53,7 @@ device_bw2_expansion_slot_interface::~device_bw2_expansion_slot_interface() bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock, "bw2_expansion_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp index 41e37f17fdd..7b97723dd3c 100644 --- a/src/devices/bus/c64/bn1541.cpp +++ b/src/devices/bus/c64/bn1541.cpp @@ -37,7 +37,7 @@ const device_type C64_BN1541 = &device_creator<c64_bn1541_device>; //------------------------------------------------- device_c64_floppy_parallel_interface::device_c64_floppy_parallel_interface(const machine_config &mconfig, device_t &device) : - m_other(NULL) + m_other(nullptr), m_parallel_data(0) { } @@ -63,7 +63,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface() c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "c64_bn1541", __FILE__), device_pet_user_port_interface(mconfig, *this), - device_c64_floppy_parallel_interface(mconfig, *this) + device_c64_floppy_parallel_interface(mconfig, *this), m_parallel_output(0) { } diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp index 00f5a8e2cb9..fe751585099 100644 --- a/src/devices/bus/c64/c128_partner.cpp +++ b/src/devices/bus/c64/c128_partner.cpp @@ -80,7 +80,7 @@ partner128_t::partner128_t(const machine_config &mconfig, const char *tag, devic device_t(mconfig, C128_PARTNER, "PARTNER 128", tag, owner, clock, "c128_partner", __FILE__), device_c64_expansion_card_interface(mconfig, *this), //device_vcs_control_port_interface(mconfig, *this), - m_ram(*this, "ram"), + m_ram(*this, "ram"), t_joyb2(nullptr), m_ram_a12_a7(0), m_ls74_cd(0), m_ls74_q1(0), diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp index ee8ffe0d6fd..b72c9182b7c 100644 --- a/src/devices/bus/c64/comal80.cpp +++ b/src/devices/bus/c64/comal80.cpp @@ -28,7 +28,8 @@ const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>; c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "c64_comal80", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp index 1533ab9f93b..33659b4e977 100644 --- a/src/devices/bus/c64/cpm.cpp +++ b/src/devices/bus/c64/cpm.cpp @@ -134,7 +134,7 @@ c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig device_c64_expansion_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), m_enabled(0), - m_ba(1) + m_ba(1), m_reset(0) { } diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp index 006b915908f..fcb5fc5c738 100644 --- a/src/devices/bus/c64/dela_ep64.cpp +++ b/src/devices/bus/c64/dela_ep64.cpp @@ -52,7 +52,7 @@ c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_con device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock, "c64_dela_ep64", __FILE__), device_c64_expansion_card_interface(mconfig, *this), m_eprom1(*this, "eprom1"), - m_eprom2(*this, "eprom2") + m_eprom2(*this, "eprom2"), m_bank(0), m_reset(0), m_rom0_ce(0), m_rom1_ce(0), m_rom2_ce(0) { } diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp index f79b3828fe5..e6d044ab490 100644 --- a/src/devices/bus/c64/dela_ep7x8.cpp +++ b/src/devices/bus/c64/dela_ep7x8.cpp @@ -67,7 +67,7 @@ c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_c m_eprom4(*this, "rom4"), m_eprom5(*this, "rom5"), m_eprom6(*this, "rom6"), - m_eprom7(*this, "rom7") + m_eprom7(*this, "rom7"), m_bank(0) { } diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp index 812e0fcdc92..d52af7ba74e 100644 --- a/src/devices/bus/c64/dinamic.cpp +++ b/src/devices/bus/c64/dinamic.cpp @@ -28,7 +28,8 @@ const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>; c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "c64_dinamic", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp index 7e30cdd1545..a49f27beac6 100644 --- a/src/devices/bus/c64/dqbb.cpp +++ b/src/devices/bus/c64/dqbb.cpp @@ -38,7 +38,9 @@ const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>; c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock, "c64_dqbb", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this), + m_cs(0), + m_we(0) { } diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp index d6a4a6b4cf9..db7e35b3067 100644 --- a/src/devices/bus/c64/easy_calc_result.cpp +++ b/src/devices/bus/c64/easy_calc_result.cpp @@ -49,7 +49,7 @@ const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_ca c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EASY_CALC_RESULT, "C64 Easy Calc Result cartridge", tag, owner, clock, "c64_easy_calc_result", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { } diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp index 7b0dfeb5934..ebe3863088c 100644 --- a/src/devices/bus/c64/epyx_fast_load.cpp +++ b/src/devices/bus/c64/epyx_fast_load.cpp @@ -38,7 +38,7 @@ const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartri c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EPYX_FAST_LOAD, "C64 Epyx Fast Load cartridge", tag, owner, clock, "c64_epyx_fast_load", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_exrom_timer(nullptr) { } diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp index a1c449d180e..043f4374933 100644 --- a/src/devices/bus/c64/exp.cpp +++ b/src/devices/bus/c64/exp.cpp @@ -65,7 +65,7 @@ c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconf m_write_irq(*this), m_write_nmi(*this), m_write_dma(*this), - m_write_reset(*this) + m_write_reset(*this), m_card(nullptr), m_hiram(0) { } diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp index 20f969bcbe7..b34cc4c17a1 100644 --- a/src/devices/bus/c64/final3.cpp +++ b/src/devices/bus/c64/final3.cpp @@ -65,7 +65,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "c64_final3", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_hidden(0) { } diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp index 69aa80288bc..a24f4c69156 100644 --- a/src/devices/bus/c64/fun_play.cpp +++ b/src/devices/bus/c64/fun_play.cpp @@ -28,7 +28,8 @@ const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>; c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock, "c64_fun_play", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp index d3c30bf029e..43881540e4a 100644 --- a/src/devices/bus/c64/georam.cpp +++ b/src/devices/bus/c64/georam.cpp @@ -29,7 +29,8 @@ const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>; c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "c64_georam", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - m_ram(*this, "ram") + m_ram(*this, "ram"), + m_bank(0) { } diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp index c327b694fd5..a5a4cb94c0d 100644 --- a/src/devices/bus/c64/ide64.cpp +++ b/src/devices/bus/c64/ide64.cpp @@ -101,7 +101,7 @@ c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mco m_rtc(*this, DS1302_TAG), m_ata(*this, ATA_TAG), m_jp1(*this, "JP1"), - m_ram(*this, "ram") + m_ram(*this, "ram"), m_bank(0), m_ata_data(0), m_wp(0), m_enable(0) { } diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp index dea893ca627..b285d35b221 100644 --- a/src/devices/bus/c64/mach5.cpp +++ b/src/devices/bus/c64/mach5.cpp @@ -54,7 +54,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock, "c64_mach5", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - m_s1(*this, "S1") + m_s1(*this, "S1"), m_c128(false) { } diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp index 7c050abb315..e315b4eeba0 100644 --- a/src/devices/bus/c64/magic_desk.cpp +++ b/src/devices/bus/c64/magic_desk.cpp @@ -28,7 +28,8 @@ const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_devi c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MAGIC_DESK, "C64 Magic Desk cartridge", tag, owner, clock, "c64_magic_desk", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index c23c87052e4..264f6f87f05 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -266,7 +266,7 @@ c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine m_vslsi(*this, T6721A_TAG), m_tpi(*this, MOS6525_TAG), m_fifo(*this, CMOS40105_TAG), - m_exp(*this, C64_EXPANSION_SLOT_TAG), + m_exp(*this, C64_EXPANSION_SLOT_TAG), m_ca(0), m_tpi_pb(0x60), m_tpi_pc6(1), m_pd(0) diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp index 0edb8b90c1c..1c54b055986 100644 --- a/src/devices/bus/c64/multiscreen.cpp +++ b/src/devices/bus/c64/multiscreen.cpp @@ -141,7 +141,7 @@ machine_config_constructor c64_multiscreen_cartridge_device::device_mconfig_addi c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock, "c64_mscr", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { } diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp index 2b885c86f55..aefdc46ca6e 100644 --- a/src/devices/bus/c64/neoram.cpp +++ b/src/devices/bus/c64/neoram.cpp @@ -29,7 +29,8 @@ const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>; c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock, "c64_neoram", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp index 8f163f41692..b6df18e03c1 100644 --- a/src/devices/bus/c64/pagefox.cpp +++ b/src/devices/bus/c64/pagefox.cpp @@ -51,7 +51,7 @@ const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>; c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "c64_pagefox", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - m_ram(*this, "ram") + m_ram(*this, "ram"), m_bank(0) { } diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp index a610d8c987c..1a074958aa0 100644 --- a/src/devices/bus/c64/ross.cpp +++ b/src/devices/bus/c64/ross.cpp @@ -28,7 +28,7 @@ const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>; c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "c64_ross", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { } diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp index 9e9ce421a6c..4ae1dd4ab75 100644 --- a/src/devices/bus/c64/silverrock.cpp +++ b/src/devices/bus/c64/silverrock.cpp @@ -61,7 +61,7 @@ const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_devi c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock, "c64_silverrock", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0) { } diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp index 404d1b9d753..5b4ec958a94 100644 --- a/src/devices/bus/c64/structured_basic.cpp +++ b/src/devices/bus/c64/structured_basic.cpp @@ -28,7 +28,8 @@ const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_ca c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_STRUCTURED_BASIC, "C64 Structured Basic cartridge", tag, owner, clock, "c64_structured_basic", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp index d58923fa97e..90c88ba1001 100644 --- a/src/devices/bus/c64/super_explode.cpp +++ b/src/devices/bus/c64/super_explode.cpp @@ -38,7 +38,7 @@ const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridg c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SUPER_EXPLODE, "C64 Super Explode! cartridge", tag, owner, clock, "c64_super_explode", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_exrom_timer(nullptr) { } diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp index 0e15485993b..2198439b3e2 100644 --- a/src/devices/bus/c64/super_games.cpp +++ b/src/devices/bus/c64/super_games.cpp @@ -28,7 +28,8 @@ const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_de c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SUPER_GAMES, "C64 Super Games cartridge", tag, owner, clock, "c64_super_games", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp index 9b0cce8c55d..d8864e5ceb9 100644 --- a/src/devices/bus/c64/sw8k.cpp +++ b/src/devices/bus/c64/sw8k.cpp @@ -74,7 +74,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SW8K, "C64 Switchable 8K cartridge", tag, owner, clock, "c64_sw8k", __FILE__), device_c64_expansion_card_interface(mconfig, *this), - m_sw(*this, "SW") + m_sw(*this, "SW"), m_bank(0) { } diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index 19e4ea5161a..cd59887c6cb 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -104,7 +104,7 @@ c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_con device_c64_expansion_card_interface(mconfig, *this), m_acia(*this, MOS6551_TAG), m_io_cs(*this, "CS"), - m_io_irq(*this, "IRQ") + m_io_irq(*this, "IRQ"), m_cs(0), m_irq(0) { } diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp index b14ca7ecc87..9bc4a33f7dd 100644 --- a/src/devices/bus/c64/system3.cpp +++ b/src/devices/bus/c64/system3.cpp @@ -28,7 +28,8 @@ const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>; c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "c64_system3", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp index e472ab7e1db..9ce8c14f22a 100644 --- a/src/devices/bus/c64/tdos.cpp +++ b/src/devices/bus/c64/tdos.cpp @@ -206,7 +206,7 @@ c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconf device_c64_expansion_card_interface(mconfig, *this), m_ssda(*this, MC68A52P_TAG), m_exp(*this, C64_EXPANSION_SLOT_TAG), - m_sw1(*this, "SW1") + m_sw1(*this, "SW1"), m_enabled(false) { } diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index 8fe00f65fd1..f0d3eeabf12 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -104,7 +104,7 @@ c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_confi m_acia(*this, MOS6551_TAG), m_rs232(*this, RS232_TAG), m_io_cs(*this, "CS"), - m_io_irq(*this, "IRQ") + m_io_irq(*this, "IRQ"), m_cs(0), m_irq(0), m_es(0) { } diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp index fdc21ff4a05..3288e492a43 100644 --- a/src/devices/bus/c64/vw64.cpp +++ b/src/devices/bus/c64/vw64.cpp @@ -68,7 +68,7 @@ const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>; c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "c64_vizawrite", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), m_game_timer(nullptr) { } diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp index 22ce1f35ce9..5406c584876 100644 --- a/src/devices/bus/c64/zaxxon.cpp +++ b/src/devices/bus/c64/zaxxon.cpp @@ -28,7 +28,8 @@ const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>; c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "c64_zaxxon", __FILE__), - device_c64_expansion_card_interface(mconfig, *this) + device_c64_expansion_card_interface(mconfig, *this), + m_bank(0) { } diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp index f45dbc2caca..4d8f6ac1c61 100644 --- a/src/devices/bus/cbm2/exp.cpp +++ b/src/devices/bus/cbm2/exp.cpp @@ -65,7 +65,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface() cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock, "cbm2_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_card(nullptr) { } diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp index 6383f39b061..b6271071a9b 100644 --- a/src/devices/bus/cbm2/user.cpp +++ b/src/devices/bus/cbm2/user.cpp @@ -48,7 +48,7 @@ cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, cons m_write_irq(*this), m_write_sp(*this), m_write_cnt(*this), - m_write_flag(*this) + m_write_flag(*this), m_card(nullptr) { } diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp index f546d2ac649..d2d0e2c9da5 100644 --- a/src/devices/bus/cbmiec/cbmiec.cpp +++ b/src/devices/bus/cbmiec/cbmiec.cpp @@ -222,7 +222,7 @@ const device_type CBM_IEC_SLOT = &device_creator<cbm_iec_slot_device>; //------------------------------------------------- device_cbm_iec_interface::device_cbm_iec_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) + : device_slot_card_interface(mconfig, device), m_next(nullptr), m_bus(nullptr), m_slot(nullptr) { } @@ -247,7 +247,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface() cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_address(0) { } diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp index 6c3fa83a8d7..4c7bc354d42 100644 --- a/src/devices/bus/centronics/comxpl80.cpp +++ b/src/devices/bus/centronics/comxpl80.cpp @@ -163,7 +163,7 @@ comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *ta device_centronics_peripheral_interface(mconfig, *this), m_plotter(*this, "PLOTTER"), m_font(*this, "FONT"), - m_sw(*this, "SW") + m_sw(*this, "SW"), m_font_addr(0), m_x_motor_phase(0), m_y_motor_phase(0), m_z_motor_phase(0), m_plotter_data(0), m_plotter_ack(0), m_plotter_online(0), m_data(0) { } diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index 6cf0f6c02e9..71a89f66219 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -92,8 +92,8 @@ centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_con : device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock, "covox_stereo", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), m_dac_left(*this, "dac_left"), - m_dac_right(*this, "dac_right"), - m_data(0) + m_dac_right(*this, "dac_right"), m_strobe(0), + m_data(0), m_autofd(0) { } diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index 9555284c711..c8a1acc54a6 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -361,7 +361,7 @@ epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *tag, dev device_t(mconfig, EPSON_EX800, "Epson EX-800", tag, owner, clock, "ex800", __FILE__), device_centronics_peripheral_interface(mconfig, *this), m_maincpu(*this, "maincpu"), - m_beeper(*this, "beeper") + m_beeper(*this, "beeper"), m_irq_state(0) { } diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 167ec22488e..771680e5cd0 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -302,7 +302,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, d m_cr_pos_abs(1), m_real_cr_pos(1), m_real_cr_steps(0), - m_real_cr_dir(0) + m_real_cr_dir(0), m_fakemem(0) { } @@ -323,7 +323,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, m_cr_pos_abs(1), m_real_cr_pos(1), m_real_cr_steps(0), - m_real_cr_dir(0) + m_real_cr_dir(0), m_fakemem(0) { } diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index 8aa924f23d2..e42d038f24d 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -27,7 +27,9 @@ MACHINE_CONFIG_END centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "centronics_printer", __FILE__), device_centronics_peripheral_interface( mconfig, *this ), - m_strobe(0), + m_strobe(0), + m_data(0), + m_busy(0), m_printer(*this, "printer") { } diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp index 12beebafa4b..858e52ad2e3 100644 --- a/src/devices/bus/chanf/rom.cpp +++ b/src/devices/bus/chanf/rom.cpp @@ -33,14 +33,14 @@ const device_type CHANF_ROM_MULTI_FINAL = &device_creator<chanf_multi_final_devi chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_channelf_cart_interface( mconfig, *this ) -{ + device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0) + { } chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CHANF_ROM_STD, "Channel F Standard Carts", tag, owner, clock, "chanf_rom", __FILE__), - device_channelf_cart_interface( mconfig, *this ) -{ + device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0) + { } chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -59,13 +59,13 @@ chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char } chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : chanf_rom_device(mconfig, CHANF_ROM_MULTI_OLD, "Channel F Multigame (Earlier Version) Cart", tag, owner, clock, "chanf_multi_old", __FILE__) -{ + : chanf_rom_device(mconfig, CHANF_ROM_MULTI_OLD, "Channel F Multigame (Earlier Version) Cart", tag, owner, clock, "chanf_multi_old", __FILE__), m_base_bank(0) + { } chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : chanf_rom_device(mconfig, CHANF_ROM_MULTI_FINAL, "Channel F Multigame (Final Version) Cart", tag, owner, clock, "chanf_multi_fin", __FILE__) -{ + : chanf_rom_device(mconfig, CHANF_ROM_MULTI_FINAL, "Channel F Multigame (Final Version) Cart", tag, owner, clock, "chanf_multi_fin", __FILE__), m_base_bank(0), m_half_bank(0) + { } diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp index 3bb58417a9c..4ce5380cb01 100644 --- a/src/devices/bus/chanf/slot.cpp +++ b/src/devices/bus/chanf/slot.cpp @@ -76,7 +76,7 @@ channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconf device_t(mconfig, CHANF_CART_SLOT, "Fairchild Channel F Cartridge Slot", tag, owner, clock, "cf_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(CF_CHESS) + m_type(CF_CHESS), m_cart(nullptr) { } diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp index 8ee53dabc32..8fdceac88a3 100644 --- a/src/devices/bus/coco/coco_dwsock.cpp +++ b/src/devices/bus/coco/coco_dwsock.cpp @@ -66,8 +66,8 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed) //------------------------------------------------- beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), - m_dwconfigport(*this, DRIVEWIRE_PORT_TAG) + : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), m_hostname(nullptr), + m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0) { m_pSocket = NULL; m_head = 0; diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 1329c3a7910..3b8a3bc19c6 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -179,22 +179,22 @@ const device_type COCO_FDC = &device_creator<coco_fdc_device>; //------------------------------------------------- coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_cococart_interface( mconfig, *this ), + device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0), m_wd17xx(*this, WD_TAG), m_wd2797(*this, WD2797_TAG), m_ds1315(*this, CLOUD9_TAG), - m_disto_msm6242(*this, DISTO_TAG) + m_disto_msm6242(*this, DISTO_TAG), m_msm6242_rtc_address(0) { } coco_fdc_device::coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "coco_fdc", __FILE__), - device_cococart_interface( mconfig, *this ), + device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_dskreg(0), m_drq(0), m_intrq(0), m_wd17xx(*this, WD_TAG), m_wd2797(*this, WD2797_TAG), m_ds1315(*this, CLOUD9_TAG), - m_disto_msm6242(*this, DISTO_TAG) -{ + m_disto_msm6242(*this, DISTO_TAG), m_msm6242_rtc_address(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 0e488c582d8..6d5b38ba4f1 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -140,8 +140,8 @@ const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>; coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "coco_multipak", __FILE__), - device_cococart_interface( mconfig, *this ) -{ + device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_select(0) + { } diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index 83f2acaee54..8f02d8612db 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -40,8 +40,8 @@ const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>; coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "coco_orch90", __FILE__), - device_cococart_interface( mconfig, *this ) -{ + device_cococart_interface( mconfig, *this ), m_left_dac(nullptr), m_right_dac(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp index 127c35ce2a0..1a861fa3bed 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -41,14 +41,14 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>; //------------------------------------------------- coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_cococart_interface( mconfig, *this ) + device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) { } coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__), - device_cococart_interface( mconfig, *this ) -{ + device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index 11687681810..794c246352b 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -41,7 +41,7 @@ cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const device_image_interface(mconfig, *this), m_cart_callback(*this), m_nmi_callback(*this), - m_halt_callback(*this) + m_halt_callback(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp index 575276ee231..5b53be7c3cf 100644 --- a/src/devices/bus/coleco/ctrl.cpp +++ b/src/devices/bus/coleco/ctrl.cpp @@ -46,7 +46,7 @@ device_colecovision_control_port_interface::device_colecovision_control_port_int colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_CONTROL_PORT, "ColecoVision control port", tag, owner, clock, "colecovision_control_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_device(nullptr), m_write_irq(*this) { } diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index c981406017e..b967d8a0cc5 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -55,7 +55,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size) colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COLECOVISION_CARTRIDGE_SLOT, "ColecoVision cartridge port", tag, owner, clock, "coleco_cartridge_port", __FILE__), device_slot_interface(mconfig, *this), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_card(nullptr) { } diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index 7fa7e678dc2..b69bbe014b0 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -85,7 +85,7 @@ device_compucolor_floppy_port_interface::device_compucolor_floppy_port_interface //------------------------------------------------- compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : rs232_port_device(mconfig, COMPUCOLOR_FLOPPY_PORT, "Compucolor Floppy Port", tag, owner, clock, "compclr_flp_port", __FILE__) + : rs232_port_device(mconfig, COMPUCOLOR_FLOPPY_PORT, "Compucolor Floppy Port", tag, owner, clock, "compclr_flp_port", __FILE__), m_dev(nullptr) { } diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp index b0ff7aa77c3..adf50a06d5a 100644 --- a/src/devices/bus/comx35/exp.cpp +++ b/src/devices/bus/comx35/exp.cpp @@ -45,7 +45,7 @@ device_comx_expansion_card_interface::device_comx_expansion_card_interface(const comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock, "comx_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), - m_write_irq(*this) + m_write_irq(*this), m_card(nullptr) { } diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp index 0a2caafa1da..b978e1494ca 100644 --- a/src/devices/bus/comx35/ram.cpp +++ b/src/devices/bus/comx35/ram.cpp @@ -36,7 +36,8 @@ const device_type COMX_RAM = &device_creator<comx_ram_device>; comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock, "comx_ram", __FILE__), device_comx_expansion_card_interface(mconfig, *this), - m_ram(*this, "ram") + m_ram(*this, "ram"), + m_bank(0) { } diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp index 8bf9fa8ad34..bae5812206a 100644 --- a/src/devices/bus/cpc/amdrum.cpp +++ b/src/devices/bus/cpc/amdrum.cpp @@ -36,7 +36,8 @@ machine_config_constructor cpc_amdrum_device::device_mconfig_additions() const cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_AMDRUM, "Amdrum", tag, owner, clock, "cpc_amdrum", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), + m_slot(nullptr), m_dac(*this,"dac") { } diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp index 9730c112e7e..c4cbc0b0b1f 100644 --- a/src/devices/bus/cpc/brunword4.cpp +++ b/src/devices/bus/cpc/brunword4.cpp @@ -64,7 +64,7 @@ const rom_entry *cpc_brunword4_device::device_rom_region() const cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_BRUNWORD_MK4, "Brunword Elite MK4", tag, owner, clock, "cpc_brunword4", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this) + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rombank_active(false), m_bank_sel(0) { } diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp index b1453d9338b..1bff1c869a0 100644 --- a/src/devices/bus/cpc/cpc_pds.cpp +++ b/src/devices/bus/cpc/cpc_pds.cpp @@ -37,7 +37,7 @@ machine_config_constructor cpc_pds_device::device_mconfig_additions() const cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_PDS, "Programmers Development System (CPC Target)", tag, owner, clock, "cpc_pds", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_pio(*this,"pio") { } diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp index 36ccb82e867..b510648b1a9 100644 --- a/src/devices/bus/cpc/cpc_rom.cpp +++ b/src/devices/bus/cpc/cpc_rom.cpp @@ -81,7 +81,7 @@ const device_type ROMSLOT = &device_creator<rom_image_device>; rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock, "rom_image", __FILE__), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_base(nullptr) { } diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index 8dba63da31c..4c931264fa0 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -85,7 +85,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *ta device_cpc_expansion_card_interface(mconfig, *this), m_pit(*this,"pit"), m_dart(*this,"dart"), - m_rs232(*this,"rs232") + m_rs232(*this,"rs232"), m_slot(nullptr) { } @@ -94,7 +94,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type ty device_cpc_expansion_card_interface(mconfig, *this), m_pit(*this,"pit"), m_dart(*this,"dart"), - m_rs232(*this,"rs232") + m_rs232(*this,"rs232"), m_slot(nullptr) { } diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index 0c638b5cf37..7ddf1ffccc5 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -160,16 +160,16 @@ machine_config_constructor cpc_dkspeech_device::device_mconfig_additions() const cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "cpc_ssa1", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), - m_lrq(1), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr), + m_lrq(1), m_sby(0), m_sp0256_device(*this,"sp0256") { } cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "cpc_dkspeech", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), - m_lrq(1), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr), + m_lrq(1), m_sby(0), m_sp0256_device(*this,"sp0256") { } diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp index a6d8d77db16..fe142a1cb19 100644 --- a/src/devices/bus/cpc/cpcexp.cpp +++ b/src/devices/bus/cpc/cpcexp.cpp @@ -26,7 +26,8 @@ const device_type CPC_EXPANSION_SLOT = &device_creator<cpc_expansion_slot_device device_cpc_expansion_card_interface::device_cpc_expansion_card_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig,device) + : device_slot_card_interface(mconfig,device), + m_rom_sel(0) { } @@ -48,7 +49,7 @@ cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconf m_out_nmi_cb(*this), m_out_reset_cb(*this), m_out_romdis_cb(*this), - m_out_rom_select(*this) + m_out_rom_select(*this), m_card(nullptr) { } diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp index 268f2f59243..ba7d36ee26c 100644 --- a/src/devices/bus/cpc/ddi1.cpp +++ b/src/devices/bus/cpc/ddi1.cpp @@ -63,9 +63,9 @@ machine_config_constructor cpc_ddi1_device::device_mconfig_additions() const cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DDI1, "DDI-1", tag, owner, clock, "cpc_ddi1", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_fdc(*this,"upd765"), - m_connector(*this,"upd765:0") + m_connector(*this,"upd765:0"), m_rom_active(false), m_romen(false) { } diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp index 2c753d3565e..9876263c323 100644 --- a/src/devices/bus/cpc/doubler.cpp +++ b/src/devices/bus/cpc/doubler.cpp @@ -6,10 +6,10 @@ * */ - #include "doubler.h" - #include "includes/amstrad.h" +#include "doubler.h" +#include "includes/amstrad.h" - //************************************************************************** +//************************************************************************** // DEVICE DEFINITIONS //************************************************************************** @@ -38,7 +38,7 @@ machine_config_constructor cpc_doubler_device::device_mconfig_additions() const cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DOUBLER, "Draysoft Doubler", tag, owner, clock, "cpc_doubler", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_tape(*this,"doubler_tape") { } diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp index a6cb2772719..3e19640be8e 100644 --- a/src/devices/bus/cpc/hd20.cpp +++ b/src/devices/bus/cpc/hd20.cpp @@ -50,7 +50,7 @@ const rom_entry *cpc_hd20_device::device_rom_region() const cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_HD20, "Dobbertin HD20", tag, owner, clock, "cpc_hd20", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_hdc(*this,"hdc") { } diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index 16e4f7d51b8..c289db92ddd 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -72,11 +72,11 @@ machine_config_constructor al_magicsound_device::device_mconfig_additions() cons al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AL_MAGICSOUND, "Magic Sound Board", tag, owner, clock, "al_magicsound", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_dac1(*this,"dac1"), m_dmac(*this,"dmac"), m_timer1(*this,"timer1"), - m_timer2(*this,"timer2") + m_timer2(*this,"timer2"), m_current_channel(0), m_ramptr(nullptr), m_current_output(0) { } diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp index 122f97fe46a..7bb2aa85546 100644 --- a/src/devices/bus/cpc/mface2.cpp +++ b/src/devices/bus/cpc/mface2.cpp @@ -310,7 +310,7 @@ ioport_constructor cpc_multiface2_device::device_input_ports() const cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "cpc_mf2", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this) + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_multiface_ram(nullptr), m_multiface_flags(0), m_romdis(0) { } diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index 9686ce952f7..b4823467d8a 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -54,7 +54,7 @@ machine_config_constructor cpc_playcity_device::device_mconfig_additions() const cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_PLAYCITY, "PlayCity", tag, owner, clock, "cpc_playcity", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_ctc(*this,"ctc"), m_ymz1(*this,"ymz_1"), m_ymz2(*this,"ymz_2") diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp index 75cc3bb8a89..e4304323932 100644 --- a/src/devices/bus/cpc/smartwatch.cpp +++ b/src/devices/bus/cpc/smartwatch.cpp @@ -47,8 +47,8 @@ const rom_entry *cpc_smartwatch_device::device_rom_region() const cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SMARTWATCH, "Dobbertin Smartwatch", tag, owner, clock, "cpc_smartwatch", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), - m_rtc(*this,"rtc") + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), + m_rtc(*this,"rtc"), m_bank(nullptr) { } diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp index 7fd8e756d5c..8f9b3d576b7 100644 --- a/src/devices/bus/cpc/symbfac2.cpp +++ b/src/devices/bus/cpc/symbfac2.cpp @@ -73,13 +73,13 @@ ioport_constructor cpc_symbiface2_device::device_input_ports() const cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SYMBIFACE2, "SYMBiFACE II", tag, owner, clock, "cpc_symf2", __FILE__), - device_cpc_expansion_card_interface(mconfig, *this), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_ide(*this,"ide"), m_rtc(*this,"rtc"), m_nvram(*this,"nvram"), m_mouse_x(*this,"sf2_mouse_x"), m_mouse_y(*this,"sf2_mouse_y"), - m_mouse_buttons(*this,"sf2_mouse_buttons") + m_mouse_buttons(*this,"sf2_mouse_buttons"), m_iohigh(false), m_ide_data(0), m_mouse_state(0), m_input_x(0), m_input_y(0), m_4xxx_ptr_r(nullptr), m_4xxx_ptr_w(nullptr), m_6xxx_ptr_r(nullptr), m_6xxx_ptr_w(nullptr) { } diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp new file mode 100644 index 00000000000..7051f67914d --- /dev/null +++ b/src/devices/bus/cpc/transtape.cpp @@ -0,0 +1,140 @@ +// license:BSD-3-Clause +// copyright-holders:Barry Rodewald +/* + * transtape.c -- Hard Micro SA Transtape + * + * Spanish hacking device + * + * Further info at - http://cpcwiki.eu/index.php/Transtape + */ + +#include "transtape.h" +#include "includes/amstrad.h" + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +const device_type CPC_TRANSTAPE = &device_creator<cpc_transtape_device>; + +ROM_START( cpc_transtape ) + ROM_REGION( 0x4000, "tt_rom", 0 ) + ROM_LOAD( "tta.rom", 0x0000, 0x4000, CRC(c568da76) SHA1(cc509d21216bf11d40f9a3e0791ef7f4ada03790) ) +ROM_END + +const rom_entry *cpc_transtape_device::device_rom_region() const +{ + return ROM_NAME( cpc_transtape ); +} + +static INPUT_PORTS_START(cpc_transtape) + PORT_START("transtape") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Red Button") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF,cpc_transtape_device,button_red_w,1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Black Button") PORT_CODE(KEYCODE_F2) PORT_CHANGED_MEMBER(DEVICE_SELF,cpc_transtape_device,button_black_w,1) +INPUT_PORTS_END + +ioport_constructor cpc_transtape_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( cpc_transtape ); +} + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, CPC_TRANSTAPE, "HM Transtape", tag, owner, clock, "cpc_transtape", __FILE__), + device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_cpu(nullptr), m_space(nullptr), m_ram(nullptr), + m_rom_active(false), + m_romen(true), + m_output(0) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void cpc_transtape_device::device_start() +{ + m_slot = dynamic_cast<cpc_expansion_slot_device *>(owner()); + m_cpu = static_cast<cpu_device*>(machine().device("maincpu")); + m_space = &m_cpu->space(AS_IO); + + m_ram = auto_alloc_array_clear(machine(), UINT8, 0x2000); + + m_space->install_write_handler(0xfbf0,0xfbf0,0,0,write8_delegate(FUNC(cpc_transtape_device::output_w),this)); + m_space->install_read_handler(0xfbff,0xfbff,0,0,read8_delegate(FUNC(cpc_transtape_device::input_r),this)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void cpc_transtape_device::device_reset() +{ + // TODO + m_rom_active = false; + m_output = 0; +} + +void cpc_transtape_device::map_enable() +{ + UINT8* ROM = memregion("tt_rom")->base(); + if(m_output & 0x02) // ROM enable + { + membank(":bank1")->set_base(ROM); + membank(":bank2")->set_base(ROM+0x2000); + } + if(m_output & 0x01) // RAM enable + { + membank(":bank7")->set_base(m_ram); + membank(":bank15")->set_base(m_ram); + membank(":bank8")->set_base(m_ram); // repeats in second 8kB + membank(":bank16")->set_base(m_ram); + } +} + +INPUT_CHANGED_MEMBER(cpc_transtape_device::button_red_w) +{ + // enables device ROM at 0x0000, RAM at 0xc000, generates NMI + if(newval & 0x01) + { + m_output |= 0x1f; + map_enable(); + m_cpu->set_input_line(INPUT_LINE_NMI,PULSE_LINE); + } +} + +INPUT_CHANGED_MEMBER(cpc_transtape_device::button_black_w) +{ + // enables device ROM at 0x0000, RAM at 0xc000(?), force execution to start at 0x0000 + if(newval & 0x01) + { + m_output |= 0x1f; + map_enable(); + m_cpu->set_pc(0); + } +} + +READ8_MEMBER(cpc_transtape_device::input_r) +{ + // TODO + return 0x80; +} + +WRITE8_MEMBER(cpc_transtape_device::output_w) +{ + // TODO + m_output = data; + m_slot->rom_select(space,0,get_rom_bank()); // trigger rethink +} + +void cpc_transtape_device::set_mapping(UINT8 type) +{ + if(type != MAP_OTHER) + return; + map_enable(); +} + + diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h new file mode 100644 index 00000000000..7a260640e9e --- /dev/null +++ b/src/devices/bus/cpc/transtape.h @@ -0,0 +1,55 @@ +// license:BSD-3-Clause +// copyright-holders:Barry Rodewald +/* + * transtape.c -- Hard Micro SA Transtape + * + * Spanish hacking device + * + */ + +#ifndef TRANSTAPE_H_ +#define TRANSTAPE_H_ + +#include "emu.h" +#include "cpcexp.h" + +class cpc_transtape_device : public device_t, + public device_cpc_expansion_card_interface +{ +public: + // construction/destruction + cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + + // optional information overrides + virtual const rom_entry *device_rom_region() const; + virtual ioport_constructor device_input_ports() const; + + virtual void set_mapping(UINT8 type); + virtual WRITE_LINE_MEMBER( romen_w ) { m_romen = state; } + + DECLARE_READ8_MEMBER(input_r); + DECLARE_WRITE8_MEMBER(output_w); + DECLARE_INPUT_CHANGED_MEMBER(button_red_w); + DECLARE_INPUT_CHANGED_MEMBER(button_black_w); + +protected: + // device-level overrides + virtual void device_start(); + virtual void device_reset(); + +private: + cpc_expansion_slot_device *m_slot; + cpu_device* m_cpu; + address_space* m_space; + UINT8* m_ram; // 8kB internal RAM + bool m_rom_active; + bool m_romen; + UINT8 m_output; + + void map_enable(); +}; + +// device type definition +extern const device_type CPC_TRANSTAPE; + +#endif /* TRANSTAPE_H_ */ diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index af3bce0a016..f99441e06f9 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -66,7 +66,7 @@ crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconf device_t(mconfig, CRVISION_CART_SLOT, "CreatiVision Cartridge Slot", tag, owner, clock, "crvision_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(CRV_4K) + m_type(CRV_4K), m_cart(nullptr) { } diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp index 7e1a45779c9..ab1b079405d 100644 --- a/src/devices/bus/dmv/dmvbus.cpp +++ b/src/devices/bus/dmv/dmvbus.cpp @@ -201,7 +201,7 @@ dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const ch m_prog_write_cb(*this), m_out_int_cb(*this), m_out_irq_cb(*this), - m_out_thold_cb(*this) + m_out_thold_cb(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 0b0e86fb27a..823afb18b3b 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -57,8 +57,8 @@ dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, m_ppi(*this, "ppi8255"), m_centronics(*this, "centronics"), m_cent_data_in(*this, "cent_data_in"), - m_cent_data_out(*this, "cent_data_out") -{ + m_cent_data_out(*this, "cent_data_out"), m_bus(nullptr), m_clk1_timer(nullptr), m_portb(0), m_portc(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index 01b0b115b79..65e278943e1 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -138,8 +138,8 @@ dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag, m_pit(*this, "pit8253"), m_ppi(*this, "ppi8255"), m_ram(*this, "ram"), - m_rom(*this, "rom") -{ + m_rom(*this, "rom"), m_portc(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index 4ce6a97f807..5f5dd5f509d 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -110,16 +110,16 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, DMV_K230, "K230 8088 without interrupt controller", tag, owner, clock, "dmv_k230", __FILE__), device_dmvslot_interface( mconfig, *this ), m_maincpu(*this, "maincpu"), - m_rom(*this, "rom") -{ + m_rom(*this, "rom"), m_bus(nullptr), m_io(nullptr), m_switch16(0), m_hold(0) + { } dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_maincpu(*this, "maincpu"), - m_rom(*this, "rom") -{ + m_rom(*this, "rom"), m_bus(nullptr), m_io(nullptr), m_switch16(0), m_hold(0) + { } //------------------------------------------------- @@ -136,8 +136,8 @@ dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, //------------------------------------------------- dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : dmv_k230_device(mconfig, DMV_K234, "K234 68008", tag, owner, clock, "dmv_k234", __FILE__) -{ + : dmv_k230_device(mconfig, DMV_K234, "K234 68008", tag, owner, clock, "dmv_k234", __FILE__), m_snr(0) + { } //------------------------------------------------- @@ -220,7 +220,7 @@ const rom_entry *dmv_k231_device::device_rom_region() const const rom_entry *dmv_k234_device::device_rom_region() const { - return NULL; + return nullptr; } const rom_entry *dmv_k235_device::device_rom_region() const diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp index 859b8b7f8f8..4a705279014 100644 --- a/src/devices/bus/dmv/k233.cpp +++ b/src/devices/bus/dmv/k233.cpp @@ -30,8 +30,10 @@ const device_type DMV_K233 = &device_creator<dmv_k233_device>; dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_K233, "K233 16K Shared RAM", tag, owner, clock, "dmv_k233", __FILE__), - device_dmvslot_interface( mconfig, *this ) -{ + device_dmvslot_interface( mconfig, *this ), + m_enabled(false), + m_ram(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index b091d117088..2d7525d93aa 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -115,16 +115,16 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, DMV_K801, "K801 RS-232 Switchable Interface", tag, owner, clock, "dmv_k801", __FILE__), device_dmvslot_interface( mconfig, *this ), m_epci(*this, "epci"), - m_dsw(*this, "DSW") -{ + m_dsw(*this, "DSW"), m_bus(nullptr) + { } dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_dmvslot_interface( mconfig, *this ), m_epci(*this, "epci"), - m_dsw(*this, "DSW") -{ + m_dsw(*this, "DSW"), m_bus(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index 7f748cc4806..00de36c9c24 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -53,8 +53,8 @@ dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, DMV_K803, "K803 RTC", tag, owner, clock, "dmv_k803", __FILE__), device_dmvslot_interface( mconfig, *this ), m_rtc(*this, "rtc"), - m_dsw(*this, "DSW") -{ + m_dsw(*this, "DSW"), m_bus(nullptr), m_latch(0), m_rtc_int(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 612940f01c1..9e79c9d90d6 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -82,8 +82,8 @@ dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *tag, m_jumpers(*this, "JUMPERS"), m_mouse_buttons(*this, "MOUSE"), m_mouse_x(*this, "MOUSEX"), - m_mouse_y(*this, "MOUSEY") -{ + m_mouse_y(*this, "MOUSEY"), m_bus(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp index 32039302b14..b53bc26a63c 100644 --- a/src/devices/bus/dmv/ram.cpp +++ b/src/devices/bus/dmv/ram.cpp @@ -34,7 +34,7 @@ const device_type DMV_K208 = &device_creator<dmv_k208_device>; dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_dmvslot_interface( mconfig, *this ), + device_dmvslot_interface( mconfig, *this ), m_ram(nullptr), m_size(size) { } diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp index b3c5fa54ab1..d6e26fdf746 100644 --- a/src/devices/bus/ecbbus/ecbbus.cpp +++ b/src/devices/bus/ecbbus/ecbbus.cpp @@ -28,7 +28,7 @@ const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>; ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock, "ecbbus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bus_tag(nullptr), m_bus_num(0), m_bus(nullptr) { } diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index f2db25938d8..c8d76981d11 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -625,7 +625,7 @@ grip_device::grip_device(const machine_config &mconfig, const char *tag, device_ m_video_ram(*this, "video_ram"), m_j3a(*this, "J3A"), m_j3b(*this, "J3B"), - m_j7(*this, "J7") + m_j7(*this, "J7"), m_centronics_busy(0), m_centronics_fault(0), m_vol0(0), m_vol1(0), m_ia(0), m_ib(0), m_keydata(0), m_kbf(0), m_lps(0), m_page(0), m_flash(0), m_base(0), m_ppi_pa(0), m_ppi_pc(0), m_kb_timer(nullptr) { } diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 7c36679a1ab..e8dd0246dd6 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -396,8 +396,8 @@ e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t m_fdc_irq(CLEAR_LINE), m_fdc_drq(CLEAR_LINE), m_adlc_irq(CLEAR_LINE), - m_clk_en(0), - m_variant(TYPE_E01) + m_clk_en(0), m_ram_en(false), + m_variant(TYPE_E01), m_clk_timer(nullptr) { } @@ -426,8 +426,8 @@ e01_device::e01_device(const machine_config &mconfig, device_type type, const ch m_fdc_irq(CLEAR_LINE), m_fdc_drq(CLEAR_LINE), m_adlc_irq(CLEAR_LINE), - m_clk_en(0), - m_variant(TYPE_E01) + m_clk_en(0), m_ram_en(false), + m_variant(TYPE_E01), m_clk_timer(nullptr) { } diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index 94b0bb77786..93cf59eb41f 100644 --- a/src/devices/bus/econet/econet.cpp +++ b/src/devices/bus/econet/econet.cpp @@ -39,7 +39,7 @@ const device_type ECONET_SLOT = &device_creator<econet_slot_device>; //------------------------------------------------- device_econet_interface::device_econet_interface(const machine_config &mconfig, device_t &device) : - device_slot_card_interface(mconfig, device) + device_slot_card_interface(mconfig, device), m_next(nullptr), m_econet(nullptr), m_address(0) { } @@ -55,7 +55,7 @@ device_econet_interface::device_econet_interface(const machine_config &mconfig, econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_address(0), m_econet(nullptr) { } diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp index 55747d8b0ea..8f9ef82fd19 100644 --- a/src/devices/bus/ep64/exp.cpp +++ b/src/devices/bus/ep64/exp.cpp @@ -48,7 +48,7 @@ ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_con m_write_irq(*this), m_write_nmi(*this), m_write_wait(*this), - m_dave(*this) + m_dave(*this), m_card(nullptr) { } diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp index b281d076f82..8f4112a86eb 100644 --- a/src/devices/bus/epson_sio/epson_sio.cpp +++ b/src/devices/bus/epson_sio/epson_sio.cpp @@ -54,7 +54,7 @@ device_epson_sio_interface::~device_epson_sio_interface() epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock, "epson_sio", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_cart(nullptr), m_write_rx(*this), m_write_pin(*this) { diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index e3b6651e2b9..f2593480a7c 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -96,10 +96,10 @@ epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char * device_epson_sio_interface(mconfig, *this), m_cpu(*this, "maincpu"), m_fdc(*this, "upd765a"), - m_sio_output(*this, "sio"), + m_sio_output(*this, "sio"), m_floppy(nullptr), m_timer(nullptr), m_port1(0xff), m_port2(0xff), - m_rxc(1) + m_rxc(1), m_hd6303_tx(0), m_pinc(0) { m_sio_input = dynamic_cast<epson_sio_device *>(owner); } diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index 084ca861be0..4ab5b8adc01 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -133,8 +133,8 @@ epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char * m_ram(*this, "ram"), m_fdc(*this, "5a"), m_mpsc(*this, "3a"), - m_sio_output(*this, "sio"), - m_rxc(1) + m_sio_output(*this, "sio"), m_fd0(nullptr), m_fd1(nullptr), m_timer_serial(nullptr), m_timer_tc(nullptr), + m_rxc(1), m_txda(0), m_dtra(0), m_pinc(0) { m_sio_input = dynamic_cast<epson_sio_device *>(owner); } diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 922dc91cce2..202b7baa048 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -38,11 +38,11 @@ const device_type MEGADUCK_CART_SLOT = &device_creator<megaduck_cart_slot_device device_gb_cart_interface::device_gb_cart_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_rom(NULL), - m_rom_size(0), - has_rumble(false), - has_timer(false), - has_battery(false) + m_rom(NULL), + m_rom_size(0), m_ram_bank(0), m_latch_bank(0), m_latch_bank2(0), + has_rumble(false), + has_timer(false), + has_battery(false) { } @@ -142,7 +142,7 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_sgb_hack(0), - m_type(GB_MBC_UNKNOWN) + m_type(GB_MBC_UNKNOWN), m_cart(nullptr) { } diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp index 4c0a81459b6..cfac868834f 100644 --- a/src/devices/bus/gameboy/mbc.cpp +++ b/src/devices/bus/gameboy/mbc.cpp @@ -39,19 +39,19 @@ const device_type GB_ROM_SM3SP = &device_creator<gb_rom_sm3sp_device>; gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_gb_cart_interface( mconfig, *this ) -{ + device_gb_cart_interface( mconfig, *this ), m_ram_enable(0) + { } gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), + : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mode(0), m_mask(0x1f), m_shift(0) { } gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), + : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), m_mode(0), m_mask(0x1f), m_shift(0) { @@ -78,8 +78,8 @@ gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char } gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__), m_latch1(0), m_latch2(0), m_bank_4000(0), m_bank_6000(0) + { } gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -88,23 +88,23 @@ gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char } gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_M161_M12, "GB M161-M12 Carts", tag, owner, clock, "gb_rom_m161m12", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_M161_M12, "GB M161-M12 Carts", tag, owner, clock, "gb_rom_m161m12", __FILE__), m_base_bank(0) + { } gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0) + { } gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_SACHEN1, "GB Sachen MMC1 Carts", tag, owner, clock, "gb_rom_sachen1", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_SACHEN1, "GB Sachen MMC1 Carts", tag, owner, clock, "gb_rom_sachen1", __FILE__), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0) + { } gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0) + { } gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -113,18 +113,18 @@ gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconf } gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc1_device(mconfig, GB_ROM_188IN1, "GB 188in1", tag, owner, clock, "gb_rom_188in1", __FILE__) -{ + : gb_rom_mbc1_device(mconfig, GB_ROM_188IN1, "GB 188in1", tag, owner, clock, "gb_rom_188in1", __FILE__), m_game_base(0) + { } gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_currentxor(0), m_xor2(0), m_xor3(0), m_xor4(0), m_xor5(0), m_sintax_mode(0) + { } gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__) -{ + : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__), m_protection_checked(0) + { } gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -138,13 +138,13 @@ gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, cons } gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0) + { } gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_sm3sp", __FILE__) -{ + : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_sm3sp", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_mode(0) + { } diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp index 2be759adf1b..ff10094c3d0 100644 --- a/src/devices/bus/gameboy/rom.cpp +++ b/src/devices/bus/gameboy/rom.cpp @@ -42,8 +42,8 @@ gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, dev } gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__) -{ + : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__), m_tama5_data(0), m_tama5_addr(0), m_tama5_cmd(0), m_rtc_reg(0) + { } gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp index 7419ec1d45a..fa09f4272a1 100644 --- a/src/devices/bus/gamegear/ggext.cpp +++ b/src/devices/bus/gamegear/ggext.cpp @@ -56,7 +56,7 @@ device_gg_ext_port_interface::~device_gg_ext_port_interface() gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GG_EXT_PORT, "EXT Port", tag, owner, clock, "gg_ext_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_device(nullptr), m_th_pin_handler(*this), m_pixel_handler(*this) { diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index 8844acbccb5..2ae46b80864 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -78,7 +78,7 @@ gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(GBA_STD) + m_type(GBA_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index 3b7f775e7cf..7afe2cffe84 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -57,13 +57,13 @@ gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, } gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__), + : gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__), m_flash_mask(0), m_flash(*this, "flash") { } gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__), + : gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__), m_flash_mask(0), m_flash(*this, "flash") { } diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp index f88740cc048..91b62b5a1c2 100644 --- a/src/devices/bus/generic/slot.cpp +++ b/src/devices/bus/generic/slot.cpp @@ -92,7 +92,7 @@ generic_slot_device::generic_slot_device(const machine_config &mconfig, const ch m_extensions("bin"), m_must_be_loaded(FALSE), m_width(GENERIC_ROM8_WIDTH), - m_endianness(ENDIANNESS_LITTLE) + m_endianness(ENDIANNESS_LITTLE), m_cart(nullptr) { } diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index b26c27c2ff6..0cc16925615 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -408,7 +408,7 @@ c2031_device::c2031_device(const machine_config &mconfig, const char *tag, devic m_address(*this, "ADDRESS"), m_nrfd_out(1), m_ndac_out(1), - m_atna(1), + m_atna(1), m_ifc(0), m_via0_irq(0), m_via1_irq(0) { diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 8ce2856e371..7b73a31ed2d 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -690,7 +690,7 @@ c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *na m_address(*this, "ADDRESS"), m_rfdo(1), m_daco(1), - m_atna(1) + m_atna(1), m_ifc(0) { } @@ -710,7 +710,7 @@ c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner m_address(*this, "ADDRESS"), m_rfdo(1), m_daco(1), - m_atna(1) + m_atna(1), m_ifc(0) { } diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index 4dfccbde366..c8cd98ae853 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -86,8 +86,8 @@ c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_ m_ds1(0), m_drv_sel(0), m_mode_sel(0), - m_rw_sel(0), - m_period(attotime::from_hz(clock)) + m_rw_sel(0), m_odd_hd(0), m_pi(0), + m_period(attotime::from_hz(clock)), t_gen(nullptr) { cur_live.tm = attotime::never; cur_live.state = IDLE; diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index e60386db689..4884e214bcd 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -832,7 +832,7 @@ c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *na m_address(*this, "ADDRESS"), m_rfdo(1), m_daco(1), - m_atna(1) + m_atna(1), m_ifc(0) { } @@ -851,7 +851,7 @@ c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner m_address(*this, "ADDRESS"), m_rfdo(1), m_daco(1), - m_atna(1) + m_atna(1), m_ifc(0) { } diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index 02bceb80328..53485b0618d 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -89,7 +89,7 @@ c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_ m_ds1(0), m_drv_sel(0), m_mode_sel(0), - m_rw_sel(1) + m_rw_sel(1), m_odd_hd(0), m_pi(0), t_gen(nullptr) { cur_live.tm = attotime::never; cur_live.state = IDLE; diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 1dd1c679c5d..72853220014 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -392,10 +392,10 @@ c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner m_fdc(*this, WD1797_TAG), m_floppy0(*this, WD1797_TAG ":0"), m_floppy1(*this, WD1797_TAG ":1"), - m_address(*this, "ADDRESS"), + m_address(*this, "ADDRESS"), m_floppy(nullptr), m_rfdo(1), m_daco(1), - m_atna(1) + m_atna(1), m_ifc(0), m_fk5(0) { } diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index f21653efb09..3260ab80a08 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -496,8 +496,8 @@ d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, cons m_address(*this, "ADDRESS"), m_rfdo(1), m_daco(1), - m_atna(1), - m_enable(0), + m_atna(1), m_ifc(0), + m_enable(0), m_data(0), m_variant(variant) { } diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index 5da15513579..83dc8caa150 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -350,7 +350,7 @@ hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, d : device_t(mconfig, HARDBOX, "HardBox", tag, owner, clock, "hardbox", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), - m_hdc(*this, CORVUS_HDC_TAG) + m_hdc(*this, CORVUS_HDC_TAG), m_ifc(0) { } diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp index f3d61fa539a..0d749bbb153 100644 --- a/src/devices/bus/ieee488/ieee488.cpp +++ b/src/devices/bus/ieee488/ieee488.cpp @@ -40,7 +40,7 @@ const device_type IEEE488_SLOT = &device_creator<ieee488_slot_device>; //------------------------------------------------- device_ieee488_interface::device_ieee488_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) + : device_slot_card_interface(mconfig, device), m_next(nullptr), m_bus(nullptr), m_slot(nullptr) { } @@ -65,7 +65,7 @@ device_ieee488_interface::~device_ieee488_interface() ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock, "ieee488_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_address(0) { } diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index a42de1e5011..56d6179158e 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -331,7 +331,7 @@ softbox_device::softbox_device(const machine_config &mconfig, const char *tag, d device_ieee488_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), m_dbrg(*this, COM8116_TAG), - m_hdc(*this, CORVUS_HDC_TAG) + m_hdc(*this, CORVUS_HDC_TAG), m_ifc(0) { } diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp index b67c980c466..8d6baaf0ef1 100644 --- a/src/devices/bus/imi7000/imi7000.cpp +++ b/src/devices/bus/imi7000/imi7000.cpp @@ -36,7 +36,7 @@ const device_type IMI7000_SLOT = &device_creator<imi7000_slot_device>; //------------------------------------------------- device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) + : device_slot_card_interface(mconfig, device), m_slot(nullptr) { } @@ -52,7 +52,7 @@ device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IMI7000_SLOT, "IMI 7000 slot", tag, owner, clock, "imi7000_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_card(nullptr) { } diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index 6b48f976e7f..e6e3658ffbe 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -148,7 +148,7 @@ intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, cons device_t(mconfig, INTV_CART_SLOT, "Intellivision Cartridge Slot", tag, owner, clock, "intv_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(INTV_STD) + m_type(INTV_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp index 795813b30bb..a63864b6a83 100644 --- a/src/devices/bus/iq151/disc2.cpp +++ b/src/devices/bus/iq151/disc2.cpp @@ -51,8 +51,8 @@ const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>; iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "iq151_disc2", __FILE__), device_iq151cart_interface( mconfig, *this ), - m_fdc(*this, "fdc") -{ + m_fdc(*this, "fdc"), m_rom(nullptr), m_rom_enabled(false) + { } //------------------------------------------------- diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp index e1a9aac6254..4d4a5f93bef 100644 --- a/src/devices/bus/iq151/grafik.cpp +++ b/src/devices/bus/iq151/grafik.cpp @@ -40,8 +40,8 @@ const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>; iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "iq151_grafik", __FILE__), device_iq151cart_interface( mconfig, *this ), - m_ppi8255(*this, "ppi8255") -{ + m_ppi8255(*this, "ppi8255"), m_posx(0), m_posy(0), m_all(0), m_pen(0), m_fast(0), m_ev(0), m_ex(0), m_sel(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp index 842602aceb8..fd2fcb016fb 100644 --- a/src/devices/bus/iq151/iq151.cpp +++ b/src/devices/bus/iq151/iq151.cpp @@ -62,7 +62,7 @@ iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, cons m_out_irq2_cb(*this), m_out_irq3_cb(*this), m_out_irq4_cb(*this), - m_out_drq_cb(*this) + m_out_drq_cb(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp index 1cec65a47d1..ca4ffdcc463 100644 --- a/src/devices/bus/iq151/minigraf.cpp +++ b/src/devices/bus/iq151/minigraf.cpp @@ -49,8 +49,8 @@ const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>; iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "iq151_minigraf", __FILE__), - device_iq151cart_interface( mconfig, *this ) -{ + device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_control(0), m_paper(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp index 67909362f8e..1a4ee73d586 100644 --- a/src/devices/bus/iq151/ms151a.cpp +++ b/src/devices/bus/iq151/ms151a.cpp @@ -48,8 +48,8 @@ const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>; iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "iq151_ms151a", __FILE__), - device_iq151cart_interface( mconfig, *this ) -{ + device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_paper(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp index 4505732486c..3229e2ac2f8 100644 --- a/src/devices/bus/iq151/rom.cpp +++ b/src/devices/bus/iq151/rom.cpp @@ -43,7 +43,7 @@ const device_type IQ151_AMOS3 = &device_creator<iq151_amos3_device>; iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_iq151cart_interface(mconfig, *this) + device_iq151cart_interface(mconfig, *this), m_rom(nullptr) { } diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp index 49079c74b3c..9bd55c4d986 100644 --- a/src/devices/bus/iq151/staper.cpp +++ b/src/devices/bus/iq151/staper.cpp @@ -48,8 +48,8 @@ iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const ch : device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "iq151_staper", __FILE__), device_iq151cart_interface( mconfig, *this ), m_ppi(*this, "ppi8255"), - m_printer(*this, "printer") -{ + m_printer(*this, "printer"), m_printer_timer(nullptr), m_ppi_portc(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp index 24ee5d1438b..b5d6a76681f 100644 --- a/src/devices/bus/iq151/video32.cpp +++ b/src/devices/bus/iq151/video32.cpp @@ -59,7 +59,7 @@ const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>; iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "iq151_video32", __FILE__), - device_iq151cart_interface( mconfig, *this ), + device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "^^palette") { diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp index c6751adfe3d..ec5e82ff645 100644 --- a/src/devices/bus/iq151/video64.cpp +++ b/src/devices/bus/iq151/video64.cpp @@ -59,7 +59,7 @@ const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>; iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "iq151_video64", __FILE__), - device_iq151cart_interface( mconfig, *this ), + device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "^^palette") { diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 84af1d2db32..ba7767018b1 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -18,10 +18,12 @@ machine_config_constructor el2_3c503_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(el2_3c503_config); } -el2_3c503_device::el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "el2_3c503", __FILE__), - device_isa8_card_interface(mconfig, *this), - m_dp8390(*this, "dp8390d") { +el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) + : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "el2_3c503", __FILE__), + device_isa8_card_interface(mconfig, *this), + m_dp8390(*this, "dp8390d"), + m_irq_state(0) +{ } void el2_3c503_device::device_start() { diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp index 83b47ff1bb1..6cb4f03775d 100644 --- a/src/devices/bus/isa/3c505.cpp +++ b/src/devices/bus/isa/3c505.cpp @@ -309,7 +309,7 @@ threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const device_isa16_card_interface(mconfig, *this), m_iobase(*this, "IO_BASE"), m_irqdrq(*this, "IRQ_DRQ"), - m_romopts(*this, "ROM_OPTS") + m_romopts(*this, "ROM_OPTS"), m_status(0), m_control(0), m_command_index(0), m_command_pending(0), m_wait_for_ack(0), m_wait_for_nak(0), m_rx_data_index(0), m_rx_pending(0), m_tx_data_length(0), m_program_length(0), m_response_length(0), m_response_index(0), m_microcode_version(0), m_microcode_running(0), m_i82586_config(0), irq_state(), m_do_command_timer(nullptr), m_installed(false), m_irq(0), m_drq(0) { } @@ -319,7 +319,7 @@ threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device device_isa16_card_interface(mconfig, *this), m_iobase(*this, "IO_BASE"), m_irqdrq(*this, "IRQ_DRQ"), - m_romopts(*this, "ROM_OPTS") + m_romopts(*this, "ROM_OPTS"), m_status(0), m_control(0), m_command_index(0), m_command_pending(0), m_wait_for_ack(0), m_wait_for_nak(0), m_rx_data_index(0), m_rx_pending(0), m_tx_data_length(0), m_program_length(0), m_response_length(0), m_response_index(0), m_microcode_version(0), m_microcode_running(0), m_i82586_config(0), irq_state(), m_do_command_timer(nullptr), m_installed(false), m_irq(0), m_drq(0) { } @@ -447,7 +447,7 @@ const char *threecom3c505_device::cpu_context() //************************************************************************** threecom3c505_device::data_buffer::data_buffer() : - m_device(NULL) + m_device(nullptr), m_length(0) { } @@ -508,8 +508,8 @@ void threecom3c505_device::data_buffer::log(const char * title) const //************************************************************************** threecom3c505_device::data_buffer_fifo::data_buffer_fifo() : - m_device(NULL), - m_size(0) + m_device(nullptr), + m_size(0), m_count(0), m_get_index(0), m_put_index(0) { } diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 1d321533391..bd8af6b9200 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -62,15 +62,19 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, m_palette(*this, "palette"), m_mc6845(*this, AGA_MC6845_NAME), m_cga_config(*this, "cga_config"), - m_update_row_type(-1), + m_update_row_type(-1), + m_mode(), m_mda_mode_control(0), - m_mda_status(0), + m_mda_status(0), + m_mda_chr_gen(nullptr), m_cga_mode_control(0), m_cga_color_select(0), - m_cga_status(0), + m_cga_status(0), + m_cga_chr_gen(nullptr), m_framecnt(0), m_vsync(0), - m_hsync(0) + m_hsync(0), + m_videoram(nullptr) { } @@ -80,15 +84,15 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type m_palette(*this, "palette"), m_mc6845(*this, AGA_MC6845_NAME), m_cga_config(*this, "cga_config"), - m_update_row_type(-1), + m_update_row_type(-1), m_mode(), m_mda_mode_control(0), - m_mda_status(0), + m_mda_status(0), m_mda_chr_gen(nullptr), m_cga_mode_control(0), m_cga_color_select(0), - m_cga_status(0), + m_cga_status(0), m_cga_chr_gen(nullptr), m_framecnt(0), m_vsync(0), - m_hsync(0) + m_hsync(0), m_videoram(nullptr) { } //------------------------------------------------- diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 6041df5f9ce..47f72f22121 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -301,9 +301,9 @@ const rom_entry *isa8_cga_device::device_rom_region() const isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock, "cga", __FILE__), device_isa8_card_interface(mconfig, *this), - m_cga_config(*this, "cga_config"), - m_update_row_type(-1), - m_vram_size( 0x4000 ), + m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), + m_update_row_type(-1), m_chr_gen_base(nullptr), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), + m_vram_size( 0x4000 ), m_plantronics(0), m_palette(*this, "palette") { m_chr_gen_offset[0] = m_chr_gen_offset[2] = 0x1800; @@ -316,9 +316,9 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), - m_cga_config(*this, "cga_config"), - m_update_row_type(-1), - m_vram_size( 0x4000 ), + m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), + m_update_row_type(-1), m_chr_gen_base(nullptr), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), + m_vram_size( 0x4000 ), m_plantronics(0), m_palette(*this, "palette") { m_chr_gen_offset[0] = m_chr_gen_offset[2] = 0x1800; @@ -1523,7 +1523,7 @@ const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] = //------------------------------------------------- isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__) + isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__), m_write(0), m_read(0), m_mc6845_address(0) { m_vram_size = 0x10000; m_chr_gen_offset[0] = 0x0000; @@ -1652,7 +1652,7 @@ const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>; //------------------------------------------------- isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__) + isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__), m_bank_offset(0), m_bank_base(0), m_control(0) { m_vram_size = 0x20000; m_start_offset = 0x18000; @@ -1740,7 +1740,7 @@ const device_type ISA8_EC1841_0002 = &device_creator<isa8_ec1841_0002_device>; //------------------------------------------------- isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_cga_device( mconfig, ISA8_EC1841_0002, "EC 1841.0002 (CGA)", tag, owner, clock, "ec1841_0002", __FILE__) + isa8_cga_device( mconfig, ISA8_EC1841_0002, "EC 1841.0002 (CGA)", tag, owner, clock, "ec1841_0002", __FILE__), m_p3df(0) { } @@ -1894,7 +1894,7 @@ const rom_entry *isa8_cga_mc1502_device::device_rom_region() const const device_type ISA8_CGA_M24 = &device_creator<isa8_cga_m24_device>; isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_cga_device( mconfig, ISA8_CGA_M24, "Olivetti M24 CGA", tag, owner, clock, "cga_m24", __FILE__) + isa8_cga_device( mconfig, ISA8_CGA_M24, "Olivetti M24 CGA", tag, owner, clock, "cga_m24", __FILE__), m_mode2(0), m_index(0) { m_vram_size = 0x8000; } diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 5cd014b7b6e..9cf7644c07d 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -6,7 +6,15 @@ const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>; dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__), - device_isa8_card_interface(mconfig, *this), + device_isa8_card_interface(mconfig, *this), + m_cmd(0), + m_stat(0), + m_data(0), + m_dsp_dma(0), + m_ctl(0), + m_dma(0), + m_vol(0), + m_bio(0), m_cpu(*this, "dectalk_cpu"), m_dac(*this, "dac"), m_dsp(*this, "dectalk_dsp") diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 4da4ead2c6d..44663ddd5fb 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -572,16 +572,16 @@ ioport_constructor isa8_ega_device::device_input_ports() const isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "ega", __FILE__), - device_isa8_card_interface(mconfig, *this), - m_misc_output(0), + device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), + m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0), m_palette(*this, "palette") { } isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_isa8_card_interface(mconfig, *this), - m_misc_output(0), + device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), + m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0), m_palette(*this, "palette") { } diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index 212a05cad87..94601de84da 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -91,8 +91,8 @@ machine_config_constructor isa8_finalchs_device::device_mconfig_additions() cons isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "finalchs", __FILE__), - device_isa8_card_interface( mconfig, *this ) -{ + device_isa8_card_interface( mconfig, *this ), m_FCH_latch_data(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index ad7d034a183..2a8edf69145 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -352,7 +352,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : acia6850_device(mconfig, GGF1, "Gravis GF1", tag, owner, clock, "gf1", __FILE__), - device_sound_interface( mconfig, *this ), + device_sound_interface( mconfig, *this ), m_dma_dram_ctrl(0), m_dma_start_addr(0), m_dram_addr(0), m_timer_ctrl(0), m_timer1_count(0), m_timer2_count(0), m_timer1_value(0), m_timer2_value(0), m_sampling_freq(0), m_sampling_ctrl(0), m_joy_trim_dac(0), m_reset(0), m_active_voices(0), m_irq_source(0), m_stream(nullptr), m_timer1(nullptr), m_timer2(nullptr), m_dmatimer(nullptr), m_voltimer(nullptr), m_current_voice(0), m_current_reg(0), m_adlib_cmd(0), m_mix_ctrl(0), m_gf1_irq(0), m_midi_irq(0), m_dma_channel1(0), m_dma_channel2(0), m_irq_combine(0), m_dma_combine(0), m_adlib_timer_cmd(0), m_adlib_timer1_enable(0), m_adlib_timer2_enable(0), m_adlib_status(0), m_adlib_data(0), m_voice_irq_ptr(0), m_voice_irq_current(0), m_dma_16bit(0), m_statread(0), m_sb_data_2xc(0), m_sb_data_2xe(0), m_reg_ctrl(0), m_fake_adlib_status(0), m_dma_current(0), m_txirq(0), m_rxirq(0), m_txirq_handler(*this), m_rxirq_handler(*this), m_wave_irq_handler(*this), @@ -1276,7 +1276,7 @@ ioport_constructor isa16_gus_device::device_input_ports() const isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "isa_gus", __FILE__), device_isa16_card_interface( mconfig, *this ), - m_gf1(*this, "gf1") + m_gf1(*this, "gf1"), m_irq_status(0) { } diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 45b6bc334dd..a56dc5261f2 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -162,17 +162,17 @@ const device_type EC1841_HDC = &device_creator<ec1841_device>; const device_type ST11M_HDC = &device_creator<st11m_device>; xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), + device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0), m_irq_handler(*this), - m_drq_handler(*this) + m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0) { m_type = STANDARD; } xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), buffer_ptr(nullptr), csb(0), status(0), error(0), m_type(0), m_current_cmd(0), m_irq_handler(*this), - m_drq_handler(*this) + m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0) { } @@ -921,14 +921,14 @@ ioport_constructor isa8_hdc_device::device_input_ports() const isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "hdc", __FILE__), device_isa8_card_interface(mconfig, *this), - m_hdc(*this,"hdc") + m_hdc(*this,"hdc"), dip(0) { } isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), - m_hdc(*this,"hdc") + m_hdc(*this,"hdc"), dip(0) { } diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 293162aa70a..2bc6c513ace 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -449,7 +449,7 @@ const rom_entry *isa8_ibm_mfc_device::device_rom_region() const isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock, "ibm_mfc", __FILE__), - device_isa8_card_interface(mconfig, *this), + device_isa8_card_interface(mconfig, *this), m_tcr(0), m_pc_ppi_c(0), m_z80_ppi_c(0), m_pc_irq_state(0), m_z80_irq_state(0), m_cpu(*this, "ibm_mfc"), m_ym2151(*this, "ym2151"), m_d8253(*this, "d8253"), diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 5b8b213580e..a98a0310872 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -26,13 +26,15 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>; //------------------------------------------------- isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_owner(nullptr), + m_isa_tag(nullptr) { } isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr) { } @@ -136,10 +138,10 @@ void isa8_device::device_config_complete() isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__), device_memory_interface(mconfig, *this), - m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, NULL), - m_io_config("ISA 8-bit I/O", ENDIANNESS_LITTLE, 8, 16, 0, NULL), - m_program16_config("ISA 16-bit program", ENDIANNESS_LITTLE, 16, 24, 0, NULL), - m_io16_config("ISA 16-bit I/O", ENDIANNESS_LITTLE, 16, 16, 0, NULL), + m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), + m_io_config("ISA 8-bit I/O", ENDIANNESS_LITTLE, 8, 16, 0, nullptr), + m_program16_config("ISA 16-bit program", ENDIANNESS_LITTLE, 16, 24, 0, nullptr), + m_io16_config("ISA 16-bit I/O", ENDIANNESS_LITTLE, 16, 16, 0, nullptr), m_maincpu(nullptr), m_iospace(nullptr), m_prgspace(nullptr), m_out_irq2_cb(*this), m_out_irq3_cb(*this), m_out_irq4_cb(*this), @@ -148,12 +150,12 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), + m_out_drq3_cb(*this), m_cputag(nullptr), m_write_iochck(*this) { for(int i=0;i<8;i++) { - m_dma_device[i] = NULL; + m_dma_device[i] = nullptr; m_dma_eop[i] = false; } m_nmi_enabled = false; @@ -164,10 +166,10 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), - m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, NULL), - m_io_config("ISA 8-bit I/O", ENDIANNESS_LITTLE, 8, 16, 0, NULL), - m_program16_config("ISA 16-bit program", ENDIANNESS_LITTLE, 16, 24, 0, NULL), - m_io16_config("ISA 16-bit I/O", ENDIANNESS_LITTLE, 16, 16, 0, NULL), + m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), + m_io_config("ISA 8-bit I/O", ENDIANNESS_LITTLE, 8, 16, 0, nullptr), + m_program16_config("ISA 16-bit program", ENDIANNESS_LITTLE, 16, 24, 0, nullptr), + m_io16_config("ISA 16-bit I/O", ENDIANNESS_LITTLE, 16, 16, 0, nullptr), m_maincpu(nullptr), m_iospace(nullptr), m_prgspace(nullptr), m_out_irq2_cb(*this), m_out_irq3_cb(*this), m_out_irq4_cb(*this), @@ -176,12 +178,12 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), + m_out_drq3_cb(*this), m_cputag(nullptr), m_write_iochck(*this) { for(int i=0;i<8;i++) { - m_dma_device[i] = NULL; + m_dma_device[i] = nullptr; m_dma_eop[i] = false; } m_nmi_enabled = false; @@ -418,7 +420,7 @@ void isa8_device::nmi() device_isa8_card_interface::device_isa8_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_isa(NULL) + m_isa(nullptr), m_isa_dev(nullptr), m_next(nullptr) { } @@ -618,7 +620,7 @@ void isa16_device::dack16_w(int line,UINT16 data) //------------------------------------------------- device_isa16_card_interface::device_isa16_card_interface(const machine_config &mconfig, device_t &device) - : device_isa8_card_interface(mconfig,device) + : device_isa8_card_interface(mconfig,device), m_isa(nullptr) { } diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index 28219c8a988..53563689fd7 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -14,7 +14,8 @@ const device_type ISA8_LPT = &device_creator<isa8_lpt_device>; isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__), - device_isa8_card_interface(mconfig, *this) + device_isa8_card_interface(mconfig, *this), + m_is_primary(false) { } diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 46121451182..f767d79e602 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -23,12 +23,16 @@ const device_type ATIMACH64_8514A = &device_creator<mach64_8514a_device>; // 8514/A device mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : mach8_device(mconfig, ATIMACH32_8514A, "ATi mach32 (2D acceleration module)", tag, owner, clock, "mach32_8514a", __FILE__) + : mach8_device(mconfig, ATIMACH32_8514A, "ATi mach32 (2D acceleration module)", tag, owner, clock, "mach32_8514a", __FILE__), + m_chip_ID(0), + m_membounds(0) { } mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : mach8_device(mconfig, type, name, tag, owner, clock, shortname, source) + : mach8_device(mconfig, type, name, tag, owner, clock, shortname, source), + m_chip_ID(0), + m_membounds(0) { } diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index ada13d1d4ec..0a482f3a3f9 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -192,7 +192,7 @@ WRITE8_MEMBER( mc1502_fdc_device::mc1502_fdc_w ) mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MC1502_FDC, "MC-1502 floppy", tag, owner, clock, "mc1502_fdc", __FILE__), device_isa8_card_interface( mconfig, *this ), - m_fdc(*this, "fdc") + m_fdc(*this, "fdc"), motor_on(0), motor_timer(nullptr) { } diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index 1d8991cab7a..e3fb7ed25ba 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -152,16 +152,16 @@ const rom_entry *isa8_mda_device::device_rom_region() const isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock, "isa_ibm_mda", __FILE__), - device_isa8_card_interface(mconfig, *this), - m_update_row_type(-1), + device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0), + m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), m_palette(*this, "palette") { } isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_isa8_card_interface(mconfig, *this), - m_update_row_type(-1), + device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0), + m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), m_palette(*this, "palette") { } @@ -581,7 +581,7 @@ const rom_entry *isa8_hercules_device::device_rom_region() const //------------------------------------------------- isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__) + isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__), m_configuration_switch(0) { } @@ -787,7 +787,7 @@ machine_config_constructor isa8_ec1840_0002_device::device_mconfig_additions() c //------------------------------------------------- isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - isa8_mda_device( mconfig, ISA8_EC1840_0002, "EC 1840.0002 (MDA)", tag, owner, clock, "ec1840_0002", __FILE__) + isa8_mda_device( mconfig, ISA8_EC1840_0002, "EC 1840.0002 (MDA)", tag, owner, clock, "ec1840_0002", __FILE__), m_soft_chr_gen(nullptr) { } diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index a62d5e71f8f..7fb291f7aed 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -19,7 +19,9 @@ machine_config_constructor ne1000_device::device_mconfig_additions() const { ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock, "ne1000", __FILE__), device_isa8_card_interface(mconfig, *this), - m_dp8390(*this, "dp8390d") { + m_dp8390(*this, "dp8390d"), + m_irq(0) + { } void ne1000_device::device_start() { diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index b635f8e736c..6fe5bf29416 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -17,10 +17,12 @@ machine_config_constructor ne2000_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(ne2000_config); } -ne2000_device::ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "ne2000", __FILE__), - device_isa16_card_interface(mconfig, *this), - m_dp8390(*this, "dp8390d") { +ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) + : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "ne2000", __FILE__), + device_isa16_card_interface(mconfig, *this), + m_dp8390(*this, "dp8390d"), + m_irq(0) +{ } void ne2000_device::device_start() { diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index 8e2216654fd..3ed1967df06 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -83,7 +83,7 @@ isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig m_upd7220(*this, "upd7220"), m_palette(*this, "palette"), m_ram(1024*1024), - m_overlay(1024) + m_overlay(1024), m_bank(0), m_mode(0), m_1024(false) { } diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 9f86243a90a..25d3076a60a 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -376,7 +376,8 @@ omti8621_device::omti8621_device(const machine_config &mconfig, const char *tag, device_isa16_card_interface(mconfig, *this), m_fdc(*this, OMTI_FDC_TAG), m_iobase(*this, "IO_BASE"), - m_biosopts(*this, "BIOS_OPTS") + 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) { } @@ -1287,7 +1288,7 @@ const device_type OMTI_DISK = &device_creator<omti_disk_image_device>; omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_type(0), m_cylinders(0), m_heads(0), m_sectors(0), m_sectorbytes(0), m_sector_count(0), m_image(nullptr) { } diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 01ef4668b58..704859b7cf7 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -208,7 +208,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), m_screen(*this, PGC_SCREEN_NAME), - m_palette(*this, "palette") + m_palette(*this, "palette"), m_commarea(nullptr), m_vram(nullptr), m_eram(nullptr), m_bitmap(nullptr) { } @@ -217,7 +217,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type device_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), m_screen(*this, PGC_SCREEN_NAME), - m_palette(*this, "palette") + m_palette(*this, "palette"), m_commarea(nullptr), m_vram(nullptr), m_eram(nullptr), m_bitmap(nullptr) { } diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index b39195c9557..983c305e04e 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -684,7 +684,9 @@ sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, m_dacl(*this, "dacl"), m_dacr(*this, "dacr"), m_joy(*this, "pc_joy"), - m_cpu(*this, "sb16_cpu") + m_cpu(*this, "sb16_cpu"), m_data_in(false), m_in_byte(0), m_data_out(false), m_out_byte(0), m_freq(0), m_mode(0), m_dac_fifo_ctrl(0), m_adc_fifo_ctrl(0), m_ctrl8(0), m_ctrl16(0), m_mpu_byte(0), + m_dma8_len(0), m_dma16_len(0), m_dma8_cnt(0), m_dma16_cnt(0), m_adc_fifo_head(0), m_adc_fifo_tail(0), m_dac_fifo_head(0), m_dac_fifo_tail(0), m_adc_r(false), m_dac_r(false), m_adc_h(false), + m_dac_h(false), m_irq8(false), m_irq16(false), m_irq_midi(false), m_dma8_done(false), m_dma16_done(false), m_timer(nullptr) { } diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 15b7191af29..27db8eaf08c 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1107,7 +1107,7 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, const char m_dacl(*this, "sbdacl"), m_dacr(*this, "sbdacr"), m_joy(*this, "pc_joy"), - m_mdout(*this, "mdout") + m_mdout(*this, "mdout"), m_dack_out(0), m_onebyte_midi(false), m_uart_midi(false), m_uart_irq(false), m_mpu_midi(false), m_rx_waiting(0), m_tx_waiting(0), m_xmit_read(0), m_xmit_write(0), m_recv_read(0), m_recv_write(0), m_tx_busy(false), m_timer(nullptr) { } diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 636a2effde6..922c62c2d15 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -319,8 +319,9 @@ sc499_device::sc499_device(const machine_config &mconfig, const char *tag, devic : device_t(mconfig, 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_image(*this, SC499_CTAPE_TAG) + 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), + m_data_index(0), m_tape_status(0), m_data_error_counter(0), m_underrun_counter(0), m_tape_pos(0), m_ctape_block_count(0), m_ctape_block_index(0), m_image_length(0), + m_image(*this, SC499_CTAPE_TAG), irq_state(), dma_drq_state(), m_timer(nullptr), m_timer1(nullptr), m_timer_type(0), m_irq(0), m_drq(0), m_installed(false) { } diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 4c1f3a37a80..b730ad3a670 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -192,7 +192,7 @@ stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *ta m_dacl(*this, "dacl"), m_dacr(*this, "dacr"), m_joy(*this, "pc_joy"), - m_cpu(*this, "stereo_fx_cpu") + m_cpu(*this, "stereo_fx_cpu"), m_data_in(false), m_in_byte(0), m_data_out(false), m_out_byte(0), m_port20(0), m_port00(0), m_timer(nullptr), m_t0(0) { m_t1 = 0; } diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index bf6ff8842e0..3e6f6ca1196 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -61,7 +61,7 @@ const rom_entry *isa16_svga_cirrus_device::device_rom_region() const isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } @@ -147,7 +147,7 @@ const rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index 01ac8d3053a..f4874db3fc9 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -72,7 +72,7 @@ const rom_entry *isa16_svga_s3_device::device_rom_region() const isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_S3, "Number Nine 9FX Vision 330 (S3 764) Graphics Card", tag, owner, clock, "s3_764", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr) { } @@ -184,7 +184,7 @@ const rom_entry *isa16_s3virge_device::device_rom_region() const isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_S3VIRGE, "S3 ViRGE Graphics Card", tag, owner, clock, "s3virge", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } @@ -271,7 +271,7 @@ const rom_entry *isa16_s3virgedx_device::device_rom_region() const isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_S3VIRGEDX, "S3 ViRGE/DX Graphics Card", tag, owner, clock, "s3virgedx", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } @@ -359,7 +359,7 @@ const rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_DMS3D2KPRO, "Diamond Stealth 3D 2000 Pro", tag, owner, clock, "dms3d2kp", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index affbf97a6a5..ded9d629fe3 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -63,7 +63,7 @@ const rom_entry *isa16_svga_tgui9680_device::device_rom_region() const isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index d1be1f4ec9b..6fff06c78ad 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -61,7 +61,7 @@ const rom_entry *isa8_svga_et4k_device::device_rom_region() const isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "et4000", __FILE__), - device_isa8_card_interface(mconfig, *this) + device_isa8_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 8b52309b31f..390834c8d5b 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -51,7 +51,7 @@ const rom_entry *isa8_vga_device::device_rom_region() const isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "ibm_vga", __FILE__), - device_isa8_card_interface(mconfig, *this) + device_isa8_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index dc6c9930ed2..490a26dc90c 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -148,19 +148,19 @@ const rom_entry *isa16_vga_mach64_device::device_rom_region() const isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Card", tag, owner, clock, "gfxultra", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr) { } isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_GFXULTRAPRO, "ATi Graphics Ultra Pro Card", tag, owner, clock, "gfxultrp", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64", __FILE__), - device_isa16_card_interface(mconfig, *this) + device_isa16_card_interface(mconfig, *this), m_vga(nullptr) { } diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index bde729cc012..cad06fcdcd2 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -303,7 +303,7 @@ xtide_device::xtide_device(const machine_config &mconfig, const char *tag, devic : device_t(mconfig, ISA8_XTIDE, "XT-IDE Fixed Drive Adapter", tag, owner, clock, "isa8_xtide", __FILE__), device_isa8_card_interface( mconfig, *this ), m_ata(*this, "ata"), - m_eeprom(*this, "eeprom") + m_eeprom(*this, "eeprom"), m_irq_number(0), m_d8_d15_latch(0) { } diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp index 319fb66a38a..bb1eea2b194 100644 --- a/src/devices/bus/isbx/isbc_218a.cpp +++ b/src/devices/bus/isbx/isbc_218a.cpp @@ -83,7 +83,7 @@ isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *ta device_t(mconfig, ISBC_218A, "ISBX 218a for ISBC", tag, owner, clock, "isbc_218a", __FILE__), device_isbx_card_interface(mconfig, *this), m_fdc(*this, I8272_TAG), - m_floppy0(*this, I8272_TAG":0") + m_floppy0(*this, I8272_TAG":0"), m_reset(false), m_motor(false) { } diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp index 09b7d84b6fd..e71aa5e5454 100644 --- a/src/devices/bus/isbx/isbx.cpp +++ b/src/devices/bus/isbx/isbx.cpp @@ -43,7 +43,7 @@ isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *ta m_write_mintr0(*this), m_write_mintr1(*this), m_write_mdrqt(*this), - m_write_mwait(*this) + m_write_mwait(*this), m_card(nullptr) { } diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp index db93fbf582c..0ce9c02b268 100644 --- a/src/devices/bus/kc/d002.cpp +++ b/src/devices/bus/kc/d002.cpp @@ -110,8 +110,8 @@ const device_type KC_D002 = &device_creator<kc_d002_device>; kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "kc_d002", __FILE__), - device_kcexp_interface( mconfig, *this ) -{ + device_kcexp_interface( mconfig, *this ), m_slot(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index de615403d69..a45b8b4b795 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -137,8 +137,8 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, d m_floppy1(*this, UPD765_TAG ":1"), m_floppy2(*this, UPD765_TAG ":2"), m_floppy3(*this, UPD765_TAG ":3"), - m_koppel_ram(*this, "koppelram") -{ + m_koppel_ram(*this, "koppelram"), m_reset_timer(nullptr), m_rom(nullptr), m_rom_base(0), m_enabled(0), m_connected(0), m_floppy(nullptr) + { } kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) @@ -150,8 +150,8 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, m_floppy1(*this, UPD765_TAG ":1"), m_floppy2(*this, UPD765_TAG ":2"), m_floppy3(*this, UPD765_TAG ":3"), - m_koppel_ram(*this, "koppelram") -{ + m_koppel_ram(*this, "koppelram"), m_reset_timer(nullptr), m_rom(nullptr), m_rom_base(0), m_enabled(0), m_connected(0), m_floppy(nullptr) + { } //------------------------------------------------- @@ -384,8 +384,8 @@ WRITE_LINE_MEMBER(kc_d004_device::fdc_irq) kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_d004gide", __FILE__), - m_ata(*this, ATA_TAG) -{ + m_ata(*this, ATA_TAG), m_ata_data(0), m_lh(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp index 5ecc1b196b6..a463fce40fd 100644 --- a/src/devices/bus/kc/kc.cpp +++ b/src/devices/bus/kc/kc.cpp @@ -158,7 +158,7 @@ kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char * device_slot_interface(mconfig, *this), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_halt_cb(*this) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) { } @@ -167,7 +167,7 @@ kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type device_slot_interface(mconfig, *this), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_halt_cb(*this) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) { } diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp index 1d747f4e53c..c10b99d0d70 100644 --- a/src/devices/bus/kc/ram.cpp +++ b/src/devices/bus/kc/ram.cpp @@ -44,13 +44,13 @@ const device_type KC_M036 = &device_creator<kc_m036_device>; kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "kc_m011", __FILE__), - device_kcexp_interface( mconfig, *this ) -{ + device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0) + { } kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_kcexp_interface( mconfig, *this ) + device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0) { } diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp index 3a80207dd7b..404089110a0 100644 --- a/src/devices/bus/kc/rom.cpp +++ b/src/devices/bus/kc/rom.cpp @@ -44,14 +44,14 @@ const device_type KC_M033 = &device_creator<kc_m033_device>; kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "kc_8k", __FILE__), - device_kcexp_interface( mconfig, *this ) -{ + device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0) + { } kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_kcexp_interface( mconfig, *this ) -{ + device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0) + { } @@ -185,8 +185,8 @@ void kc_m006_device::read(offs_t offset, UINT8 &data) //------------------------------------------------- kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__) -{ + : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__), m_bank(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index 108302045d9..16b4099776e 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -20,7 +20,9 @@ i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, : northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "i82439tx", __FILE__), pci_device_interface( mconfig, *this ), m_cpu_tag( NULL ), - m_region_tag( NULL ) + m_region_tag( NULL ), + m_space(nullptr), + m_rom(nullptr) { } diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp index cd1c88c9f88..e45c1343fbb 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -32,8 +32,11 @@ const device_type MPC105 = &device_creator<mpc105_device>; mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MPC105, "MPC105", tag, owner, clock, "mpc105", __FILE__), pci_device_interface( mconfig, *this ), - m_cpu_tag(NULL), - m_bank_base_default(0) + m_cpu_tag(nullptr), + m_bank_base_default(0), + m_bank_base(0), + m_bank_enable(0), + m_maincpu(nullptr) { } diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index 13baf9e66a3..af919100382 100644 --- a/src/devices/bus/lpci/pci.cpp +++ b/src/devices/bus/lpci/pci.cpp @@ -90,8 +90,8 @@ const device_type PCI_BUS = &device_creator<pci_bus_device>; // pci_bus_device - constructor //------------------------------------------------- pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), - m_father(NULL) + device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0), + m_father(NULL), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr) { for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) { m_devtag[i]= NULL; diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index b051d29a73a..823dded56cc 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -141,7 +141,7 @@ southbridge_device::southbridge_device(const machine_config &mconfig, device_typ m_ds12885(*this, "rtc"), m_pc_kbdc(*this, "pc_kbdc"), m_ide(*this, "ide"), - m_ide2(*this, "ide2") + m_ide2(*this, "ide2"), m_at_spkrdata(0), m_pit_out2(0), m_dma_channel(0), m_cur_eop(false), m_dma_high_byte(0), m_at_speaker(0), m_refresh(false), m_channel_check(0), m_nmi_enabled(0) { } /********************************************************** diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp index 0a2cf2477e9..4b181ddd43e 100644 --- a/src/devices/bus/macpds/macpds.cpp +++ b/src/devices/bus/macpds/macpds.cpp @@ -28,13 +28,15 @@ const device_type MACPDS_SLOT = &device_creator<macpds_slot_device>; //------------------------------------------------- macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACPDS_SLOT, "Mac 68000 Processor-Direct Slot", tag, owner, clock, "macpds_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_macpds_tag(nullptr), + m_macpds_slottag(nullptr) { } macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_macpds_tag(nullptr), m_macpds_slottag(nullptr) { } @@ -77,12 +79,12 @@ void macpds_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- macpds_device::macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__) + device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr), m_cputag(nullptr) { } macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source) + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_cputag(nullptr) { } //------------------------------------------------- @@ -148,8 +150,8 @@ void macpds_device::set_irq_line(int line, int state) device_macpds_card_interface::device_macpds_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_macpds(NULL), - m_macpds_tag(NULL) + m_macpds(nullptr), + m_macpds_tag(nullptr), m_macpds_slottag(nullptr), m_next(nullptr) { } diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index a9e7c36c067..0ceb591ce09 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -89,7 +89,7 @@ const rom_entry *macpds_sedisplay_device::device_rom_region() const macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS_SEDISPLAY, "Radius SE Full Page Display", tag, owner, clock, "pds_sefp", __FILE__), device_video_interface(mconfig, *this), - device_macpds_card_interface(mconfig, *this) + device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(SEDISPLAY_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -98,7 +98,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_macpds_card_interface(mconfig, *this) + device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(SEDISPLAY_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp index e0a72f3a939..1a432d6f6d6 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -63,15 +63,15 @@ const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>; md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) + { } md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock, "md_std_eeprom", __FILE__), device_md_cart_interface( mconfig, *this ), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) + { } md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp index 1c75febc54b..caef897b77c 100644 --- a/src/devices/bus/megadrive/ggenie.cpp +++ b/src/devices/bus/megadrive/ggenie.cpp @@ -35,8 +35,8 @@ const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>; md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_GAMEGENIE, "MD Game Genie", tag, owner, clock, "md_ggenie", __FILE__), device_md_cart_interface( mconfig, *this ), - m_exp(*this, "subslot") -{ + m_exp(*this, "subslot"), m_gg_bypass(0), m_reg_enable(0) + { } diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index e99d43b9d49..85fb7c373b4 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -59,14 +59,14 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, // Micro Machines 2, Micro Machines Military md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) + { } md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_seprom_codemast", __FILE__), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) + { } // Micro Machines 96 diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index 6caa7df817f..459acf13c4f 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -64,7 +64,7 @@ const device_type COPERA_CART_SLOT = &device_creator<copera_cart_slot_device>; //------------------------------------------------- device_md_cart_interface::device_md_cart_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device), + : device_slot_card_interface(mconfig, device), m_nvram_start(0), m_nvram_end(0), m_nvram_active(0), m_nvram_readonly(0), m_nvram_handlers_installed(0), m_rom(NULL), m_rom_size(0) { @@ -164,7 +164,7 @@ base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(SEGA_STD), + m_type(SEGA_STD), m_cart(nullptr), m_must_be_loaded(1) { } diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp index bc81477cc09..70687fa8c91 100644 --- a/src/devices/bus/megadrive/rom.cpp +++ b/src/devices/bus/megadrive/rom.cpp @@ -86,18 +86,18 @@ md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char } md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__), m_lastoff(0), m_lastdata(0) + { } md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__), m_base(0) + { } md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__), m_bank(0) + { } md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -121,8 +121,8 @@ md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char } md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__), m_latch0(0), m_latch1(0) + { } md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -156,8 +156,8 @@ md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const ch } md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__), m_bank(0) + { } md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -176,13 +176,13 @@ md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const } md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__), m_prot1_data(0), m_prot2_data(0) + { } md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__), m_bank(0) + { } md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -191,13 +191,13 @@ md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const ch } md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__), m_bank(0) + { } md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__), m_bank_addr(0), m_bank_size(0), m_old_bank_addr(0) + { } md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -206,33 +206,33 @@ md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const ch } md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__), m_latch(0) + { } md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_TEKKENSP, "MD Tekken Special", tag, owner, clock, "md_rom_tekkensp", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_TEKKENSP, "MD Tekken Special", tag, owner, clock, "md_rom_tekkensp", __FILE__), m_reg(0) + { } md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__), m_latch(0) + { } md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__), m_bank(0) + { } md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__), m_mode(0), m_lock(0) + { } md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__) -{ + : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__), m_mode(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index cc8765f3b4a..0ddcaca0017 100644 --- a/src/devices/bus/megadrive/stm95.cpp +++ b/src/devices/bus/megadrive/stm95.cpp @@ -177,14 +177,14 @@ const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>; md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_md_cart_interface( mconfig, *this ) -{ + device_md_cart_interface( mconfig, *this ), m_rdcnt(0) + { } md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "md_eeprom_stm95", __FILE__), - device_md_cart_interface( mconfig, *this ) -{ + device_md_cart_interface( mconfig, *this ), m_rdcnt(0) + { } diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 324c5302a33..51f6a1ea8de 100644 --- a/src/devices/bus/megadrive/svp.cpp +++ b/src/devices/bus/megadrive/svp.cpp @@ -40,16 +40,16 @@ md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_svp(*this, "svp"), - m_test_ipt(*this, "MEMORY_TEST") -{ + m_test_ipt(*this, "MEMORY_TEST"), m_emu_status(0), m_xst(0), m_xst2(0) + { } md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock, "md_rom_svp", __FILE__), device_md_cart_interface( mconfig, *this ), m_svp(*this, "svp"), - m_test_ipt(*this, "MEMORY_TEST") -{ + m_test_ipt(*this, "MEMORY_TEST"), m_emu_status(0), m_xst(0), m_xst2(0) + { } diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index 3c77b4ca227..7a4a415ee4e 100644 --- a/src/devices/bus/midi/midi.cpp +++ b/src/devices/bus/midi/midi.cpp @@ -6,7 +6,8 @@ const device_type MIDI_PORT = &device_creator<midi_port_device>; midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), + m_rxd(0), m_rxd_handler(*this), m_dev(NULL) { diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index 529fcf803a1..e93e0234297 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -140,8 +140,8 @@ msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type ty msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) - : msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname) - , m_control(0) + : msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname), m_side_control(0) + , m_control(0) { } diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp index eb6ca123c39..8925e03d2ba 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.cpp +++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp @@ -8,8 +8,9 @@ const device_type MSX_AUDIO_KBDC_PORT = &device_creator<msx_audio_kbdc_port_devi msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__) - , device_slot_interface(mconfig, *this) + : device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__), + device_slot_interface(mconfig, *this), + m_keyboard(NULL) { } diff --git a/src/devices/bus/neogeo/banked_cart.cpp b/src/devices/bus/neogeo/banked_cart.cpp index 9d0e1f06cad..05f677c5c3c 100644 --- a/src/devices/bus/neogeo/banked_cart.cpp +++ b/src/devices/bus/neogeo/banked_cart.cpp @@ -10,8 +10,10 @@ extern const device_type NEOGEO_BANKED_CART = &device_creator<neogeo_banked_cart neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEOGEO_BANKED_CART, "NeoGeo Banked Cartridge", tag, owner, clock, "neogeo_banked_cart", __FILE__), - m_bank_cartridge(0), - m_region(0) + m_bank_cartridge(0), + m_main_cpu_bank_address(0), + m_region(0), + m_region_size(0) { } diff --git a/src/devices/bus/neogeo/bootleg_prot.cpp b/src/devices/bus/neogeo/bootleg_prot.cpp index aa5ad7da084..e8767bbd7a5 100644 --- a/src/devices/bus/neogeo/bootleg_prot.cpp +++ b/src/devices/bus/neogeo/bootleg_prot.cpp @@ -10,7 +10,11 @@ extern const device_type NGBOOTLEG_PROT = &device_creator<ngbootleg_prot_device> ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, NGBOOTLEG_PROT, "NeoGeo Protection (Bootleg)", tag, owner, clock, "ngbootleg_prot", __FILE__) + : device_t(mconfig, NGBOOTLEG_PROT, "NeoGeo Protection (Bootleg)", tag, owner, clock, "ngbootleg_prot", __FILE__), + kof2k3_overlay(0), + m_mainrom(NULL), + m_fixedrom(NULL), + m_bankdev(NULL) { } diff --git a/src/devices/bus/neogeo/cmc_prot.cpp b/src/devices/bus/neogeo/cmc_prot.cpp index f4ccc1ecada..7656552337b 100644 --- a/src/devices/bus/neogeo/cmc_prot.cpp +++ b/src/devices/bus/neogeo/cmc_prot.cpp @@ -10,7 +10,16 @@ extern const device_type CMC_PROT = &device_creator<cmc_prot_device>; cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, CMC_PROT, "NeoGeo Protection (CMC)", tag, owner, clock, "cmc_prot", __FILE__) + : device_t(mconfig, CMC_PROT, "NeoGeo Protection (CMC)", tag, owner, clock, "cmc_prot", __FILE__), + type0_t03(NULL), + type0_t12(NULL), + type1_t03(NULL), + type1_t12(NULL), + address_8_15_xor1(NULL), + address_8_15_xor2(NULL), + address_16_23_xor1(NULL), + address_16_23_xor2(NULL), + address_0_7_xor(NULL) { } diff --git a/src/devices/bus/neogeo/fatfury2_prot.cpp b/src/devices/bus/neogeo/fatfury2_prot.cpp index 07e483dbc44..a3bb6f30e5d 100644 --- a/src/devices/bus/neogeo/fatfury2_prot.cpp +++ b/src/devices/bus/neogeo/fatfury2_prot.cpp @@ -10,7 +10,9 @@ extern const device_type FATFURY2_PROT = &device_creator<fatfury2_prot_device>; fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, FATFURY2_PROT, "NeoGeo Protection (Fatal Fury 2)", tag, owner, clock, "fatfury2_prot", __FILE__) + : device_t(mconfig, FATFURY2_PROT, "NeoGeo Protection (Fatal Fury 2)", tag, owner, clock, "fatfury2_prot", __FILE__), + m_bankdev(NULL), + m_fatfury2_prot_data(0) { } diff --git a/src/devices/bus/neogeo/kof98_prot.cpp b/src/devices/bus/neogeo/kof98_prot.cpp index fefe7c190d3..ca6f83a4274 100644 --- a/src/devices/bus/neogeo/kof98_prot.cpp +++ b/src/devices/bus/neogeo/kof98_prot.cpp @@ -11,7 +11,8 @@ extern const device_type KOF98_PROT = &device_creator<kof98_prot_device>; kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, KOF98_PROT, "NeoGeo Protection (KOF98)", tag, owner, clock, "kof98_prot", __FILE__) + : device_t(mconfig, KOF98_PROT, "NeoGeo Protection (KOF98)", tag, owner, clock, "kof98_prot", __FILE__), + kof98_prot_state(0) { } diff --git a/src/devices/bus/neogeo/mslugx_prot.cpp b/src/devices/bus/neogeo/mslugx_prot.cpp index 567f308414c..41adabc3920 100644 --- a/src/devices/bus/neogeo/mslugx_prot.cpp +++ b/src/devices/bus/neogeo/mslugx_prot.cpp @@ -9,7 +9,9 @@ extern const device_type MSLUGX_PROT = &device_creator<mslugx_prot_device>; mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, MSLUGX_PROT, "NeoGeo Protection (Metal Slug X)", tag, owner, clock, "mslugx_prot", __FILE__) + : device_t(mconfig, MSLUGX_PROT, "NeoGeo Protection (Metal Slug X)", tag, owner, clock, "mslugx_prot", __FILE__), + m_mslugx_counter(0), + m_mslugx_command(0) { } diff --git a/src/devices/bus/neogeo/neogeo_intf.cpp b/src/devices/bus/neogeo/neogeo_intf.cpp index 92f7ba5be19..6ad0ae96972 100644 --- a/src/devices/bus/neogeo/neogeo_intf.cpp +++ b/src/devices/bus/neogeo/neogeo_intf.cpp @@ -9,17 +9,18 @@ //------------------------------------------------- device_neogeo_cart_interface::device_neogeo_cart_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) - /* - m_rom(NULL), - m_fixed(NULL), - m_sprites(NULL), - m_sprites_optimized(NULL), - m_audio(NULL), - m_ym(NULL), - m_ymdelta(NULL), - m_audiocrypt(NULL) - */ + : device_slot_card_interface(mconfig, device), + m_sprite_gfx_address_mask(0) +/* +m_rom(NULL), +m_fixed(NULL), +m_sprites(NULL), +m_sprites_optimized(NULL), +m_audio(NULL), +m_ym(NULL), +m_ymdelta(NULL), +m_audiocrypt(NULL) +*/ { } diff --git a/src/devices/bus/neogeo/pvc_prot.cpp b/src/devices/bus/neogeo/pvc_prot.cpp index 95b8cfeb770..5b8de8b91e5 100644 --- a/src/devices/bus/neogeo/pvc_prot.cpp +++ b/src/devices/bus/neogeo/pvc_prot.cpp @@ -11,7 +11,8 @@ extern const device_type PVC_PROT = &device_creator<pvc_prot_device>; pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, PVC_PROT, "NeoGeo Protection (PVC)", tag, owner, clock, "pvc_prot", __FILE__) + : device_t(mconfig, PVC_PROT, "NeoGeo Protection (PVC)", tag, owner, clock, "pvc_prot", __FILE__), + m_bankdev(NULL) { } diff --git a/src/devices/bus/neogeo/sbp_prot.cpp b/src/devices/bus/neogeo/sbp_prot.cpp index a286bbbb88e..3575ab050ce 100644 --- a/src/devices/bus/neogeo/sbp_prot.cpp +++ b/src/devices/bus/neogeo/sbp_prot.cpp @@ -11,7 +11,8 @@ extern const device_type SBP_PROT = &device_creator<sbp_prot_device>; sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SBP_PROT, "NeoGeo Protection (Super Bubble Pop)", tag, owner, clock, "sbp_prot", __FILE__) + : device_t(mconfig, SBP_PROT, "NeoGeo Protection (Super Bubble Pop)", tag, owner, clock, "sbp_prot", __FILE__), + m_mainrom(NULL) { } diff --git a/src/devices/bus/neogeo/sma_prot.cpp b/src/devices/bus/neogeo/sma_prot.cpp index 5fe723375a0..ed29df2a1c8 100644 --- a/src/devices/bus/neogeo/sma_prot.cpp +++ b/src/devices/bus/neogeo/sma_prot.cpp @@ -9,7 +9,9 @@ extern const device_type SMA_PROT = &device_creator<sma_prot_device>; sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SMA_PROT, "NeoGeo SMA Cartridge", tag, owner, clock, "sma_prot", __FILE__) + : device_t(mconfig, SMA_PROT, "NeoGeo SMA Cartridge", tag, owner, clock, "sma_prot", __FILE__), + m_bankdev(NULL), + m_sma_rng(0) { } diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp index a09244b3a85..2e8f09d2d05 100644 --- a/src/devices/bus/nes/act53.cpp +++ b/src/devices/bus/nes/act53.cpp @@ -33,8 +33,9 @@ const device_type NES_ACTION53 = &device_creator<nes_action53_device>; nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_ACTION53, "NES Cart Action 53 PCB", tag, owner, clock, "nes_action53", __FILE__) -{ + : nes_nrom_device(mconfig, NES_ACTION53, "NES Cart Action 53 PCB", tag, owner, clock, "nes_action53", __FILE__), + m_sel(0) + { } diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 67749cbe12d..3d12678aea2 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -41,7 +41,9 @@ aladdin_cart_interface::aladdin_cart_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_rom(NULL), - m_rom_size(0), + m_rom_size(0), + m_lobank(0), + m_hibank(0), m_rom_mask(0xff) { } @@ -67,7 +69,7 @@ const device_type NES_ALADDIN_SLOT = &device_creator<nes_aladdin_slot_device>; nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } @@ -194,8 +196,8 @@ nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const ch } nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_algn_rom_device(mconfig, NES_ALGQ_ROM, "NES Aladdin Deck Enhancer ALGQ ROM", tag, owner, clock, "nes_algq_rom", __FILE__) -{ + : nes_algn_rom_device(mconfig, NES_ALGQ_ROM, "NES Aladdin Deck Enhancer ALGQ ROM", tag, owner, clock, "nes_algq_rom", __FILE__), m_bank_base(0) + { } void nes_algn_rom_device::device_start() diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index bc24f1294a5..c1103f228ac 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -49,8 +49,8 @@ nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char } nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_MAXI15, "NES Cart AVE Maxi 15 PCB", tag, owner, clock, "nes_maxi15", __FILE__) -{ + : nes_nrom_device(mconfig, NES_MAXI15, "NES Cart AVE Maxi 15 PCB", tag, owner, clock, "nes_maxi15", __FILE__), m_reg(0), m_bank(0) + { } diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 4aa54055969..8a223a5d645 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -59,18 +59,18 @@ const device_type NES_FJUMP2 = &device_creator<nes_fjump2_device>; nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_OEKAKIDS, "NES Cart Bandai Oeka Kids PCB", tag, owner, clock, "nes_oeka", __FILE__) -{ + : nes_nrom_device(mconfig, NES_OEKAKIDS, "NES Cart Bandai Oeka Kids PCB", tag, owner, clock, "nes_oeka", __FILE__), m_reg(0), m_latch(0) + { } nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_FCG, "NES Cart Bandai FCG PCB", tag, owner, clock, "nes_fcg", __FILE__) -{ + : nes_nrom_device(mconfig, NES_FCG, "NES Cart Bandai FCG PCB", tag, owner, clock, "nes_fcg", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) @@ -85,14 +85,14 @@ nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : nes_lz93d50_device(mconfig, type, name, tag, owner, clock, shortname, source), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) + { } nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nes_lz93d50_device(mconfig, NES_LZ93D50_24C01, "NES Cart Bandai LZ93D50 + 24C01 PCB", tag, owner, clock, "nes_lz93d50_ep1", __FILE__), - m_i2cmem(*this, "i2cmem") -{ + m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) + { } nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp index b96c75e6297..9e562afdcf2 100644 --- a/src/devices/bus/nes/benshieng.cpp +++ b/src/devices/bus/nes/benshieng.cpp @@ -32,8 +32,9 @@ const device_type NES_BENSHIENG = &device_creator<nes_benshieng_device>; nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BENSHIENG, "NES Cart Benshieng PCB", tag, owner, clock, "nes_benshieng", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BENSHIENG, "NES Cart Benshieng PCB", tag, owner, clock, "nes_benshieng", __FILE__), + m_dipsetting(0) + { } diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index 23b13b51711..87910440771 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -66,73 +66,73 @@ nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char * } nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SC127, "NES Cart SC-127 PCB", tag, owner, clock, "nes_sc127", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SC127, "NES Cart SC-127 PCB", tag, owner, clock, "nes_sc127", __FILE__), m_irq_count(0), m_irq_enable(0) + { } nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_MARIOBABY, "NES Cart Mario Baby Bootleg PCB", tag, owner, clock, "nes_mbaby", __FILE__) -{ + : nes_nrom_device(mconfig, NES_MARIOBABY, "NES Cart Mario Baby Bootleg PCB", tag, owner, clock, "nes_mbaby", __FILE__), m_latch(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_ASN, "NES Cart Ai Senshi Nicol Bootleg PCB", tag, owner, clock, "nes_asn", __FILE__) -{ + : nes_nrom_device(mconfig, NES_ASN, "NES Cart Ai Senshi Nicol Bootleg PCB", tag, owner, clock, "nes_asn", __FILE__), m_latch(0) + { } nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SMB3PIRATE, "NES Cart Super Mario Bros. 3 Pirate PCB", tag, owner, clock, "nes_smb3p", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SMB3PIRATE, "NES Cart Super Mario Bros. 3 Pirate PCB", tag, owner, clock, "nes_smb3p", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BTL_DNINJA, "NES Cart DragonNinja Pirate PCB", tag, owner, clock, "nes_btl_dn", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BTL_DNINJA, "NES Cart DragonNinja Pirate PCB", tag, owner, clock, "nes_btl_dn", __FILE__), m_irq_count(0) + { } nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_WHIRLWIND_2706, "NES Cart Whirlwind 2706 PCB", tag, owner, clock, "nes_whirl2706", __FILE__) -{ + : nes_nrom_device(mconfig, NES_WHIRLWIND_2706, "NES Cart Whirlwind 2706 PCB", tag, owner, clock, "nes_whirl2706", __FILE__), m_latch(0) + { } nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SMB2J, "NES Cart Super Mario Bros. 2 Jpn PCB", tag, owner, clock, "nes_smb2j", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SMB2J, "NES Cart Super Mario Bros. 2 Jpn PCB", tag, owner, clock, "nes_smb2j", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SMB2JA, "NES Cart Super Mario Bros. 2 Jpn (Alt) PCB", tag, owner, clock, "nes_smb2ja", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SMB2JA, "NES Cart Super Mario Bros. 2 Jpn (Alt) PCB", tag, owner, clock, "nes_smb2ja", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SMB2JB, "NES Cart Super Mario Bros. 2 Jpn (Alt 2) PCB", tag, owner, clock, "nes_smb2jb", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SMB2JB, "NES Cart Super Mario Bros. 2 Jpn (Alt 2) PCB", tag, owner, clock, "nes_smb2jb", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_09034A, "NES Cart 09-034A PCB", tag, owner, clock, "nes_09034a", __FILE__) -{ + : nes_nrom_device(mconfig, NES_09034A, "NES Cart 09-034A PCB", tag, owner, clock, "nes_09034a", __FILE__), m_reg(0) + { } nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_TOBIDASE, "NES Cart Tobidase Daisakusen Pirate PCB", tag, owner, clock, "nes_tobidase", __FILE__) -{ + : nes_nrom_device(mconfig, NES_TOBIDASE, "NES Cart Tobidase Daisakusen Pirate PCB", tag, owner, clock, "nes_tobidase", __FILE__), m_latch(0) + { } nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_LH32, "NES Cart LH-32 Pirate PCB", tag, owner, clock, "nes_lh32", __FILE__) -{ + : nes_nrom_device(mconfig, NES_LH32, "NES Cart LH-32 Pirate PCB", tag, owner, clock, "nes_lh32", __FILE__), m_latch(0) + { } nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_LH10, "NES Cart LH-10 Pirate PCB", tag, owner, clock, "nes_lh10", __FILE__) -{ + : nes_nrom_device(mconfig, NES_LH10, "NES Cart LH-10 Pirate PCB", tag, owner, clock, "nes_lh10", __FILE__), m_latch(0) + { } nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_LH53, "NES Cart LH-53 Pirate PCB", tag, owner, clock, "nes_lh53", __FILE__) -{ + : nes_nrom_device(mconfig, NES_LH53, "NES Cart LH-53 Pirate PCB", tag, owner, clock, "nes_lh53", __FILE__), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr) + { } nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -141,8 +141,8 @@ nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, } nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_AC08, "NES Cart AC08 Pirate PCB", tag, owner, clock, "nes_ac08", __FILE__) -{ + : nes_nrom_device(mconfig, NES_AC08, "NES Cart AC08 Pirate PCB", tag, owner, clock, "nes_ac08", __FILE__), m_latch(0) + { } nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -156,8 +156,8 @@ nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char * } nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SHUIGUAN, "NES Cart Shui Guan Pipe Pirate PCB", tag, owner, clock, "nes_shuiguan", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SHUIGUAN, "NES Cart Shui Guan Pipe Pirate PCB", tag, owner, clock, "nes_shuiguan", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index 61c41dd7867..d1418c763f6 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -52,13 +52,13 @@ nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char * } nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BF9096, "NES Cart Camerica BF9096 PCB", tag, owner, clock, "nes_bf9096", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BF9096, "NES Cart Camerica BF9096 PCB", tag, owner, clock, "nes_bf9096", __FILE__), m_bank_base(0), m_latch(0) + { } nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_GOLDEN5, "NES Cart Camerica Golden 5 PCB", tag, owner, clock, "nes_golden5", __FILE__) -{ + : nes_nrom_device(mconfig, NES_GOLDEN5, "NES Cart Camerica Golden 5 PCB", tag, owner, clock, "nes_golden5", __FILE__), m_bank_base(0), m_latch(0) + { } diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index a64063ebc8a..0de53a8fe85 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -40,18 +40,24 @@ const device_type NES_YOKO = &device_creator<nes_yoko_device>; nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), + m_irq_count(0), + m_irq_enable(0), + irq_timer(nullptr), + m_latch1(0), + m_latch2(0), + m_extra1(0) + { } nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_CONY, "NES Cart Cony PCB", tag, owner, clock, "nes_cony", __FILE__) -{ + : nes_nrom_device(mconfig, NES_CONY, "NES Cart Cony PCB", tag, owner, clock, "nes_cony", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch1(0), m_latch2(0), m_extra1(0) + { } nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_cony_device(mconfig, NES_YOKO, "NES Cart Yoko PCB", tag, owner, clock, "nes_yoko", __FILE__) -{ + : nes_cony_device(mconfig, NES_YOKO, "NES Cart Yoko PCB", tag, owner, clock, "nes_yoko", __FILE__), m_extra2(0) + { } diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index 1bf562976ed..01b454646ba 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -45,8 +45,8 @@ datach_cart_interface::datach_cart_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_i2cmem(*this, "i2cmem"), - m_rom(NULL) -{ + m_rom(nullptr), m_bank(0) + { } datach_cart_interface::~datach_cart_interface() @@ -70,7 +70,7 @@ const device_type NES_DATACH_SLOT = &device_creator<nes_datach_slot_device>; nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } @@ -228,11 +228,11 @@ const device_type NES_DATACH = &device_creator<nes_datach_device>; nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_lz93d50_device(mconfig, NES_DATACH, "NES Cart Bandai Datach PCB", tag, owner, clock, "nes_datach", __FILE__), + : nes_lz93d50_device(mconfig, NES_DATACH, "NES Cart Bandai Datach PCB", tag, owner, clock, "nes_datach", __FILE__), m_datach_latch(0), m_i2cmem(*this, "i2cmem"), m_reader(*this, "datach"), - m_subslot(*this, "datach_slot") -{ + m_subslot(*this, "datach_slot"), m_i2c_dir(0), m_i2c_in_use(0), serial_timer(nullptr) + { } diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 45cb275e9de..2637a731683 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -104,11 +104,11 @@ const device_type NES_DISKSYS = &device_creator<nes_disksys_device>; nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_DISKSYS, "FC RAM Expansion + Disk System PCB", tag, owner, clock, "fc_disksys", __FILE__), + : nes_nrom_device(mconfig, NES_DISKSYS, "FC RAM Expansion + Disk System PCB", tag, owner, clock, "fc_disksys", __FILE__), m_2c33_rom(nullptr), m_fds_data(NULL), - m_disk(*this, FLOPPY_0), - m_fds_sides(0) -{ + m_disk(*this, FLOPPY_0), irq_timer(nullptr), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_transfer(0), m_fds_motor_on(0), m_fds_door_closed(0), m_fds_current_side(0), m_fds_head_position(0), m_fds_status0(0), m_read_mode(0), m_drive_ready(0), + m_fds_sides(0), m_fds_last_side(0), m_fds_count(0) + { } diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index 4059b107a24..d32bc631f9b 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -37,8 +37,13 @@ const device_type NES_EVENT = &device_creator<nes_event_device>; nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nes_sxrom_device(mconfig, NES_EVENT, "NES Cart Event PCB", tag, owner, clock, "nes_event", __FILE__), - m_dsw(*this, "DIPSW") -{ + m_dsw(*this, "DIPSW"), + m_nwc_init(0), + event_timer(nullptr), + m_timer_count(0), + m_timer_on(0), + m_timer_enabled(0) + { } diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index f9320a5fbee..69d4a103313 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -36,8 +36,9 @@ const device_type NES_GGENIE = &device_creator<nes_ggenie_device>; nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nes_nrom_device(mconfig, NES_GGENIE, "NES Cart Game Genie PCB", tag, owner, clock, "nes_ggenie", __FILE__), - m_ggslot(*this, "gg_slot") -{ + m_ggslot(*this, "gg_slot"), + m_gg_bypass(0) + { } diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index 5cda60e6938..8a212e17bf3 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -54,8 +54,8 @@ nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, cons } nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_HENGG_SHJY3, "NES Cart Henggedianzi Shen Hua Jian Yun III PCB", tag, owner, clock, "nes_hengg_shjy3", __FILE__) -{ + : nes_nrom_device(mconfig, NES_HENGG_SHJY3, "NES Cart Henggedianzi Shen Hua Jian Yun III PCB", tag, owner, clock, "nes_hengg_shjy3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_chr_mode(0) + { } diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp index fae439ac903..c0fafcb3f4b 100644 --- a/src/devices/bus/nes/hosenkan.cpp +++ b/src/devices/bus/nes/hosenkan.cpp @@ -33,8 +33,13 @@ const device_type NES_HOSENKAN = &device_creator<nes_hosenkan_device>; nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_HOSENKAN, "NES Cart HOSENKAN PCB", tag, owner, clock, "nes_hosenkan", __FILE__) -{ + : nes_nrom_device(mconfig, NES_HOSENKAN, "NES Cart HOSENKAN PCB", tag, owner, clock, "nes_hosenkan", __FILE__), + m_irq_count(0), + m_irq_count_latch(0), + m_irq_clear(0), + m_irq_enable(0), + m_latch(0) + { } diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index 43f5bab1d7d..5a8a1052849 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -58,13 +58,13 @@ nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char * } nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_G101, "NES Cart Irem G-101 PCB", tag, owner, clock, "nes_g101", __FILE__) -{ + : nes_nrom_device(mconfig, NES_G101, "NES Cart Irem G-101 PCB", tag, owner, clock, "nes_g101", __FILE__), m_latch(0) + { } nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_H3001, "NES Cart Irem H-3001 PCB", tag, owner, clock, "nes_h3001", __FILE__) -{ + : nes_nrom_device(mconfig, NES_H3001, "NES Cart Irem H-3001 PCB", tag, owner, clock, "nes_h3001", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr) + { } diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index 28df5250118..b400f6bd07a 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -68,13 +68,13 @@ nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, } nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) + { } nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_JF17, "NES Cart Jaleco JF-17 PCB", tag, owner, clock, "nes_jf17", __FILE__) -{ + : nes_nrom_device(mconfig, NES_JF17, "NES Cart Jaleco JF-17 PCB", tag, owner, clock, "nes_jf17", __FILE__), m_latch(0) + { } nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -100,13 +100,13 @@ nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, cons } nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0) + { } nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SS88006, "NES Cart Jaleco SS88006 PCB", tag, owner, clock, "nes_ss88006", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SS88006, "NES Cart Jaleco SS88006 PCB", tag, owner, clock, "nes_ss88006", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0) + { } nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 31358e2ab16..b6b38343dc7 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -43,12 +43,15 @@ const device_type NES_JY_TYPEC = &device_creator<nes_jy_typec_device>; nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0), + m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr) + { } nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_JY_TYPEA, "NES Cart JY Company Type A PCB", tag, owner, clock, "nes_jya", __FILE__) + : nes_nrom_device(mconfig, NES_JY_TYPEA, "NES Cart JY Company Type A PCB", tag, owner, clock, "nes_jya", __FILE__), m_latch(0), m_extra_chr_bank(0), + m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), + m_irq_down(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 1c7d7bced0a..911099d71b4 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -63,18 +63,18 @@ nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char * } nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_KS7022, "NES Cart Kaiser KS-7022 PCB", tag, owner, clock, "nes_ks7022", __FILE__) -{ + : nes_nrom_device(mconfig, NES_KS7022, "NES Cart Kaiser KS-7022 PCB", tag, owner, clock, "nes_ks7022", __FILE__), m_latch(0) + { } nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_KS7032, "NES Cart Kaiser KS-7032 PCB", tag, owner, clock, "nes_ks7032", __FILE__) -{ + : nes_nrom_device(mconfig, NES_KS7032, "NES Cart Kaiser KS-7032 PCB", tag, owner, clock, "nes_ks7032", __FILE__), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -83,8 +83,8 @@ nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *ta } nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_KS7017, "NES Cart Kaiser KS-7017 PCB", tag, owner, clock, "nes_ks7017", __FILE__) -{ + : nes_nrom_device(mconfig, NES_KS7017, "NES Cart Kaiser KS-7017 PCB", tag, owner, clock, "nes_ks7017", __FILE__), m_latch(0), m_irq_count(0), m_irq_status(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index 002bdf6eea3..f6a1cb73dd7 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -52,8 +52,8 @@ kstudio_cart_interface::kstudio_cart_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_rom(NULL) -{ + m_rom(nullptr), m_bank(0) + { } kstudio_cart_interface::~kstudio_cart_interface() @@ -74,7 +74,7 @@ const device_type NES_KSEXPANSION_SLOT = &device_creator<nes_kstudio_slot_device nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } @@ -188,7 +188,7 @@ const device_type NES_KARAOKESTUDIO = &device_creator<nes_karaokestudio_device>; nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_KARAOKESTUDIO, "NES Cart Bandai Karaoke Studio PCB", tag, owner, clock, "nes_karaoke", __FILE__), + : nes_nrom_device(mconfig, NES_KARAOKESTUDIO, "NES Cart Bandai Karaoke Studio PCB", tag, owner, clock, "nes_karaoke", __FILE__), m_exp_active(0), m_subslot(*this, "exp_slot"), m_mic_ipt(*this, "MIC") { diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index 4cd4f1fd872..ded2e4b0980 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -57,23 +57,23 @@ nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, co } nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_VRC2, "NES Cart Konami VRC-2 PCB", tag, owner, clock, "nes_vrc2", __FILE__) -{ + : nes_nrom_device(mconfig, NES_VRC2, "NES Cart Konami VRC-2 PCB", tag, owner, clock, "nes_vrc2", __FILE__), m_latch(0) + { } nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_VRC3, "NES Cart Konami VRC-3 PCB", tag, owner, clock, "nes_vrc3", __FILE__) -{ + : nes_nrom_device(mconfig, NES_VRC3, "NES Cart Konami VRC-3 PCB", tag, owner, clock, "nes_vrc3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), irq_timer(nullptr) + { } nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr) + { } nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_VRC4, "NES Cart Konami VRC-4 PCB", tag, owner, clock, "nes_vrc4", __FILE__) -{ + : nes_nrom_device(mconfig, NES_VRC4, "NES Cart Konami VRC-4 PCB", tag, owner, clock, "nes_vrc4", __FILE__), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr) + { } nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 3a452fd2f39..cdcc69df682 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -45,13 +45,13 @@ nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, } nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0) + { } nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_FFE4, "NES Cart FFE-4 PCB", tag, owner, clock, "nes_ff4", __FILE__) -{ + : nes_nrom_device(mconfig, NES_FFE4, "NES Cart FFE-4 PCB", tag, owner, clock, "nes_ff4", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0) + { } nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index ff31250ee19..b1bd17d3917 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -40,13 +40,13 @@ const device_type NES_SOROM_A = &device_creator<nes_sorom_a_device>; nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg_write_enable(0), m_latch(0), m_count(0) + { } nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SXROM, "NES Cart SxROM (MMC-1) PCB", tag, owner, clock, "nes_sxrom", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SXROM, "NES Cart SxROM (MMC-1) PCB", tag, owner, clock, "nes_sxrom", __FILE__), m_reg_write_enable(0), m_latch(0), m_count(0) + { } nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index b9ef5402a00..29cef8fe0e6 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -33,13 +33,15 @@ const device_type NES_FXROM = &device_creator<nes_fxrom_device>; nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), + m_latch1(0), + m_latch2(0) + { } nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_PXROM, "NES Cart PxROM (MMC-2) PCB", tag, owner, clock, "nes_pxrom", __FILE__) -{ + : nes_nrom_device(mconfig, NES_PXROM, "NES Cart PxROM (MMC-2) PCB", tag, owner, clock, "nes_pxrom", __FILE__), m_latch1(0), m_latch2(0) + { } nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index 8e81fac286f..a9bc5631b0d 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -54,18 +54,20 @@ const device_type NES_ZZ_PCB = &device_creator<nes_zz_device>; nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0), + m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) + { } nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_TXROM, "NES Cart TxROM (MMC-3) PCB", tag, owner, clock, "nes_txrom", __FILE__) -{ + : nes_nrom_device(mconfig, NES_TXROM, "NES Cart TxROM (MMC-3) PCB", tag, owner, clock, "nes_txrom", __FILE__), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0), + m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) + { } nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_HKROM, "NES Cart HKROM (MMC-6) PCB", tag, owner, clock, "nes_hkrom", __FILE__) -{ + : nes_txrom_device(mconfig, NES_HKROM, "NES Cart HKROM (MMC-6) PCB", tag, owner, clock, "nes_hkrom", __FILE__), m_wram_enable(0), m_mmc6_reg(0) + { } nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index 4a806d0fde2..7c320c56060 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -96,28 +96,28 @@ nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char } nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_8237, "NES Cart UNL-8237 PCB", tag, owner, clock, "nes_8237", __FILE__) -{ + : nes_txrom_device(mconfig, NES_8237, "NES Cart UNL-8237 PCB", tag, owner, clock, "nes_8237", __FILE__), m_cd_enable(0) + { } nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_SG_LIONK, "NES Cart SuperGame Lion King PCB", tag, owner, clock, "nes_sglionk", __FILE__) -{ + : nes_txrom_device(mconfig, NES_SG_LIONK, "NES Cart SuperGame Lion King PCB", tag, owner, clock, "nes_sglionk", __FILE__), m_reg(0), m_reg_enabled(0) + { } nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_SG_BOOG, "NES Cart SuperGame BoogerMan PCB", tag, owner, clock, "nes_sgbooger", __FILE__) -{ + : nes_txrom_device(mconfig, NES_SG_BOOG, "NES Cart SuperGame BoogerMan PCB", tag, owner, clock, "nes_sgbooger", __FILE__), m_mode(0) + { } nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_KASING, "NES Cart Kasing PCB", tag, owner, clock, "nes_kasing", __FILE__) -{ + : nes_txrom_device(mconfig, NES_KASING, "NES Cart Kasing PCB", tag, owner, clock, "nes_kasing", __FILE__), m_reg(0) + { } nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_KAY, "NES Cart KAY PCB", tag, owner, clock, "nes_kay", __FILE__) -{ + : nes_txrom_device(mconfig, NES_KAY, "NES Cart KAY PCB", tag, owner, clock, "nes_kay", __FILE__), m_low_reg(0) + { } nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -126,8 +126,8 @@ nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *ta } nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_6035052, "NES Cart UNL-603-5052 PCB", tag, owner, clock, "nes_6035052", __FILE__) -{ + : nes_txrom_device(mconfig, NES_6035052, "NES Cart UNL-603-5052 PCB", tag, owner, clock, "nes_6035052", __FILE__), m_prot(0) + { } nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -156,13 +156,13 @@ nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char * } nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_SA9602B, "NES Cart SA-9602B PCB", tag, owner, clock, "nes_sa9602b", __FILE__) -{ + : nes_txrom_device(mconfig, NES_SA9602B, "NES Cart SA-9602B PCB", tag, owner, clock, "nes_sa9602b", __FILE__), m_reg(0), m_prg_chip(0) + { } nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_SACHEN_SHERO, "NES Cart Street Hero PCB", tag, owner, clock, "nes_shero", __FILE__) -{ + : nes_txrom_device(mconfig, NES_SACHEN_SHERO, "NES Cart Street Hero PCB", tag, owner, clock, "nes_shero", __FILE__), m_reg(0) + { } //nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -171,13 +171,13 @@ nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, //} nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mmc_cmd1(0) + { } nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_FK23C, "NES Cart FK23C PCB", tag, owner, clock, "nes_fk23c", __FILE__) -{ + : nes_txrom_device(mconfig, NES_FK23C, "NES Cart FK23C PCB", tag, owner, clock, "nes_fk23c", __FILE__), m_mmc_cmd1(0) + { } nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -201,8 +201,8 @@ nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const } nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_BMC_HIK8, "NES Cart BMC Super HIK 8 in 1 PCB", tag, owner, clock, "nes_bmc_hik8", __FILE__) -{ + : nes_txrom_device(mconfig, NES_BMC_HIK8, "NES Cart BMC Super HIK 8 in 1 PCB", tag, owner, clock, "nes_bmc_hik8", __FILE__), m_count(0) + { } nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -211,13 +211,13 @@ nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const ch } nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_BMC_MARIO7IN1, "NES Cart BMC Mario 7 in 1 PCB", tag, owner, clock, "nes_bmc_mario7in1", __FILE__) -{ + : nes_txrom_device(mconfig, NES_BMC_MARIO7IN1, "NES Cart BMC Mario 7 in 1 PCB", tag, owner, clock, "nes_bmc_mario7in1", __FILE__), m_reg_written(0) + { } nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, "NES Cart BMC Golden 7 in 1 PCB", tag, owner, clock, "nes_bmc_gold7in1", __FILE__) -{ + : nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, "NES Cart BMC Golden 7 in 1 PCB", tag, owner, clock, "nes_bmc_gold7in1", __FILE__), m_reg_written(0) + { } nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -226,13 +226,13 @@ nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, cons } nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_BMC_411120C, "NES Cart BMC 411120C PCB", tag, owner, clock, "nes_bmc_411120c", __FILE__) -{ + : nes_txrom_device(mconfig, NES_BMC_411120C, "NES Cart BMC 411120C PCB", tag, owner, clock, "nes_bmc_411120c", __FILE__), m_reg(0) + { } nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_BMC_830118C, "NES Cart BMC 830118C PCB", tag, owner, clock, "nes_bmc_830118c", __FILE__) -{ + : nes_txrom_device(mconfig, NES_BMC_830118C, "NES Cart BMC 830118C PCB", tag, owner, clock, "nes_bmc_830118c", __FILE__), m_reg(0) + { } nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index 995b71080a7..996c0dedcf8 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -45,8 +45,11 @@ const device_type NES_EXROM = &device_creator<nes_exrom_device>; nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_EXROM, "NES Cart ExROM (MMC-5) PCB", tag, owner, clock, "nes_exrom", __FILE__) -{ + : nes_nrom_device(mconfig, NES_EXROM, "NES Cart ExROM (MMC-5) PCB", tag, owner, clock, "nes_exrom", __FILE__), m_irq_count(0), + m_irq_status(0), m_irq_enable(0), m_mult1(0), m_mult2(0), m_mmc5_scanline(0), m_vrom_page_a(0), m_vrom_page_b(0), m_floodtile(0), m_floodattr(0), + m_prg_mode(0), m_chr_mode(0), m_wram_protect_1(0), m_wram_protect_2(0), m_exram_control(0), m_wram_base(0), m_last_chr(0), m_ex1_chr(0), + m_split_chr(0), m_ex1_bank(0), m_high_chr(0), m_split_scr(0), m_split_rev(0), m_split_ctrl(0), m_split_yst(0), m_split_bank(0), m_vcount(0) + { } diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index ba65c3d0e7c..bd905a11de5 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -83,23 +83,23 @@ nes_action52_device::nes_action52_device(const machine_config &mconfig, const ch } nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_CALTRON6IN1, "NES Cart Caltron 6 in 1 PCB", tag, owner, clock, "nes_caltron", __FILE__) -{ + : nes_nrom_device(mconfig, NES_CALTRON6IN1, "NES Cart Caltron 6 in 1 PCB", tag, owner, clock, "nes_caltron", __FILE__), m_latch(0) + { } nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_RUMBLESTATION, "NES Cart Rumblestation PCB", tag, owner, clock, "nes_rumblestat", __FILE__) -{ + : nes_nrom_device(mconfig, NES_RUMBLESTATION, "NES Cart Rumblestation PCB", tag, owner, clock, "nes_rumblestat", __FILE__), m_prg(0), m_chr(0) + { } nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SVISION16, "NES Cart Supervision 16 in 1 PCB", tag, owner, clock, "nes_svision16", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SVISION16, "NES Cart Supervision 16 in 1 PCB", tag, owner, clock, "nes_svision16", __FILE__), m_latch1(0), m_latch2(0) + { } nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_N625092, "NES Cart N625092 PCB", tag, owner, clock, "nes_n625092", __FILE__) -{ + : nes_nrom_device(mconfig, NES_N625092, "NES Cart N625092 PCB", tag, owner, clock, "nes_n625092", __FILE__), m_latch1(0), m_latch2(0) + { } nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -108,8 +108,8 @@ nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *ta } nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_T262, "NES Cart T-262 PCB", tag, owner, clock, "nes_t262", __FILE__) -{ + : nes_nrom_device(mconfig, NES_T262, "NES Cart T-262 PCB", tag, owner, clock, "nes_t262", __FILE__), m_latch1(0), m_latch2(0) + { } nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -133,8 +133,8 @@ nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const } nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_VT5201, "NES Cart VT5201 PCB", tag, owner, clock, "nes_vt5201", __FILE__) -{ + : nes_nrom_device(mconfig, NES_VT5201, "NES Cart VT5201 PCB", tag, owner, clock, "nes_vt5201", __FILE__), m_latch(0), m_dipsetting(0) + { } nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -148,13 +148,13 @@ nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *ta } nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_GB63, "NES Cart BMC Ghostbusters 63 in 1 PCB", tag, owner, clock, "nes_bmc_gb63", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_GB63, "NES Cart BMC Ghostbusters 63 in 1 PCB", tag, owner, clock, "nes_bmc_gb63", __FILE__), m_latch(0), m_dipsetting(0), m_vram_disable(0) + { } nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_GKA, "NES Cart BMC GK-A PCB", tag, owner, clock, "nes_bmc_gka", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_GKA, "NES Cart BMC GK-A PCB", tag, owner, clock, "nes_bmc_gka", __FILE__), m_latch1(0), m_latch2(0) + { } nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -163,8 +163,8 @@ nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char } nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_WS, "NES Cart BMC WS PCB", tag, owner, clock, "nes_bmc_ws", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_WS, "NES Cart BMC WS PCB", tag, owner, clock, "nes_bmc_ws", __FILE__), m_latch(0) + { } nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -243,8 +243,8 @@ nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const } nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_70IN1, "NES Cart BMC 70 in 1 PCB", tag, owner, clock, "nes_bmc_70in1", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_70IN1, "NES Cart BMC 70 in 1 PCB", tag, owner, clock, "nes_bmc_70in1", __FILE__), m_mode(0) + { } nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -253,8 +253,8 @@ nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const } nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_76IN1, "NES Cart BMC 76 in 1 PCB", tag, owner, clock, "nes_bmc_76in1", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_76IN1, "NES Cart BMC 76 in 1 PCB", tag, owner, clock, "nes_bmc_76in1", __FILE__), m_latch1(0), m_latch2(0) + { } nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -273,18 +273,18 @@ nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, cons } nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_800IN1, "NES Cart BMC 800 in 1 PCB", tag, owner, clock, "nes_bmc_800in1", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_800IN1, "NES Cart BMC 800 in 1 PCB", tag, owner, clock, "nes_bmc_800in1", __FILE__), m_mode(0) + { } nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_1200IN1, "NES Cart BMC 1200 in 1 PCB", tag, owner, clock, "nes_bmc_1200in1", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_1200IN1, "NES Cart BMC 1200 in 1 PCB", tag, owner, clock, "nes_bmc_1200in1", __FILE__), m_vram_protect(0) + { } nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_GOLD150, "NES Cart BMC Golden 150 in 1 PCB", tag, owner, clock, "nes_bmc_gold150", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_GOLD150, "NES Cart BMC Golden 150 in 1 PCB", tag, owner, clock, "nes_bmc_gold150", __FILE__), m_latch(0) + { } nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -293,8 +293,8 @@ nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, co } nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_CH001, "NES Cart BMC CH-001 PCB", tag, owner, clock, "nes_bmc_ch001", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_CH001, "NES Cart BMC CH-001 PCB", tag, owner, clock, "nes_bmc_ch001", __FILE__), m_latch(0) + { } nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -303,13 +303,13 @@ nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, co } nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_4IN1RESET, "NES Cart BMC 4 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_4in1reset", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_4IN1RESET, "NES Cart BMC 4 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_4in1reset", __FILE__), m_latch(0) + { } nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_BMC_42IN1RESET, "NES Cart BMC 42 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_42in1reset", __FILE__) -{ + : nes_nrom_device(mconfig, NES_BMC_42IN1RESET, "NES Cart BMC 42 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_42in1reset", __FILE__), m_latch(0) + { } diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 236effc4a24..5d166114e49 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -50,43 +50,43 @@ const device_type NES_NAMCOT163 = &device_creator<nes_namcot163_device>; nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) + { } nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NAMCOT3433, "NES Cart Namcot 3433 & 3443 / DxROM PCB", tag, owner, clock, "nes_namcot3433", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NAMCOT3433, "NES Cart Namcot 3433 & 3443 / DxROM PCB", tag, owner, clock, "nes_namcot3433", __FILE__), m_latch(0) + { } nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NAMCOT3446, "NES Cart Namcot 3446 PCB", tag, owner, clock, "nes_namcot3446", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NAMCOT3446, "NES Cart Namcot 3446 PCB", tag, owner, clock, "nes_namcot3446", __FILE__), m_latch(0) + { } nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NAMCOT3425, "NES Cart Namcot 3425 PCB", tag, owner, clock, "nes_namcot3425", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NAMCOT3425, "NES Cart Namcot 3425 PCB", tag, owner, clock, "nes_namcot3425", __FILE__), m_latch(0) + { } nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__) -{ + : nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0) + { } nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_namcot340_device(mconfig, NES_NAMCOT163, "NES Cart Namcot 163 PCB", tag, owner, clock, "nes_namcot163", __FILE__) -{ + : nes_namcot340_device(mconfig, NES_NAMCOT163, "NES Cart Namcot 163 PCB", tag, owner, clock, "nes_namcot163", __FILE__), m_wram_protect(0), m_latch(0), m_chr_bank(0) + { } diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp index 39f2fcf63df..e107c5098f1 100644 --- a/src/devices/bus/nes/nanjing.cpp +++ b/src/devices/bus/nes/nanjing.cpp @@ -34,8 +34,11 @@ const device_type NES_NANJING = &device_creator<nes_nanjing_device>; nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NANJING, "NES Cart Nanjing PCB", tag, owner, clock, "nes_nanjing", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NANJING, "NES Cart Nanjing PCB", tag, owner, clock, "nes_nanjing", __FILE__), + m_count(0), + m_latch1(0), + m_latch2(0) + { } diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index ec1b1f5f4af..f537f978561 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -110,7 +110,7 @@ device_nes_cart_interface::device_nes_cart_interface(const machine_config &mconf m_vrom(NULL), m_ciram(NULL), m_prg_size(0), - m_vrom_size(0), + m_vrom_size(0), m_maincpu(nullptr), m_mapper_sram(NULL), m_mapper_sram_size(0), m_ce_mask(0), @@ -746,7 +746,7 @@ nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock, "nes_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_crc_hack(0), + m_crc_hack(0), m_cart(nullptr), m_pcb_id(NO_BOARD), m_must_be_loaded(1) { diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index 4dd7e56a842..8cba184432c 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -39,8 +39,9 @@ const device_type NES_NTDEC_FH = &device_creator<nes_ntdec_fh_device>; nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_NTDEC_ASDER, "NES Cart NTDEC Asder PCB", tag, owner, clock, "nes_ntdec_asder", __FILE__) -{ + : nes_nrom_device(mconfig, NES_NTDEC_ASDER, "NES Cart NTDEC Asder PCB", tag, owner, clock, "nes_ntdec_asder", __FILE__), + m_latch(0) + { } nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index 431d384e7f1..c7fb9a90f3b 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -92,13 +92,13 @@ nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *ta } nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chr_open_bus(0) + { } nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_CNROM, "NES Cart CNROM PCB", tag, owner, clock, "nes_cnrom", __FILE__) -{ + : nes_nrom_device(mconfig, NES_CNROM, "NES Cart CNROM PCB", tag, owner, clock, "nes_cnrom", __FILE__), m_chr_open_bus(0) + { } nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 557831ed144..9d31e1b7a1f 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -64,13 +64,13 @@ nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const } nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_FUKUTAKE, "NES Cart Fukutake Study Box PCB", tag, owner, clock, "nes_fukutake", __FILE__) -{ + : nes_nrom_device(mconfig, NES_FUKUTAKE, "NES Cart Fukutake Study Box PCB", tag, owner, clock, "nes_fukutake", __FILE__), m_latch(0) + { } nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_FUTUREMEDIA, "NES Cart FutureMedia PCB", tag, owner, clock, "nes_futuremedia", __FILE__) -{ + : nes_nrom_device(mconfig, NES_FUTUREMEDIA, "NES Cart FutureMedia PCB", tag, owner, clock, "nes_futuremedia", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) + { } nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -104,38 +104,38 @@ nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char * } nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_EDU2K, "NES Cart Educational Computer 2000 PCB", tag, owner, clock, "nes_edu2k", __FILE__) -{ + : nes_nrom_device(mconfig, NES_EDU2K, "NES Cart Educational Computer 2000 PCB", tag, owner, clock, "nes_edu2k", __FILE__), m_latch(0) + { } nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_T230, "NES Cart T-230 PCB", tag, owner, clock, "nes_t230", __FILE__) -{ + : nes_nrom_device(mconfig, NES_T230, "NES Cart T-230 PCB", tag, owner, clock, "nes_t230", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), m_irq_enable_latch(0) + { } nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_MK2, "NES Cart Mortal Kombat 2 PCB", tag, owner, clock, "nes_mk2", __FILE__) -{ + : nes_nrom_device(mconfig, NES_MK2, "NES Cart Mortal Kombat 2 PCB", tag, owner, clock, "nes_mk2", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) + { } nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_WHERO, "NES Cart World Heroes PCB", tag, owner, clock, "nes_whero", __FILE__) -{ + : nes_nrom_device(mconfig, NES_WHERO, "NES Cart World Heroes PCB", tag, owner, clock, "nes_whero", __FILE__), m_reg(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0) + { } nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_43272, "NES Cart UNL-43272 PCB", tag, owner, clock, "nes_43272", __FILE__) -{ + : nes_nrom_device(mconfig, NES_43272, "NES Cart UNL-43272 PCB", tag, owner, clock, "nes_43272", __FILE__), m_latch(0) + { } nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_TF1201, "NES Cart UNL-TF1201 PCB", tag, owner, clock, "nes_tf1201", __FILE__) -{ + : nes_nrom_device(mconfig, NES_TF1201, "NES Cart UNL-TF1201 PCB", tag, owner, clock, "nes_tf1201", __FILE__), m_prg(0), m_swap(0), m_irq_count(0), m_irq_enable(0), m_irq_enable_latch(0) + { } nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__) -{ + : nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) + { } diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp index 6989c2254cb..42940c365a4 100644 --- a/src/devices/bus/nes/racermate.cpp +++ b/src/devices/bus/nes/racermate.cpp @@ -36,8 +36,9 @@ const device_type NES_RACERMATE = &device_creator<nes_racermate_device>; nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_RACERMATE, "NES Cart Racermate PCB", tag, owner, clock, "nes_racermate", __FILE__) -{ + : nes_nrom_device(mconfig, NES_RACERMATE, "NES Cart Racermate PCB", tag, owner, clock, "nes_racermate", __FILE__), + m_latch(0) + { } diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index 28ec6e8277e..a599dcbd432 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -67,8 +67,8 @@ nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, d } nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_3DBLOCK, "NES Cart RCM 3D Block PCB", tag, owner, clock, "nes_3dblock", __FILE__) -{ + : nes_nrom_device(mconfig, NES_3DBLOCK, "NES Cart RCM 3D Block PCB", tag, owner, clock, "nes_3dblock", __FILE__), m_irq_count(0) + { } diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index c0e261dc5fa..022527d2382 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -40,13 +40,14 @@ const device_type NES_REX_SL1632 = &device_creator<nes_rex_sl1632_device>; nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_REX_DBZ5, "NES Cart Rex Soft DragonBall Z V PCB", tag, owner, clock, "nes_rex_dbz5", __FILE__) -{ + : nes_txrom_device(mconfig, NES_REX_DBZ5, "NES Cart Rex Soft DragonBall Z V PCB", tag, owner, clock, "nes_rex_dbz5", __FILE__), + m_extra(0) + { } nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_REX_SL1632, "NES Cart Rex Soft SL-1632 PCB", tag, owner, clock, "nes_rex_sl1632", __FILE__) -{ + : nes_txrom_device(mconfig, NES_REX_SL1632, "NES Cart Rex Soft SL-1632 PCB", tag, owner, clock, "nes_rex_sl1632", __FILE__), m_mode(0), m_mirror(0) + { } diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index 87edbc6a700..a5128b1bf6a 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -96,18 +96,18 @@ nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, } nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SACHEN_TCU02, "NES Cart Sachen TCU-02 PCB", tag, owner, clock, "nes_tcu02", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SACHEN_TCU02, "NES Cart Sachen TCU-02 PCB", tag, owner, clock, "nes_tcu02", __FILE__), m_latch(0) + { } nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_vrom_bank(0) + { } nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SACHEN_74X374, "NES Cart Sachen 74*374 PCB", tag, owner, clock, "nes_s74x34", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SACHEN_74X374, "NES Cart Sachen 74*374 PCB", tag, owner, clock, "nes_s74x34", __FILE__), m_latch(0), m_mmc_vrom_bank(0) + { } nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp index 634aad58b68..a2313b9e644 100644 --- a/src/devices/bus/nes/somari.cpp +++ b/src/devices/bus/nes/somari.cpp @@ -40,8 +40,13 @@ const device_type NES_SOMARI = &device_creator<nes_somari_device>; nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_SOMARI, "NES Cart Team Somari PCB", tag, owner, clock, "nes_somari", __FILE__) -{ + : nes_txrom_device(mconfig, NES_SOMARI, "NES Cart Team Somari PCB", tag, owner, clock, "nes_somari", __FILE__), + m_board_mode(0), + m_mmc3_mirror_reg(0), + m_count(0), + m_mmc1_latch(0), + m_vrc_mirror_reg(0) + { } diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 48d95c05727..8cc1929b308 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -59,28 +59,28 @@ nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const } nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SUNSOFT_3, "NES Cart Sunsoft 3 PCB", tag, owner, clock, "nes_sun3", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SUNSOFT_3, "NES Cart Sunsoft 3 PCB", tag, owner, clock, "nes_sun3", __FILE__), m_irq_count(0), m_irq_enable(0), m_irq_toggle(0), irq_timer(nullptr) + { } nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0) + { } nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft 4 PCB", tag, owner, clock, "nes_sun4", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft 4 PCB", tag, owner, clock, "nes_sun4", __FILE__), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0) + { } nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0) + { } nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__) -{ + : nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0) + { } nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index c7de9fd3040..84f7af38883 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -53,7 +53,7 @@ const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>; nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } @@ -163,9 +163,9 @@ const device_type NES_SUNSOFT_DCS = &device_creator<nes_sunsoft_dcs_device>; nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, "NES Cart Sunsoft DCS PCB", tag, owner, clock, "nes_dcs", __FILE__), - m_subslot(*this, "ntb_slot") -{ + : nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, "NES Cart Sunsoft DCS PCB", tag, owner, clock, "nes_dcs", __FILE__), m_timer_on(0), m_exrom_enable(0), + m_subslot(*this, "ntb_slot"), ntb_enable_timer(nullptr) + { } diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index 2338d91ee25..6d3a4e68941 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -58,18 +58,18 @@ nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const } nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, "NES Cart Taito TC0190FMC + PAL16R4 PCB", tag, owner, clock, "nes_tc0190pal", __FILE__) -{ + : nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, "NES Cart Taito TC0190FMC + PAL16R4 PCB", tag, owner, clock, "nes_tc0190pal", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) + { } nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_X1_005, "NES Cart Taito X1-005 PCB", tag, owner, clock, "nes_x1_005", __FILE__) -{ + : nes_nrom_device(mconfig, NES_X1_005, "NES Cart Taito X1-005 PCB", tag, owner, clock, "nes_x1_005", __FILE__), m_latch(0) + { } nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_X1_017, "NES Cart Taito X1-017 PCB", tag, owner, clock, "nes_x1_017", __FILE__) -{ + : nes_nrom_device(mconfig, NES_X1_017, "NES Cart Taito X1-017 PCB", tag, owner, clock, "nes_x1_017", __FILE__), m_latch(0) + { } diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 555b0da3f35..828519a0e71 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -49,12 +49,12 @@ nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const } nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr) + { } nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_TENGEN_800032, "NES Cart Tengen 800032 PCB", tag, owner, clock, "nes_tengen032", __FILE__) + : nes_nrom_device(mconfig, NES_TENGEN_800032, "NES Cart Tengen 800032 PCB", tag, owner, clock, "nes_tengen032", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 8a223a8e295..f4dbd58d718 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -132,18 +132,18 @@ nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, co } nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_txrom_device(mconfig, NES_WAIXING_SEC, "NES Cart Waixing Security Chip PCB", tag, owner, clock, "nes_waixing_sec", __FILE__) -{ + : nes_txrom_device(mconfig, NES_WAIXING_SEC, "NES Cart Waixing Security Chip PCB", tag, owner, clock, "nes_waixing_sec", __FILE__), m_reg(0) + { } nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_WAIXING_SGZ, "NES Cart Waixing San Guo Zhi PCB", tag, owner, clock, "nes_waixing_sgz", __FILE__) -{ + : nes_nrom_device(mconfig, NES_WAIXING_SGZ, "NES Cart Waixing San Guo Zhi PCB", tag, owner, clock, "nes_waixing_sgz", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0) + { } nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, "NES Cart Waixing San Guo Zhong Lie Zhuan PCB", tag, owner, clock, "nes_waixing_sgzlz", __FILE__) -{ + : nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, "NES Cart Waixing San Guo Zhong Lie Zhuan PCB", tag, owner, clock, "nes_waixing_sgzlz", __FILE__), m_latch(0) + { } nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp index 867af2669b1..e5adb5feb97 100644 --- a/src/devices/bus/nes_ctrl/4score.cpp +++ b/src/devices/bus/nes_ctrl/4score.cpp @@ -112,8 +112,8 @@ ioport_constructor nes_4score_p2p4_device::device_input_ports() const nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_nes_control_port_interface(mconfig, *this) -{ + device_nes_control_port_interface(mconfig, *this), m_latch(0) + { } nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp index 897c35da000..5e7e6bc992e 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.cpp +++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp @@ -48,15 +48,15 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), - m_button(*this, "BUTTON") -{ + m_button(*this, "BUTTON"), m_start_conv(0), m_latch(0) + { } nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), - m_button(*this, "BUTTON") + m_button(*this, "BUTTON"), m_start_conv(0), m_latch(0) { } diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 96b0a5bda86..336a14e92c8 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -84,7 +84,7 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_BARCODE_BATTLER, "Epoch Barcode Battler (FC)", tag, owner, clock, "nes_bcbattle", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_reader(*this, "battler") + m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr) { } diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp index d128b1cfb5e..a1ef7dc9c1a 100644 --- a/src/devices/bus/nes_ctrl/ctrl.cpp +++ b/src/devices/bus/nes_ctrl/ctrl.cpp @@ -102,7 +102,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface() nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_CONTROL_PORT, "Nintendo NES/FC control port", tag, owner, clock, "nes_control_port", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_device(nullptr) { } diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index 946fb072e53..2381933041c 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -148,7 +148,7 @@ nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const ch device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__), device_nes_control_port_interface(mconfig, *this), m_cassette(*this, "tape"), - m_kbd(*this, "FCKEY") + m_kbd(*this, "FCKEY"), m_fck_scan(0), m_fck_mode(0) { } diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp index 491cc59539e..506418d4446 100644 --- a/src/devices/bus/nes_ctrl/ftrainer.cpp +++ b/src/devices/bus/nes_ctrl/ftrainer.cpp @@ -86,7 +86,7 @@ ioport_constructor nes_ftrainer_device::device_input_ports() const nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_trainer(*this, "FT_COL") + m_trainer(*this, "FT_COL"), m_row_scan(0) { } diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index efe17fb8a62..b0c9617cec6 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -176,14 +176,14 @@ machine_config_constructor nes_arcstick_device::device_mconfig_additions() const nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), - m_joypad(*this, "JOYPAD") + m_joypad(*this, "JOYPAD"), m_latch(0) { } nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_JOYPAD, "Nintendo NES / FC Control Pad", tag, owner, clock, "nes_joypad", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_joypad(*this, "JOYPAD") + m_joypad(*this, "JOYPAD"), m_latch(0) { } diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp index 33be8576788..46d5fb1f2fa 100644 --- a/src/devices/bus/nes_ctrl/konamihs.cpp +++ b/src/devices/bus/nes_ctrl/konamihs.cpp @@ -46,7 +46,7 @@ nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const ch device_t(mconfig, NES_KONAMIHS, "Konami Hyper Shot Controller", tag, owner, clock, "nes_konamihs", __FILE__), device_nes_control_port_interface(mconfig, *this), m_ipt_p1(*this, "P1"), - m_ipt_p2(*this, "P2") + m_ipt_p2(*this, "P2"), m_latch_p1(0), m_latch_p2(0) { } diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index bcfc6fbadac..6fdbc6f273a 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -63,7 +63,8 @@ nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char device_serial_interface(mconfig, *this), device_nes_control_port_interface(mconfig, *this), m_midiin(*this, "mdin"), - m_midiout(*this, "mdout") + m_midiout(*this, "mdout"), strobe_timer(nullptr), m_strobe_on(0), m_midi_mode(0), m_sent_bits(0), m_strobe_clock(0), + m_data_sent(0), m_xmit_read(0), m_xmit_write(0), m_recv_read(0), m_recv_write(0), m_tx_busy(false), m_read_status(false), m_status_bit(false) { } diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp index cb37aeb1c2a..8a4710c2c88 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.cpp +++ b/src/devices/bus/nes_ctrl/mjpanel.cpp @@ -72,7 +72,7 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_panel(*this, "MJPANEL") + m_panel(*this, "MJPANEL"), m_latch(0) { } diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp index 8c61cf00c14..c4fdeb4b5d9 100644 --- a/src/devices/bus/nes_ctrl/pachinko.cpp +++ b/src/devices/bus/nes_ctrl/pachinko.cpp @@ -51,7 +51,7 @@ nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const ch device_t(mconfig, NES_PACHINKO, "Famicom Pachinko Controller", tag, owner, clock, "nes_pachinko", __FILE__), device_nes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), - m_trigger(*this, "TRIGGER") + m_trigger(*this, "TRIGGER"), m_latch(0) { } diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp index 3338a443423..2a1acd8adc9 100644 --- a/src/devices/bus/nes_ctrl/partytap.cpp +++ b/src/devices/bus/nes_ctrl/partytap.cpp @@ -46,7 +46,7 @@ ioport_constructor nes_partytap_device::device_input_ports() const nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_PARTYTAP, "Yonezawa Party Tap Controller", tag, owner, clock, "nes_partytap", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_inputs(*this, "INPUTS") + m_inputs(*this, "INPUTS"), m_mode(0), m_latch(0) { } diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp index 8c6e6be7b3c..13f8bb72481 100644 --- a/src/devices/bus/nes_ctrl/suborkey.cpp +++ b/src/devices/bus/nes_ctrl/suborkey.cpp @@ -163,7 +163,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__), device_nes_control_port_interface(mconfig, *this), - m_kbd(*this, "SUBOR") + m_kbd(*this, "SUBOR"), m_fck_scan(0), m_fck_mode(0) { } diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp index 5d6548289ec..b6529484c84 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -28,13 +28,15 @@ const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>; //------------------------------------------------- nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_nubus_tag(nullptr), + m_nubus_slottag(nullptr) { } nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_nubus_tag(nullptr), m_nubus_slottag(nullptr) { } @@ -77,24 +79,24 @@ void nubus_device::static_set_cputag(device_t &device, const char *tag) //------------------------------------------------- nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__), + device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__), m_maincpu(nullptr), m_out_irq9_cb(*this), m_out_irqa_cb(*this), m_out_irqb_cb(*this), m_out_irqc_cb(*this), m_out_irqd_cb(*this), - m_out_irqe_cb(*this) + m_out_irqe_cb(*this), m_cputag(nullptr) { } nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq9_cb(*this), m_out_irqa_cb(*this), m_out_irqb_cb(*this), m_out_irqc_cb(*this), m_out_irqd_cb(*this), - m_out_irqe_cb(*this) + m_out_irqe_cb(*this), m_cputag(nullptr) { } //------------------------------------------------- @@ -256,8 +258,8 @@ WRITE_LINE_MEMBER( nubus_device::irqe_w ) { m_out_irqe_cb(state); } device_nubus_card_interface::device_nubus_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_nubus(NULL), - m_nubus_tag(NULL) + m_nubus(nullptr), + m_nubus_tag(nullptr), m_nubus_slottag(nullptr), m_slot(0), m_next(nullptr) { } diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 213cf0a0753..2a8cb829bb9 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -79,7 +79,7 @@ const rom_entry *nubus_824gc_device::device_rom_region() const jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0), m_is824(false) { m_assembled_tag = std::string(tag).append(":").append(GC48_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp index 2e4febed481..29889da8a46 100644 --- a/src/devices/bus/nubus/nubus_cb264.cpp +++ b/src/devices/bus/nubus/nubus_cb264.cpp @@ -71,13 +71,13 @@ const rom_entry *nubus_cb264_device::device_rom_region() const nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "nb_cb264", __FILE__), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0) { } nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0) { } diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp index 6b929c98270..3ce468de2fe 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -70,7 +70,7 @@ const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>; messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_size(0), m_data(nullptr), m_ejected(false) { } @@ -175,13 +175,13 @@ const rom_entry *nubus_image_device::device_rom_region() const nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "nb_image", __FILE__), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_image(nullptr) { } nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_image(nullptr) { } diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index 7a2d1a8ffdf..1d2598a927b 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -68,7 +68,7 @@ const rom_entry *nubus_m2hires_device::device_rom_region() const nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(M2HIRES_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -77,7 +77,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(M2HIRES_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index edf0b90abbb..5bb8cfad09c 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -69,7 +69,7 @@ const rom_entry *nubus_m2video_device::device_rom_region() const nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(M2VIDEO_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -78,7 +78,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(M2VIDEO_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index 3b30fc4a384..23a43f7caeb 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -68,7 +68,7 @@ const rom_entry *nubus_radiustpd_device::device_rom_region() const nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(RADIUSTPD_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -77,7 +77,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, co nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(RADIUSTPD_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index b72fc2d676f..31c058651d6 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -70,7 +70,7 @@ const rom_entry *nubus_spec8s3_device::device_rom_region() const nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0) { m_assembled_tag = std::string(tag).append(":").append(SPEC8S3_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -79,7 +79,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0) { m_assembled_tag = std::string(tag).append(":").append(SPEC8S3_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index 9971454feac..39a4cfe4c44 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -85,7 +85,7 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this), + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0), m_palette(*this, "palette") { m_assembled_tag = std::string(tag).append(":").append(SPECPDQ_SCREEN_NAME); @@ -95,7 +95,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this), + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0), m_palette(*this, "palette") { m_assembled_tag = std::string(tag).append(":").append(SPECPDQ_SCREEN_NAME); diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp index 52e30c0ca92..532e9b66145 100644 --- a/src/devices/bus/nubus/nubus_vikbw.cpp +++ b/src/devices/bus/nubus/nubus_vikbw.cpp @@ -67,13 +67,13 @@ const rom_entry *nubus_vikbw_device::device_rom_region() const nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "nb_vikbw", __FILE__), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vbl_disable(0) { } nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vbl_disable(0) { } diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index 3f00160ba40..c634ab6e000 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -71,7 +71,7 @@ const rom_entry *nubus_wsportrait_device::device_rom_region() const nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(WSPORTRAIT_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -80,7 +80,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(WSPORTRAIT_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index 1d1af85f5ba..4e94539a88b 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -71,7 +71,7 @@ const rom_entry *nubus_xceed30hr_device::device_rom_region() const nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(XCEED30HR_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -80,7 +80,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, co nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(XCEED30HR_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index 21eafd10935..be87de6ba85 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -64,7 +64,7 @@ const rom_entry *nubus_cb264se30_device::device_rom_region() const nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(CB264SE30_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -73,7 +73,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, co nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(CB264SE30_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index ddc063bbb8f..b330b52df4e 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -67,7 +67,7 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(XCEEDMC30_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -76,7 +76,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, co nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(XCEEDMC30_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 4150a2c91b0..8cc136e5a53 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -70,7 +70,7 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(PROCOLOR816_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -79,7 +79,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { m_assembled_tag = std::string(tag).append(":").append(PROCOLOR816_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index 32028fd6824..f85ffb1c074 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -64,7 +64,7 @@ const rom_entry *nubus_lview_device::device_rom_region() const nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0) { m_assembled_tag = std::string(tag).append(":").append(LVIEW_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); @@ -73,7 +73,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), - device_nubus_card_interface(mconfig, *this) + device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0) { m_assembled_tag = std::string(tag).append(":").append(LVIEW_SCREEN_NAME); m_screen_tag = m_assembled_tag.c_str(); diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index 2e364e59b9c..649e5992f65 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -23,15 +23,17 @@ const device_type O2_ROM_16K = &device_creator<o2_rom16_device>; o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_o2_cart_interface( mconfig, *this ) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_o2_cart_interface(mconfig, *this), + m_bank_base(0) { } o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, O2_ROM_STD, "Odyssey 2 Standard Carts", tag, owner, clock, "o2_rom", __FILE__), - device_o2_cart_interface( mconfig, *this ) -{ + device_o2_cart_interface( mconfig, *this ), + m_bank_base(0) + { } o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index 72262afe7ac..caf68a0d4e2 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -76,7 +76,7 @@ o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const ch device_t(mconfig, O2_CART_SLOT, "Odyssey 2 Cartridge Slot", tag, owner, clock, "o2_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(O2_STD) + m_type(O2_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index c8fd1d81081..106979a0581 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -44,7 +44,7 @@ ADDRESS_MAP_END jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : oricext_device(mconfig, JASMIN, "Jasmin floppy drive interface", tag, owner, clock, "jasmin", __FILE__), - fdc(*this, "fdc") + fdc(*this, "fdc"), side_sel(false), fdc_reset(false), ram_access(false), rom_access(false), jasmin_rom(nullptr), cur_floppy(nullptr) { } diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index c66adfa555a..26225b807c1 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -39,7 +39,7 @@ ADDRESS_MAP_END microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : oricext_device(mconfig, MICRODISC, "Microdisc floppy drive interface", tag, owner, clock, "microdisc", __FILE__), - fdc(*this, "fdc") + fdc(*this, "fdc"), microdisc_rom(nullptr), port_314(0), intrq_state(false), drq_state(false), hld_state(false) { } diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index e13b5c5f245..0482da61b7f 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -9,7 +9,8 @@ const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>; oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__), device_slot_interface(mconfig, *this), - irq_handler(*this) + irq_handler(*this), + cputag(NULL) { } @@ -41,7 +42,18 @@ void oricext_connector::device_config_complete() oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_card_interface(mconfig, *this) + device_slot_card_interface(mconfig, *this), + cputag(nullptr), + cpu(nullptr), + connector(nullptr), + bank_c000_r(nullptr), + bank_e000_r(nullptr), + bank_f800_r(nullptr), + bank_c000_w(nullptr), + bank_e000_w(nullptr), + bank_f800_w(nullptr), + rom(nullptr), + ram(nullptr) { } diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp index 99c3f5c1957..a0fa667e5ec 100644 --- a/src/devices/bus/pc_joy/pc_joy.cpp +++ b/src/devices/bus/pc_joy/pc_joy.cpp @@ -15,7 +15,8 @@ const device_type PC_JOY = &device_creator<pc_joy_device>; pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_dev(nullptr) { } diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp index ebfb1af785b..85111b746b7 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.cpp +++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp @@ -13,7 +13,11 @@ pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char m_btn2(*this, "btn2"), m_btn3(*this, "btn3"), m_btn4(*this, "btn4"), - m_conf(*this, "CONFIG") + m_conf(*this, "CONFIG"), + m_timer(NULL), + m_count(0), + m_state(0), + m_active(false) { } diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 581f30b5a77..b90fd1cef14 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -286,7 +286,7 @@ iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconf m_md20(*this, "MD20"), m_md21(*this, "MD21"), m_md22(*this, "MD22"), - m_md23(*this, "MD23"), + m_md23(*this, "MD23"), m_bus(0), m_p1(0), m_p2(0), m_q(0) diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 01fbaf6852b..8dd5a4e3d5c 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -380,7 +380,7 @@ ROM_END pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__), device_pc_kbd_interface(mconfig, *this), - m_cpu(*this, "kb_keytr") + m_cpu(*this, "kb_keytr"), m_p1(0), m_p1_data(0), m_p2(0), m_p3(0), m_last_write_addr(0) { } diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index 201ff864fb2..2d300841d26 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -247,7 +247,7 @@ pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_c , m_p1_4(*this, "P1.4") , m_p1_5(*this, "P1.5") , m_p1_6(*this, "P1.6") - , m_p1_7(*this, "P1.7") + , m_p1_7(*this, "P1.7"), m_p0(0), m_p1(0), m_p2(0), m_p3(0) { } diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index ef979eef530..e79c4126c47 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -275,7 +275,7 @@ ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconf m_dr20(*this, "DR20"), m_dr21(*this, "DR21"), m_dr22(*this, "DR22"), - m_dr23(*this, "DR23") + m_dr23(*this, "DR23"), m_cnt(0) { } diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp index 296dbbef547..daadac95a7b 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.cpp +++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp @@ -33,7 +33,8 @@ const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>; //------------------------------------------------- pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock, "pc_kbdc_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_kbdc_device(nullptr) { } @@ -74,7 +75,7 @@ pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, d m_out_clock_cb(*this), m_out_data_cb(*this), m_clock_state(-1), - m_data_state(-1), + m_data_state(-1), m_mb_clock_state(0), m_mb_data_state(0), m_kb_clock_state(1), m_kb_data_state(1), m_keyboard( NULL ) @@ -195,7 +196,7 @@ WRITE_LINE_MEMBER( pc_kbdc_device::data_write_from_kb ) device_pc_kbd_interface::device_pc_kbd_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), m_pc_kbdc(NULL), - m_pc_kbdc_tag(NULL) + m_pc_kbdc_tag(NULL), m_next(nullptr) { } diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 8829e7823d0..5323f8a675b 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -46,8 +46,8 @@ pce_populous_device::pce_populous_device(const machine_config &mconfig, const ch } pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : pce_rom_device(mconfig, PCE_ROM_SF2, "PCE Street Fighters 2 Cart", tag, owner, clock, "pce_sf2", __FILE__) -{ + : pce_rom_device(mconfig, PCE_ROM_SF2, "PCE Street Fighters 2 Cart", tag, owner, clock, "pce_sf2", __FILE__), m_bank_base(0) + { } diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index bc124852c0c..6c706b97955 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -140,7 +140,7 @@ pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_interface("pce_cart"), - m_type(PCE_STD) + m_type(PCE_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index aab392e9ffb..0e32410dec6 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -55,7 +55,8 @@ c2n_device::c2n_device(const machine_config &mconfig, device_type type, const ch : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), - m_motor(false) + m_motor(false), + m_read_timer(nullptr) { } @@ -63,7 +64,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t : device_t(mconfig, C2N, "C2N Datassette", tag, owner, clock, "c2n", __FILE__), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), - m_motor(false) + m_motor(false), m_read_timer(nullptr) { } diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp index f425478e5a2..a5d934cc082 100644 --- a/src/devices/bus/pet/cass.cpp +++ b/src/devices/bus/pet/cass.cpp @@ -54,7 +54,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface() pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock, "pet_datassette_port", __FILE__), device_slot_interface(mconfig, *this), - m_read_handler(*this) + m_read_handler(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp index e550c2cf80f..d68a39db82e 100644 --- a/src/devices/bus/pet/exp.cpp +++ b/src/devices/bus/pet/exp.cpp @@ -36,7 +36,7 @@ const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock, "pet_expansion_slot", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_card(nullptr), m_read_dma(*this), m_write_dma(*this) { diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index 35a80c2e298..3c8b2f96742 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -185,7 +185,7 @@ superpet_device::superpet_device(const machine_config &mconfig, const char *tag, m_io_sw1(*this, "SW1"), m_io_sw2(*this, "SW2"), m_system(0), - m_bank(0), + m_bank(0), m_sw1(0), m_sw2(0), m_sel9_rom(0), m_pet_irq(CLEAR_LINE), m_acia_irq(CLEAR_LINE) diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 5439eaf1fd5..4e10f777702 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -428,7 +428,7 @@ c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner m_status(1), m_dav(1), m_ack(1), - m_dev(0) + m_dev(0), m_irq_timer(nullptr) { } diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp index 801470cbf30..332fc22903b 100644 --- a/src/devices/bus/plus4/exp.cpp +++ b/src/devices/bus/plus4/exp.cpp @@ -74,7 +74,7 @@ plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &m m_write_irq(*this), m_read_dma_cd(*this), m_write_dma_cd(*this), - m_write_aec(*this) + m_write_aec(*this), m_card(nullptr) { } diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index f9896dcd2e5..a85bd9b2fc9 100644 --- a/src/devices/bus/psx/analogue.cpp +++ b/src/devices/bus/psx/analogue.cpp @@ -7,7 +7,13 @@ const device_type PSX_DUALSHOCK = &device_creator<psx_dualshock_device>; psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_psx_controller_interface(mconfig, *this), + device_psx_controller_interface(mconfig, *this), + m_type(), + m_confmode(false), + m_analogmode(false), + m_analoglock(false), + m_temp(0), + m_cmd(0), m_pad0(*this, "PSXPAD0"), m_pad1(*this, "PSXPAD1"), m_rstickx(*this, "PSXRSTICKX"), diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 09099cb5481..43203718ecd 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -10,7 +10,9 @@ const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_devi psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), + m_tx(false), + m_dev(nullptr), m_card(*this, "card") { } @@ -40,7 +42,7 @@ void psx_controller_port_device::disable_card(bool state) const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>; psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), + : device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr), m_dsr_handler(*this), m_rxd_handler(*this) { @@ -97,8 +99,8 @@ void psxcontrollerports_device::ack() } device_psx_controller_interface::device_psx_controller_interface(const machine_config &mconfig, device_t &device) : - device_slot_card_interface(mconfig, device), - m_ack(true) + device_slot_card_interface(mconfig, device), m_odata(0), m_idata(0), m_bit(0), m_count(0), m_memcard(false), m_clock(false), m_sel(false), + m_ack(true), m_rx(false), m_ack_timer(nullptr), m_owner(nullptr) { } diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index c0461a3efac..c478b54b664 100644 --- a/src/devices/bus/psx/memcard.cpp +++ b/src/devices/bus/psx/memcard.cpp @@ -43,7 +43,24 @@ enum transfer_states psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock, "psxcard", __FILE__), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), + pkt_ptr(0), + pkt_sz(0), + cmd(0), + addr(0), + state(0), + m_disabled(false), + m_odata(0), + m_idata(0), + m_bit(0), + m_count(0), + m_pad(false), + m_clock(false), + m_sel(false), + m_ack(false), + m_rx(false), + m_ack_timer(nullptr), + m_owner(nullptr) { } diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index 67a794b1f58..74c944b6b0a 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -8,7 +8,11 @@ const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>; psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__), - device_psx_controller_interface(mconfig, *this), + device_psx_controller_interface(mconfig, *this), + m_activeport(0), + m_singlemode(false), + m_nextmode(false), + m_tapmc(false), m_porta(*this, "a"), m_portb(*this, "b"), m_portc(*this, "c"), diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp index 4276f941811..92a5580334d 100644 --- a/src/devices/bus/ql/exp.cpp +++ b/src/devices/bus/ql/exp.cpp @@ -49,7 +49,7 @@ ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const ch m_write_ipl0l(*this), m_write_ipl1l(*this), m_write_berrl(*this), - m_write_extintl(*this) + m_write_extintl(*this), m_card(nullptr) { } diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp index 13d72619e8b..53847b26ba0 100644 --- a/src/devices/bus/ql/rom.cpp +++ b/src/devices/bus/ql/rom.cpp @@ -56,7 +56,7 @@ device_ql_rom_cartridge_card_interface::~device_ql_rom_cartridge_card_interface( ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, QL_ROM_CARTRIDGE_SLOT, "QL ROM cartridge slot", tag, owner, clock, "ql_rom_cartridge_slot", __FILE__), device_slot_interface(mconfig, *this), - device_image_interface(mconfig, *this) + device_image_interface(mconfig, *this), m_card(nullptr) { } diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index cf334d6db67..55db9141e2a 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -120,7 +120,7 @@ sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char m_centronics(*this, CENTRONICS_TAG), m_latch(*this, TTL74273_TAG), m_rom(*this, "rom"), - m_busy(1) + m_busy(1), m_fd6(0) { } diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index fa77ed23d53..5ff2ad2091e 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -119,7 +119,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, m_floppy1(*this, WD1772_TAG":1"), m_rom(*this, "rom"), m_ram(*this, "ram"), - m_ram_size(0) + m_ram_size(0), m_rom_en(false) { } @@ -131,7 +131,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type m_floppy1(*this, WD1772_TAG":1"), m_rom(*this, "rom"), m_ram(*this, "ram"), - m_ram_size(ram_size) + m_ram_size(ram_size), m_rom_en(false) { } diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index f30d8476d56..47b82c5d71e 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -5,7 +5,8 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : generic_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock, "serial_keyboard", __FILE__), device_serial_interface(mconfig, *this), - device_rs232_port_interface(mconfig, *this), + device_rs232_port_interface(mconfig, *this), + m_curr_key(0), m_key_valid(false), m_rs232_txbaud(*this, "RS232_TXBAUD"), m_rs232_startbits(*this, "RS232_STARTBITS"), @@ -18,7 +19,8 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, co serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : generic_keyboard_device(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), - device_rs232_port_interface(mconfig, *this), + device_rs232_port_interface(mconfig, *this), + m_curr_key(0), m_key_valid(false), m_rs232_txbaud(*this, "RS232_TXBAUD"), m_rs232_startbits(*this, "RS232_STARTBITS"), diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 16fc4215c9a..a5140ef5d1e 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -14,7 +14,8 @@ null_modem_device::null_modem_device(const machine_config &mconfig, const char * m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS"), m_input_count(0), - m_input_index(0) + m_input_index(0), + m_timer_poll(NULL) { } diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index 0039925ac85..72e8f22dd57 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -18,7 +18,8 @@ pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, co m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS"), m_input_count(0), - m_input_index(0) + m_input_index(0), + m_timer_poll(NULL) { } diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp index 411a31a8f01..06462491db7 100644 --- a/src/devices/bus/rs232/rs232.cpp +++ b/src/devices/bus/rs232/rs232.cpp @@ -6,7 +6,12 @@ const device_type RS232_PORT = &device_creator<rs232_port_device>; rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), + m_rxd(0), + m_dcd(0), + m_dsr(0), + m_ri(0), + m_cts(0), m_rxd_handler(*this), m_dcd_handler(*this), m_dsr_handler(*this), @@ -18,7 +23,12 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, const char * rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), + m_rxd(0), + m_dcd(0), + m_dsr(0), + m_ri(0), + m_cts(0), m_rxd_handler(*this), m_dcd_handler(*this), m_dsr_handler(*this), diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp index cb2d4d12b50..53d035fee7e 100644 --- a/src/devices/bus/rs232/ser_mouse.cpp +++ b/src/devices/bus/rs232/ser_mouse.cpp @@ -16,7 +16,12 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t device_rs232_port_interface(mconfig, *this), device_serial_interface(mconfig, *this), m_dtr(1), - m_rts(1), + m_rts(1), + m_head(0), + m_tail(0), + m_mb(0), + m_timer(nullptr), + m_enabled(false), m_x(*this, "ser_mouse_x"), m_y(*this, "ser_mouse_y"), m_btn(*this, "ser_mouse_btn") diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp index a8b8db63e36..fcfd9074c67 100644 --- a/src/devices/bus/rs232/terminal.cpp +++ b/src/devices/bus/rs232/terminal.cpp @@ -11,7 +11,9 @@ serial_terminal_device::serial_terminal_device(const machine_config &mconfig, co m_rs232_startbits(*this, "RS232_STARTBITS"), m_rs232_databits(*this, "RS232_DATABITS"), m_rs232_parity(*this, "RS232_PARITY"), - m_rs232_stopbits(*this, "RS232_STOPBITS") + m_rs232_stopbits(*this, "RS232_STOPBITS"), + m_curr_key(0), + m_key_valid(false) { } diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index 47c960e55af..dd443d24ef1 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -5,7 +5,9 @@ jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, JVC_XVD701, "JVC XV-D701", tag, owner, clock, "xvd701", __FILE__), device_serial_interface(mconfig, *this), - device_rs232_port_interface(mconfig, *this) + device_rs232_port_interface(mconfig, *this), + m_response_index(0), + m_timer_response(nullptr) { } diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp index aee9ecbccf6..915c2c3c68a 100644 --- a/src/devices/bus/s100/s100.cpp +++ b/src/devices/bus/s100/s100.cpp @@ -27,7 +27,9 @@ const device_type S100_SLOT = &device_creator<s100_slot_t>; //------------------------------------------------- device_s100_card_interface::device_s100_card_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device) + : device_slot_card_interface(mconfig, device), + m_bus(nullptr), + m_next(nullptr) { } @@ -37,7 +39,7 @@ device_s100_card_interface::device_s100_card_interface(const machine_config &mco //------------------------------------------------- s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock, "s100_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bus(nullptr) { } diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index 4b269a80e93..7e06af8a26b 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -245,7 +245,7 @@ s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, cons m_ace3(*this, INS8250_3_TAG), m_rtc(*this, UPD1990C_TAG), m_7c(*this, "7C"), - m_10a(*this, "10A") + m_10a(*this, "10A"), m_group(0), m_rtc_tp(0) { } diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index aa3a563f68d..7588348ed71 100644 --- a/src/devices/bus/saturn/sat_slot.cpp +++ b/src/devices/bus/saturn/sat_slot.cpp @@ -37,7 +37,7 @@ const device_type SATURN_CART_SLOT = &device_creator<sat_cart_slot_device>; //------------------------------------------------- device_sat_cart_interface::device_sat_cart_interface(const machine_config &mconfig, device_t &device) - : device_slot_card_interface(mconfig, device), + : device_slot_card_interface(mconfig, device), m_cart_type(0), m_rom(NULL), m_rom_size(0) { @@ -104,7 +104,7 @@ void device_sat_cart_interface::dram1_alloc(UINT32 size) sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr) { } diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index 7eac8fc7631..66c0894dff2 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -21,14 +21,16 @@ SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *ta m_data4_handler(*this), m_data5_handler(*this), m_data6_handler(*this), - m_data7_handler(*this), + m_data7_handler(*this), + m_device_count(0), m_bsy_in(0), m_sel_in(0), m_cd_in(0), m_io_in(0), m_msg_in(0), m_req_in(0), - m_ack_in(0), + m_ack_in(0), + m_atn_in(0), m_rst_in(0), m_data0_in(0), m_data1_in(0), @@ -44,7 +46,8 @@ SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *ta m_io_out(0), m_msg_out(0), m_req_out(0), - m_ack_out(0), + m_ack_out(0), + m_atn_out(0), m_rst_out(0), m_data0_out(0), m_data1_out(0), diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp index 57a1759db07..274b3cdeacb 100644 --- a/src/devices/bus/scsi/scsihle.cpp +++ b/src/devices/bus/scsi/scsihle.cpp @@ -13,7 +13,16 @@ Base class for HLE'd SCSI devices. scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), scsi_port_interface(mconfig, *this), - m_scsi_id(*this, "SCSI_ID"), + m_scsi_id(*this, "SCSI_ID"), + req_timer(NULL), + sel_timer(NULL), + dataout_timer(NULL), + cmd_idx(0), + is_linked(0), + data_idx(0), + bytes_left(0), + data_last(0), + scsiID(0), m_input_data(0) { } diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp index ce71249d453..27487e8cc73 100644 --- a/src/devices/bus/scv/rom.cpp +++ b/src/devices/bus/scv/rom.cpp @@ -49,23 +49,23 @@ scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *ta } scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : scv_rom8_device(mconfig, SCV_ROM32K_RAM8K, "SCV 32K + RAM 8K Carts", tag, owner, clock, "scv_rom32_ram8", __FILE__) -{ + : scv_rom8_device(mconfig, SCV_ROM32K_RAM8K, "SCV 32K + RAM 8K Carts", tag, owner, clock, "scv_rom32_ram8", __FILE__), m_ram_enabled(0) + { } scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__) -{ + : scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0) + { } scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__) -{ + : scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0) + { } scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : scv_rom8_device(mconfig, SCV_ROM128K_RAM4K, "SCV 128K + RAM 4K Carts", tag, owner, clock, "scv_rom128_ram4", __FILE__) -{ + : scv_rom8_device(mconfig, SCV_ROM128K_RAM4K, "SCV 128K + RAM 4K Carts", tag, owner, clock, "scv_rom128_ram4", __FILE__), m_bank_base(0), m_ram_enabled(0) + { } diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index 12ecf7c4db9..bc72dcc4bfb 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -76,7 +76,7 @@ scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const device_t(mconfig, SCV_CART_SLOT, "SCV Cartridge Slot", tag, owner, clock, "scv_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(SCV_8K) + m_type(SCV_8K), m_cart(nullptr) { } diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index 3770560806d..b9c35af15f9 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -45,14 +45,14 @@ const device_type SEGA8_ROM_KOREAN_NB = &device_creator<sega8_korean_nb_device>; sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_sega8_cart_interface( mconfig, *this ) -{ + device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) + { } sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_STD, "Mark III, SMS & GG Carts", tag, owner, clock, "sega8_rom", __FILE__), - device_sega8_cart_interface( mconfig, *this ) -{ + device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) + { } @@ -86,8 +86,8 @@ sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const ch : sega8_rom_device(mconfig, SEGA8_ROM_TEREBI, "SG-1000 Terebi Oekaki Cart", tag, owner, clock, "sega8_terebi", __FILE__), m_tvdraw_x(*this, "TVDRAW_X"), m_tvdraw_y(*this, "TVDRAW_Y"), - m_tvdraw_pen(*this, "TVDRAW_PEN") -{ + m_tvdraw_pen(*this, "TVDRAW_PEN"), m_tvdraw_data(0) + { } @@ -108,15 +108,15 @@ sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconf sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_EEPROM, "GG Carts + EEPROM", tag, owner, clock, "sega8_eeprom", __FILE__), device_sega8_cart_interface( mconfig, *this ), - m_eeprom(*this, "eeprom") -{ + m_eeprom(*this, "eeprom"), m_93c46_enabled(0), m_93c46_lines(0) + { } sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_CODEMASTERS, "Mark III, SMS & GG Codemasters Carts", tag, owner, clock, "sega8_codemasters", __FILE__), - device_sega8_cart_interface( mconfig, *this ) -{ + device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) + { } @@ -128,14 +128,14 @@ sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char * sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_sega8_cart_interface( mconfig, *this ) -{ + device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) + { } sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA8_ROM_ZEMINA, "SMS Zemina Carts", tag, owner, clock, "sega8_zemina", __FILE__), - device_sega8_cart_interface( mconfig, *this ) -{ + device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) + { } @@ -153,8 +153,8 @@ sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sega8_rom_device(mconfig, SEGA8_ROM_HICOM, "SMS Hi-Com Carts", tag, owner, clock, "sega8_hicom", __FILE__) -{ + : sega8_rom_device(mconfig, SEGA8_ROM_HICOM, "SMS Hi-Com Carts", tag, owner, clock, "sega8_hicom", __FILE__), m_rom_bank_base(0) + { } diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index ac696a0ac95..29bf4f5ec2b 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -114,7 +114,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, de m_type(SEGA8_BASE_ROM), m_must_be_loaded(FALSE), m_interface("sms_cart"), - m_extensions("bin") + m_extensions("bin"), m_cart(nullptr) { m_is_card = is_card; } @@ -127,7 +127,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, co m_must_be_loaded(FALSE), m_is_card(FALSE), m_interface("sms_cart"), - m_extensions("bin") + m_extensions("bin"), m_cart(nullptr) { } diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index 32998115887..d5b0a6513ae 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -74,7 +74,7 @@ sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, device_sms_control_port_interface(mconfig, *this), m_lphaser_pins(*this, "CTRL_PORT"), m_lphaser_x(*this, "LPHASER_X"), - m_lphaser_y(*this, "LPHASER_Y") + m_lphaser_y(*this, "LPHASER_Y"), m_sensor_last_state(0), m_lphaser_timer(nullptr) { // Workaround for failed validation that occurs when running on a driver // with Sega Scope emulation, which adds 2 screens (left/right lenses). diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp index 59536ef0f38..170a716a70f 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.cpp +++ b/src/devices/bus/sms_ctrl/smsctrl.cpp @@ -62,7 +62,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface() sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock, "sms_control_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_device(nullptr), m_th_pin_handler(*this), m_pixel_handler(*this) { diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp index 4050159beb1..e7ea829372c 100644 --- a/src/devices/bus/sms_ctrl/sports.cpp +++ b/src/devices/bus/sms_ctrl/sports.cpp @@ -154,7 +154,7 @@ sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, cons m_last_data(0), m_x_axis_reset_value(0x80), // value 0x80 helps when start playing paddle games. m_y_axis_reset_value(0x80), - m_interval(SPORTS_PAD_INTERVAL) + m_interval(SPORTS_PAD_INTERVAL), m_sportspad_timer(nullptr) { } diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp index 9b26999a94b..73961674687 100644 --- a/src/devices/bus/sms_exp/smsexp.cpp +++ b/src/devices/bus/sms_exp/smsexp.cpp @@ -52,7 +52,7 @@ device_sms_expansion_slot_interface::~device_sms_expansion_slot_interface() sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SMS_EXPANSION_SLOT, "Sega SMS expansion slot", tag, owner, clock, "sms_expansion_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_device(nullptr) { } diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index 08fa68dc082..004ce9d3dab 100644 --- a/src/devices/bus/snes/bsx.cpp +++ b/src/devices/bus/snes/bsx.cpp @@ -25,13 +25,27 @@ const device_type SNS_BSMEMPAK = &device_creator<sns_rom_bsmempak_device>; sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), - m_slot(*this, "bs_slot") + : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), + m_base_unit(nullptr), + access_00_1f(0), + access_80_9f(0), + access_40_4f(0), + access_50_5f(0), + access_60_6f(0), + rom_access(0), + m_slot(*this, "bs_slot") { } sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_bsx", __FILE__), + m_base_unit(nullptr), + access_00_1f(0), + access_80_9f(0), + access_40_4f(0), + access_50_5f(0), + access_60_6f(0), + rom_access(0), m_slot(*this, "bs_slot") { } @@ -49,8 +63,8 @@ sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const } sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__) -{ + : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__), m_command(0), m_write_old(0), m_write_new(0), m_flash_enable(0), m_read_enable(0), m_write_enable(0) + { } @@ -113,7 +127,7 @@ void sns_rom_bsmempak_device::device_reset() // BS-X Base Unit emulation, to be device-fied ? BSX_base::BSX_base(running_machine &machine) - : m_machine(machine) + : r2192_minute(0), m_machine(machine) { m_machine.save().save_item(regs, "SNES_BSX/regs"); m_machine.save().save_item(r2192_counter, "SNES_BSX/r2192_counter"); diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp index ebd203adaad..ea1308e6a32 100644 --- a/src/devices/bus/snes/event.cpp +++ b/src/devices/bus/snes/event.cpp @@ -21,10 +21,15 @@ const device_type SNS_PFEST94 = &device_creator<sns_pfest94_device>; sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SNS_PFEST94, "SNES Powerfest '94", tag, owner, clock, "sns_pfest94", __FILE__), - device_sns_cart_interface( mconfig, *this ), - m_upd7725(*this, "dsp"), - m_dsw(*this, "DIPSW") + : device_t(mconfig, SNS_PFEST94, "SNES Powerfest '94", tag, owner, clock, "sns_pfest94", __FILE__), + device_sns_cart_interface(mconfig, *this), + m_upd7725(*this, "dsp"), + m_dsw(*this, "DIPSW"), + m_base_bank(0), + m_mask(0), + m_status(0), + m_count(0), + pfest94_timer(nullptr) { } diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp index 9e77da8dda5..daac69bbc72 100644 --- a/src/devices/bus/snes/rom.cpp +++ b/src/devices/bus/snes/rom.cpp @@ -42,21 +42,21 @@ sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, d } sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__), m_address(0), m_offset(0), m_shift(0) + { } // Pirate LoROM 'mappers' sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__), m_latch(0) + { } sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__), m_prot(0) + { } sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -76,18 +76,18 @@ sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const ch // Multigame LoROM 'mappers' sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__), m_base_bank(0) + { } sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__), m_base_bank(0) + { } sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__) -{ + : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__), m_base_bank(0) + { } diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp index 09630b7e393..477b75bdc1e 100644 --- a/src/devices/bus/snes/rom21.cpp +++ b/src/devices/bus/snes/rom21.cpp @@ -32,8 +32,8 @@ sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *ta } sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__) -{ + : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__), m_mode(0), m_index(0) + { } diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index 6da031f21b2..be4f4c039fe 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -88,8 +88,8 @@ const device_type SNS_LOROM_SA1 = &device_creator<sns_sa1_device>; sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM_SA1, "SNES Cart + SA-1", tag, owner, clock, "sns_rom_sa1", __FILE__), device_sns_cart_interface( mconfig, *this ), - m_sa1(*this, "sa1cpu") -{ + m_sa1(*this, "sa1cpu"), m_sa1_ctrl(0), m_scpu_sie(0), m_sa1_reset(0), m_sa1_nmi(0), m_sa1_irq(0), m_scpu_ctrl(0), m_sa1_sie(0), m_irq_vector(0), m_nmi_vector(0), m_hcount(0), m_vcount(0), m_bank_c_hi(0), m_bank_c_rom(0), m_bank_d_hi(0), m_bank_d_rom(0), m_bank_e_hi(0), m_bank_e_rom(0), m_bank_f_hi(0), m_bank_f_rom(0), m_bwram_snes(0), m_bwram_sa1(0), m_bwram_sa1_source(0), m_bwram_sa1_format(0), m_bwram_write_snes(0), m_bwram_write_sa1(0), m_bwpa_sa1(0), m_iram_write_snes(0), m_iram_write_sa1(0), m_dma_ctrl(0), m_dma_ccparam(0), m_src_addr(0), m_dst_addr(0), m_dma_cnt(0), m_math_ctlr(0), m_math_overflow(0), m_math_a(0), m_math_b(0), m_math_res(0), m_vda(0), m_vbit(0), m_vlen(0), m_drm(0), m_scpu_flags(0), m_sa1_flags(0), m_hcr(0), m_vcr(0) + { } diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp index 0b47d84f3c0..ccfed10ebe1 100644 --- a/src/devices/bus/snes/sdd1.cpp +++ b/src/devices/bus/snes/sdd1.cpp @@ -413,14 +413,14 @@ const device_type SNS_LOROM_SDD1 = &device_creator<sns_rom_sdd1_device>; sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_sns_cart_interface( mconfig, *this ) -{ + device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr) + { } sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "sns_rom_sdd1", __FILE__), - device_sns_cart_interface( mconfig, *this ) -{ + device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr) + { } diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h index cef80512694..6448e994ee1 100644 --- a/src/devices/bus/snes/sdd1.h +++ b/src/devices/bus/snes/sdd1.h @@ -10,7 +10,10 @@ class SDD1_IM //Input Manager { public: - SDD1_IM() {} + SDD1_IM(): + m_byte_ptr(0), + m_bit_count(0) + { } UINT32 m_byte_ptr; UINT8 m_bit_count; @@ -34,8 +37,12 @@ class SDD1_BG // Bits Generator { public: SDD1_BG(SDD1_GCD* associatedGCD, UINT8 code) - : m_code_num(code), - m_GCD(associatedGCD) { } + : m_code_num(code), + m_MPScount(0), + m_LPSind(0), + m_GCD(associatedGCD) + { + } UINT8 m_code_num; UINT8 m_MPScount; @@ -83,7 +90,7 @@ class SDD1_CM { public: SDD1_CM(SDD1_PEM* associatedPEM) - : m_PEM(associatedPEM) { } + : m_bitplanesInfo(0), m_contextBitsInfo(0), m_bit_number(0), m_currBitplane(0), m_PEM(associatedPEM) { } UINT8 m_bitplanesInfo; UINT8 m_contextBitsInfo; @@ -101,7 +108,7 @@ class SDD1_OL { public: SDD1_OL(SDD1_CM* associatedCM) - : m_CM(associatedCM) { } + : m_bitplanesInfo(0), m_length(0), m_buffer(nullptr), m_CM(associatedCM) { } UINT8 m_bitplanesInfo; UINT16 m_length; diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp index 93edb4aeb50..a9723009771 100644 --- a/src/devices/bus/snes/sgb.cpp +++ b/src/devices/bus/snes/sgb.cpp @@ -22,12 +22,24 @@ const device_type SNS_LOROM_SUPERGB = &device_creator<sns_rom_sgb_device>; -sns_rom_sgb_device::sns_rom_sgb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom_device(mconfig, SNS_LOROM_SUPERGB, "SNES Super Game Boy Cart", tag, owner, clock, "sns_rom_sgb", __FILE__), - m_gb_cpu(*this, "sgb_cpu"), - m_gb_snd(*this, "sgb_snd"), - m_gb_lcd(*this, "sgb_lcd"), - m_cartslot(*this, "gb_slot") +sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : + sns_rom_device(mconfig, SNS_LOROM_SUPERGB, "SNES Super Game Boy Cart", tag, owner, clock, "sns_rom_sgb", __FILE__), + m_gb_cpu(*this, "sgb_cpu"), + m_gb_snd(*this, "sgb_snd"), + m_gb_lcd(*this, "sgb_lcd"), + m_cartslot(*this, "gb_slot"), + m_sgb_ly(0), + m_sgb_row(0), + m_vram(0), + m_port(0), + m_joy1(0), + m_joy2(0), + m_joy3(0), + m_joy4(0), + m_vram_offs(0), + m_mlt_req(0), + m_lcd_row(0), + m_packetsize(0) { } diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 92da3357dd1..f9cd16f4e7e 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -177,7 +177,7 @@ base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconf device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_addon(ADDON_NONE), - m_type(SNES_MODE20) + m_type(SNES_MODE20), m_cart(nullptr) { } diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp index 6124ddec6d1..6face9f6b26 100644 --- a/src/devices/bus/snes/spc7110.cpp +++ b/src/devices/bus/snes/spc7110.cpp @@ -25,12 +25,20 @@ const device_type SNS_HIROM_SPC7110_RTC = &device_creator<sns_rom_spc7110rtc_dev sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source) -{ + : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0), + m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0), + m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0), + m_r482b(0), m_r482c(0), m_r482d(0), m_r482e(0), m_r482f(0), m_r4830(0), m_r4831(0), m_r4832(0), m_r4833(0), m_r4834(0), m_dx_offset(0), m_ex_offset(0), m_fx_offset(0), m_r4840(0), + m_r4841(0), m_r4842(0), m_rtc_state(0), m_rtc_mode(0), m_rtc_index(0), m_rtc_offset(0) + { } sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__) + : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0), + m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0), + m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0), + m_r482b(0), m_r482c(0), m_r482d(0), m_r482e(0), m_r482f(0), m_r4830(0), m_r4831(0), m_r4832(0), m_r4833(0), m_r4834(0), m_dx_offset(0), m_ex_offset(0), m_fx_offset(0), m_r4840(0), + m_r4841(0), m_r4842(0), m_rtc_state(0), m_rtc_mode(0), m_rtc_index(0), m_rtc_offset(0) { } diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp index 5d332c4885e..dddda96de46 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.cpp +++ b/src/devices/bus/snes_ctrl/bcbattle.cpp @@ -84,7 +84,7 @@ void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, in snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_BARCODE_BATTLER, "Epoch Barcode Battler (SFC)", tag, owner, clock, "snes_bcbattle", __FILE__), device_snes_control_port_interface(mconfig, *this), - m_reader(*this, "battler") + m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr), m_strobe(0), m_idx(0) { } diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp index ccd05ec8cf9..af8ed67db02 100644 --- a/src/devices/bus/snes_ctrl/ctrl.cpp +++ b/src/devices/bus/snes_ctrl/ctrl.cpp @@ -59,7 +59,7 @@ device_snes_control_port_interface::~device_snes_control_port_interface() snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_CONTROL_PORT, "Nintendo SNES / SFC control port", tag, owner, clock, "snes_control_port", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_device(nullptr) { } diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp index 7afb9e8f9a8..0edea6be148 100644 --- a/src/devices/bus/snes_ctrl/joypad.cpp +++ b/src/devices/bus/snes_ctrl/joypad.cpp @@ -55,7 +55,7 @@ ioport_constructor snes_joypad_device::device_input_ports() const snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_JOYPAD, "Nintendo SNES / SFC Control Pad", tag, owner, clock, "snes_joypad", __FILE__), device_snes_control_port_interface(mconfig, *this), - m_joypad(*this, "JOYPAD") + m_joypad(*this, "JOYPAD"), m_strobe(0), m_latch(0) { } diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp index d0dfddb71ff..7ec640047de 100644 --- a/src/devices/bus/snes_ctrl/miracle.cpp +++ b/src/devices/bus/snes_ctrl/miracle.cpp @@ -64,7 +64,8 @@ snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const ch device_serial_interface(mconfig, *this), device_snes_control_port_interface(mconfig, *this), m_midiin(*this, "mdin"), - m_midiout(*this, "mdout") + m_midiout(*this, "mdout"), strobe_timer(nullptr), m_strobe_on(0), m_midi_mode(0), m_sent_bits(0), m_strobe_clock(0), + m_data_sent(0), m_xmit_read(0), m_xmit_write(0), m_recv_read(0), m_recv_write(0), m_tx_busy(false), m_read_status(false), m_status_bit(false) { } diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp index 535b68d02bb..fc851dc33f6 100644 --- a/src/devices/bus/snes_ctrl/mouse.cpp +++ b/src/devices/bus/snes_ctrl/mouse.cpp @@ -63,7 +63,8 @@ snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char * device_snes_control_port_interface(mconfig, *this), m_buttons(*this, "BUTTONS"), m_xaxis(*this, "MOUSE_X"), - m_yaxis(*this, "MOUSE_Y") + m_yaxis(*this, "MOUSE_Y"), m_strobe(0), m_idx(0), m_latch(0), m_x(0), m_y(0), m_oldx(0), m_oldy(0), m_deltax(0), + m_deltay(0), m_speed(0), m_dirx(0), m_diry(0) { } diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp index 7b5ad87bfbc..2eba8914bcb 100644 --- a/src/devices/bus/snes_ctrl/multitap.cpp +++ b/src/devices/bus/snes_ctrl/multitap.cpp @@ -74,7 +74,7 @@ snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const m_port2(*this, "port2"), m_port3(*this, "port3"), m_port4(*this, "port4"), - m_cfg(*this, "CONFIG") + m_cfg(*this, "CONFIG"), m_select(0) { } diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp index 724c4bccbd9..ecdc1b21fe5 100644 --- a/src/devices/bus/snes_ctrl/pachinko.cpp +++ b/src/devices/bus/snes_ctrl/pachinko.cpp @@ -48,7 +48,7 @@ snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const device_t(mconfig, SNES_PACHINKO, "Sunsoft Pachinko Controller", tag, owner, clock, "snes_pachinko", __FILE__), device_snes_control_port_interface(mconfig, *this), m_dial(*this, "DIAL"), - m_button(*this, "BUTTON") + m_button(*this, "BUTTON"), m_strobe(0), m_latch(0) { } diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp index 72c81e84328..3f26fe562c4 100644 --- a/src/devices/bus/snes_ctrl/sscope.cpp +++ b/src/devices/bus/snes_ctrl/sscope.cpp @@ -58,7 +58,7 @@ snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char device_snes_control_port_interface(mconfig, *this), m_buttons(*this, "BUTTONS"), m_xaxis(*this, "SSX"), - m_yaxis(*this, "SSY") + m_yaxis(*this, "SSY"), m_strobe(0), m_idx(0), m_latch(0), m_x(0), m_y(0), m_turbo_lock(0), m_pause_lock(0), m_fire_lock(0) { } diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp index 0755e14ef74..29db7df0029 100644 --- a/src/devices/bus/snes_ctrl/twintap.cpp +++ b/src/devices/bus/snes_ctrl/twintap.cpp @@ -52,7 +52,7 @@ ioport_constructor snes_twintap_device::device_input_ports() const snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES_TWINTAP, "Yonezawa Twin Tap Controller", tag, owner, clock, "snes_twintap", __FILE__), device_snes_control_port_interface(mconfig, *this), - m_inputs(*this, "INPUTS") + m_inputs(*this, "INPUTS"), m_strobe(0), m_latch(0) { } diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp index 7a63161096e..83d919215a1 100644 --- a/src/devices/bus/spc1000/exp.cpp +++ b/src/devices/bus/spc1000/exp.cpp @@ -37,7 +37,7 @@ device_spc1000_card_interface::~device_spc1000_card_interface() //------------------------------------------------- spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPC1000_EXP_SLOT, "Samsung SPC-1000 expansion", tag, owner, clock, "spc1000_exp", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_card(nullptr) { } diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 9089dae5829..504a13ec0be 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -139,8 +139,8 @@ spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, co device_spc1000_card_interface(mconfig, *this), m_cpu(*this, "fdccpu"), m_fdc(*this, "upd765"), - m_pio(*this, "d8255_master") -{ + m_pio(*this, "d8255_master"), m_fd0(nullptr), m_fd1(nullptr), m_timer_tc(nullptr), m_i8255_0_pc(0), m_i8255_1_pc(0), m_i8255_portb(0) + { } diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp index 55a1150f972..59119a1046c 100644 --- a/src/devices/bus/ti99_peb/bwg.cpp +++ b/src/devices/bus/ti99_peb/bwg.cpp @@ -85,9 +85,10 @@ */ snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__), + : ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__), m_DRQ(), m_IRQ(), m_dip1(0), m_dip2(0), m_dip34(0), m_ram_page(0), m_rom_page(0), m_WAITena(false), m_inDsrArea(false), m_WDsel(false), m_WDsel0(false), m_RTCsel(false), m_lastK(false), m_dataregLB(false), m_rtc_enabled(false), m_MOTOR_ON(), m_lastval(0), m_address(0), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr), m_dsrrom(nullptr), m_buffer_ram(nullptr), m_current_floppy(nullptr), m_wd1773(*this, FDC_TAG), - m_clock(*this, CLOCK_TAG) { } + m_clock(*this, CLOCK_TAG), m_debug_dataout(false) + { } /* Operate the wait state logic. diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp index 57b16fb9466..351efe7d70b 100644 --- a/src/devices/bus/ti99_peb/evpc.cpp +++ b/src/devices/bus/ti99_peb/evpc.cpp @@ -26,7 +26,11 @@ snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "ti99_evpc", __FILE__), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this), + m_dsrrom(nullptr), + m_RAMEN(false), + m_dsr_page(0), + m_novram(nullptr) { } diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp index 62f31b7d141..8982e7acb2d 100644 --- a/src/devices/bus/ti99_peb/hfdc.cpp +++ b/src/devices/bus/ti99_peb/hfdc.cpp @@ -88,9 +88,11 @@ Constructor for the HFDC card. */ myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__), + : ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__), m_motor_on_timer(nullptr), m_hdc9234(*this, FDC_TAG), - m_clock(*this, CLOCK_TAG) + m_clock(*this, CLOCK_TAG), m_current_floppy(nullptr), m_current_harddisk(nullptr), m_see_switches(false), m_irq(), m_dip(), m_motor_running(false), + m_inDsrArea(false), m_HDCsel(false), m_RTCsel(false), m_tapesel(false), m_RAMsel(false), m_ROMsel(false), m_address(0), m_dma_in_progress(false), + m_wait_for_hd1(false), m_dsrrom(nullptr), m_rom_page(0), m_buffer_ram(nullptr), m_status_latch(0), m_dma_address(0), m_output1_latch(0), m_output2_latch(0), m_lastval(0), m_MOTOR_ON(), m_readyflags(0) { } diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp index 36bf35cbd18..b44d009186c 100644 --- a/src/devices/bus/ti99_peb/horizon.cpp +++ b/src/devices/bus/ti99_peb/horizon.cpp @@ -67,7 +67,7 @@ horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this), m_ram(nullptr), m_nvram(nullptr), m_ros(nullptr), m_select6_value(0), m_select_all(0), m_page(0), m_cru_horizon(0), m_cru_phoenix(0), m_timode(false), m_32k_installed(false), m_split_mode(false), m_rambo_mode(false), m_killswitch(false), m_use_rambo(false) { } diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp index 8cfe1c9ede7..14dc8bac20a 100644 --- a/src/devices/bus/ti99_peb/hsgpl.cpp +++ b/src/devices/bus/ti99_peb/hsgpl.cpp @@ -140,7 +140,10 @@ #define ROM6_EEPROM "u6_rom6" snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__) +: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__), m_dsr_eeprom(nullptr), +m_rom6_eeprom(nullptr), m_grom_a_eeprom(nullptr), m_grom_b_eeprom(nullptr), m_ram6_memory(nullptr), m_gram_memory(nullptr), m_dsr_enabled(false), +m_gram_enabled(false), m_bank_inhibit(false), m_dsr_page(0), m_card_enabled(false), m_write_enabled(false), m_supercart_enabled(false), m_led_on(false), +m_mbx_enabled(false), m_ram_enabled(false), m_flash_mode(false), m_current_grom_port(0), m_current_bank(0), m_module_bank(0), m_waddr_LSB(false), m_raddr_LSB(false), m_grom_address(0) { } diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp index 66c3a571838..1a56fe6a492 100644 --- a/src/devices/bus/ti99_peb/memex.cpp +++ b/src/devices/bus/ti99_peb/memex.cpp @@ -33,7 +33,9 @@ enum }; geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__) +: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__), + m_ram(nullptr), + m_genmod(0) { } diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp index caeeb9504df..0ccd0f4178a 100644 --- a/src/devices/bus/ti99_peb/myarcmem.cpp +++ b/src/devices/bus/ti99_peb/myarcmem.cpp @@ -45,7 +45,8 @@ enum }; myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__) +: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__), +m_ram(nullptr), m_dsrrom(nullptr), m_bank(0), m_size(0) { } diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp index eb12a20a8e8..9baff162ac7 100644 --- a/src/devices/bus/ti99_peb/pcode.cpp +++ b/src/devices/bus/ti99_peb/pcode.cpp @@ -96,7 +96,7 @@ #define VERBOSE 1 ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__) +: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__), m_rom(nullptr), m_bank_select(0), m_switch(false) { } diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp index 9d5024e7fa6..966f0221c4d 100644 --- a/src/devices/bus/ti99_peb/peribox.cpp +++ b/src/devices/bus/ti99_peb/peribox.cpp @@ -220,7 +220,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d : bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__), m_console_inta(*this), m_console_intb(*this), - m_datamux_ready(*this) + m_datamux_ready(*this), m_inta_flag(0), m_intb_flag(0), m_ready_flag(0) { for (int i=2; i <= 8; i++) m_slot[i] = NULL; // The address prefix is actually created by the "Flex cable interface" @@ -235,7 +235,7 @@ peribox_device::peribox_device(const machine_config &mconfig, device_type type, : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_console_inta(*this), m_console_intb(*this), - m_datamux_ready(*this) + m_datamux_ready(*this), m_inta_flag(0), m_intb_flag(0), m_ready_flag(0), m_address_prefix(0) { for (int i=2; i <= 8; i++) m_slot[i] = NULL; } @@ -614,7 +614,7 @@ int peribox_slot_device::get_index_from_tagname() } peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this) +: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_slotnumber(0) { } diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h index 7e48726f75c..5ab71620f7b 100644 --- a/src/devices/bus/ti99_peb/peribox.h +++ b/src/devices/bus/ti99_peb/peribox.h @@ -193,8 +193,8 @@ class ti_expansion_card_device : public bus8z_device, public device_slot_card_in public: ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_card_interface(mconfig, *this) - { + device_slot_card_interface(mconfig, *this), m_selected(false), m_cru_base(0), m_select_mask(0), m_select_value(0) +{ m_slot = static_cast<peribox_slot_device*>(owner); m_senila = CLEAR_LINE; m_senilb = CLEAR_LINE; diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp index 7a8db384ffd..9c22aaa36d1 100644 --- a/src/devices/bus/ti99_peb/samsmem.cpp +++ b/src/devices/bus/ti99_peb/samsmem.cpp @@ -26,7 +26,7 @@ #define LOG logerror sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__) +: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__), m_ram(nullptr), m_map_mode(false), m_access_mapper(false) { } diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp index 70be9ee3db6..1fb447f6d17 100644 --- a/src/devices/bus/ti99_peb/spchsyn.cpp +++ b/src/devices/bus/ti99_peb/spchsyn.cpp @@ -33,7 +33,7 @@ /****************************************************************************/ ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__) +: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__), m_vsp(nullptr), m_read_mode(false) { } diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp index 49ce105b89c..9e4a2b82349 100644 --- a/src/devices/bus/ti99_peb/ti_32kmem.cpp +++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp @@ -32,7 +32,7 @@ #define RAMREGION "ram" ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__) +: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__), m_ram_ptr(nullptr) { } diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp index e43a1be2475..a7cb3a8bb45 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.cpp +++ b/src/devices/bus/ti99_peb/ti_fdc.cpp @@ -48,8 +48,10 @@ #define TI_FDC_TAG "ti_dssd_controller" ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__), - m_fd1771(*this, FDC_TAG) { } + : ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__), m_address(0), m_DRQ(), m_IRQ(), + m_lastval(0), m_DVENA(), m_inDsrArea(false), m_WAITena(false), m_WDsel(false), m_DSEL(0), m_SIDSEL(), m_motor_on_timer(nullptr), + m_fd1771(*this, FDC_TAG), m_dsrrom(nullptr), m_current_floppy(nullptr), m_debug_dataout(false) + { } /* Operate the wait state logic. diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp index 9f3706cece1..b55399e207a 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.cpp +++ b/src/devices/bus/ti99_peb/ti_rs232.cpp @@ -117,7 +117,7 @@ #define ESC 0x1b ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__) +: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__), m_piodev(nullptr), m_dsrrom(nullptr), m_pio_direction_in(false), m_pio_handshakeout(false), m_pio_handshakein(false), m_pio_spareout(false), m_pio_sparein(false), m_flag0(false), m_led(false), m_pio_out_buffer(0), m_pio_in_buffer(0), m_pio_readable(false), m_pio_writable(false), m_pio_write(false), m_ila(0) { } diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp index 10e69ace518..b371a1937d4 100644 --- a/src/devices/bus/ti99_peb/tn_ide.cpp +++ b/src/devices/bus/ti99_peb/tn_ide.cpp @@ -50,8 +50,10 @@ enum }; nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__), - m_ata(*this, "ata") + : ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__), m_ata_irq(false), + m_cru_register(0), m_rtc(nullptr), + m_ata(*this, "ata"), m_clk_irq(false), m_sram_enable(false), m_sram_enable_dip(false), m_cur_page(0), m_tms9995_mode(false), + m_input_latch(0), m_output_latch(0), m_ram(nullptr) { } diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp index f3a911af0f2..7f5f79e0e4f 100644 --- a/src/devices/bus/ti99_peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp @@ -52,7 +52,9 @@ enum }; nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__), +: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__), +m_feeprom_page(0), m_sram_page(0), m_cru_register(0), m_tms9995_mode(false), m_enable_io(false), m_enable_int(false), m_enable_sm(false), +m_write_flash(false), m_input_latch(0), m_output_latch(0), m_smartmedia(*this, "smartmedia"), m_flash(*this, STRATA_TAG) { diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp index 5eb8ea58892..b9e13091837 100644 --- a/src/devices/bus/ti99x/990_dk.cpp +++ b/src/devices/bus/ti99x/990_dk.cpp @@ -43,8 +43,9 @@ enum const device_type FD800 = &device_creator<fd800_legacy_device>; fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__), - m_int_line(*this) + : device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__), + m_recv_buf(0), m_stat_reg(0), m_xmit_buf(0), m_cmd_reg(0), m_interrupt_f_f(0), + m_int_line(*this), m_buf_pos(0), m_buf_mode(), m_unit(0), m_sector(0) { } diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp index 987cac6de54..21efa853f28 100644 --- a/src/devices/bus/ti99x/998board.cpp +++ b/src/devices/bus/ti99x/998board.cpp @@ -205,7 +205,7 @@ mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, MAINBOARD8, "TI-99/8 Main board", tag, owner, clock, "ti998_mainboard", __FILE__), - m_ready(*this), + m_ready(*this), m_dsr_selected(false), m_hexbus_selected(false), m_CRUS(false), m_PTGE(false), m_waitcount(0), m_sram(nullptr), m_dram(nullptr), m_rom0(nullptr), m_rom1(nullptr), m_pcode(nullptr), m_oso(*this, OSO_TAG) { } @@ -859,7 +859,7 @@ enum }; ti998_oso_device::ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: device_t(mconfig, OSO, "OSO Hexbus interface", tag, owner, clock, "ti998_oso", __FILE__) +: device_t(mconfig, OSO, "OSO Hexbus interface", tag, owner, clock, "ti998_oso", __FILE__), m_data(0), m_status(0), m_control(0), m_xmit(0) { } @@ -948,7 +948,7 @@ const device_type OSO = &device_creator<ti998_oso_device>; #define REAL_TIMING 0 ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: bus8z_device(mconfig, SPEECH8, "TI-99/8 Onboard Speech synthesizer", tag, owner, clock, "ti998_speech", __FILE__), +: bus8z_device(mconfig, SPEECH8, "TI-99/8 Onboard Speech synthesizer", tag, owner, clock, "ti998_speech", __FILE__), m_vsp(nullptr), m_ready(*this) { } diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h index 87332491b97..3412a00d23e 100644 --- a/src/devices/bus/ti99x/998board.h +++ b/src/devices/bus/ti99x/998board.h @@ -90,7 +90,7 @@ class logically_addressed_device public: logically_addressed_device(mapper8_device_kind kind, device_t *busdevice, const mapper8_list_entry &entry) - : m_kind(kind), m_device(busdevice), m_config(&entry) { }; + : m_next(nullptr), m_kind(kind), m_device(busdevice), m_config(&entry) { }; private: logically_addressed_device *m_next; // needed for simple_list @@ -109,7 +109,7 @@ class physically_addressed_device public: physically_addressed_device(mapper8_device_kind kind, device_t *busdevice, const mapper8_list_entry &entry) - : m_kind(kind), m_device(busdevice), m_config(&entry) { }; + : m_next(nullptr), m_kind(kind), m_device(busdevice), m_config(&entry) { }; private: physically_addressed_device *m_next; // needed for simple_list diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp index c9db97f1788..78fada91e28 100644 --- a/src/devices/bus/ti99x/datamux.cpp +++ b/src/devices/bus/ti99x/datamux.cpp @@ -75,8 +75,9 @@ Constructor */ ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__), - m_ready(*this) { } +: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__), m_spacep(nullptr), + m_ready(*this), m_muxready(), m_sysready(), m_addr_buf(0), m_read_mode(false), m_latch(0), m_waitcount(0), m_ram16b(nullptr), m_use32k(false), m_base32k(0), m_cpu(nullptr) +{ } #define TRACE_READY 0 #define TRACE_ACCESS 0 diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h index 7bc52972602..577da6da6ac 100644 --- a/src/devices/bus/ti99x/datamux.h +++ b/src/devices/bus/ti99x/datamux.h @@ -54,7 +54,7 @@ class attached_device public: attached_device(device_t *busdevice, const dmux_device_list_entry &entry) - : m_device(busdevice), m_config(&entry) { }; + : m_next(nullptr), m_device(busdevice), m_config(&entry) { }; private: attached_device *m_next; diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp index 0c021bd0234..e82d5fc1a8b 100644 --- a/src/devices/bus/ti99x/genboard.cpp +++ b/src/devices/bus/ti99x/genboard.cpp @@ -206,8 +206,8 @@ #define TRACE_PFM 0 geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__), - m_ready(*this) +: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__), m_gromwaddr_LSB(false), m_gromraddr_LSB(false), m_grom_address(0), m_video_waitstates(false), m_extra_waitstates(false), m_ready_asserted(false), m_read_mode(false), m_debug_no_ws(false), m_geneve_mode(false), m_direct_mode(false), m_cartridge_size(0), m_cartridge_secondpage(false), m_cartridge6_writable(false), m_cartridge7_writable(false), m_turbo(false), m_genmod(false), m_timode(false), m_pfm_mode(0), m_pfm_bank(0), m_pfm_output_enable(false), m_sram_mask(0), m_sram_val(0), + m_ready(*this), m_waitcount(0), m_ext_waitcount(0), m_clock(nullptr), m_cpu(nullptr), m_pfm512(nullptr), m_pfm512a(nullptr), m_keyboard(nullptr), m_video(nullptr), m_peribox(nullptr), m_sound(nullptr), m_sram(nullptr), m_dram(nullptr) { m_eprom = NULL; } @@ -1468,7 +1468,9 @@ static const UINT8 MF1_CODE[0xe] = geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock, "geneve_keyboard", __FILE__), - m_interrupt(*this) + m_interrupt(*this), m_key_reset(false), m_key_queue_length(0), m_key_queue_head(0), m_key_in_buffer(false), m_key_numlock_state(false), m_key_ctrl_state(0), m_key_alt_state(0), + m_key_real_shift_state(0), m_key_fake_shift_state(false), m_key_fake_unshift_state(false), m_key_autorepeat_key(0), m_key_autorepeat_timer(0), m_keep_keybuf(false), + m_keyboard_clock(false), m_timer(nullptr) { } @@ -1918,7 +1920,7 @@ const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>; ****************************************************************************/ geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__) +: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__), m_v9938(nullptr), m_last_mx(0), m_last_my(0) { } diff --git a/src/devices/bus/ti99x/grom.cpp b/src/devices/bus/ti99x/grom.cpp index 3c20eeb35d7..3d7d53f43c6 100644 --- a/src/devices/bus/ti99x/grom.cpp +++ b/src/devices/bus/ti99x/grom.cpp @@ -93,8 +93,8 @@ Constructor. */ ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__), - m_gromready(*this) +: bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__), m_writable(false), m_ident(0), m_size(0), + m_gromready(*this), m_clockrate(0), m_address(0), m_buffer(0), m_raddr_LSB(false), m_waddr_LSB(false), m_memptr(nullptr), m_timer(nullptr) { } diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index f246753f3b3..8d815f20d13 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -137,10 +137,11 @@ gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__), device_slot_interface(mconfig, *this), - m_connector(NULL), + m_connector(nullptr), m_reset_on_insert(true), m_console_ready(*this), - m_console_reset(*this) { } + m_console_reset(*this), m_grombase(0), m_grommask(0) +{ } /* Only called for addresses 6000-7fff and GROM addresses (see datamux config) */ READ8Z_MEMBER(gromport_device::readz) @@ -1452,7 +1453,7 @@ const device_type TI99CART = &device_creator<ti99_cartridge_device>; Unlike in the previous implementation we do not model it as a full device. ***************************************************************************/ -ti99_cartridge_pcb::ti99_cartridge_pcb() +ti99_cartridge_pcb::ti99_cartridge_pcb(): m_cart(nullptr), m_grom_size(0), m_rom_size(0), m_ram_size(0), m_rom_ptr(nullptr), m_ram_ptr(nullptr), m_rom_page(0), m_grom_ptr(nullptr), m_grom_address(0), m_ram_page(0), m_tag(nullptr) { } @@ -2124,8 +2125,8 @@ DTD: Constructor. */ rpk::rpk(emu_options& options, const char* sysname) - :m_options(options) - //,m_system_name(sysname) + :m_options(options), m_type(0) +//,m_system_name(sysname) { m_sockets.reset(); } @@ -2461,8 +2462,8 @@ rpk* rpk_reader::open(emu_options &options, const char *filename, const char *sy if (strcmp(socket_node->name, "socket")!=0) throw rpk_exception(RPK_INVALID_LAYOUT, "<pcb> element has only <socket> children"); id = xml_get_attribute_string(socket_node, "id", NULL); if (id == NULL) throw rpk_exception(RPK_INVALID_LAYOUT, "<socket> must have an 'id' attribute"); - uses_name = xml_get_attribute_string(socket_node, "uses", NULL); - if (uses_name == NULL) throw rpk_exception(RPK_INVALID_LAYOUT, "<socket> must have a 'uses' attribute"); + uses_name = xml_get_attribute_string(socket_node, "uses", nullptr); + if (uses_name == nullptr) throw rpk_exception(RPK_INVALID_LAYOUT, "<socket> must have a 'uses' attribute"); bool found = false; // Locate the resource node diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index a6c0c1c3c8f..a0fd7aa0a56 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -404,7 +404,8 @@ public: class ti99_gromemu_cartridge : public ti99_cartridge_pcb { public: - ti99_gromemu_cartridge() { m_grom_address = 0; } + ti99_gromemu_cartridge(): m_waddr_LSB(false) + { m_grom_address = 0; } ~ti99_gromemu_cartridge() { }; DECLARE_READ8Z_MEMBER(readz); DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp index 4b41ea0bd06..2a073636910 100644 --- a/src/devices/bus/ti99x/handset.cpp +++ b/src/devices/bus/ti99x/handset.cpp @@ -51,7 +51,7 @@ static const char *const joynames[2][4] = static const char *const keynames[] = { "KP0", "KP1", "KP2", "KP3", "KP4" }; ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__) +: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr) { } @@ -490,7 +490,7 @@ INPUT_PORTS_START( joysticks ) INPUT_PORTS_END ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) -: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__) +: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0) { } diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp index d49345e0b0a..9aab362f812 100644 --- a/src/devices/bus/ti99x/joyport.cpp +++ b/src/devices/bus/ti99x/joyport.cpp @@ -42,7 +42,7 @@ joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock, "ti99_joyport", __FILE__), device_slot_interface(mconfig, *this), - m_interrupt(*this) + m_interrupt(*this), m_connected(nullptr) { } diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h index 6d19148fad7..5344b62fa36 100644 --- a/src/devices/bus/ti99x/joyport.h +++ b/src/devices/bus/ti99x/joyport.h @@ -33,7 +33,8 @@ class joyport_attached_device : public device_t { public: joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } + : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_joyport(nullptr) +{ } virtual UINT8 read_dev() =0; virtual void write_dev(UINT8 data) =0; diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp index 6afcec642d4..573fce594ff 100644 --- a/src/devices/bus/ti99x/mecmouse.cpp +++ b/src/devices/bus/ti99x/mecmouse.cpp @@ -53,7 +53,7 @@ #define POLL_TIMER 1 mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__) + : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__), m_last_select(0), m_read_y_axis(false), m_x(0), m_y(0), m_x_buf(0), m_y_buf(0), m_last_mx(0), m_last_my(0), m_poll_timer(nullptr) { } diff --git a/src/devices/bus/ti99x/videowrp.cpp b/src/devices/bus/ti99x/videowrp.cpp index d42349947f8..bb6f01f6a89 100644 --- a/src/devices/bus/ti99x/videowrp.cpp +++ b/src/devices/bus/ti99x/videowrp.cpp @@ -28,7 +28,8 @@ Constructors */ ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) -: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source) +: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), +m_tms9928a(nullptr) { } @@ -38,7 +39,7 @@ ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const ch } ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__) + : ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__), m_v9938(nullptr) { } diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h index c38a8e7f152..f45cfabc865 100644 --- a/src/devices/bus/ti99x/videowrp.h +++ b/src/devices/bus/ti99x/videowrp.h @@ -85,7 +85,7 @@ class ti_sound_system_device : public bus8z_device { public: ti_sound_system_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), + : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_sound_chip(nullptr), m_console_ready(*this) { }; // Cannot read from sound; just ignore silently diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp index 3122ff5fc31..36b2b78811c 100644 --- a/src/devices/bus/tiki100/exp.cpp +++ b/src/devices/bus/tiki100/exp.cpp @@ -29,7 +29,9 @@ const device_type TIKI100_BUS_SLOT = &device_creator<tiki100_bus_slot_t>; tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIKI100_BUS_SLOT, "TIKI-100 expansion bus slot", tag, owner, clock, "tiki100bus_slot", __FILE__), device_slot_interface(mconfig, *this), - device_z80daisy_interface(mconfig, *this) + device_z80daisy_interface(mconfig, *this), + m_bus(nullptr), + m_card(nullptr) { } @@ -186,8 +188,8 @@ WRITE_LINE_MEMBER( tiki100_bus_t::busak_w ) //------------------------------------------------- device_tiki100bus_card_interface::device_tiki100bus_card_interface(const machine_config &mconfig, device_t &device) : - device_slot_card_interface(mconfig, device), - m_busak(CLEAR_LINE) + device_slot_card_interface(mconfig, device), m_bus(nullptr), + m_busak(CLEAR_LINE), m_next(nullptr) { m_slot = dynamic_cast<tiki100_bus_slot_t *>(device.owner()); } diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index 760226a2cfb..b527c0ba896 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -61,8 +61,8 @@ const device_type TVC_HBF = &device_creator<tvc_hbf_device>; tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "tvc_hbf", __FILE__), device_tvcexp_interface( mconfig, *this ), - m_fdc(*this, "fdc") -{ + m_fdc(*this, "fdc"), m_rom(nullptr), m_ram(nullptr), m_rom_bank(0) + { } diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp index 54ea47c9149..2ee28a2f3c0 100644 --- a/src/devices/bus/tvc/tvc.cpp +++ b/src/devices/bus/tvc/tvc.cpp @@ -56,7 +56,7 @@ tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock, "tvcexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_out_irq_cb(*this), - m_out_nmi_cb(*this) + m_out_nmi_cb(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp index da00aeaca04..87e0130deda 100644 --- a/src/devices/bus/vboy/slot.cpp +++ b/src/devices/bus/vboy/slot.cpp @@ -78,7 +78,7 @@ vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, cons device_t(mconfig, VBOY_CART_SLOT, "Nintendo Virtual Boy Cartridge Slot", tag, owner, clock, "vboy_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(VBOY_STD) + m_type(VBOY_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp index 2c353ef90b6..501ee091800 100644 --- a/src/devices/bus/vc4000/slot.cpp +++ b/src/devices/bus/vc4000/slot.cpp @@ -76,7 +76,7 @@ vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, device_t(mconfig, VC4000_CART_SLOT, "Interton VC 4000 Cartridge Slot", tag, owner, clock, "vc4000_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(VC4000_STD) + m_type(VC4000_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index f0787b6bcb4..87a2ee34424 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -17,9 +17,15 @@ const device_type ATARI_DPC = &device_creator<dpc_device>; -dpc_device::dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, ATARI_DPC, "Atari DCP", tag, owner, clock, "atari_dcp", __FILE__), - m_displaydata(NULL) +dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : + device_t(mconfig, ATARI_DPC, "Atari DCP", tag, owner, clock, "atari_dcp", __FILE__), + m_movamt(0), + m_latch_62(0), + m_latch_64(0), + m_dlc(0), + m_shift_reg(0), + m_displaydata(nullptr), + m_oscillator(nullptr) { } diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp index 6449f756ed4..2c4dcd0d3a0 100755 --- a/src/devices/bus/vcs/rom.cpp +++ b/src/devices/bus/vcs/rom.cpp @@ -104,20 +104,20 @@ a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char * a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_2k_device(mconfig, A26_ROM_FE, "Atari VCS 2600 ROM Carts w/FE bankswitch", tag, owner, clock, "vcs_fe", __FILE__) -{ + : a26_rom_2k_device(mconfig, A26_ROM_FE, "Atari VCS 2600 ROM Carts w/FE bankswitch", tag, owner, clock, "vcs_fe", __FILE__), m_base_bank(0), m_trigger_on_next_access(0) + { } a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_f6_device(mconfig, A26_ROM_3E, "Atari VCS 2600 ROM Carts w/3E bankswitch", tag, owner, clock, "vcs_3e", __FILE__) -{ + : a26_rom_f6_device(mconfig, A26_ROM_3E, "Atari VCS 2600 ROM Carts w/3E bankswitch", tag, owner, clock, "vcs_3e", __FILE__), m_num_bank(0), m_ram_bank(0), m_ram_enable(0) + { } a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_f6_device(mconfig, A26_ROM_3F, "Atari VCS 2600 ROM Carts w/3F bankswitch", tag, owner, clock, "vcs_3f", __FILE__) -{ + : a26_rom_f6_device(mconfig, A26_ROM_3F, "Atari VCS 2600 ROM Carts w/3F bankswitch", tag, owner, clock, "vcs_3f", __FILE__), m_num_bank(0) + { } @@ -128,8 +128,8 @@ a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char * a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_f6_device(mconfig, A26_ROM_E7, "Atari VCS 2600 ROM Carts w/E7 bankswitch", tag, owner, clock, "vcs_e7", __FILE__) -{ + : a26_rom_f6_device(mconfig, A26_ROM_E7, "Atari VCS 2600 ROM Carts w/E7 bankswitch", tag, owner, clock, "vcs_e7", __FILE__), m_ram_bank(0) + { } @@ -152,8 +152,8 @@ a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char * a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_f6_device(mconfig, A26_ROM_FV, "Atari VCS 2600 ROM Carts w/FV bankswitch", tag, owner, clock, "vcs_fv", __FILE__) -{ + : a26_rom_f6_device(mconfig, A26_ROM_FV, "Atari VCS 2600 ROM Carts w/FV bankswitch", tag, owner, clock, "vcs_fv", __FILE__), m_locked(0) + { } @@ -170,8 +170,8 @@ a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const ch a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : a26_rom_f8_device(mconfig, A26_ROM_8IN1, "Atari VCS 2600 ROM Cart 8 in 1", tag, owner, clock, "vcs_8in1", __FILE__) -{ + : a26_rom_f8_device(mconfig, A26_ROM_8IN1, "Atari VCS 2600 ROM Cart 8 in 1", tag, owner, clock, "vcs_8in1", __FILE__), m_reset_bank(0) + { } diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index a3d90391ce9..57366f05186 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -42,8 +42,16 @@ const device_type A26_ROM_SUPERCHARGER = &device_creator<a26_rom_ss_device>; a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a26_rom_f6_device(mconfig, A26_ROM_SUPERCHARGER, "Atari 2600 ROM Cart Supercharger", tag, owner, clock, "a2600_ss", __FILE__), - m_cassette(*this, "cassette") -{ + m_cassette(*this, "cassette"), + m_maincpu(nullptr), + m_reg(0), + m_write_delay(0), + m_ram_write_enabled(0), + m_rom_enabled(0), + m_byte_started(0), + m_last_address(0), + m_diff_adjust(0) + { } //------------------------------------------------- diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp index e4824d91d60..0295c0d7d7d 100755 --- a/src/devices/bus/vcs/vcs_slot.cpp +++ b/src/devices/bus/vcs/vcs_slot.cpp @@ -80,7 +80,7 @@ void device_vcs_cart_interface::ram_alloc(UINT32 size) vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_CART_SLOT, "Atari VCS 2600 Cartridge Slot", tag, owner, clock, "vcs_cart_slot", __FILE__), device_image_interface(mconfig, *this), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0) { } diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp index 07afbb93cb1..a74c5ae1b84 100644 --- a/src/devices/bus/vcs_ctrl/ctrl.cpp +++ b/src/devices/bus/vcs_ctrl/ctrl.cpp @@ -44,7 +44,7 @@ device_vcs_control_port_interface::device_vcs_control_port_interface(const machi vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock, "vcs_control_port", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), m_device(nullptr), m_write_trigger(*this) { } diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp index 0ef8b6b4db3..b1a1f2079d6 100644 --- a/src/devices/bus/vcs_ctrl/keypad.cpp +++ b/src/devices/bus/vcs_ctrl/keypad.cpp @@ -56,7 +56,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__), device_vcs_control_port_interface(mconfig, *this), - m_keypad(*this, "KEYPAD") + m_keypad(*this, "KEYPAD"), m_column(0) { } diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index 866fd741f9a..d8f2993a3be 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -38,8 +38,8 @@ vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char } vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : vectrex_rom_device(mconfig, VECTREX_ROM_64K, "Vectrex Carts w/ Bankswitch", tag, owner, clock, "vectrex_64k", __FILE__) -{ + : vectrex_rom_device(mconfig, VECTREX_ROM_64K, "Vectrex Carts w/ Bankswitch", tag, owner, clock, "vectrex_64k", __FILE__), m_bank(0) + { } vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 932248c22ce..0d29be505cd 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -67,7 +67,7 @@ vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), m_type(VECTREX_STD), - m_vec3d(VEC3D_NONE) + m_vec3d(VEC3D_NONE), m_cart(nullptr) { } diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index c6d7a43c6bb..911ae63b881 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -63,7 +63,7 @@ vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &m m_write_irq(*this), m_write_res(*this), m_write_cnt(*this), - m_write_sp(*this) + m_write_sp(*this), m_card(nullptr) { } diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp index bab88756ff5..bb29967c910 100644 --- a/src/devices/bus/vic20/exp.cpp +++ b/src/devices/bus/vic20/exp.cpp @@ -62,7 +62,7 @@ vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &m device_image_interface(mconfig, *this), m_write_irq(*this), m_write_nmi(*this), - m_write_res(*this) + m_write_res(*this), m_card(nullptr) { } diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index 6b9cc319cd4..9c24b0de19e 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -114,7 +114,7 @@ vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconf device_t(mconfig, VIC20_FE3, "Final Expansion v3", tag, owner, clock, "vic20_fe3", __FILE__), device_vic20_expansion_card_interface(mconfig, *this), m_flash_rom(*this, AM29F040_TAG), - m_ram(*this, "sram") + m_ram(*this, "sram"), m_reg1(0), m_reg2(0), m_lockbit(0) { } diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index 482f7f01b03..e0ee8cd91a6 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -139,7 +139,7 @@ vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, d device_vic20_expansion_card_interface(mconfig, *this), m_via0(*this, M6522_0_TAG), m_via1(*this, M6522_1_TAG), - m_bus(*this, IEEE488_TAG) + m_bus(*this, IEEE488_TAG), m_via0_irq(0), m_via1_irq(0) { } diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp index e3634283efa..f6ad31c791a 100644 --- a/src/devices/bus/vidbrain/exp.cpp +++ b/src/devices/bus/vidbrain/exp.cpp @@ -90,7 +90,7 @@ videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock, "videobrain_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), - m_write_extres(*this) + m_write_extres(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp index bdebad76dba..fb8dda396de 100644 --- a/src/devices/bus/vip/byteio.cpp +++ b/src/devices/bus/vip/byteio.cpp @@ -45,7 +45,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__), device_slot_interface(mconfig, *this), - m_write_inst(*this) + m_write_inst(*this), m_cart(nullptr) { } diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp index 4d83df7119a..24d5d8bc06a 100644 --- a/src/devices/bus/vip/exp.cpp +++ b/src/devices/bus/vip/exp.cpp @@ -55,7 +55,7 @@ vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconf device_slot_interface(mconfig, *this), m_write_int(*this), m_write_dma_out(*this), - m_write_dma_in(*this) + m_write_dma_in(*this), m_card(nullptr) { } diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index c5f4ed201e4..dbf25a6a190 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -82,7 +82,7 @@ vp550_device::vp550_device(const machine_config &mconfig, const char *tag, devic device_t(mconfig, VP550, "VP550", tag, owner, clock, "vp550", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_pfg_a(*this, CDP1863_A_TAG), - m_pfg_b(*this, CDP1863_B_TAG) + m_pfg_b(*this, CDP1863_B_TAG), m_sync_timer(nullptr) { } diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp index dd51edebcff..81d73634fe1 100644 --- a/src/devices/bus/vip/vp585.cpp +++ b/src/devices/bus/vip/vp585.cpp @@ -83,7 +83,7 @@ vp585_device::vp585_device(const machine_config &mconfig, const char *tag, devic device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__), device_vip_expansion_card_interface(mconfig, *this), m_j1(*this, "J1"), - m_j2(*this, "J2") + m_j2(*this, "J2"), m_keylatch(0) { } diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index e4a045388dd..b9027a9c943 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -142,7 +142,7 @@ vp590_device::vp590_device(const machine_config &mconfig, const char *tag, devic m_cgc(*this, CDP1862_TAG), m_color_ram(*this, "color_ram"), m_j1(*this, "J1"), - m_j2(*this, "J2") + m_j2(*this, "J2"), m_a12(0), m_color(0), m_keylatch(0) { } diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index ef169703035..a72b19fde62 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -72,7 +72,7 @@ floppy_controller_device::floppy_controller_device(const machine_config &mconfig device_memexp_interface(mconfig, *this), m_memexp(*this, "mem"), m_floppy0(*this, "0"), - m_floppy1(*this, "1") + m_floppy1(*this, "1"), m_floppy(nullptr), m_latch(0), m_shifter(0), m_latching_inverter(false), m_current_cyl(0), m_write_position(0) { } diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp index e53b8ea2308..43e1176e04c 100644 --- a/src/devices/bus/wangpc/emb.cpp +++ b/src/devices/bus/wangpc/emb.cpp @@ -46,7 +46,7 @@ const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>; wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock, "wangpc_emb", __FILE__), device_wangpcbus_card_interface(mconfig, *this), - m_ram(*this, "ram") + m_ram(*this, "ram"), m_option(0), m_parity_error(0), m_parity_odd(0) { } diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index fb0ef5e9325..7f7e0ebe25b 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -171,7 +171,7 @@ wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char * device_wangpcbus_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), m_video_ram(*this, "video_ram"), - m_option(0), + m_option(0), m_scroll(0), m_irq(CLEAR_LINE) { } diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index 35a664201b9..37bd21dda25 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -106,7 +106,7 @@ wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char * device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock, "wangpc_mcc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_sio(*this, Z80SIO2_TAG), - m_dart(*this, Z80DART_TAG) + m_dart(*this, Z80DART_TAG), m_option(0), m_irq(0) { } diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index a2b7214c054..47bda2c6747 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -155,7 +155,7 @@ wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char * device_wangpcbus_card_interface(mconfig, *this), m_hgdc0(*this, UPD7720_0_TAG), m_hgdc1(*this, UPD7720_1_TAG), - m_option(0), + m_option(0), m_underline(0), m_palette(*this, "palette") { } diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index d5773f8e283..487db67e80e 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -28,7 +28,9 @@ const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>; wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock, "wangpcbus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_bus(nullptr), + m_sid(0) { } @@ -246,7 +248,7 @@ WRITE_LINE_MEMBER( wangpcbus_device::tc_w ) //------------------------------------------------- device_wangpcbus_card_interface::device_wangpcbus_card_interface(const machine_config &mconfig, device_t &device) : - device_slot_card_interface(mconfig, device) + device_slot_card_interface(mconfig, device), m_bus(nullptr), m_sid(0), m_next(nullptr) { m_slot = dynamic_cast<wangpcbus_slot_device *>(device.owner()); } diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 4e4e8fb92bc..7b2dafdd5f9 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -145,7 +145,7 @@ wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char * device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock, "wangpc_wdc", __FILE__), device_wangpcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), - m_ctc(*this, MK3882_TAG) + m_ctc(*this, MK3882_TAG), m_status(0), m_option(0), m_irq(0) { } diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index de57f954b8c..fbfab9272e4 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -26,27 +26,53 @@ const device_type WS_ROM_SRAM = &device_creator<ws_rom_sram_device>; const device_type WS_ROM_EEPROM = &device_creator<ws_rom_eeprom_device>; -ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_ws_cart_interface( mconfig, *this ) +ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : + device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_ws_cart_interface(mconfig, *this), + m_base20(0), + m_base30(0), + m_base40(0), + m_rtc_setting(0), + m_rtc_year(0), + m_rtc_month(0), + m_rtc_day(0), + m_rtc_day_of_week(0), + m_rtc_hour(0), + m_rtc_minute(0), + m_rtc_second(0), + m_rtc_index(0), + rtc_timer(nullptr) { } ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WS_ROM_STD, "Wonderswan Standard Carts", tag, owner, clock, "ws_rom", __FILE__), - device_ws_cart_interface( mconfig, *this ) -{ + device_ws_cart_interface( mconfig, *this ), m_base20(0), + m_base30(0), + m_base40(0), + m_rtc_setting(0), + m_rtc_year(0), + m_rtc_month(0), + m_rtc_day(0), + m_rtc_day_of_week(0), + m_rtc_hour(0), + m_rtc_minute(0), + m_rtc_second(0), + m_rtc_index(0), + rtc_timer(nullptr) + { } ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ws_rom_device(mconfig, WS_ROM_SRAM, "Wonderswan Carts w/SRAM", tag, owner, clock, "ws_sram", __FILE__) -{ + : ws_rom_device(mconfig, WS_ROM_SRAM, "Wonderswan Carts w/SRAM", tag, owner, clock, "ws_sram", __FILE__), m_nvram_base(0) + { } ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : ws_rom_device(mconfig, WS_ROM_EEPROM, "Wonderswan Carts w/EEPROM", tag, owner, clock, "ws_eeprom", __FILE__) -{ + : ws_rom_device(mconfig, WS_ROM_EEPROM, "Wonderswan Carts w/EEPROM", tag, owner, clock, "ws_eeprom", __FILE__), m_eeprom_mode(0), + m_eeprom_address(0), m_eeprom_command(0), m_eeprom_start(0), m_eeprom_write_enabled(0) + { } diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index 8da5f6e694d..f5efc58ad32 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -80,7 +80,7 @@ ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const ch device_t(mconfig, WS_CART_SLOT, "Wonderswan Cartridge Slot", tag, owner, clock, "ws_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_type(WS_STD) + m_type(WS_STD), m_cart(nullptr) { } diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index affb3ead65c..c1b47f944af 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -30,7 +30,8 @@ machine_config_constructor x68k_neptune_device::device_mconfig_additions() const x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "x68k_neptunex", __FILE__), - device_x68k_expansion_card_interface(mconfig, *this), + device_x68k_expansion_card_interface(mconfig, *this), + m_slot(nullptr), m_dp8390(*this, "dp8390d") { } diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp index b3490cda74d..fce3c4a89ca 100644 --- a/src/devices/bus/x68k/x68k_scsiext.cpp +++ b/src/devices/bus/x68k/x68k_scsiext.cpp @@ -58,7 +58,7 @@ machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock, "x68k_cz6bs1", __FILE__), - device_x68k_expansion_card_interface(mconfig, *this), + device_x68k_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_spc(*this, "mb89352") { } diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp index 3aaf03bdd3a..39f1f74eec9 100644 --- a/src/devices/bus/x68k/x68kexp.cpp +++ b/src/devices/bus/x68k/x68kexp.cpp @@ -40,7 +40,7 @@ x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mco m_out_irq2_cb(*this), m_out_irq4_cb(*this), m_out_nmi_cb(*this), - m_out_reset_cb(*this) + m_out_reset_cb(*this), m_card(nullptr) { } diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp index d35f3d81ccd..b9c8cc6cea7 100644 --- a/src/devices/bus/z88/ram.cpp +++ b/src/devices/bus/z88/ram.cpp @@ -34,14 +34,14 @@ const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>; z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "z88_32k_ram", __FILE__), - device_z88cart_interface( mconfig, *this ) -{ + device_z88cart_interface( mconfig, *this ), m_ram(nullptr) + { } z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_z88cart_interface( mconfig, *this ) -{ + device_z88cart_interface( mconfig, *this ), m_ram(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp index 4ebdef5fc85..08f14011c9d 100644 --- a/src/devices/bus/z88/rom.cpp +++ b/src/devices/bus/z88/rom.cpp @@ -33,14 +33,14 @@ const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>; z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "z88_32k_rom", __FILE__), - device_z88cart_interface( mconfig, *this ) -{ + device_z88cart_interface( mconfig, *this ), m_rom(nullptr) + { } z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_z88cart_interface( mconfig, *this ) -{ + device_z88cart_interface( mconfig, *this ), m_rom(nullptr) + { } //------------------------------------------------- diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp index b1c13865fb7..66b784129a7 100644 --- a/src/devices/bus/z88/z88.cpp +++ b/src/devices/bus/z88/z88.cpp @@ -60,7 +60,7 @@ z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const ch device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock, "z88cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), - m_out_flp_cb(*this) + m_out_flp_cb(*this), m_cart(nullptr), m_flp_timer(nullptr) { } diff --git a/src/devices/cpu/dsp56k/dsp56mem.h b/src/devices/cpu/dsp56k/dsp56mem.h index 93ab74ede42..e8445f1b736 100644 --- a/src/devices/cpu/dsp56k/dsp56mem.h +++ b/src/devices/cpu/dsp56k/dsp56mem.h @@ -13,10 +13,10 @@ namespace DSP56K void mem_reset(dsp56k_core* cpustate); // Adjusts the documented address to match the offset in peripheral RAM -#define A2O(a) (a-0xffc0) +#define A2O(a) (a - 0xffc0) // Adjusts the offset in peripheral RAM to match the documented address -#define O2A(a) (a+0xffc0) +#define O2A(a) (a + 0xffc0) // The memory 'registers' #define PBC (cpustate->peripheral_ram[A2O(0xffc0)]) diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index 0323cbbd56f..94fb85be5df 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -270,7 +270,7 @@ UINT8 i8085a_cpu_device::get_rim_value() if (m_irq_state[I8085_RST55_LINE]) result |= IM_I55; /* fetch the SID bit if we have a callback */ - result = (result & 0x7f) | (sid ? 0x80 : 0); + result = (result & ~IM_SID) | (sid ? IM_SID : 0); return result; } diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp index e6314b9cf83..637f9cc1e47 100644 --- a/src/devices/cpu/i86/i286.cpp +++ b/src/devices/cpu/i86/i286.cpp @@ -1292,7 +1292,7 @@ m_limit[sreg] = LIMIT(desc); } LOADDESC(0x848, DS); #undef LOADDESC // void cast supresses warning -#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr+2); desc[0] = read_word(addr+4); \ +#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr + 2); desc[0] = read_word(addr + 4); \ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } LOADDESC(0x84e, m_gdtr, 1); LOADDESC(0x854, m_ldtr, m_ldtr.rights = RIGHTS(desc)); diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp index a500b287d7a..a85804dc124 100644 --- a/src/devices/cpu/m6502/deco16.cpp +++ b/src/devices/cpu/m6502/deco16.cpp @@ -16,7 +16,8 @@ const device_type DECO16 = &device_creator<deco16_device>; deco16_device::deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__), + m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__), + io(NULL), io_config("io", ENDIANNESS_LITTLE, 8, 16) { } diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index 79aa2a95a83..ef9c3876d9b 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -55,7 +55,13 @@ m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, co read_ad_4(*this), read_ad_5(*this), read_ad_6(*this), - read_ad_7(*this) + read_ad_7(*this), + m_intreq1(0), + m_intreq2(0), + m_intctrl1(0), + m_intctrl2(0), + m_adctrl(0), + m_last_all_ints(0) { } @@ -195,7 +201,7 @@ void m3745x_device::execute_set_input(int inputnum, int state) void m3745x_device::recalc_irqs() { - UINT16 all_ints = 0; + UINT16 all_ints; int static const irq_lines[16] = { -1, -1, -1, M740_INT11_LINE, M740_INT12_LINE, M740_INT13_LINE, -1, -1, diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp index 2a7eb10ee1e..7d8c366a6db 100644 --- a/src/devices/cpu/m6502/m4510.cpp +++ b/src/devices/cpu/m6502/m4510.cpp @@ -14,7 +14,9 @@ const device_type M4510 = &device_creator<m4510_device>; m4510_device::m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__) + m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__), + map_enable(0), + nomap(false) { program_config.m_addrbus_width = 20; program_config.m_logaddr_width = 16; diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp index dc499b912c0..b427ec51488 100644 --- a/src/devices/cpu/m6502/m5074x.cpp +++ b/src/devices/cpu/m6502/m5074x.cpp @@ -49,7 +49,18 @@ m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, co write_p0(*this), write_p1(*this), write_p2(*this), - write_p3(*this) + write_p3(*this), + m_intctrl(0), + m_tmrctrl(0), + m_tmr12pre(0), + m_tmr1(0), + m_tmr2(0), + m_tmrxpre(0), + m_tmrx(0), + m_tmr1latch(0), + m_tmr2latch(0), + m_tmrxlatch(0), + m_last_all_ints(0) { } diff --git a/src/devices/cpu/m6809/6309dasm.cpp b/src/devices/cpu/m6809/6309dasm.cpp index d39f03796e2..41baa606d59 100644 --- a/src/devices/cpu/m6809/6309dasm.cpp +++ b/src/devices/cpu/m6809/6309dasm.cpp @@ -613,7 +613,7 @@ CPU_DISASSEMBLE( hd6309 ) unsigned int ea, flags; int numoperands, offset, indirect; - int i, p = 0, page = 0, opcode_found = FALSE; + int i, p = 0, page = 0, opcode_found; do { diff --git a/src/devices/cpu/m6809/6809dasm.cpp b/src/devices/cpu/m6809/6809dasm.cpp index 192dda3b484..977b86fc951 100644 --- a/src/devices/cpu/m6809/6809dasm.cpp +++ b/src/devices/cpu/m6809/6809dasm.cpp @@ -372,7 +372,7 @@ CPU_DISASSEMBLE( m6809 ) const UINT8 *operandarray; unsigned int ea, flags; int numoperands, offset, indirect; - int i, p = 0, page = 0, opcode_found = FALSE; + int i, p = 0, page = 0, opcode_found; do { diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp index 5b270d26c90..37cc995736e 100644 --- a/src/devices/cpu/m6809/hd6309.cpp +++ b/src/devices/cpu/m6809/hd6309.cpp @@ -127,8 +127,10 @@ const device_type HD6309 = &device_creator<hd6309_device>; // hd6309_device - constructor //------------------------------------------------- -hd6309_device::hd6309_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : m6809_base_device(mconfig, "HD6309", tag, owner, clock, HD6309, 4, "hd6309", __FILE__) +hd6309_device::hd6309_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + m6809_base_device(mconfig, "HD6309", tag, owner, clock, HD6309, 4, "hd6309", __FILE__), + m_md(0), + m_temp_im(0) { } @@ -450,7 +452,7 @@ inline void hd6309_device::bittest_set(bool result) inline m6809_base_device::exgtfr_register hd6309_device::read_exgtfr_register(UINT8 reg) { - UINT16 value = 0; + UINT16 value; switch(reg & 0x0F) { diff --git a/src/devices/cpu/sh2/sh2comn.cpp b/src/devices/cpu/sh2/sh2comn.cpp index 1080203494f..687306babb8 100644 --- a/src/devices/cpu/sh2/sh2comn.cpp +++ b/src/devices/cpu/sh2/sh2comn.cpp @@ -13,14 +13,6 @@ #include "sh2.h" #include "sh2comn.h" - -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) @@ -1022,6 +1014,3 @@ WRITE16_MEMBER(sh2a_device::sh7021_w) { COMBINE_DATA(&m_sh7021_regs[offset]); } -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/cpu/tms32031/32031ops.cpp b/src/devices/cpu/tms32031/32031ops.inc index 9c1786f0c86..9c1786f0c86 100644 --- a/src/devices/cpu/tms32031/32031ops.cpp +++ b/src/devices/cpu/tms32031/32031ops.inc diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp index e8217446d29..9bfe152b1e0 100644 --- a/src/devices/cpu/tms32031/tms32031.cpp +++ b/src/devices/cpu/tms32031/tms32031.cpp @@ -846,4 +846,4 @@ void tms3203x_device::execute_run() // CORE OPCODES //************************************************************************** -#include "32031ops.cpp" +#include "32031ops.inc" diff --git a/src/devices/cpu/tms32051/32051ops.cpp b/src/devices/cpu/tms32051/32051ops.inc index 527c7366394..527c7366394 100644 --- a/src/devices/cpu/tms32051/32051ops.cpp +++ b/src/devices/cpu/tms32051/32051ops.inc diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp index d7c5334be54..c8b40255272 100644 --- a/src/devices/cpu/tms32051/tms32051.cpp +++ b/src/devices/cpu/tms32051/tms32051.cpp @@ -105,7 +105,7 @@ void tms32051_device::DM_WRITE16(UINT16 address, UINT16 data) m_data->write_word(address << 1, data); } -#include "32051ops.cpp" +#include "32051ops.inc" #include "32051ops.h" void tms32051_device::op_group_be() diff --git a/src/devices/cpu/tms34010/34010fld.cpp b/src/devices/cpu/tms34010/34010fld.inc index ca05039dac0..ca05039dac0 100644 --- a/src/devices/cpu/tms34010/34010fld.cpp +++ b/src/devices/cpu/tms34010/34010fld.inc diff --git a/src/devices/cpu/tms34010/34010gfx.cpp b/src/devices/cpu/tms34010/34010gfx.inc index 23c9b72cc97..ce29ba91ab0 100644 --- a/src/devices/cpu/tms34010/34010gfx.cpp +++ b/src/devices/cpu/tms34010/34010gfx.inc @@ -641,35 +641,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] = /* 1bpp cases */ #define BITS_PER_PIXEL 1 #define FUNCTION_NAME(base) base##_1_op0 - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 2bpp cases */ #define BITS_PER_PIXEL 2 #define FUNCTION_NAME(base) base##_2_op0 - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 4bpp cases */ #define BITS_PER_PIXEL 4 #define FUNCTION_NAME(base) base##_4_op0 - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 8bpp cases */ #define BITS_PER_PIXEL 8 #define FUNCTION_NAME(base) base##_8_op0 - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 16bpp cases */ #define BITS_PER_PIXEL 16 #define FUNCTION_NAME(base) base##_16_op0 - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL @@ -687,35 +687,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] = /* 1bpp cases */ #define BITS_PER_PIXEL 1 #define FUNCTION_NAME(base) base##_1_opx - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 2bpp cases */ #define BITS_PER_PIXEL 2 #define FUNCTION_NAME(base) base##_2_opx - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 4bpp cases */ #define BITS_PER_PIXEL 4 #define FUNCTION_NAME(base) base##_4_opx - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 8bpp cases */ #define BITS_PER_PIXEL 8 #define FUNCTION_NAME(base) base##_8_opx - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 16bpp cases */ #define BITS_PER_PIXEL 16 #define FUNCTION_NAME(base) base##_16_opx - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL @@ -734,35 +734,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] = /* 1bpp cases */ #define BITS_PER_PIXEL 1 #define FUNCTION_NAME(base) base##_1_op0_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 2bpp cases */ #define BITS_PER_PIXEL 2 #define FUNCTION_NAME(base) base##_2_op0_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 4bpp cases */ #define BITS_PER_PIXEL 4 #define FUNCTION_NAME(base) base##_4_op0_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 8bpp cases */ #define BITS_PER_PIXEL 8 #define FUNCTION_NAME(base) base##_8_op0_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 16bpp cases */ #define BITS_PER_PIXEL 16 #define FUNCTION_NAME(base) base##_16_op0_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL @@ -780,35 +780,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] = /* 1bpp cases */ #define BITS_PER_PIXEL 1 #define FUNCTION_NAME(base) base##_1_opx_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 2bpp cases */ #define BITS_PER_PIXEL 2 #define FUNCTION_NAME(base) base##_2_opx_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 4bpp cases */ #define BITS_PER_PIXEL 4 #define FUNCTION_NAME(base) base##_4_opx_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 8bpp cases */ #define BITS_PER_PIXEL 8 #define FUNCTION_NAME(base) base##_8_opx_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL /* 16bpp cases */ #define BITS_PER_PIXEL 16 #define FUNCTION_NAME(base) base##_16_opx_trans - #include "34010gfx.cpp" + #include "34010gfx.inc" #undef FUNCTION_NAME #undef BITS_PER_PIXEL diff --git a/src/devices/cpu/tms34010/34010ops.cpp b/src/devices/cpu/tms34010/34010ops.inc index 6674d7a1faa..6674d7a1faa 100644 --- a/src/devices/cpu/tms34010/34010ops.cpp +++ b/src/devices/cpu/tms34010/34010ops.inc diff --git a/src/devices/cpu/tms34010/34010tbl.cpp b/src/devices/cpu/tms34010/34010tbl.inc index 2cef83dcb9c..2cef83dcb9c 100644 --- a/src/devices/cpu/tms34010/34010tbl.cpp +++ b/src/devices/cpu/tms34010/34010tbl.inc diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index e09351301a4..9258a2b1836 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -458,14 +458,14 @@ UINT32 tms340x0_device::raster_op_21(UINT32 newpix, UINT32 oldpix) { return (old OPCODE TABLE & IMPLEMENTATIONS ***************************************************************************/ -#include "34010fld.cpp" +#include "34010fld.inc" /* includes the static function prototypes and the master opcode table */ -#include "34010tbl.cpp" +#include "34010tbl.inc" /* includes the actual opcode implementations */ -#include "34010ops.cpp" -#include "34010gfx.cpp" +#include "34010ops.inc" +#include "34010gfx.inc" diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index 81e2e560505..7d88bd2fc3c 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -131,7 +131,7 @@ private: // Processor states bool m_idle_state; bool m_nmi_state; - bool m_irq_state; +// bool m_irq_state; bool m_hold_state; // READY handling. The READY line is operated before the clock @@ -382,7 +382,7 @@ private: void alu_lst_lwp(); void alu_mov(); void alu_multiply(); - void alu_multiply_signed(); +// void alu_multiply_signed(); void alu_rtwp(); void alu_sbo_sbz(); void alu_shift(); diff --git a/src/devices/cpu/z80/z80dasm.cpp b/src/devices/cpu/z80/z80dasm.cpp index ebb965db26e..a65ea623e3f 100644 --- a/src/devices/cpu/z80/z80dasm.cpp +++ b/src/devices/cpu/z80/z80dasm.cpp @@ -420,7 +420,7 @@ CPU_DISASSEMBLE( z80 ) char *dst; INT8 offset = 0; UINT8 op, op1 = 0; - UINT16 ea = 0; + UINT16 ea; int pos = 0; ixy = "oops!!"; diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp index fc11b76230e..7b58d3e01cb 100644 --- a/src/devices/imagedev/cassette.cpp +++ b/src/devices/imagedev/cassette.cpp @@ -30,8 +30,15 @@ const device_type CASSETTE = &device_creator<cassette_image_device>; cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CASSETTE, "Cassette", tag, owner, clock, "cassette_image", __FILE__), - device_image_interface(mconfig, *this), - m_state(CASSETTE_STOPPED), + device_image_interface(mconfig, *this), + m_cassette(NULL), + m_state(CASSETTE_STOPPED), + m_position(0), + m_position_time(0), + m_value(0), + m_channel(0), + m_speed(0), + m_direction(0), m_formats(cassette_default_formats), m_create_opts(NULL), m_default_state(CASSETTE_PLAY), @@ -423,7 +430,6 @@ void cassette_image_device::call_display() if (position > length) { m_state = (cassette_state)(( m_state & ~CASSETTE_MASK_UISTATE ) | CASSETTE_STOPPED); - position = length; } } } diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index b506ebfa784..429eafe4b4d 100644 --- a/src/devices/imagedev/chd_cd.cpp +++ b/src/devices/imagedev/chd_cd.cpp @@ -28,14 +28,18 @@ const device_type CDROM = &device_creator<cdrom_image_device>; cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDROM, "CD-ROM Image", tag, owner, clock, "cdrom_image", __FILE__), - device_image_interface(mconfig, *this), + device_image_interface(mconfig, *this), + m_cdrom_handle(NULL), + m_extension_list(NULL), m_interface(NULL) { } cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_image_interface(mconfig, *this), + device_image_interface(mconfig, *this), + m_cdrom_handle(NULL), + m_extension_list(NULL), m_interface(NULL) { } diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index 30537e5d190..a9639b3ce9a 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -709,11 +709,13 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco m_rdy(0), m_dskchg(0), m_drive_id(0), - m_active(0), + m_active(0), + m_config(NULL), m_flags(0), m_max_track(0), m_num_sides(0), - m_current_track(0), + m_current_track(0), + m_index_timer(NULL), m_index_pulse_callback(NULL), m_rpm(0.0f), m_id_index(0), @@ -741,11 +743,13 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco m_rdy(0), m_dskchg(0), m_drive_id(0), - m_active(0), + m_active(0), + m_config(NULL), m_flags(0), m_max_track(0), m_num_sides(0), - m_current_track(0), + m_current_track(0), + m_index_timer(NULL), m_index_pulse_callback(NULL), m_rpm(0.0f), m_id_index(0), diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index e2511ca9a50..4d1b4cc6800 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -161,7 +161,6 @@ private: TIMER_CALLBACK_MEMBER(floppy_drive_index_callback); void floppy_drive_init(); void floppy_drive_index_func(); - TIMER_CALLBACK(floppy_drive_index_callback); int internal_floppy_device_load(int create_format, option_resolution *create_args); TIMER_CALLBACK_MEMBER( set_wpt ); diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 827a037ac13..9847cb81662 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -7,7 +7,6 @@ *********************************************************************/ #include "emu.h" -#include "emuopts.h" #include "ui/menu.h" #include "ui/filesel.h" #include "zippath.h" @@ -127,7 +126,8 @@ const floppy_format_type floppy_image_device::default_floppy_formats[] = { floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock, "floppy_connector", __FILE__), - device_slot_interface(mconfig, *this), + device_slot_interface(mconfig, *this), + formats(NULL), m_enable_sound(false) { } @@ -167,10 +167,27 @@ floppy_image_device *floppy_connector::get_device() floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), - device_slot_card_interface(mconfig, *this), + device_slot_card_interface(mconfig, *this), + input_format(NULL), + output_format(NULL), image(NULL), - fif_list(NULL), - m_make_sound(false) + fif_list(NULL), + index_timer(NULL), + tracks(0), + sides(0), + form_factor(0), + motor_always_on(false), + dir(0), stp(0), wtg(0), mon(0), ss(0), idx(0), wpt(0), rdy(0), dskchg(0), + ready(false), + rpm(0), + floppy_ratio_1(0), + revolution_count(0), + cyl(0), + subcyl(0), + image_dirty(false), + ready_counter(0), + m_make_sound(false), + m_sound_out(NULL) { extension_list[0] = '\0'; m_err = IMAGE_ERROR_INVALIDIMAGE; @@ -668,7 +685,7 @@ int floppy_image_device::find_index(UINT32 position, const std::vector<UINT32> & { int spos = (buf.size() >> 1)-1; int step; - for(step=1; step<buf.size()+1; step<<=1); + for(step=1; step<buf.size()+1; step<<=1) { } step >>= 1; for(;;) { @@ -983,7 +1000,7 @@ void ui_menu_control_floppy_image::hook_load(std::string filename, bool softlist bool can_in_place = input_format->supports_save(); if(can_in_place) { - file_error filerr = FILERR_NOT_FOUND; + file_error filerr; std::string tmp_path; core_file *tmp_file; /* attempt to open the file for writing but *without* create */ @@ -1004,8 +1021,9 @@ void ui_menu_control_floppy_image::handle() switch (state) { case DO_CREATE: { floppy_image_format_t *fif_list = fd->get_formats(); - int ext_match = 0, total_usable = 0; - for(floppy_image_format_t *i = fif_list; i; i = i->next) { + int ext_match; + int total_usable = 0; + for(floppy_image_format_t *i = fif_list; i; i = i->next) { if(!i->supports_save()) continue; if (i->extension_matches(current_file.c_str())) @@ -1085,7 +1103,22 @@ void ui_menu_control_floppy_image::handle() //=================================================================== floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : samples_device(mconfig, FLOPPYSOUND, "Floppy sound", tag, owner, clock, "flopsnd", __FILE__) + : samples_device(mconfig, FLOPPYSOUND, "Floppy sound", tag, owner, clock, "flopsnd", __FILE__), + m_sound(NULL), + m_is525(false), + m_sampleindex_motor_start(0), + m_sampleindex_motor_loop(0), + m_sampleindex_motor_end(0), + m_samplesize_motor_start(0), + m_samplesize_motor_loop(0), + m_samplesize_motor_end(0), + m_samplepos_motor(0), + m_motor_playback_state(0), + m_motor_on(false), + m_step_samples(0), + m_sampleindex_step1(0), + m_samplepos_step(0), + m_step_playback_state(0) { m_loaded = false; } @@ -1193,7 +1226,7 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, stream_sampl // Also, there is no need for interpolation, as we only expect // one sample rate of 44100 for all samples - INT16 out = 0; + INT16 out; stream_sample_t *samplebuffer = outputs[0]; while (samples-- > 0) diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index 2a3099fbcde..a0dff4f2c83 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -270,7 +270,6 @@ **************************************************************************/ #include "emu.h" -#include "formats/imageutl.h" #include "harddisk.h" #include "mfmhd.h" @@ -310,7 +309,25 @@ std::string mfm_harddisk_device::tts(const attotime &t) mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : harddisk_image_device(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_card_interface(mconfig, *this) + device_slot_card_interface(mconfig, *this), + m_index_timer(NULL), + m_spinup_timer(NULL), + m_seek_timer(NULL), + m_cache_timer(NULL), + m_precomp_cyl(0), + m_redwc_cyl(0), + m_encoding(), + m_ready(false), + m_current_cylinder(0), + m_current_head(0), + m_track_delta(0), + m_step_phase(0), + m_seek_complete(false), + m_seek_inward(false), + m_autotruncation(false), + m_recalibrated(false), + m_step_line(), + m_format(NULL) { m_spinupms = 10000; m_cachelines = 5; @@ -952,7 +969,8 @@ const device_type MFMHD_ST251 = &device_creator<mfm_hd_st251_device>; // This is a write-back LRU cache. // =========================================================== -mfmhd_trackimage_cache::mfmhd_trackimage_cache(running_machine &machine): +mfmhd_trackimage_cache::mfmhd_trackimage_cache(running_machine &machine): + m_mfmhd(NULL), m_tracks(NULL), m_machine(machine) { @@ -1026,9 +1044,9 @@ void mfmhd_trackimage_cache::init(mfm_harddisk_device* mfmhd, int tracksize, int { if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache init; cache size is %d tracks\n", mfmhd->tag(), trackslots); - chd_error state = CHDERR_NONE; + chd_error state; - mfmhd_trackimage* previous = NULL; + mfmhd_trackimage* previous; mfmhd_trackimage* current = NULL; m_mfmhd = mfmhd; @@ -1141,7 +1159,11 @@ UINT16* mfmhd_trackimage_cache::get_trackimage(int cylinder, int head) mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock): device_t(mconfig, MFM_HD_CONNECTOR, "MFM hard disk connector", tag, owner, clock, "mfm_hd_connector", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_encoding(), + m_spinupms(0), + m_cachesize(0), + m_format(NULL) { } diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index 85450f23bbb..7be3dc8c1cb 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -154,7 +154,6 @@ private: mfmhd_trackimage_cache* m_cache; mfmhd_image_format_t* m_format; - void prepare_track(int cylinder, int head); void head_move(); void recalibrate(); diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index e412409aa38..3f2c22d7c99 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -24,9 +24,14 @@ const device_type MIDIIN = &device_creator<midiin_device>; midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIIN, "MIDI In image device", tag, owner, clock, "midiin", __FILE__), - device_image_interface(mconfig, *this), - device_serial_interface(mconfig, *this), - m_input_cb(*this) + device_image_interface(mconfig, *this), + device_serial_interface(mconfig, *this), + m_midi(NULL), + m_timer(NULL), + m_input_cb(*this), + m_xmit_read(0), + m_xmit_write(0), + m_tx_busy(false) { } diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp index 97ecb36ab89..86c446fa6b4 100644 --- a/src/devices/imagedev/midiout.cpp +++ b/src/devices/imagedev/midiout.cpp @@ -24,8 +24,9 @@ const device_type MIDIOUT = &device_creator<midiout_device>; midiout_device::midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIOUT, "MIDI Out image device", tag, owner, clock, "midiout", __FILE__), - device_image_interface(mconfig, *this), - device_serial_interface(mconfig, *this) + device_image_interface(mconfig, *this), + device_serial_interface(mconfig, *this), + m_midi(NULL) { } diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp index 02fc2fa241e..78d55333f16 100644 --- a/src/devices/imagedev/snapquik.cpp +++ b/src/devices/imagedev/snapquik.cpp @@ -20,17 +20,23 @@ const device_type SNAPSHOT = &device_creator<snapshot_image_device>; snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNAPSHOT, "Snapshot", tag, owner, clock, "snapshot_image", __FILE__), - device_image_interface(mconfig, *this), - m_interface(NULL), - m_delay_attoseconds(0) + device_image_interface(mconfig, *this), + m_file_extensions(NULL), + m_interface(NULL), + m_delay_seconds(0), + m_delay_attoseconds(0), + m_timer(NULL) { } snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_image_interface(mconfig, *this), - m_interface(NULL), - m_delay_attoseconds(0) + device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_image_interface(mconfig, *this), + m_file_extensions(NULL), + m_interface(NULL), + m_delay_seconds(0), + m_delay_attoseconds(0), + m_timer(NULL) { } //------------------------------------------------- diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp index 98bb8c2dacc..00102adf6f7 100644 --- a/src/devices/machine/6532riot.cpp +++ b/src/devices/machine/6532riot.cpp @@ -238,7 +238,7 @@ READ8_MEMBER( riot6532_device::read ) UINT8 riot6532_device::reg_r(UINT8 offset, bool debugger_access) { - UINT8 val = 0; + UINT8 val; /* if A2 == 1 and A0 == 1, we are reading interrupt flags */ if ((offset & 0x05) == 0x05) @@ -392,10 +392,15 @@ riot6532_device::riot6532_device(const machine_config &mconfig, const char *tag, m_out_pa_cb(*this), m_in_pb_cb(*this), m_out_pb_cb(*this), - m_irq_cb(*this), + m_irq_cb(*this), + m_irqstate(0), + m_irqenable(0), m_irq(CLEAR_LINE), m_pa7dir(0), - m_pa7prev(0) + m_pa7prev(0), + m_timershift(0), + m_timerstate(0), + m_timer(NULL) { memset(m_port, 0x00, sizeof(m_port)); } diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 3fbf6477fa9..f775cff74b1 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -51,23 +51,27 @@ const device_type PIA6821 = &device_creator<pia6821_device>; pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PIA6821, "6821 PIA", tag, owner, clock, "pia6821", __FILE__), - m_in_a_handler(*this), - m_in_b_handler(*this), - m_in_ca1_handler(*this), - m_in_cb1_handler(*this), - m_in_ca2_handler(*this), - m_out_a_handler(*this), - m_out_b_handler(*this), - m_ca2_handler(*this), - m_cb2_handler(*this), - m_irqa_handler(*this), - m_irqb_handler(*this), - m_in_ca1(0), - m_ctl_a(0), - m_irq_a_state(0), - m_in_cb1(0), - m_ctl_b(0), - m_irq_b_state(0) + m_in_a_handler(*this), + m_in_b_handler(*this), + m_in_ca1_handler(*this), + m_in_cb1_handler(*this), + m_in_ca2_handler(*this), + m_out_a_handler(*this), + m_out_b_handler(*this), + m_ca2_handler(*this), + m_cb2_handler(*this), + m_irqa_handler(*this), + m_irqb_handler(*this), m_in_a(0), + m_in_ca1(0), m_in_ca2(0), m_out_a(0), m_out_ca2(0), m_port_a_z_mask(0), m_ddr_a(0), + m_ctl_a(0), m_irq_a1(0), m_irq_a2(0), + m_irq_a_state(0), m_in_b(0), + m_in_cb1(0), m_in_cb2(0), m_out_b(0), m_out_cb2(0), m_last_out_cb2_z(0), m_ddr_b(0), + m_ctl_b(0), m_irq_b1(0), m_irq_b2(0), + m_irq_b_state(0), m_in_a_pushed(false), m_out_a_needs_pulled(false), m_in_ca1_pushed(false), + m_in_ca2_pushed(false), m_out_ca2_needs_pulled(false), m_in_b_pushed(false), m_out_b_needs_pulled(false), + m_in_cb1_pushed(false), m_in_cb2_pushed(false), m_out_cb2_needs_pulled(false), m_logged_port_a_not_connected(false), + m_logged_port_b_not_connected(false), m_logged_ca1_not_connected(false), m_logged_ca2_not_connected(false), + m_logged_cb1_not_connected(false), m_logged_cb2_not_connected(false) { } diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp index 1a600527511..75e6de89b6a 100644 --- a/src/devices/machine/bankdev.cpp +++ b/src/devices/machine/bankdev.cpp @@ -11,7 +11,8 @@ address_map_bank_device::address_map_bank_device( const machine_config &mconfig, m_endianness(ENDIANNESS_NATIVE), m_databus_width(0), m_addrbus_width(32), - m_stride(1), + m_stride(1), + m_program(NULL), m_offset(0) { } diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index 03d538f2a3e..30d3d528e93 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -43,7 +43,10 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, m_io_kbd7(*this, "TERM_LINE7"), m_io_kbd8(*this, "TERM_LINE8"), m_io_kbd9(*this, "TERM_LINE9"), - m_io_kbdc(*this, "TERM_LINEC"), + m_io_kbdc(*this, "TERM_LINEC"), + m_timer(NULL), + m_last_code(0), + m_scan_line(0), m_keyboard_cb(*this) { } @@ -61,6 +64,9 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, m_io_kbd8(*this, "TERM_LINE8"), m_io_kbd9(*this, "TERM_LINE9"), m_io_kbdc(*this, "TERM_LINEC"), + m_timer(NULL), + m_last_code(0), + m_scan_line(0), m_keyboard_cb(*this) { } diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp index 4071ccf8c3a..21e635bd1d8 100644 --- a/src/devices/machine/legscsi.cpp +++ b/src/devices/machine/legscsi.cpp @@ -3,7 +3,8 @@ #include "legscsi.h" legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), + device_t(mconfig, type, name, tag, owner, clock, shortname, source), + m_selected(0), m_scsi_port(*this) { } diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp index a1c9d734e2e..8ea20a58eac 100644 --- a/src/devices/machine/nvram.cpp +++ b/src/devices/machine/nvram.cpp @@ -11,14 +11,6 @@ #include "emu.h" #include "machine/nvram.h" - -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -175,7 +167,3 @@ void nvram_device::determine_final_base() if (m_region != NULL && m_region->bytes() != m_length) throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag(), m_length); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp index a5c95198c75..079444f379b 100644 --- a/src/devices/machine/pci.cpp +++ b/src/devices/machine/pci.cpp @@ -2,13 +2,6 @@ // copyright-holders:Olivier Galibert #include "pci.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - const device_type PCI_ROOT = &device_creator<pci_root_device>; const device_type PCI_BRIDGE = &device_creator<pci_bridge_device>; @@ -902,7 +895,3 @@ void pci_root_device::device_start() void pci_root_device::device_reset() { } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 1ad506686e0..2a0be4466ab 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -23,13 +23,6 @@ #include "emu.h" #include "machine/pit8253.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - /* device types */ enum { @@ -1129,7 +1122,3 @@ WRITE_LINE_MEMBER( pit8253_device::write_clk2 ) { set_clock_signal(2, state); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp index 3a92aa48c1b..815ec477ba4 100644 --- a/src/devices/machine/ram.cpp +++ b/src/devices/machine/ram.cpp @@ -78,8 +78,8 @@ void ram_device::device_validity_check(validity_checker &valid) const { const char *ramsize_string = NULL; int is_valid = FALSE; - UINT32 specified_ram = 0; - const char *gamename_option = NULL; + UINT32 specified_ram; + const char *gamename_option; /* verify default ram value */ if (default_size() == 0) @@ -183,7 +183,7 @@ UINT32 ram_device::parse_string(const char *s) UINT32 ram; char suffix = '\0'; - s += sscanf(s, "%u%c", &ram, &suffix); + sscanf(s, "%u%c", &ram, &suffix); switch(tolower(suffix)) { diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index f46bcd3156e..081266f801d 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -143,16 +143,22 @@ static const UINT8 terminal_font[256*16] = generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_palette(*this, "palette"), - m_io_term_conf(*this, "TERM_CONF"), + m_io_term_conf(*this, "TERM_CONF"), + m_x_pos(0), + m_framecnt(0), + m_y_pos(0), m_keyboard_cb(*this) { } generic_terminal_device::generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GENERIC_TERMINAL, "Generic Terminal", tag, owner, clock, "generic_terminal", __FILE__), - m_palette(*this, "palette"), - m_io_term_conf(*this, "TERM_CONF"), - m_keyboard_cb(*this) + m_palette(*this, "palette"), + m_io_term_conf(*this, "TERM_CONF"), + m_x_pos(0), + m_framecnt(0), + m_y_pos(0), + m_keyboard_cb(*this) { } diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index bf911e5d928..4f7a2c32e7c 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "z80ctc.h" -#include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -86,7 +85,8 @@ z80ctc_device::z80ctc_device(const machine_config &mconfig, const char *tag, dev m_zc0_cb(*this), m_zc1_cb(*this), m_zc2_cb(*this), - m_zc3_cb(*this) + m_zc3_cb(*this), + m_vector(0) { } @@ -284,7 +284,9 @@ void z80ctc_device::interrupt_check() //------------------------------------------------- z80ctc_device::ctc_channel::ctc_channel() - : m_mode(0), + : m_device(NULL), + m_index(0), + m_mode(0), m_tconst(0), m_down(0), m_extclk(0), diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h index b5191d21104..fb5e9b5b522 100644 --- a/src/devices/machine/z80ctc.h +++ b/src/devices/machine/z80ctc.h @@ -88,7 +88,6 @@ protected: private: // internal helpers void interrupt_check(); - void timercallback(int chanindex); // a single channel within the CTC class ctc_channel diff --git a/src/devices/sound/2151intf.cpp b/src/devices/sound/2151intf.cpp index e4739c758ee..567b8cfe16d 100644 --- a/src/devices/sound/2151intf.cpp +++ b/src/devices/sound/2151intf.cpp @@ -9,7 +9,6 @@ ***************************************************************************/ #include "emu.h" -#include "fm.h" #include "2151intf.h" #include "ym2151.h" @@ -24,7 +23,10 @@ const device_type YM2151 = &device_creator<ym2151_device>; ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM2151, "YM2151", tag, owner, clock, "ym2151", __FILE__), - device_sound_interface(mconfig, *this), + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_chip(NULL), + m_lastreg(0), m_irqhandler(*this), m_portwritehandler(*this) { diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp index d90b053a4d3..6639aa83e5e 100644 --- a/src/devices/sound/3526intf.cpp +++ b/src/devices/sound/3526intf.cpp @@ -19,7 +19,6 @@ * ******************************************************************************/ #include "3526intf.h" -#include "fm.h" #include "fmopl.h" @@ -157,7 +156,9 @@ const device_type YM3526 = &device_creator<ym3526_device>; ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__), - device_sound_interface(mconfig, *this), + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_chip(NULL), m_irq_handler(*this) { } diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp index ee4a9e3d5af..73d0307d20a 100644 --- a/src/devices/sound/3812intf.cpp +++ b/src/devices/sound/3812intf.cpp @@ -20,7 +20,6 @@ ******************************************************************************/ #include "emu.h" #include "3812intf.h" -#include "fm.h" #include "sound/fmopl.h" @@ -155,7 +154,9 @@ const device_type YM3812 = &device_creator<ym3812_device>; ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__), - device_sound_interface(mconfig, *this), + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_chip(NULL), m_irq_handler(*this) { } diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp index 172ee03ef25..4ca01ed31a7 100644 --- a/src/devices/sound/8950intf.cpp +++ b/src/devices/sound/8950intf.cpp @@ -19,7 +19,6 @@ * ******************************************************************************/ #include "8950intf.h" -#include "fm.h" #include "fmopl.h" @@ -206,7 +205,9 @@ const device_type Y8950 = &device_creator<y8950_device>; y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__), - device_sound_interface(mconfig, *this), + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_chip(NULL), m_irq_handler(*this), m_keyboard_read_handler(*this), m_keyboard_write_handler(*this), diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index 9e8d397ff7a..384930014fe 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -493,7 +493,8 @@ INLINE void build_3D_table(double rl, const ay8910_device::ay_ym_param *par, con INLINE void build_single_table(double rl, const ay8910_device::ay_ym_param *par, int normalize, INT32 *tab, int zero_is_off) { int j; - double rt, rw = 0; + double rt; + double rw; double temp[32], min=10.0, max=0.0; for (j=0; j < par->res_count; j++) diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index e9e1281f42c..6d72e6b1e95 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -39,14 +39,6 @@ #include "sound/wavwrite.h" #include "discrete.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - /* for_each collides with c++ standard libraries - include it here */ #define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++) @@ -135,8 +127,8 @@ public: protected: discrete_task(discrete_device &pdev) - : task_group(0), m_device(pdev), m_threadid(-1) - { + : task_group(0), m_device(pdev), m_threadid(-1), m_samples(0) +{ source_list.clear(); step_list.clear(); m_buffers.clear(); @@ -332,7 +324,7 @@ void discrete_task::check(discrete_task *dest_task) buf.source = dest_node->m_input[inputnum]; buf.node_num = inputnode_num; //buf.node = device->discrete_find_node(inputnode); - i = m_buffers.count(); + m_buffers.count(); pbuf = m_buffers.add(buf); } m_device.discrete_log("dso_task_start - buffering %d(%d) in task %p group %d referenced by %d group %d", NODE_INDEX(inputnode_num), NODE_CHILD_NODE_NUM(inputnode_num), this, task_group, dest_node->index(), dest_task->task_group); @@ -362,9 +354,15 @@ void discrete_task::check(discrete_task *dest_task) * *************************************/ -discrete_base_node::discrete_base_node() : +discrete_base_node::discrete_base_node() : + m_device(NULL), + m_block(NULL), + m_active_inputs(0), + m_custom(NULL), + m_input_is_node(0), m_step_intf(NULL), - m_input_intf(NULL) + m_input_intf(NULL), + m_output_intf(NULL) { m_output[0] = 0.0; } @@ -853,7 +851,8 @@ discrete_device::discrete_device(const machine_config &mconfig, device_type type discrete_sound_device::discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : discrete_device(mconfig, DISCRETE, "DISCRETE", tag, owner, clock), - device_sound_interface(mconfig, *this) + device_sound_interface(mconfig, *this), + m_stream(NULL) { } @@ -1104,7 +1103,7 @@ READ8_MEMBER( discrete_device::read ) { const discrete_base_node *node = discrete_find_node(offset); - UINT8 data = 0; + UINT8 data; /* Read the node input value if allowed */ if (node) @@ -1142,7 +1141,3 @@ WRITE8_MEMBER( discrete_device::write ) discrete_log("discrete_sound_w write to non-existent NODE_%02d\n", offset-NODE_00); } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index 964c21e2b22..279eada7a1f 100644 --- a/src/devices/sound/samples.cpp +++ b/src/devices/sound/samples.cpp @@ -363,7 +363,6 @@ void samples_device::sound_stream_update(sound_stream &stream, stream_sample_t * chan.source_num = -1; if (samples > 0) memset(buffer, 0, samples * sizeof(*buffer)); - samples = 0; break; } } diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 3ab0b67f52d..1ab14ca6b3d 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -726,6 +726,9 @@ INT32 tms5110_device::lattice_filter() m_u[2] = m_u[3] - matrix_multiply(m_current_k[2], m_x[2]); m_u[1] = m_u[2] - matrix_multiply(m_current_k[1], m_x[1]); m_u[0] = m_u[1] - matrix_multiply(m_current_k[0], m_x[0]); +#ifdef DEBUG_LATTICE + INT32 err = m_x[9] + matrix_multiply(m_current_k[9], m_u[9]); //x_10, real chip doesn't use or calculate this +#endif m_x[9] = m_x[8] + matrix_multiply(m_current_k[8], m_u[8]); m_x[8] = m_x[7] + matrix_multiply(m_current_k[7], m_u[7]); m_x[7] = m_x[6] + matrix_multiply(m_current_k[6], m_u[6]); @@ -743,9 +746,14 @@ INT32 tms5110_device::lattice_filter() for (i = 9; i >= 0; i--) { fprintf(stderr,"Y%d:%04d ", i+1, m_u[i]); + } + fprintf(stderr,"\n"); + fprintf(stderr,"E:%04d ", err); + for (i = 9; i >= 0; i--) + { fprintf(stderr,"b%d:%04d ", i+1, m_x[i]); - if ((i % 5) == 0) fprintf(stderr,"\n"); } + fprintf(stderr,"\n"); #endif return m_u[0]; } diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index d04069e50b9..033bd4551df 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -1129,6 +1129,9 @@ INT32 tms5220_device::lattice_filter() m_u[2] = m_u[3] - matrix_multiply(m_current_k[2], m_x[2]); m_u[1] = m_u[2] - matrix_multiply(m_current_k[1], m_x[1]); m_u[0] = m_u[1] - matrix_multiply(m_current_k[0], m_x[0]); +#ifdef DEBUG_LATTICE + INT32 err = m_x[9] + matrix_multiply(m_current_k[9], m_u[9]); //x_10, real chip doesn't use or calculate this +#endif m_x[9] = m_x[8] + matrix_multiply(m_current_k[8], m_u[8]); m_x[8] = m_x[7] + matrix_multiply(m_current_k[7], m_u[7]); m_x[7] = m_x[6] + matrix_multiply(m_current_k[6], m_u[6]); @@ -1146,9 +1149,14 @@ INT32 tms5220_device::lattice_filter() for (i = 9; i >= 0; i--) { fprintf(stderr,"Y%d:%04d ", i+1, m_u[i]); + } + fprintf(stderr,"\n"); + fprintf(stderr,"E:%04d ", err); + for (i = 9; i >= 0; i--) + { fprintf(stderr,"b%d:%04d ", i+1, m_x[i]); - if ((i % 5) == 0) fprintf(stderr,"\n"); } + fprintf(stderr,"\n"); #endif return m_u[0]; } diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp index b1c84fb2491..ff91eb33f44 100644 --- a/src/devices/sound/votrax.cpp +++ b/src/devices/sound/votrax.cpp @@ -96,10 +96,15 @@ const double votrax_sc01_device::s_glottal_wave[16] = votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", tag, owner, clock, "votrax", __FILE__), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_phoneme_timer(NULL), - m_request_cb(*this) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_phoneme_timer(NULL), m_rom(NULL), m_inflection(0), m_phoneme(0), + m_request_cb(*this), m_request_state(0), m_internal_request(0), m_master_clock_freq(0), m_master_clock(0), m_counter_34(0), + m_latch_70(0), m_latch_72(0), m_beta1(0), m_p2(0), m_p1(0), m_phi2(0), m_phi1(0), m_phi2_20(0), m_phi1_20(0), m_subphoneme_period(0), + m_subphoneme_count(0), m_clock_88(0), m_latch_42(0), m_counter_84(0), m_latch_92(0), m_srff_132(false), m_srff_114(false), m_srff_112(false), + m_srff_142(false), m_latch_80(0), m_counter_220(0), m_counter_222(0), m_counter_224(0), m_counter_234(0), m_counter_236(0), m_fgate(0), + m_glottal_sync(0), m_0625_clock(0), m_counter_46(0), m_latch_46(0), m_latch_168(0), m_latch_170(0), m_f1(0), m_f2(0), m_fc(0), m_f3(0), + m_f2q(0), m_va(0), m_fa(0), m_noise_clock(0), m_shift_252(0), m_counter_250(0) { } diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp index b709efa14bd..01fdf869310 100644 --- a/src/devices/sound/ym2151.cpp +++ b/src/devices/sound/ym2151.cpp @@ -601,10 +601,10 @@ static void init_chip_tables(YM2151 *chip) for (i=0; i<768; i++) { +#if 0 /* 3.4375 Hz is note A; C# is 4 semitones higher */ Hz = 1000; -#if 0 -/* Hz is close, but not perfect */ + /* Hz is close, but not perfect */ //Hz = scaler * 3.4375 * pow (2, (i + 4 * 64 ) / 768.0 ); /* calculate phase increment */ phaseinc = (Hz*SIN_LEN) / (double)chip->sampfreq; @@ -687,7 +687,9 @@ static void init_chip_tables(YM2151 *chip) /* calculate timers' deltas */ /* User's Manual pages 15,16 */ - mult = (1<<TIMER_SH); + #ifndef USE_MAME_TIMERS + mult = (1<<TIMER_SH); + #endif for (i=0; i<1024; i++) { /* ASG 980324: changed to compute both tim_A_tab and timer_A_time */ diff --git a/src/devices/video/poly.h b/src/devices/video/poly.h index 958c69a934d..058a6c793a2 100644 --- a/src/devices/video/poly.h +++ b/src/devices/video/poly.h @@ -656,9 +656,9 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_trian v3 = tv; if (v2->y < v1->y) { - const vertex_t *tv = v1; + const vertex_t *tv2 = v1; v1 = v2; - v2 = tv; + v2 = tv2; } } @@ -1002,7 +1002,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_polyg edgeptr->dxdy = (edgeptr->v2->x - edgeptr->v1->x) * ooy; for (int paramnum = 0; paramnum < paramcount; paramnum++) edgeptr->dpdy[paramnum] = (edgeptr->v2->p[paramnum] - edgeptr->v1->p[paramnum]) * ooy; - edgeptr++; + ++edgeptr; } // walk backward to build up the backward edge list @@ -1023,7 +1023,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_polyg edgeptr->dxdy = (edgeptr->v2->x - edgeptr->v1->x) * ooy; for (int paramnum = 0; paramnum < paramcount; paramnum++) edgeptr->dpdy[paramnum] = (edgeptr->v2->p[paramnum] - edgeptr->v1->p[paramnum]) * ooy; - edgeptr++; + ++edgeptr; } // determine which list is left/right: @@ -1068,9 +1068,9 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_polyg // compute the ending X based on which part of the triangle we're in _BaseType fully = _BaseType(curscan + extnum) + _BaseType(0.5); while (fully > ledge->v2->y && fully < v[maxv].y) - ledge++; + ++ledge; while (fully > redge->v2->y && fully < v[maxv].y) - redge++; + ++redge; _BaseType startx = ledge->v1->x + (fully - ledge->v1->y) * ledge->dxdy; _BaseType stopx = redge->v1->x + (fully - redge->v1->y) * redge->dxdy; @@ -1159,7 +1159,7 @@ int poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::zclip_if_less(i nextout->y = v1.y + frac * (v2.y - v1.y); for (int paramnum = 0; paramnum < paramcount; paramnum++) nextout->p[paramnum] = v1.p[paramnum] + frac * (v2.p[paramnum] - v1.p[paramnum]); - nextout++; + ++nextout; } // if this vertex is not clipped, copy it in diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 83bcbaaadac..f989f43dc4a 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -29,7 +29,8 @@ address_map_entry::address_map_entry(device_t &device, address_map &map, offs_t m_addrmask(0), m_share(NULL), m_region(NULL), - m_rgnoffs(0), + m_rgnoffs(0), + m_submap_bits(0), m_memory(NULL), m_bytestart(0), m_byteend(0), diff --git a/src/emu/audit.cpp b/src/emu/audit.cpp index 0f2b5cf4854..758bb508db0 100644 --- a/src/emu/audit.cpp +++ b/src/emu/audit.cpp @@ -15,14 +15,6 @@ #include "sound/samples.h" #include "softlist.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - //************************************************************************** // CORE FUNCTIONS //************************************************************************** @@ -278,8 +270,8 @@ media_auditor::summary media_auditor::audit_samples() int found = 0; // iterate over sample entries - samples_device_iterator iter(m_enumerator.config().root_device()); - for (samples_device *device = iter.first(); device != NULL; device = iter.next()) + samples_device_iterator iterator(m_enumerator.config().root_device()); + for (samples_device *device = iterator.first(); device != NULL; device = iterator.next()) { // by default we just search using the driver name std::string searchpath(m_enumerator.driver().name); @@ -615,7 +607,3 @@ audit_record::audit_record(const char *name, media_type type) m_shared_device(NULL) { } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/emu/config.cpp b/src/emu/config.cpp index 711b0a404f9..7eb77de9cfd 100644 --- a/src/emu/config.cpp +++ b/src/emu/config.cpp @@ -86,7 +86,7 @@ void config_register(running_machine &machine, const char *nodename, config_save newtype->save = save; /* add us to the end */ - for (ptype = &typelist; *ptype; ptype = &(*ptype)->next) ; + for (ptype = &typelist; *ptype; ptype = &(*ptype)->next) { } *ptype = newtype; } diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index 8993c9a095e..60b25df1928 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -1353,7 +1353,7 @@ static void execute_wpset(running_machine &machine, int ref, int params, const c address_space *space; const char *action = NULL; UINT64 address, length; - int type = 0; + int type; int wpnum; /* CPU is implicit */ @@ -1484,7 +1484,7 @@ static void execute_wplist(running_machine &machine, int ref, int params, const /* loop over all CPUs */ device_iterator iter(machine.root_device()); for (device_t *device = iter.first(); device != NULL; device = iter.next()) - for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum) if (device->debug()->watchpoint_first(spacenum) != NULL) { static const char *const types[] = { "unkn ", "read ", "write", "r/w " }; @@ -1830,7 +1830,7 @@ static void execute_dump(running_machine &machine, int ref, int params, const ch { UINT64 offset, endoffset, length, width = 0, ascii = 1; address_space *space; - FILE *f = NULL; + FILE *f; UINT64 i, j; /* validate parameters */ @@ -1984,8 +1984,6 @@ static void execute_cheatinit(running_machine &machine, int ref, int params, con /* initialize entire memory by default */ if (params <= 1) { - offset = 0; - length = space->bytemask() + 1; for (entry = space->map()->m_entrylist.first(); entry != NULL; entry = entry->next()) { cheat_region[region_count].offset = space->address_to_byte(entry->m_addrstart) & space->bytemask(); @@ -2456,7 +2454,7 @@ static void execute_dasm(running_machine &machine, int ref, int params, const ch UINT64 offset, length, bytes = 1; int minbytes, maxbytes, byteswidth; address_space *space, *decrypted_space; - FILE *f = NULL; + FILE *f; int j; /* validate parameters */ diff --git a/src/emu/debug/debugcon.cpp b/src/emu/debug/debugcon.cpp index e2bda0b6af2..06a878b3367 100644 --- a/src/emu/debug/debugcon.cpp +++ b/src/emu/debug/debugcon.cpp @@ -11,7 +11,6 @@ #include "emu.h" #include "debugcon.h" #include "debugcpu.h" -#include "debughlp.h" #include "debugvw.h" #include "textbuf.h" #include "debugger.h" @@ -270,7 +269,7 @@ static CMDERR internal_parse_command(running_machine &machine, const char *origi { char command[MAX_COMMAND_LENGTH], parens[MAX_COMMAND_LENGTH]; char *params[MAX_COMMAND_PARAMS] = { 0 }; - CMDERR result = CMDERR_NONE; + CMDERR result; char *command_start; char *p, c = 0; diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 37d451ca0fb..8f399a1117a 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -12,7 +12,6 @@ #include "emuopts.h" #include "osdepend.h" #include "debugcpu.h" -#include "debugcmd.h" #include "debugcon.h" #include "express.h" #include "debugvw.h" @@ -2378,7 +2377,7 @@ int device_debug::watchpoint_set(address_space &space, int type, offs_t address, bool device_debug::watchpoint_clear(int index) { // scan the list to see if we own this breakpoint - for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); ++spacenum) for (watchpoint **wp = &m_wplist[spacenum]; *wp != NULL; wp = &(*wp)->m_next) if ((*wp)->m_index == index) { @@ -2402,7 +2401,7 @@ bool device_debug::watchpoint_clear(int index) void device_debug::watchpoint_clear_all() { // clear the head until we run out - for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); ++spacenum) while (m_wplist[spacenum] != NULL) watchpoint_clear(m_wplist[spacenum]->index()); } @@ -2416,7 +2415,7 @@ void device_debug::watchpoint_clear_all() bool device_debug::watchpoint_enable(int index, bool enable) { // scan the list to see if we own this watchpoint - for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); ++spacenum) for (watchpoint *wp = m_wplist[spacenum]; wp != NULL; wp = wp->next()) if (wp->m_index == index) { @@ -2438,7 +2437,7 @@ bool device_debug::watchpoint_enable(int index, bool enable) void device_debug::watchpoint_enable_all(bool enable) { // apply the enable to all watchpoints we own - for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); ++spacenum) for (watchpoint *wp = m_wplist[spacenum]; wp != NULL; wp = wp->next()) watchpoint_enable(wp->index(), enable); } diff --git a/src/emu/debug/debugvw.cpp b/src/emu/debug/debugvw.cpp index d04b48b162a..9c6c76aba10 100644 --- a/src/emu/debug/debugvw.cpp +++ b/src/emu/debug/debugvw.cpp @@ -17,9 +17,7 @@ #include "dvmemory.h" #include "dvbpoints.h" #include "dvwpoints.h" -#include "debugcmd.h" #include "debugcpu.h" -#include "debugcon.h" #include <ctype.h> @@ -443,7 +441,7 @@ void debug_view_manager::flush_osd_updates() debug_view *debug_view_manager::append(debug_view *view) { debug_view **viewptr; - for (viewptr = &m_viewlist; *viewptr != NULL; viewptr = &(*viewptr)->m_next) ; + for (viewptr = &m_viewlist; *viewptr != NULL; viewptr = &(*viewptr)->m_next) { } *viewptr = view; return view; } diff --git a/src/emu/debug/debugvw.h b/src/emu/debug/debugvw.h index 248379eab3c..c813619aaa1 100644 --- a/src/emu/debug/debugvw.h +++ b/src/emu/debug/debugvw.h @@ -162,7 +162,6 @@ public: const simple_list<debug_view_source> &source_list() const { return m_source_list; } // setters - void set_size(int width, int height); void set_visible_size(debug_view_xy size); void set_visible_position(debug_view_xy pos); void set_cursor_position(debug_view_xy pos); diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp index a81e032ce48..1e2e0648326 100644 --- a/src/emu/debug/dvmemory.cpp +++ b/src/emu/debug/dvmemory.cpp @@ -133,7 +133,7 @@ void debug_view_memory::enumerate_sources() memory_interface_iterator iter(machine().root_device()); for (device_memory_interface *memintf = iter.first(); memintf != NULL; memintf = iter.next()) if (&memintf->device() != &machine().root_device()) - for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum) if (memintf->has_space(spacenum)) { address_space &space = memintf->space(spacenum); diff --git a/src/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h index e3d743169a5..1628a9052e2 100644 --- a/src/emu/debug/dvmemory.h +++ b/src/emu/debug/dvmemory.h @@ -11,9 +11,6 @@ #ifndef __DVMEMORY_H__ #define __DVMEMORY_H__ -#include "dvstate.h" - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp index 2e5f89b24f3..c09cff91bf3 100644 --- a/src/emu/debug/dvwpoints.cpp +++ b/src/emu/debug/dvwpoints.cpp @@ -231,7 +231,7 @@ void debug_view_watchpoints::gather_watchpoints() { // Collect device_debug &debugInterface = *source->device()->debug(); - for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum) { for (device_debug::watchpoint *wp = debugInterface.watchpoint_first(spacenum); wp != NULL; wp = wp->next()) m_buffer.push_back(wp); diff --git a/src/emu/debug/express.cpp b/src/emu/debug/express.cpp index a37a7796f5f..4dbe76202b7 100644 --- a/src/emu/debug/express.cpp +++ b/src/emu/debug/express.cpp @@ -1105,7 +1105,7 @@ void parsed_expression::parse_memory_operator(parse_token &token, const char *st throw expression_error(expression_error::INVALID_TOKEN, token.offset()); // convert the space to flags - expression_space memspace = EXPSPACE_INVALID; + expression_space memspace; switch (space) { case 'p': memspace = physical ? EXPSPACE_PROGRAM_PHYSICAL : EXPSPACE_PROGRAM_LOGICAL; break; @@ -1219,7 +1219,7 @@ void parsed_expression::infix_to_postfix() // loop over all the original tokens parse_token *prev = NULL; - parse_token *next = NULL; + parse_token *next; for (parse_token *token = m_tokenlist.detach_all(); token != NULL; prev = token, token = next) { // pre-determine our next token diff --git a/src/emu/debugger.cpp b/src/emu/debugger.cpp index 9ad47970b0b..d4ddd241389 100644 --- a/src/emu/debugger.cpp +++ b/src/emu/debugger.cpp @@ -13,7 +13,6 @@ #include "debug/debugcpu.h" #include "debug/debugcmd.h" #include "debug/debugcon.h" -#include "debug/express.h" #include "debug/debugvw.h" #include <ctype.h> diff --git a/src/emu/devcb.cpp b/src/emu/devcb.cpp index 5a0b4d69e44..aa69ce9e7d1 100644 --- a/src/emu/devcb.cpp +++ b/src/emu/devcb.cpp @@ -108,7 +108,8 @@ void devcb_base::resolve_space() //------------------------------------------------- devcb_read_base::devcb_read_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask) + : devcb_base(device, defmask), + m_adapter(NULL) { } @@ -335,7 +336,8 @@ UINT64 devcb_read_base::read_constant_adapter(address_space &space, offs_t offse //------------------------------------------------- devcb_write_base::devcb_write_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask) + : devcb_base(device, defmask), + m_adapter(NULL) { } diff --git a/src/emu/devcpu.cpp b/src/emu/devcpu.cpp index d67752d68a6..00bac6ed1b0 100644 --- a/src/emu/devcpu.cpp +++ b/src/emu/devcpu.cpp @@ -9,7 +9,6 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include <ctype.h> diff --git a/src/emu/devfind.cpp b/src/emu/devfind.cpp index c7ac9c509ff..0f6ee0a3a77 100644 --- a/src/emu/devfind.cpp +++ b/src/emu/devfind.cpp @@ -40,7 +40,7 @@ finder_base::~finder_base() // find_memregion - find memory region //------------------------------------------------- -void *finder_base::find_memregion(UINT8 width, size_t &length, bool required) +void *finder_base::find_memregion(UINT8 width, size_t &length, bool required) const { // look up the region and return NULL if not found memory_region *region = m_base.memregion(m_tag); diff --git a/src/emu/devfind.h b/src/emu/devfind.h index e268bc9784a..3251738c5b2 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -53,7 +53,7 @@ public: protected: // helpers - void *find_memregion(UINT8 width, size_t &length, bool required); + void *find_memregion(UINT8 width, size_t &length, bool required) const; void *find_memshare(UINT8 width, size_t &bytes, bool required); bool report_missing(bool found, const char *objname, bool required); @@ -80,7 +80,8 @@ public: // operators to make use transparent operator _ObjectClass *() const { return m_target; } - _ObjectClass *operator->() const { assert(m_target != NULL); return m_target; } + + virtual _ObjectClass *operator->() const { assert(m_target != NULL); return m_target; } // getter for explicit fetching _ObjectClass *target() const { return m_target; } diff --git a/src/emu/device.cpp b/src/emu/device.cpp index c0055c9c3a7..c6c29d7af4a 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -14,51 +14,6 @@ #include "debug/debugcpu.h" - -//************************************************************************** -// CONSTANTS -//************************************************************************** - -#define TEMP_STRING_POOL_ENTRIES 16 -#define MAX_STRING_LENGTH 256 - - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -static char temp_string_pool[TEMP_STRING_POOL_ENTRIES][MAX_STRING_LENGTH]; -static int temp_string_pool_index; - - - -//************************************************************************** -// INLINE FUNCTIONS -//************************************************************************** - -//------------------------------------------------- -// get_temp_string_buffer - return a pointer to -// a temporary string buffer -//------------------------------------------------- - -char *get_temp_string_buffer(void) -{ - char *string = &temp_string_pool[temp_string_pool_index++ % TEMP_STRING_POOL_ENTRIES][0]; - string[0] = 0; - return string; -} - - -resource_pool &machine_get_pool(running_machine &machine) -{ - // temporary to get around include dependencies, until CPUs - // get a proper device class - return machine.respool(); -} - - - //************************************************************************** // LIVE DEVICE MANAGEMENT //************************************************************************** @@ -898,7 +853,7 @@ device_interface::device_interface(device_t &device, const char *type) m_type(type) { device_interface **tailptr; - for (tailptr = &device.m_interface_list; *tailptr != NULL; tailptr = &(*tailptr)->m_interface_next) ; + for (tailptr = &device.m_interface_list; *tailptr != NULL; tailptr = &(*tailptr)->m_interface_next) { } *tailptr = this; } diff --git a/src/emu/device.h b/src/emu/device.h index cde81b237c5..5e10488d696 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -198,8 +198,8 @@ public: // debugging device_debug *debug() const { return m_debug; } - offs_t safe_pc(); - offs_t safe_pcbase(); + offs_t safe_pc() const; + offs_t safe_pcbase() const; void set_default_bios(UINT8 bios) { m_default_bios = bios; } void set_system_bios(UINT8 bios) { m_system_bios = bios; } diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 0863924d974..cd0e0f947e4 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -166,12 +166,12 @@ public: void set_input_line(int linenum, int state) { m_input[linenum].set_state_synced(state); } void set_input_line_vector(int linenum, int vector) { m_input[linenum].set_vector(vector); } void set_input_line_and_vector(int linenum, int state, int vector) { m_input[linenum].set_state_synced(state, vector); } - int input_state(int linenum) { return m_input[linenum].m_curstate; } + int input_state(int linenum) const { return m_input[linenum].m_curstate; } // suspend/resume void suspend(UINT32 reason, bool eatcycles); void resume(UINT32 reason); - bool suspended(UINT32 reason = SUSPEND_ANY_REASON) { return (m_nextsuspend & reason) != 0; } + bool suspended(UINT32 reason = SUSPEND_ANY_REASON) const { return (m_nextsuspend & reason) != 0; } void yield() { suspend(SUSPEND_REASON_TIMESLICE, false); } void spin() { suspend(SUSPEND_REASON_TIMESLICE, true); } void spin_until_trigger(int trigid) { suspend_until_trigger(trigid, true); } @@ -195,9 +195,6 @@ public: device_execute_interface &execute() { return *this; } protected: - // internal helpers - void run_thread_wrapper(); - // clock and cycle information getters virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const; virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const; diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp index 47d9646eb67..933dd5a72c5 100644 --- a/src/emu/digfx.cpp +++ b/src/emu/digfx.cpp @@ -22,7 +22,8 @@ device_gfx_interface::device_gfx_interface(const machine_config &mconfig, device_t &device, const gfx_decode_entry *gfxinfo, const char *palette_tag) - : device_interface(device, "gfx"), + : device_interface(device, "gfx"), + m_palette(NULL), m_gfxdecodeinfo(gfxinfo), m_palette_tag(palette_tag), m_palette_is_sibling(palette_tag == NULL), diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 9a62108c1ff..87a6b10797b 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -14,8 +14,6 @@ #include "ui/ui.h" #include "ui/menu.h" #include "zippath.h" -#include "ui/filesel.h" -#include "ui/swlist.h" #include "ui/imgcntrl.h" #include "softlist.h" #include "image.h" @@ -57,12 +55,18 @@ const image_device_type_info device_image_interface::m_device_info_array[] = device_image_interface::device_image_interface(const machine_config &mconfig, device_t &device) : device_interface(device, "image"), + m_err(), m_file(NULL), m_mame_file(NULL), m_software_info_ptr(NULL), - m_software_part_ptr(NULL), + m_software_part_ptr(NULL), + m_supported(0), m_readonly(false), - m_created(false), + m_created(false), + m_init_phase(false), + m_from_swlist(false), + m_create_format(0), + m_create_args(NULL), m_is_loading(FALSE) { } @@ -575,8 +579,8 @@ bool device_image_interface::is_loaded() image_error_t device_image_interface::load_image_by_path(UINT32 open_flags, const char *path) { - file_error filerr = FILERR_NOT_FOUND; - image_error_t err = IMAGE_ERROR_FILENOTFOUND; + file_error filerr; + image_error_t err; std::string revised_path; /* attempt to read the file */ @@ -629,8 +633,8 @@ int device_image_interface::reopen_for_write(const char *path) if(m_file) core_fclose(m_file); - file_error filerr = FILERR_NOT_FOUND; - image_error_t err = IMAGE_ERROR_FILENOTFOUND; + file_error filerr; + image_error_t err; std::string revised_path; /* attempt to open the file for writing*/ diff --git a/src/emu/diimage.h b/src/emu/diimage.h index 63d01249aa3..b2aa398396a 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -253,7 +253,6 @@ protected: void setup_working_directory(); bool try_change_working_directory(const char *subdir); - int read_hash_config(const char *sysname); void run_hash(void (*partialhash)(hash_collection &, const unsigned char *, unsigned long, const char *), hash_collection &hashes, const char *types); void image_checkhash(); void update_names(const device_type device_type = NULL, const char *inst = NULL, const char *brief = NULL); diff --git a/src/emu/dimemory.cpp b/src/emu/dimemory.cpp index c10584817cb..0306774feae 100644 --- a/src/emu/dimemory.cpp +++ b/src/emu/dimemory.cpp @@ -241,7 +241,7 @@ void device_memory_interface::interface_validity_check(validity_checker &valid) bool detected_overlap = DETECT_OVERLAPPING_MEMORY ? false : true; // loop over all address spaces - for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum) { const address_space_config *spaceconfig = space_config(spacenum); if (spaceconfig != NULL) diff --git a/src/emu/dinetwork.cpp b/src/emu/dinetwork.cpp index fc411c6529c..26acbfcf479 100644 --- a/src/emu/dinetwork.cpp +++ b/src/emu/dinetwork.cpp @@ -16,7 +16,7 @@ device_network_interface::~device_network_interface() { } -int device_network_interface::send(UINT8 *buf, int len) +int device_network_interface::send(UINT8 *buf, int len) const { if(!m_dev) return 0; return m_dev->send(buf, len); diff --git a/src/emu/dinetwork.h b/src/emu/dinetwork.h index db85e456fce..b2ae35c8497 100644 --- a/src/emu/dinetwork.h +++ b/src/emu/dinetwork.h @@ -19,7 +19,7 @@ public: bool get_promisc() { return m_promisc; } int get_interface() { return m_intf; } - int send(UINT8 *buf, int len); + int send(UINT8 *buf, int len) const; virtual void recv_cb(UINT8 *buf, int len); protected: diff --git a/src/emu/dioutput.cpp b/src/emu/dioutput.cpp index cf222f7a477..54633f3acbd 100644 --- a/src/emu/dioutput.cpp +++ b/src/emu/dioutput.cpp @@ -35,7 +35,7 @@ device_output_interface::~device_output_interface() { } -void device_output_interface::set_output_value(int value) +void device_output_interface::set_output_value(int value) const { if (m_output_name) output_set_value(m_output_name, value); @@ -43,7 +43,7 @@ void device_output_interface::set_output_value(int value) fatalerror("Output name not set!"); } -void device_output_interface::set_led_value(int value) +void device_output_interface::set_led_value(int value) const { if (m_output_name) output_set_value(m_output_name, value); @@ -51,7 +51,7 @@ void device_output_interface::set_led_value(int value) output_set_led_value(m_output_index, value); } -void device_output_interface::set_lamp_value(int value) +void device_output_interface::set_lamp_value(int value) const { if (m_output_name) output_set_value(m_output_name, value); @@ -59,7 +59,7 @@ void device_output_interface::set_lamp_value(int value) output_set_lamp_value(m_output_index, value); } -void device_output_interface::set_digit_value(int value) +void device_output_interface::set_digit_value(int value) const { if (m_output_name) output_set_value(m_output_name, value); diff --git a/src/emu/dioutput.h b/src/emu/dioutput.h index ba00ac4804d..94528671ad9 100644 --- a/src/emu/dioutput.h +++ b/src/emu/dioutput.h @@ -47,10 +47,10 @@ public: static void set_output_index(device_t &device, int index) { dynamic_cast<device_output_interface &>(device).m_output_index = index; } static void set_output_name(device_t &device, const char *name) { dynamic_cast<device_output_interface &>(device).m_output_name = name; } - void set_output_value(int value); - void set_led_value(int value); - void set_lamp_value(int value); - void set_digit_value(int value); + void set_output_value(int value) const; + void set_led_value(int value) const; + void set_lamp_value(int value) const; + void set_digit_value(int value) const; protected: int m_output_index; diff --git a/src/emu/dipty.cpp b/src/emu/dipty.cpp index f0637abb0fe..97533eae976 100644 --- a/src/emu/dipty.cpp +++ b/src/emu/dipty.cpp @@ -53,7 +53,7 @@ bool device_pty_interface::is_open(void) const return m_opened; } -ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count) +ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count) const { UINT32 actual_bytes; @@ -64,7 +64,7 @@ ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count) } } -void device_pty_interface::write(UINT8 tx_char) +void device_pty_interface::write(UINT8 tx_char) const { UINT32 actual_bytes; diff --git a/src/emu/dipty.h b/src/emu/dipty.h index 8df192efcca..4efa39fa702 100644 --- a/src/emu/dipty.h +++ b/src/emu/dipty.h @@ -29,8 +29,8 @@ public: bool is_open(void) const; - ssize_t read(UINT8 *rx_chars , size_t count); - void write(UINT8 tx_char); + ssize_t read(UINT8 *rx_chars , size_t count) const; + void write(UINT8 tx_char) const; bool is_slave_connected(void) const; diff --git a/src/emu/dirtc.h b/src/emu/dirtc.h index 0afb7910073..758157233ea 100644 --- a/src/emu/dirtc.h +++ b/src/emu/dirtc.h @@ -55,8 +55,8 @@ public: void set_current_time(running_machine &machine); protected: - UINT8 convert_to_bcd(int val); - int bcd_to_integer(UINT8 val); + static UINT8 convert_to_bcd(int val); + static int bcd_to_integer(UINT8 val); void set_clock_register(int register, int value); int get_clock_register(int register); diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index d21374cbc09..9fce5064a90 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -19,10 +19,14 @@ device_serial_interface::device_serial_interface(const machine_config &mconfig, m_rcv_register_data(0x8000), m_rcv_flags(0), m_rcv_bit_count_received(0), - m_rcv_bit_count(0), + m_rcv_bit_count(0), + m_rcv_byte_received(0), m_rcv_framing_error(false), m_rcv_parity_error(false), - m_tra_flags(TRANSMIT_REGISTER_EMPTY), + m_tra_register_data(0), + m_tra_flags(TRANSMIT_REGISTER_EMPTY), + m_tra_bit_count_transmitted(0), + m_tra_bit_count(0), m_rcv_clock(NULL), m_tra_clock(NULL), m_rcv_rate(attotime::never), diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index e0c07d206f1..7a6d2471d6e 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -20,8 +20,9 @@ device_slot_interface::~device_slot_interface() { } -device_slot_option::device_slot_option(const char *name, const device_type &devtype): - m_name(name), +device_slot_option::device_slot_option(const char *name, const device_type &devtype): + m_next(NULL), + m_name(name), m_devtype(devtype), m_selectable(true), m_default_bios(NULL), diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp index 94c92a62de1..e6c68737e0f 100644 --- a/src/emu/disound.cpp +++ b/src/emu/disound.cpp @@ -194,8 +194,8 @@ void device_sound_interface::set_output_gain(int outputnum, float gain) { for (sound_stream *stream = m_device.machine().sound().first_stream(); stream != NULL; stream = stream->next()) if (&stream->device() == &device()) - for (int outputnum = 0; outputnum < stream->output_count(); outputnum++) - stream->set_output_gain(outputnum, gain); + for (int num = 0; num < stream->output_count(); num++) + stream->set_output_gain(num, gain); } // look up the stream and stream output index diff --git a/src/emu/distate.cpp b/src/emu/distate.cpp index 79ec37e422b..450fe412259 100644 --- a/src/emu/distate.cpp +++ b/src/emu/distate.cpp @@ -146,7 +146,7 @@ void device_state_entry::format_from_mask() UINT64 device_state_entry::value() const { // pick up the value - UINT64 result = ~(UINT64)0; + UINT64 result; switch (m_datasize) { default: @@ -172,7 +172,7 @@ std::string &device_state_entry::format(std::string &dest, const char *string, b bool leadzero = false; bool percent = false; bool explicitsign = false; - bool hitnonzero = false; + bool hitnonzero; bool reset = true; int width = 0; for (const char *fptr = m_format.c_str(); *fptr != 0; fptr++) diff --git a/src/emu/distate.h b/src/emu/distate.h index 352a3c1337d..b8adb436f1c 100644 --- a/src/emu/distate.h +++ b/src/emu/distate.h @@ -195,7 +195,7 @@ typedef device_interface_iterator<device_state_interface> state_interface_iterat // or 0 if no state object exists //------------------------------------------------- -inline offs_t device_t::safe_pc() +inline offs_t device_t::safe_pc() const { return (m_state != NULL) ? m_state->pc() : 0; } @@ -206,7 +206,7 @@ inline offs_t device_t::safe_pc() // base or 0 if no state object exists //------------------------------------------------- -inline offs_t device_t::safe_pcbase() +inline offs_t device_t::safe_pcbase() const { return (m_state != NULL) ? m_state->pcbase() : 0; } diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index 4bd555c907d..4a310ca4839 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -50,9 +50,6 @@ #ifndef __DRAWGFXM_H__ #define __DRAWGFXM_H__ -#include "profiler.h" - - /* special priority type meaning "none" */ struct NO_PRIORITY { char dummy[3]; }; diff --git a/src/emu/drivenum.cpp b/src/emu/drivenum.cpp index 857c4bab3fb..62fffe13d40 100644 --- a/src/emu/drivenum.cpp +++ b/src/emu/drivenum.cpp @@ -395,7 +395,7 @@ void driver_enumerator::find_approximate_matches(const char *string, int count, // we're done with it //------------------------------------------------- -void driver_enumerator::release_current() +void driver_enumerator::release_current() const { // skip if no current entry if (m_current < 0 || m_current >= s_driver_count) diff --git a/src/emu/drivenum.h b/src/emu/drivenum.h index 096d8b873a1..e2c7d65a58f 100644 --- a/src/emu/drivenum.h +++ b/src/emu/drivenum.h @@ -117,7 +117,7 @@ public: private: // internal helpers - void release_current(); + void release_current() const; // entry in the config cache struct config_entry diff --git a/src/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp index d3d077f025b..04260578fc2 100644 --- a/src/emu/drivers/testcpu.cpp +++ b/src/emu/drivers/testcpu.cpp @@ -32,7 +32,8 @@ public: testcpu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), - m_ram(*this, "ram") + m_ram(*this, "ram"), + m_space(NULL) { } diff --git a/src/emu/emualloc.cpp b/src/emu/emualloc.cpp index 566176ce39a..02642b44922 100644 --- a/src/emu/emualloc.cpp +++ b/src/emu/emualloc.cpp @@ -9,7 +9,6 @@ ***************************************************************************/ #include "emucore.h" -#include "coreutil.h" //************************************************************************** diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 1e578068b77..7db30e57869 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -290,7 +290,7 @@ void emu_options::update_slot_options() } } } - while (add_slot_options(false)); + while (add_slot_options(false)) { } add_device_options(false); } @@ -359,13 +359,15 @@ void emu_options::remove_device_options() bool emu_options::parse_slot_devices(int argc, char *argv[], std::string &error_string, const char *name, const char *value) { // an initial parse to capture the initial set of values - bool result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); + bool result; + + core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); // keep adding slot options until we stop seeing new stuff bool isfirstpass = true; while (add_slot_options(isfirstpass)) { - result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); + core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); isfirstpass = false; } @@ -373,9 +375,9 @@ bool emu_options::parse_slot_devices(int argc, char *argv[], std::string &error_ add_device_options(true); if (name != NULL && exists(name)) set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string); - result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); + core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); - int num = 0; + int num; do { num = options_count(); update_slot_options(); @@ -528,7 +530,7 @@ void emu_options::set_system_name(const char *name) // then add the options add_device_options(true); - int num = 0; + int num; do { num = options_count(); update_slot_options(); diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index b1bda17bc98..a7673d12447 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -24,15 +24,20 @@ palette_device::palette_device(const machine_config &mconfig, const char *tag, d m_entries(0), m_indirect_entries(0), m_enable_shadows(0), - m_enable_hilights(0), - m_membits_supplied(false), + m_enable_hilights(0), + m_membits(0), + m_membits_supplied(false), + m_endianness(), m_endianness_supplied(false), m_raw_to_rgb(raw_to_rgb_converter()), m_palette(NULL), - m_pens(NULL), + m_pens(NULL), + m_format(), m_shadow_table(NULL), m_shadow_group(0), - m_hilight_group(0), + m_hilight_group(0), + m_white_pen(0), + m_black_pen(0), m_init(palette_init_delegate()) { } diff --git a/src/emu/hash.cpp b/src/emu/hash.cpp index 1d92458d139..3ada8eb2690 100644 --- a/src/emu/hash.cpp +++ b/src/emu/hash.cpp @@ -292,8 +292,6 @@ bool hash_collection::from_internal_string(const char *string) // non-hex alpha values specify a hash type if (uc >= 'G' && uc <= 'Z') { - if (skip_digits != 0) - errors = true; skip_digits = 0; if (uc == HASH_CRC) { diff --git a/src/emu/hashfile.cpp b/src/emu/hashfile.cpp index ff667fd5ac4..c4735191780 100644 --- a/src/emu/hashfile.cpp +++ b/src/emu/hashfile.cpp @@ -539,8 +539,8 @@ const char *extra_info = NULL; bool read_hash_config(device_image_interface &image, const char *sysname, std::string &result) { - hash_file *hashfile = NULL; - const hash_info *info = NULL; + hash_file *hashfile; + const hash_info *info; /* open the hash file */ hashfile = hashfile_open(image.device().mconfig().options(), sysname, FALSE, NULL); diff --git a/src/emu/input.cpp b/src/emu/input.cpp index 01469566a63..5495a5054f8 100644 --- a/src/emu/input.cpp +++ b/src/emu/input.cpp @@ -834,7 +834,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite // if we have a generic ID, pick a new internal one input_item_id originalid = itemid; if (itemid >= ITEM_ID_OTHER_SWITCH && itemid <= ITEM_ID_OTHER_AXIS_RELATIVE) - for (itemid = (input_item_id)(ITEM_ID_MAXIMUM + 1); itemid <= ITEM_ID_ABSOLUTE_MAXIMUM; itemid++) + for (itemid = (input_item_id)(ITEM_ID_MAXIMUM + 1); itemid <= ITEM_ID_ABSOLUTE_MAXIMUM; ++itemid) if (m_item[itemid] == NULL) break; assert(itemid <= ITEM_ID_ABSOLUTE_MAXIMUM); @@ -843,7 +843,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite assert(m_item[itemid] == NULL); // determine the class and create the appropriate item class - input_device_item *item = NULL; + input_device_item *item; switch (m_class.standard_item_class(originalid)) { case ITEM_CLASS_SWITCH: @@ -859,6 +859,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite break; default: + item = NULL; assert(false); } @@ -919,7 +920,7 @@ void input_device::apply_steadykey() const // update the state of all the keys and see if any changed state bool anything_changed = false; - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= m_maxitem; itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= m_maxitem; ++itemid) { input_device_item *item = m_item[itemid]; if (item != NULL && item->itemclass() == ITEM_CLASS_SWITCH) @@ -929,7 +930,7 @@ void input_device::apply_steadykey() const // if the keyboard state is stable, flush the current state if (!anything_changed) - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= m_maxitem; itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= m_maxitem; ++itemid) { input_device_item *item = m_item[itemid]; if (item != NULL && item->itemclass() == ITEM_CLASS_SWITCH) @@ -1182,7 +1183,7 @@ void input_manager::reset_polling() reset_memory(); // iterate over device classes and devices - for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; devclass++) + for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { // fetch the device; ignore if NULL @@ -1191,7 +1192,7 @@ void input_manager::reset_polling() continue; // iterate over items within each device - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); ++itemid) { // for any non-switch items, set memory equal to the current value input_device_item *item = device->item(itemid); @@ -1209,7 +1210,7 @@ void input_manager::reset_polling() input_code input_manager::poll_switches() { // iterate over device classes and devices - for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; devclass++) + for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { // fetch the device; ignore if NULL @@ -1218,7 +1219,7 @@ input_code input_manager::poll_switches() continue; // iterate over items within each device - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); ++itemid) { input_device_item *item = device->item(itemid); if (item != NULL) @@ -1298,7 +1299,7 @@ input_code input_manager::poll_keyboard_switches() continue; // iterate over items within each device - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); ++itemid) { input_device_item *item = device->item(itemid); if (item != NULL && item->itemclass() == ITEM_CLASS_SWITCH) @@ -1363,7 +1364,7 @@ bool input_manager::code_check_axis(input_device_item &item, input_code code) input_code input_manager::poll_axes() { // iterate over device classes and devices - for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; devclass++) + for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { // fetch the device; ignore if NULL @@ -1372,7 +1373,7 @@ input_code input_manager::poll_axes() continue; // iterate over items within each device - for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); itemid++) + for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); ++itemid) { input_device_item *item = device->item(itemid); if (item != NULL && item->itemclass() != ITEM_CLASS_SWITCH) @@ -1444,7 +1445,7 @@ void input_manager::reset_memory() input_code input_manager::code_from_itemid(input_item_id itemid) const { // iterate over device classes and devices - for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; devclass++) + for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { input_device *device = m_class[devclass]->device(devnum); @@ -1612,7 +1613,7 @@ input_code input_manager::code_from_token(const char *_token) return INPUT_CODE_INVALID; // if not a standard code, look it up in the device specific codes - for (itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); itemid++) + for (itemid = ITEM_ID_FIRST_VALID; itemid <= device->maxitem(); ++itemid) { input_device_item *item = device->item(itemid); if (item != NULL && token[curtok].compare(item->token()) == 0) diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp index 5c0224aa77c..50b27db4779 100644 --- a/src/emu/ioport.cpp +++ b/src/emu/ioport.cpp @@ -97,7 +97,6 @@ #include "profiler.h" #include "ui/ui.h" #include "uiinput.h" -#include "debug/debugcon.h" #include "osdepend.h" @@ -713,7 +712,7 @@ void input_type_entry::configure_osd(const char *token, const char *name) void input_type_entry::restore_default_seq() { - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) m_seq[seqtype] = defseq(seqtype); } @@ -727,7 +726,8 @@ void input_type_entry::restore_default_seq() //------------------------------------------------- digital_joystick::digital_joystick(int player, int number) - : m_player(player), + : m_next(NULL), + m_player(player), m_number(number), m_current(0), m_current4way(0), @@ -763,7 +763,7 @@ void digital_joystick::frame_update() // read all the associated ports running_machine *machine = NULL; - for (direction_t direction = JOYDIR_UP; direction < JOYDIR_COUNT; direction++) + for (direction_t direction = JOYDIR_UP; direction < JOYDIR_COUNT; ++direction) for (const simple_list_wrapper<ioport_field> *i = m_field[direction].first(); i != NULL; i = i->next()) { machine = &i->object()->machine(); @@ -1477,7 +1477,7 @@ ioport_field::ioport_field(ioport_port &port, ioport_type type, ioport_value def m_way(0) { // reset sequences and chars - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) m_seq[seqtype].set_default(); m_chars[0] = m_chars[1] = m_chars[2] = m_chars[3] = unicode_char(0); @@ -1679,7 +1679,7 @@ void ioport_field::get_user_settings(user_settings &settings) memset(&settings, 0, sizeof(settings)); // copy the basics - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) settings.seq[seqtype] = seq(seqtype); // if there's a list of settings or we're an adjuster, copy the current value @@ -1711,7 +1711,7 @@ void ioport_field::get_user_settings(user_settings &settings) void ioport_field::set_user_settings(const user_settings &settings) { // copy the basics - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) { const input_seq &defseq = manager().type_seq(m_type, m_player, input_seq_type(seqtype)); if (defseq == settings.seq[seqtype]) @@ -2159,7 +2159,7 @@ ioport_field_live::ioport_field_live(ioport_field &field, analog_field *analog) joydir(digital_joystick::JOYDIR_COUNT) { // fill in the basic values - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) seq[seqtype] = field.defseq_unresolved(seqtype); // if this is a digital joystick field, make a note of it @@ -2454,7 +2454,11 @@ ioport_manager::ioport_manager(running_machine &machine) m_record_file(machine.options().input_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS), m_playback_file(machine.options().input_directory(), OPEN_FLAG_READ), m_playback_accumulated_speed(0), - m_playback_accumulated_frames(0) + m_playback_accumulated_frames(0), + m_has_configs(false), + m_has_analog(false), + m_has_dips(false), + m_has_bioses(false) { memset(m_type_to_entry, 0, sizeof(m_type_to_entry)); } @@ -2980,7 +2984,7 @@ void ioport_manager::load_config(int config_type, xml_data_node *parentnode) // initialize sequences to invalid defaults input_seq newseq[SEQ_TYPE_TOTAL]; - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) newseq[seqtype].set(INPUT_CODE_INVALID); // loop over new sequences @@ -3008,7 +3012,7 @@ void ioport_manager::load_config(int config_type, xml_data_node *parentnode) // what we will diff against if (config_type == CONFIG_TYPE_CONTROLLER) for (input_type_entry *entry = m_typelist.first(); entry != NULL; entry = entry->next()) - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) entry->defseq(seqtype) = entry->seq(seqtype); } @@ -3049,7 +3053,7 @@ void ioport_manager::load_remap_table(xml_data_node *parentnode) // loop over the remapping table, then over default ports, replacing old with new for (int remapnum = 0; remapnum < count; remapnum++) for (input_type_entry *entry = m_typelist.first(); entry != NULL; entry = entry->next()) - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) entry->m_seq[seqtype].replace(oldtable[remapnum], newtable[remapnum]); } } @@ -3066,7 +3070,7 @@ bool ioport_manager::load_default_config(xml_data_node *portnode, int type, int for (input_type_entry *entry = m_typelist.first(); entry != NULL; entry = entry->next()) if (entry->type() == type && entry->player() == player) { - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) if (newseq[seqtype][0] != INPUT_CODE_INVALID) entry->m_seq[seqtype] = newseq[seqtype]; return true; @@ -3098,7 +3102,7 @@ bool ioport_manager::load_game_config(xml_data_node *portnode, int type, int pla field->mask() == mask && (field->defvalue() & mask) == (defvalue & mask)) { // if a sequence was specified, copy it in - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) if (newseq[seqtype][0] != INPUT_CODE_INVALID) field->live().seq[seqtype] = newseq[seqtype]; @@ -3217,7 +3221,7 @@ void ioport_manager::save_default_inputs(xml_data_node *parentnode) { // see if any of the sequences have changed input_seq_type seqtype; - for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) if (entry->seq(seqtype) != entry->defseq(seqtype)) break; @@ -3233,9 +3237,9 @@ void ioport_manager::save_default_inputs(xml_data_node *parentnode) xml_set_attribute(portnode, "type", input_type_to_token(tempstr, entry->type(), entry->player())); // add only the sequences that have changed from the defaults - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) - if (entry->seq(seqtype) != entry->defseq(seqtype)) - save_sequence(portnode, seqtype, entry->type(), entry->seq(seqtype)); + for (input_seq_type type = SEQ_TYPE_STANDARD; type < SEQ_TYPE_TOTAL; ++type) + if (entry->seq(type) != entry->defseq(type)) + save_sequence(portnode, type, entry->type(), entry->seq(type)); } } } @@ -3257,7 +3261,7 @@ void ioport_manager::save_game_inputs(xml_data_node *parentnode) { // determine if we changed bool changed = false; - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) changed |= (field->seq(seqtype) != field->defseq(seqtype)); // non-analog changes @@ -3291,7 +3295,7 @@ void ioport_manager::save_game_inputs(xml_data_node *parentnode) xml_set_attribute_int(portnode, "defvalue", field->defvalue() & field->mask()); // add sequences if changed - for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) if (field->seq(seqtype) != field->defseq(seqtype)) save_sequence(portnode, seqtype, field->type(), field->seq(seqtype)); diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 6531bda50af..5eeedb9a792 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -1394,7 +1394,6 @@ public: int count_players() const; bool crosshair_position(int player, float &x, float &y); bool has_keyboard() const; - void setup_natural_keyboard(ioport_queue_chars_delegate queue_chars, ioport_accept_char_delegate accept_char, ioport_charqueue_empty_delegate charqueue_empty); INT32 frame_interpolate(INT32 oldval, INT32 newval); ioport_type token_to_input_type(const char *string, int &player) const; const char *input_type_to_token(std::string &str, ioport_type type, int player); diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index 989cb78f72b..e7f00e60126 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -13,8 +13,6 @@ #include "luabridge/Source/LuaBridge/LuaBridge.h" #include <signal.h> #include "emu.h" -#include "emuopts.h" -#include "osdepend.h" #include "drivenum.h" #include "ui/ui.h" #include "luaengine.h" @@ -430,7 +428,7 @@ luabridge::LuaRef lua_engine::l_dev_get_memspaces(const device_t *d) lua_State *L = luaThis->m_lua_state; luabridge::LuaRef sp_table = luabridge::LuaRef::newTable(L); - for (address_spacenum sp = AS_0; sp < ADDRESS_SPACES; sp++) { + for (address_spacenum sp = AS_0; sp < ADDRESS_SPACES; ++sp) { if (dev->memory().has_space(sp)) { sp_table[dev->memory().space(sp).name()] = &(dev->memory().space(sp)); } @@ -838,7 +836,7 @@ void lua_engine::serve_lua() osd_lock_release(lock); // Wait for response - int done = 0; + int done; do { osd_sleep(osd_ticks_per_second() / 1000); osd_lock_acquire(lock); diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 9562d4aa32f..346f907c0a7 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -75,12 +75,9 @@ #include "debugger.h" #include "render.h" #include "cheat.h" -#include "ui/selgame.h" #include "uiinput.h" #include "crsshair.h" -#include "validity.h" #include "unzip.h" -#include "debug/debugcon.h" #include "debug/debugvw.h" #include "image.h" #include "luaengine.h" @@ -322,9 +319,9 @@ device_t &running_machine::add_dynamic_device(device_t &owner, device_type type, // notify this device and all its subdevices that they are now configured device_iterator iter(root_device()); - for (device_t *device = iter.first(); device != NULL; device = iter.next()) - if (!device->configured()) - device->config_complete(); + for (device_t *dev = iter.first(); dev != NULL; dev = iter.next()) + if (!dev->configured()) + dev->config_complete(); return *device; } @@ -578,7 +575,7 @@ std::string running_machine::get_statename(const char *option) // find length of the device name int end1 = statename_str.find("/", pos + 3); int end2 = statename_str.find("%", pos + 3); - int end = -1; + int end; if ((end1 != -1) && (end2 != -1)) end = MIN(end1, end2); diff --git a/src/emu/machine.h b/src/emu/machine.h index d06193a1596..dcd935cfde9 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -73,7 +73,6 @@ const int DEBUG_FLAG_OSD_ENABLED = 0x00001000; // The OSD debugger is e #define auto_alloc_array_clear(m, t, c) pool_alloc_array_clear(static_cast<running_machine &>(m).respool(), t, c) #define auto_free(m, v) pool_free(static_cast<running_machine &>(m).respool(), v) -#define auto_bitmap_alloc(m, w, h, f) auto_alloc(m, bitmap_t(w, h, f)) #define auto_bitmap_ind8_alloc(m, w, h) auto_alloc(m, bitmap_ind8(w, h)) #define auto_bitmap_ind16_alloc(m, w, h) auto_alloc(m, bitmap_ind16(w, h)) #define auto_bitmap_ind32_alloc(m, w, h) auto_alloc(m, bitmap_ind32(w, h)) @@ -191,7 +190,7 @@ public: bool scheduled_event_pending() const { return m_exit_pending || m_hard_reset_pending; } // fetch items by name - inline device_t *device(const char *tag) { return root_device().subdevice(tag); } + inline device_t *device(const char *tag) const { return root_device().subdevice(tag); } template<class _DeviceClass> inline _DeviceClass *device(const char *tag) { return downcast<_DeviceClass *>(device(tag)); } // configuration helpers diff --git a/src/emu/machine/generic.cpp b/src/emu/machine/generic.cpp index 79a3ea3f5cf..636b65f3581 100644 --- a/src/emu/machine/generic.cpp +++ b/src/emu/machine/generic.cpp @@ -9,7 +9,6 @@ *********************************************************************/ #include "emu.h" -#include "emuopts.h" #include "config.h" diff --git a/src/emu/mame.cpp b/src/emu/mame.cpp index 220ced70a7a..8ec83710330 100644 --- a/src/emu/mame.cpp +++ b/src/emu/mame.cpp @@ -73,15 +73,7 @@ #include "emu.h" #include "emuopts.h" #include "osdepend.h" -#include "config.h" -#include "debugger.h" -#include "render.h" -#include "cheat.h" -#include "ui/ui.h" -#include "uiinput.h" -#include "crsshair.h" #include "validity.h" -#include "debug/debugcon.h" #include "luaengine.h" #include <time.h> diff --git a/src/emu/memory.cpp b/src/emu/memory.cpp index 653b858569f..c9767bcd592 100644 --- a/src/emu/memory.cpp +++ b/src/emu/memory.cpp @@ -335,7 +335,8 @@ public: // construction/destruction handler_entry_read(UINT8 width, endianness_t endianness, UINT8 **rambaseptr) - : handler_entry(width, endianness, rambaseptr) + : handler_entry(width, endianness, rambaseptr), + m_ioport(NULL) { } @@ -397,7 +398,8 @@ public: // construction/destruction handler_entry_write(UINT8 width, endianness_t endianness, UINT8 **rambaseptr) - : handler_entry(width, endianness, rambaseptr) + : handler_entry(width, endianness, rambaseptr), + m_ioport(NULL) { } @@ -482,13 +484,13 @@ public: // forward delegate callbacks configuration template<typename _delegate> void set_delegate(_delegate delegate) const { - for (typename std::list<_HandlerEntry *>::const_iterator i = handlers.begin(); i != handlers.end(); i++) + for (typename std::list<_HandlerEntry *>::const_iterator i = handlers.begin(); i != handlers.end(); ++i) (*i)->set_delegate(delegate, mask); } // forward I/O port access configuration void set_ioport(ioport_port &ioport) const { - for (typename std::list<_HandlerEntry *>::const_iterator i = handlers.begin(); i != handlers.end(); i++) + for (typename std::list<_HandlerEntry *>::const_iterator i = handlers.begin(); i != handlers.end(); ++i) (*i)->set_ioport(ioport); } @@ -659,7 +661,7 @@ public: std::list<UINT32> entries; setup_range(bytestart, byteend, bytemask, bytemirror, mask, entries); std::list<handler_entry_read *> handlers; - for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); i++) + for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); ++i) handlers.push_back(&handler_read(*i)); return handler_entry_proxy<handler_entry_read>(handlers, mask); } @@ -732,7 +734,7 @@ public: std::list<UINT32> entries; setup_range(bytestart, byteend, bytemask, bytemirror, mask, entries); std::list<handler_entry_write *> handlers; - for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); i++) + for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); ++i) handlers.push_back(&handler_write(*i)); return handler_entry_proxy<handler_entry_write>(handlers, mask); } @@ -810,7 +812,7 @@ public: std::list<UINT32> entries; setup_range(bytestart, byteend, bytemask, bytemirror, mask, entries); std::list<handler_entry_setoffset *> handlers; - for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); i++) + for (std::list<UINT32>::const_iterator i = entries.begin(); i != entries.end(); ++i) handlers.push_back(&handler_setoffset(*i)); return handler_entry_proxy<handler_entry_setoffset>(handlers, mask); } @@ -1522,7 +1524,7 @@ void memory_manager::initialize() // loop over devices and spaces within each device memory_interface_iterator iter(machine().root_device()); for (device_memory_interface *memory = iter.first(); memory != NULL; memory = iter.next()) - for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++) + for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum) { // if there is a configuration for this space, we need an address space const address_space_config *spaceconfig = memory->space_config(spacenum); @@ -1909,7 +1911,7 @@ void address_space::populate_from_map(address_map *map) { // find the entry before the last one we processed const address_map_entry *entry; - for (entry = map->m_entrylist.first(); entry->next() != last_entry; entry = entry->next()) ; + for (entry = map->m_entrylist.first(); entry->next() != last_entry; entry = entry->next()) { }; last_entry = entry; // map both read and write halves @@ -2867,7 +2869,7 @@ void address_table::setup_range_masked(offs_t addrstart, offs_t addrend, offs_t curentry.configure(bytestart, byteend, bytemask); // Populate it wherever needed - for (std::list<subrange>::const_iterator i = range_override.begin(); i != range_override.end(); i++) + for (std::list<subrange>::const_iterator i = range_override.begin(); i != range_override.end(); ++i) populate_range(i->start, i->end, entry); // Add it in the "to be setup" list @@ -2880,7 +2882,7 @@ void address_table::setup_range_masked(offs_t addrstart, offs_t addrend, offs_t // Ranges in range_partial must duplicated then partially changed if (!range_partial.empty()) { - for (std::map<UINT16, std::list<subrange> >::const_iterator i = range_partial.begin(); i != range_partial.end(); i++) + for (std::map<UINT16, std::list<subrange> >::const_iterator i = range_partial.begin(); i != range_partial.end(); ++i) { // Theorically, if the handler to change matches the // characteristics of ours, we can directly change it. In @@ -2910,7 +2912,7 @@ void address_table::setup_range_masked(offs_t addrstart, offs_t addrend, offs_t curentry.configure(bytestart, byteend, bytemask); // Populate it wherever needed - for (std::list<subrange>::const_iterator j = i->second.begin(); j != i->second.end(); j++) + for (std::list<subrange>::const_iterator j = i->second.begin(); j != i->second.end(); ++j) populate_range(j->start, j->end, entry); // Add it in the "to be setup" list @@ -4079,7 +4081,8 @@ handler_entry::handler_entry(UINT8 width, endianness_t endianness, UINT8 **ramba m_byteend(0), m_bytemask(~0), m_rambaseptr(rambaseptr), - m_subunits(0) + m_subunits(0), + m_invsubmask(0) { } diff --git a/src/emu/network.cpp b/src/emu/network.cpp index 9619a435b2d..ceb557cdefd 100644 --- a/src/emu/network.cpp +++ b/src/emu/network.cpp @@ -9,7 +9,6 @@ #include <ctype.h> #include "emu.h" -#include "emuopts.h" #include "network.h" #include "config.h" #include "xmlfile.h" diff --git a/src/emu/profiler.cpp b/src/emu/profiler.cpp index 50e289e8d46..668d57964c2 100644 --- a/src/emu/profiler.cpp +++ b/src/emu/profiler.cpp @@ -175,12 +175,12 @@ void real_profiler_state::update_text(running_machine &machine) // compute the total time for all bits, not including profiler or idle UINT64 computed = 0; profile_type curtype; - for (curtype = PROFILER_DEVICE_FIRST; curtype < PROFILER_PROFILER; curtype++) + for (curtype = PROFILER_DEVICE_FIRST; curtype < PROFILER_PROFILER; ++curtype) computed += m_data[curtype]; // save that result in normalize, and continue adding the rest UINT64 normalize = computed; - for ( ; curtype < PROFILER_TOTAL; curtype++) + for ( ; curtype < PROFILER_TOTAL; ++curtype) computed += m_data[curtype]; // this becomes the total; if we end up with 0 for anything, we were just started, so return empty @@ -193,7 +193,7 @@ void real_profiler_state::update_text(running_machine &machine) // loop over all types and generate the string device_iterator iter(machine.root_device()); - for (curtype = PROFILER_DEVICE_FIRST; curtype < PROFILER_TOTAL; curtype++) + for (curtype = PROFILER_DEVICE_FIRST; curtype < PROFILER_TOTAL; ++curtype) { // determine the accumulated time for this type computed = m_data[curtype]; diff --git a/src/emu/render.cpp b/src/emu/render.cpp index f9e55bf9abe..c86b3f914c5 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1204,7 +1204,7 @@ void render_target::compute_minimum_size(INT32 &minwidth, INT32 &minheight) throw emu_fatalerror("Mandatory artwork is missing"); // scan the current view for all screens - for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; layer++) + for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; ++layer) // iterate over items in the layer for (layout_view::item *curitem = m_curview->first_item(layer); curitem != NULL; curitem = curitem->next()) @@ -1287,7 +1287,7 @@ render_primitive_list &render_target::get_primitives() // iterate over layers back-to-front, but only if we're running if (m_manager.machine().phase() >= MACHINE_PHASE_RESET) - for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; layernum++) + for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; ++layernum) { int blendmode; item_layer layer = get_layer_and_blendmode(*m_curview, layernum, blendmode); @@ -1916,7 +1916,7 @@ bool render_target::map_point_internal(INT32 target_x, INT32 target_y, render_co } // loop through each layer - for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; layernum++) + for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; ++layernum) { int blendmode; item_layer layer = get_layer_and_blendmode(*m_curview, layernum, blendmode); @@ -2500,8 +2500,8 @@ render_target *render_manager::target_by_index(int index) const float render_manager::ui_aspect(render_container *rc) { - int orient = 0; - float aspect = 1.0f; + int orient; + float aspect; if (rc == m_ui_container || rc == NULL) { // ui container, aggregated multi-screen target diff --git a/src/emu/render.h b/src/emu/render.h index df305b5e23d..f3b37fb9aed 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -304,6 +304,14 @@ class render_primitive friend class simple_list<render_primitive>; public: + render_primitive(): + type(), + flags(0), + width(0), + container(NULL), + m_next(NULL) + {} + // render primitive types enum primitive_type { @@ -522,6 +530,8 @@ private: friend class simple_list<item>; public: + item() : m_next(NULL), m_type(0), m_flags(0), m_internal(0), m_width(0), m_texture(NULL) { } + // getters item *next() const { return m_next; } UINT8 type() const { return m_type; } diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp index 5248bc326b5..dea9f32db4a 100644 --- a/src/emu/rendfont.cpp +++ b/src/emu/rendfont.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "rendfont.h" -#include "rendutil.h" #include "emuopts.h" #include "coreutil.h" @@ -511,7 +510,7 @@ bool render_font::load_bdf() else if (strncmp(ptr, "BITMAP", 6) == 0) { // stash the raw pointer and scan for the end of the character - for (rawdata = ptr = next_line(ptr); ptr != NULL && strncmp(ptr, "ENDCHAR", 7) != 0; ptr = next_line(ptr)) ; + for (rawdata = ptr = next_line(ptr); ptr != NULL && strncmp(ptr, "ENDCHAR", 7) != 0; ptr = next_line(ptr)) { } break; } } diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index 6733ecbcb92..9f53cf86255 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -53,8 +53,6 @@ #include "rendlay.h" #include "rendutil.h" #include "xmlfile.h" -#include "png.h" -#include "ui/ui.h" @@ -632,7 +630,7 @@ layout_element::component::component(running_machine &machine, xml_data_node &co std::string symbollist = xml_get_attribute_string_with_subst(machine, compnode, "symbollist", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15"); // split out position names from string and figure out our number of symbols - int location = -1; + int location; m_numstops = 0; location=symbollist.find(","); while (location!=-1) @@ -2218,7 +2216,7 @@ void layout_view::recompute(render_layer_config layerconfig) // loop over all layers bool first = true; bool scrfirst = true; - for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; layer++) + for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; ++layer) { // determine if this layer should be visible switch (layer) @@ -2293,7 +2291,7 @@ void layout_view::recompute(render_layer_config layerconfig) float yscale = (target_bounds.y1 - target_bounds.y0) / (m_bounds.y1 - m_bounds.y0); // normalize all the item bounds - for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; layer++) + for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; ++layer) for (item *curitem = first_item(layer); curitem != NULL; curitem = curitem->next()) { curitem->m_bounds.x0 = target_bounds.x0 + (curitem->m_rawbounds.x0 - xoffs) * xscale; @@ -2310,7 +2308,7 @@ void layout_view::recompute(render_layer_config layerconfig) void layout_view::resolve_tags() { - for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; layer++) + for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; ++layer) { for (item *curitem = first_item(layer); curitem != NULL; curitem = curitem->next()) { diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index 370815e8366..a43adc4f58b 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -10,9 +10,7 @@ #include "emu.h" #include "emuopts.h" #include "drivenum.h" -#include "png.h" #include "chd.h" -#include "config.h" #include "softlist.h" #include "ui/ui.h" diff --git a/src/emu/save.cpp b/src/emu/save.cpp index fe20fe2a988..4af850163c2 100644 --- a/src/emu/save.cpp +++ b/src/emu/save.cpp @@ -194,7 +194,7 @@ void save_manager::save_memory(device_t *device, const char *module, const char save_error save_manager::check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)) { // if we want to validate the signature, compute it - UINT32 sig = 0; + UINT32 sig; sig = machine.save().signature(); // seek to the beginning and read the header diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp index 28521538d16..43a26ebb1fd 100644 --- a/src/emu/schedule.cpp +++ b/src/emu/schedule.cpp @@ -11,14 +11,6 @@ #include "emu.h" #include "debugger.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - //************************************************************************** // DEBUGGING //************************************************************************** @@ -498,9 +490,9 @@ void device_scheduler::timeslice() exec->m_totalcycles += ran; // update the local time for this CPU - attotime delta(0, exec->m_attoseconds_per_cycle * ran); - assert(delta >= attotime::zero); - exec->m_localtime += delta; + attotime deltatime(0, exec->m_attoseconds_per_cycle * ran); + assert(deltatime >= attotime::zero); + exec->m_localtime += deltatime; LOG((" %d ran, %d total, time = %s\n", ran, (INT32)exec->m_totalcycles, exec->m_localtime.as_string(PRECISION))); // if the new local CPU time is less than our target, move the target up, but not before the base @@ -990,7 +982,3 @@ void device_scheduler::dump_timers() const timer->dump(); machine().logerror("=============================================\n"); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index 399c376c856..fb6fcbc1b57 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -58,7 +58,8 @@ screen_device::screen_device(const machine_config &mconfig, const char *tag, dev m_container(NULL), m_width(100), m_height(100), - m_visarea(0, 99, 0, 99), + m_visarea(0, 99, 0, 99), + m_texformat(), m_curbitmap(0), m_curtexture(0), m_changed(true), @@ -634,7 +635,7 @@ bool screen_device::update_partial(int scanline) LOG_PARTIAL_UPDATES(("updating %d-%d\n", clip.min_y, clip.max_y)); g_profiler.start(PROFILER_VIDEO); - UINT32 flags = UPDATE_HAS_NOT_CHANGED; + UINT32 flags; screen_bitmap &curbitmap = m_bitmap[m_curbitmap]; switch (curbitmap.format()) { @@ -751,7 +752,7 @@ void screen_device::update_now() LOG_PARTIAL_UPDATES(("doing scanline partial draw: Y %d X %d-%d\n", clip.max_y, clip.min_x, clip.max_x)); - UINT32 flags = UPDATE_HAS_NOT_CHANGED; + UINT32 flags; screen_bitmap &curbitmap = m_bitmap[m_curbitmap]; switch (curbitmap.format()) { diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp index c90bb6cccdc..a8cdbb0f19f 100644 --- a/src/emu/softlist.cpp +++ b/src/emu/softlist.cpp @@ -9,7 +9,6 @@ ***************************************************************************/ #include "emu.h" -#include "pool.h" #include "emuopts.h" #include "softlist.h" #include "clifront.h" @@ -279,7 +278,8 @@ software_list_device::software_list_device(const machine_config &mconfig, const m_list_type(SOFTWARE_LIST_ORIGINAL_SYSTEM), m_filter(NULL), m_parsed(false), - m_file(mconfig.options().hash_path(), OPEN_FLAG_READ) + m_file(mconfig.options().hash_path(), OPEN_FLAG_READ), + m_description(NULL) { } diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 3a08bdf4971..980e552f0b0 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -791,8 +791,9 @@ sound_stream::stream_input::stream_input() //------------------------------------------------- sound_stream::stream_output::stream_output() - : m_dependents(0), - m_gain(0x100) + : m_stream(NULL), + m_dependents(0), + m_gain(0x100) { } diff --git a/src/emu/speaker.cpp b/src/emu/speaker.cpp index c12b36b87d7..c525ff2cbc6 100644 --- a/src/emu/speaker.cpp +++ b/src/emu/speaker.cpp @@ -9,10 +9,6 @@ ***************************************************************************/ #include "emu.h" -#include "emuopts.h" -#include "osdepend.h" -#include "config.h" -#include "sound/wavwrite.h" diff --git a/src/emu/sprite.h b/src/emu/sprite.h index b2bd9cb7f0c..44a57606864 100644 --- a/src/emu/sprite.h +++ b/src/emu/sprite.h @@ -20,10 +20,11 @@ // class representing a single dirty region class sparse_dirty_rect : public rectangle -{ +{ friend class simple_list<sparse_dirty_rect>; public: + sparse_dirty_rect(): m_next(NULL) { } // getters const sparse_dirty_rect *next() const { return m_next; } diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index 6f61210355b..29af574443a 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -1355,7 +1355,7 @@ void tilemap_t::draw_roz_core(screen_device &screen, _BitmapClass &destbitmap, c // advance in X cx += incxx; x++; - dest++; + ++dest; pri++; } } @@ -1395,7 +1395,7 @@ void tilemap_t::draw_roz_core(screen_device &screen, _BitmapClass &destbitmap, c cx += incxx; cy += incxy; x++; - dest++; + ++dest; pri++; } @@ -1436,7 +1436,7 @@ void tilemap_t::draw_roz_core(screen_device &screen, _BitmapClass &destbitmap, c cx += incxx; cy += incxy; x++; - dest++; + ++dest; pri++; } @@ -1589,7 +1589,8 @@ const device_type TILEMAP = &device_creator<tilemap_device>; tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TILEMAP, "Tilemap", tag, owner, clock, "tilemap", __FILE__), m_gfxdecode(*this), - m_standard_mapper(TILEMAP_STANDARD_COUNT), + m_standard_mapper(TILEMAP_STANDARD_COUNT), + m_bytes_per_entry(0), m_tile_width(8), m_tile_height(8), m_num_columns(64), diff --git a/src/emu/timer.cpp b/src/emu/timer.cpp index f92d0ecce9b..7d089ca4655 100644 --- a/src/emu/timer.cpp +++ b/src/emu/timer.cpp @@ -217,7 +217,7 @@ void timer_device::device_reset() case TIMER_TYPE_PERIODIC: { // convert the period into attotime - attotime period = attotime::never; + attotime period; if (m_period > attotime::zero) { period = m_period; diff --git a/src/emu/ui/cheatopt.cpp b/src/emu/ui/cheatopt.cpp index f505c61eff7..f2bff8e7feb 100644 --- a/src/emu/ui/cheatopt.cpp +++ b/src/emu/ui/cheatopt.cpp @@ -11,7 +11,6 @@ #include "emu.h" #include "cheat.h" -#include "uiinput.h" #include "ui/ui.h" #include "ui/menu.h" #include "ui/cheatopt.h" diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp index 00ff8354027..6bc789299d9 100644 --- a/src/emu/ui/filemngr.cpp +++ b/src/emu/ui/filemngr.cpp @@ -14,7 +14,6 @@ #include "emu.h" #include "ui/ui.h" #include "ui/menu.h" -#include "ui/swlist.h" #include "ui/filemngr.h" #include "ui/filesel.h" #include "ui/miscmenu.h" @@ -29,7 +28,7 @@ // ctor //------------------------------------------------- -ui_menu_file_manager::ui_menu_file_manager(running_machine &machine, render_container *container, const char *warnings) : ui_menu(machine, container) +ui_menu_file_manager::ui_menu_file_manager(running_machine &machine, render_container *container, const char *warnings) : ui_menu(machine, container), selected_device(NULL) { // This warning string is used when accessing from the force_file_manager call, i.e. // when the file manager is loaded top front in the case of mandatory image devices @@ -127,8 +126,8 @@ void ui_menu_file_manager::populate() if (subiter.count() > 0) { // if so, cycle through all its image interfaces - image_interface_iterator subiter(*dev); - for (device_image_interface *scan = subiter.first(); scan != NULL; scan = subiter.next()) + image_interface_iterator subiterator(*dev); + for (device_image_interface *scan = subiterator.first(); scan != NULL; scan = subiterator.next()) { // if it is a children device, and not something further down the device tree, we want it in the menu! if (strcmp(scan->device().owner()->tag(), dev->tag()) == 0) diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp index 265e67d6f19..78193f49399 100644 --- a/src/emu/ui/filesel.cpp +++ b/src/emu/ui/filesel.cpp @@ -16,9 +16,7 @@ #include "ui/ui.h" #include "ui/menu.h" #include "zippath.h" -#include "ui/menu.h" #include "ui/filesel.h" -#include "ui/swlist.h" #include "imagedev/floppy.h" @@ -100,9 +98,7 @@ static void extra_text_draw_box(render_container *container, float origx1, float // take off the borders x1 += UI_BOX_LR_BORDER; - x2 -= UI_BOX_LR_BORDER; y1 += UI_BOX_TB_BORDER; - y2 -= UI_BOX_TB_BORDER; // draw the text within it container->manager().machine().ui().draw_text_full(container,text, x1, y1, text_width, JUSTIFY_LEFT, WRAP_WORD, @@ -222,7 +218,8 @@ static int is_valid_filename_char(unicode_char unichar) ui_menu_file_create::ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *image, std::string ¤t_directory, std::string ¤t_file, bool *ok) : ui_menu(machine, container), m_current_directory(current_directory), - m_current_file(current_file) + m_current_file(current_file), + m_current_format(NULL) { m_image = image; m_ok = ok; @@ -274,7 +271,7 @@ void ui_menu_file_create::populate() item_append("New Image Name:", new_image_name, 0, ITEMREF_NEW_IMAGE_NAME); // do we support multiple formats? - format = m_image->formatlist(); + if (ENABLE_FORMATS) format = m_image->formatlist(); if (ENABLE_FORMATS && (format != NULL)) { item_append("Image Format:", m_current_format->description(), 0, ITEMREF_FORMAT); @@ -347,7 +344,8 @@ void ui_menu_file_create::handle() ui_menu_file_selector::ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *image, std::string ¤t_directory, std::string ¤t_file, bool has_empty, bool has_softlist, bool has_create, int *result) : ui_menu(machine, container), m_current_directory(current_directory), - m_current_file(current_file) + m_current_file(current_file), + m_entrylist(NULL) { m_image = image; m_has_empty = has_empty; @@ -538,7 +536,7 @@ void ui_menu_file_selector::append_entry_menu_item(const file_selector_entry *en void ui_menu_file_selector::populate() { zippath_directory *directory = NULL; - file_error err = FILERR_NONE; + file_error err; const osd_directory_entry *dirent; const file_selector_entry *entry; const file_selector_entry *selected_entry = NULL; diff --git a/src/emu/ui/imgcntrl.cpp b/src/emu/ui/imgcntrl.cpp index 6687055003b..eefea73189c 100644 --- a/src/emu/ui/imgcntrl.cpp +++ b/src/emu/ui/imgcntrl.cpp @@ -28,7 +28,10 @@ //------------------------------------------------- ui_menu_control_device_image::ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *_image) - : ui_menu(machine, container) + : ui_menu(machine, container), + submenu_result(0), + create_ok(false), + create_confirmed(false) { image = _image; diff --git a/src/emu/ui/inputmap.cpp b/src/emu/ui/inputmap.cpp index b660cac2447..ab1318e30c3 100644 --- a/src/emu/ui/inputmap.cpp +++ b/src/emu/ui/inputmap.cpp @@ -109,7 +109,7 @@ void ui_menu_input_general::populate() /* loop over all sequence types */ sortorder++; - for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) { /* build an entry for the standard sequence */ input_item_data *item = (input_item_data *)m_pool_alloc(sizeof(*item)); @@ -187,7 +187,7 @@ void ui_menu_input_specific::populate() sortorder = field->type() | 0xf000; /* loop over all sequence types */ - for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; seqtype++) + for (seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) { /* build an entry for the standard sequence */ input_item_data *item = (input_item_data *)m_pool_alloc(sizeof(*item)); @@ -224,7 +224,7 @@ ui_menu_input_specific::~ui_menu_input_specific() /*------------------------------------------------- menu_input - display a menu for inputs -------------------------------------------------*/ -ui_menu_input::ui_menu_input(running_machine &machine, render_container *container) : ui_menu(machine, container) +ui_menu_input::ui_menu_input(running_machine &machine, render_container *container) : ui_menu(machine, container), last_sortorder(0), record_next(false) { pollingitem = 0; pollingref = 0; @@ -264,7 +264,6 @@ void ui_menu_input::handle() if (pollingitem != NULL) { input_item_data *item = pollingitem; - input_seq newseq; /* if UI_CANCEL is pressed, abort */ if (ui_input_pressed(machine(), IPT_UI_CANCEL)) @@ -533,7 +532,7 @@ void ui_menu_settings::handle() switches menus -------------------------------------------------*/ -ui_menu_settings::ui_menu_settings(running_machine &machine, render_container *container, UINT32 _type) : ui_menu(machine, container) +ui_menu_settings::ui_menu_settings(running_machine &machine, render_container *container, UINT32 _type) : ui_menu(machine, container), diplist(NULL), dipcount(0) { type = _type; } diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp index 0bc3f549c0f..b49aa51d4e3 100644 --- a/src/emu/ui/mainmenu.cpp +++ b/src/emu/ui/mainmenu.cpp @@ -9,17 +9,12 @@ *********************************************************************/ #include "emu.h" -#include "audit.h" #include "crsshair.h" -#include "osdnet.h" #include "emuopts.h" #include "rendutil.h" #include "cheat.h" -#include "uiinput.h" -#include "ui/ui.h" #include "ui/menu.h" #include "ui/filemngr.h" -#include "ui/filesel.h" #include "ui/barcode.h" #include "ui/cheatopt.h" #include "ui/info.h" @@ -33,7 +28,6 @@ #include "ui/tapectrl.h" #include "ui/videoopt.h" #include "imagedev/cassette.h" -#include "imagedev/bitbngr.h" #include "machine/bcreader.h" diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp index 49ab6b897bf..63b47a37b5f 100644 --- a/src/emu/ui/menu.cpp +++ b/src/emu/ui/menu.cpp @@ -9,14 +9,12 @@ *********************************************************************/ #include "emu.h" -#include "emuopts.h" #include "rendutil.h" #include "cheat.h" #include "uiinput.h" #include "ui/ui.h" #include "ui/menu.h" #include "ui/mainmenu.h" -#include "ui/cheatopt.h" @@ -411,7 +409,7 @@ void ui_menu::draw(bool customonly) float effective_width, effective_left; float visible_width, visible_main_menu_height; - float visible_extra_menu_height = 0; + float visible_extra_menu_height; float visible_top, visible_left; int selected_subitem_too_big = FALSE; int visible_lines; @@ -812,8 +810,8 @@ void ui_menu::handle_events() void ui_menu::handle_keys(UINT32 flags) { int ignorepause = ui_menu::stack_has_special_main_menu(); - int ignoreright = FALSE; - int ignoreleft = FALSE; + int ignoreright; + int ignoreleft; int code; // bail if no items diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h index b62bd51d8cb..c16add8d5c8 100644 --- a/src/emu/ui/menu.h +++ b/src/emu/ui/menu.h @@ -180,7 +180,6 @@ private: void draw_text_box(); void handle_events(); void handle_keys(UINT32 flags); - void clear_free_list(); inline bool exclusive_input_pressed(int key, int repeat); static void clear_free_list(running_machine &machine); diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp index b6b7066dbd0..1f5d3e49c3d 100644 --- a/src/emu/ui/miscmenu.cpp +++ b/src/emu/ui/miscmenu.cpp @@ -15,7 +15,6 @@ #include "ui/ui.h" #include "ui/menu.h" #include "ui/miscmenu.h" -#include "ui/filemngr.h" /*************************************************************************** diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp index 54fcc4b8fbf..914fae5f900 100644 --- a/src/emu/ui/selgame.cpp +++ b/src/emu/ui/selgame.cpp @@ -9,18 +9,14 @@ ***************************************************************************/ #include "emu.h" -#include "osdnet.h" #include "emuopts.h" #include "ui/ui.h" #include "ui/menu.h" -#include "rendutil.h" -#include "cheat.h" #include "uiinput.h" #include "ui/selgame.h" #include "ui/inputmap.h" #include "ui/miscmenu.h" #include "audit.h" -#include "crsshair.h" #include <ctype.h> @@ -409,7 +405,6 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott x1 += UI_BOX_LR_BORDER; x2 -= UI_BOX_LR_BORDER; y1 += UI_BOX_TB_BORDER; - y2 -= UI_BOX_TB_BORDER; // draw all lines for (line = 0; line < 4; line++) diff --git a/src/emu/ui/swlist.cpp b/src/emu/ui/swlist.cpp index d60e24f44a1..b8dbeb45ccf 100644 --- a/src/emu/ui/swlist.cpp +++ b/src/emu/ui/swlist.cpp @@ -270,8 +270,8 @@ void ui_menu_software_list::handle() // handle selections else if (event->iptkey == IPT_UI_SELECT) { - entry_info *entry = (entry_info *) event->itemref; - m_result = entry->short_name; + entry_info *info = (entry_info *) event->itemref; + m_result = info->short_name; ui_menu::stack_pop(machine()); } else if (event->iptkey == IPT_SPECIAL) diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index 19e84e55045..0f59220ccc8 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -18,9 +18,7 @@ #include "uiinput.h" #include "ui/ui.h" #include "ui/menu.h" -#include "ui/cheatopt.h" #include "ui/mainmenu.h" -#include "ui/miscmenu.h" #include "ui/filemngr.h" #include "ui/sliders.h" #include "ui/viewgfx.h" @@ -371,7 +369,7 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) // clear the input memory machine().input().reset_polling(); - while (machine().input().poll_switches() != INPUT_CODE_INVALID) ; + while (machine().input().poll_switches() != INPUT_CODE_INVALID) { } // loop while we have a handler while (m_handler_callback != handler_ingame && !machine().scheduled_event_pending() && !ui_menu::stack_has_special_main_menu()) @@ -1688,7 +1686,6 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co UINT32 ui_manager::handler_load_save(running_machine &machine, render_container *container, UINT32 state) { char filename[20]; - input_code code; char file = 0; // if we're not in the middle of anything, skip @@ -1716,15 +1713,15 @@ UINT32 ui_manager::handler_load_save(running_machine &machine, render_container } // check for A-Z or 0-9 - for (input_item_id id = ITEM_ID_A; id <= ITEM_ID_Z; id++) + for (input_item_id id = ITEM_ID_A; id <= ITEM_ID_Z; ++id) if (machine.input().code_pressed_once(input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id))) file = id - ITEM_ID_A + 'a'; if (file == 0) - for (input_item_id id = ITEM_ID_0; id <= ITEM_ID_9; id++) + for (input_item_id id = ITEM_ID_0; id <= ITEM_ID_9; ++id) if (machine.input().code_pressed_once(input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id))) file = id - ITEM_ID_0 + '0'; if (file == 0) - for (input_item_id id = ITEM_ID_0_PAD; id <= ITEM_ID_9_PAD; id++) + for (input_item_id id = ITEM_ID_0_PAD; id <= ITEM_ID_9_PAD; ++id) if (machine.input().code_pressed_once(input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id))) file = id - ITEM_ID_0_PAD + '0'; if (file == 0) diff --git a/src/emu/ui/videoopt.cpp b/src/emu/ui/videoopt.cpp index 518d2232a0c..584ec6e679f 100644 --- a/src/emu/ui/videoopt.cpp +++ b/src/emu/ui/videoopt.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "rendutil.h" -#include "uiinput.h" -#include "ui/ui.h" #include "ui/menu.h" #include "ui/videoopt.h" diff --git a/src/emu/ui/viewgfx.cpp b/src/emu/ui/viewgfx.cpp index 434cc9255f3..0d133af3f6c 100644 --- a/src/emu/ui/viewgfx.cpp +++ b/src/emu/ui/viewgfx.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "ui/ui.h" -#include "ui/menu.h" #include "uiinput.h" #include "render.h" #include "rendfont.h" @@ -193,7 +192,7 @@ static void ui_gfx_count_devices(running_machine &machine, ui_gfx_state &state) i < tempcount && state.gfxset.devcount < MAX_GFX_DECODERS; i++, interface = gfx_iter.next()) { - for (count = 0; count < MAX_GFX_ELEMENTS && interface->gfx(count) != NULL; count++); + for (count = 0; count < MAX_GFX_ELEMENTS && interface->gfx(count) != NULL; count++) { } // count = index of first NULL if (count > 0) @@ -1007,8 +1006,8 @@ static void tilemap_handler(running_machine &machine, render_container *containe pixelscale = state.tilemap.zoom; if (pixelscale == 0) { - for (maxxscale = 1; mapwidth * (maxxscale + 1) < mapboxwidth; maxxscale++) ; - for (maxyscale = 1; mapheight * (maxyscale + 1) < mapboxheight; maxyscale++) ; + for (maxxscale = 1; mapwidth * (maxxscale + 1) < mapboxwidth; maxxscale++) { } + for (maxyscale = 1; mapheight * (maxyscale + 1) < mapboxheight; maxyscale++) { } pixelscale = MIN(maxxscale, maxyscale); } diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp index 5f407725366..b0cbaa0add0 100644 --- a/src/emu/uiinput.cpp +++ b/src/emu/uiinput.cpp @@ -97,7 +97,7 @@ void ui_input_frame_update(running_machine &machine) ui_input_private *uidata = machine.ui_input_data; /* update the state of all the UI keys */ - for (ioport_type code = ioport_type(IPT_UI_FIRST + 1); code < IPT_UI_LAST; code++) + for (ioport_type code = ioport_type(IPT_UI_FIRST + 1); code < IPT_UI_LAST; ++code) { bool pressed = machine.ioport().type_pressed(code); if (!pressed || uidata->seqpressed[code] != SEQ_PRESSED_RESET) @@ -249,7 +249,7 @@ bool ui_input_pressed(running_machine &machine, int code) bool ui_input_pressed_repeat(running_machine &machine, int code, int speed) { ui_input_private *uidata = machine.ui_input_data; - int pressed = FALSE; + int pressed; g_profiler.start(PROFILER_INPUT); diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 7447445a519..01d56378939 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -719,11 +719,11 @@ void validity_checker::validate_analog_input_field(ioport_field &field) if (field.type() == IPT_POSITIONAL || field.type() == IPT_POSITIONAL_V) { int shift; - for (shift = 0; shift <= 31 && (~field.mask() & (1 << shift)) != 0; shift++) ; + for (shift = 0; shift <= 31 && (~field.mask() & (1 << shift)) != 0; shift++) { } // convert the positional max value to be in the bitmask for testing - INT32 analog_max = field.maxval(); - analog_max = (analog_max - 1) << shift; + //INT32 analog_max = field.maxval(); + //analog_max = (analog_max - 1) << shift; // positional port size must fit in bits used if ((field.mask() >> shift) + 1 < field.maxval()) diff --git a/src/emu/video.cpp b/src/emu/video.cpp index a9e07972f6d..7d600e82847 100644 --- a/src/emu/video.cpp +++ b/src/emu/video.cpp @@ -1142,7 +1142,7 @@ file_error video_manager::open_next(emu_file &file, const char *extension) // find length of the device name int end1 = snapstr.find("/", pos + 3); int end2 = snapstr.find("%", pos + 3); - int end = -1; + int end; if ((end1 != -1) && (end2 != -1)) end = MIN(end1, end2); diff --git a/src/emu/video/resnet.cpp b/src/emu/video/resnet.cpp index 57f9423f480..a4df1c0bdc4 100644 --- a/src/emu/video/resnet.cpp +++ b/src/emu/video/resnet.cpp @@ -346,7 +346,7 @@ double compute_resistor_net_outputs( max = minval; for( i = 0; i < networks_no; i++ ) { - double val = 0.0; + double val; double max_tmp = minval; double min_tmp = maxval; diff --git a/src/emu/video/rgbgen.h b/src/emu/video/rgbgen.h index dae5a2984d3..4ade036637a 100644 --- a/src/emu/video/rgbgen.h +++ b/src/emu/video/rgbgen.h @@ -19,7 +19,7 @@ class rgbaint_t { public: - inline rgbaint_t() { } + inline rgbaint_t(): m_a(0), m_r(0), m_g(0), m_b(0) { } inline rgbaint_t(UINT32 rgba) { set(rgba); } inline rgbaint_t(INT32 a, INT32 r, INT32 g, INT32 b) { set(a, r, g, b); } inline rgbaint_t(rgb_t& rgba) { set(rgba); } diff --git a/src/emu/video/rgbvmx.h b/src/emu/video/rgbvmx.h index 66d0ae8d2c4..f5829c17c56 100644 --- a/src/emu/video/rgbvmx.h +++ b/src/emu/video/rgbvmx.h @@ -28,11 +28,11 @@ protected: typedef __vector unsigned int VECU32; public: - inline rgbaint_t() { } + inline rgbaint_t(): VECS8(0), VECU8(0), VECS16(0), VECU16(0), VECS32(0), VECU32(0) { } inline rgbaint_t(UINT32 rgba) { set(rgba); } inline rgbaint_t(INT32 a, INT32 r, INT32 g, INT32 b) { set(a, r, g, b); } inline rgbaint_t(rgb_t& rgb) { set(rgb); } - inline rgbaint_t(VECS32 rgba) { m_value = rgba; } + inline rgbaint_t(VECS32 rgba): VECS8(0), VECU8(0), VECS16(0), VECU16(0), VECS32(0), VECU32(0) { m_value = rgba; } inline void set(rgbaint_t& other) { m_value = other.m_value; } diff --git a/src/emu/video/vector.cpp b/src/emu/video/vector.cpp index 720e24bd049..2d8648dd145 100644 --- a/src/emu/video/vector.cpp +++ b/src/emu/video/vector.cpp @@ -130,13 +130,15 @@ const device_type VECTOR = &device_creator<vector_device>; vector_device::vector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_video_interface(mconfig, *this) + device_video_interface(mconfig, *this), + m_vector_list(NULL) { } vector_device::vector_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VECTOR, "VECTOR", tag, owner, clock, "vector_device", __FILE__), - device_video_interface(mconfig, *this) + device_video_interface(mconfig, *this), + m_vector_list(NULL) { } @@ -299,7 +301,7 @@ UINT32 vector_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, float xratio = xscale / yscale; float yratio = yscale / xscale; xratio = (xratio < 1.0f) ? xratio : 1.0f; - xratio = (yratio < 1.0f) ? yratio : 1.0f; + yratio = (yratio < 1.0f) ? yratio : 1.0f; point *curpoint; render_bounds clip; diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp index 312410fafc6..638bbae219a 100644 --- a/src/lib/netlist/nl_parser.cpp +++ b/src/lib/netlist/nl_parser.cpp @@ -9,13 +9,6 @@ #include "nl_factory.h" #include "devices/nld_truthtable.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - namespace netlist { // ---------------------------------------------------------------------------------------- @@ -463,7 +456,3 @@ nl_double parser_t::eval_param(const token_t tok) #endif } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h index cfa622c9118..6a96eca52d1 100644 --- a/src/lib/netlist/plib/pconfig.h +++ b/src/lib/netlist/plib/pconfig.h @@ -5,13 +5,6 @@ * */ -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #ifndef PCONFIG_H_ #define PCONFIG_H_ @@ -206,7 +199,3 @@ private: #endif #endif /* PCONFIG_H_ */ - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index aa11c30cfa9..f61a1677ced 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -9,13 +9,6 @@ #include "pparser.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - // ---------------------------------------------------------------------------------------- // A simple tokenizer // ---------------------------------------------------------------------------------------- @@ -475,8 +468,3 @@ postream & ppreprocessor::process_i(pistream &istrm, postream &ostrm) } return ostrm; } - - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index c2544f7dbdf..b862e031f3d 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -9,14 +9,6 @@ * the vectorizations fast-math enables pretty expensive */ -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - #if 0 #pragma GCC optimize "-ffast-math" //#pragma GCC optimize "-ftree-parallelize-loops=4" @@ -649,7 +641,3 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start() } NETLIB_NAMESPACE_DEVICES_END() - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp index dae68968445..8157bfffdcd 100644 --- a/src/lib/netlist/tools/nl_convert.cpp +++ b/src/lib/netlist/tools/nl_convert.cpp @@ -11,13 +11,6 @@ #include "nl_convert.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - template<typename Class> static plist_t<int> bubble(const pnamedlist_t<Class *> &sl) { @@ -453,7 +446,3 @@ void nl_convert_eagle_t::convert(const pstring &contents) } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst index 9b3c14881b3..bf4cebb8925 100644 --- a/src/mame/arcade.lst +++ b/src/mame/arcade.lst @@ -8138,9 +8138,9 @@ wwfwfesta // TA-0031 (c) 1991 + Tecmo license (US) wwfwfestb // bootleg wwfwfestj // TA-0031 (c) 1991 (Japan) wwfwfestk // TA-0031 (c) 1991 (Korea) -shadfrce // TA-0032 (c) 1993 (US) +shadfrce // TA-0032 (c) 1993 (World) +shadfrceu // TA-0032 (c) 1993 (US) shadfrcej // TA-0032 (c) 1993 (Japan) -shadfrcejv2 // TA-0032 (c) 1993 (Japan) // Stern "Berzerk hardware" games berzerk // (c) 1980 @@ -9006,6 +9006,7 @@ inufuku // (c) 1998 Video System Co. (Japan) // 68020 board samuraia // (c) 1993 (World) sngkace // (c) 1993 (Japan) +sngkacea // (c) 1993 (Japan) gunbird // (c) 1994 gunbirdk // (c) 1994 gunbirdj // (c) 1994 @@ -11231,11 +11232,37 @@ potnpkrd // Bootleg potnpkre // Bootleg potnpkrf // Bootleg potnpkrg // Bootleg -goodluck // Unknown -superdbl // 198? Karateco +potnpkrh // Bootleg ngold // 198? Unknown ngolda // 198? Unknown ngoldb // 198? Unknown +goodluck // Unknown +bsuerte // 1990, Unknown +bsuertea // 1991, Unknown +bsuerteb // 1991, Unknown +bsuertec // 1991, Unknown +bsuerted // 1991, Unknown +bsuertee // 1991, Unknown +bsuertef // 1991, Unknown +bsuerteg // 1991, Unknown +bsuerteh // 1991, Unknown +bsuertei // 1991, Unknown +bsuertej // 1991, Unknown +bsuertek // 1991, Unknown +bsuertel // 1991, Unknown +bsuertem // 1991, Unknown +bsuerten // 1991, Unknown +bsuerteo // 1991, Unknown +bsuertep // 1991, Unknown +bsuerteq // 1991, Unknown +bsuerter // 1991, Unknown +bsuertes // 1991, Unknown +bsuertet // 1991, Unknown +bsuerteu // 1991, Unknown +falcnwld // 1991, TVG +falcnwlda // (c) 1990, Video Klein +falcnwldb // (c) 1990, Video Klein +falcnwldc // (c) 1983, Falcon witchcrd // (c) 1991, Video Klein witchcda // 1991, Unknown witchcdb // 1991, Unknown @@ -11279,43 +11306,17 @@ wupndownc // (c) 1998, Video Klein wupndownd // (c) 1998, Video Klein wstrike // (c) 1992, Video Klein wstrikea // (c) 1992, Video Klein -wtchjack // (c) 1992-1996, Video Klein -wtchjacka // (c) 1992-1996, Video Klein -wtchjackb // (c) 1992-1996, Video Klein -wtchjackc // (c) 1992-1996, Video Klein -wtchjackd // (c) 1992-1996, Video Klein -wtchjacke // (c) 1992-1996, Video Klein -wtchjackf // (c) 1992-1996, Video Klein -wtchjackg // (c) 1992-1996, Video Klein -wtchjackh // (c) 1992-1996, Video Klein -wtchjacki // (c) 1992-1996, Video Klein -wtchjackj // (c) 1992-1996, Video Klein -falcnwld // 1991, TVG -falcnwlda // (c) 1990, Video Klein -falcnwldb // (c) 1990, Video Klein -falcnwldc // (c) 1983, Falcon -bsuerte // 1990, Unknown -bsuertea // 1991, Unknown -bsuerteb // 1991, Unknown -bsuertec // 1991, Unknown -bsuerted // 1991, Unknown -bsuertee // 1991, Unknown -bsuertef // 1991, Unknown -bsuerteg // 1991, Unknown -bsuerteh // 1991, Unknown -bsuertei // 1991, Unknown -bsuertej // 1991, Unknown -bsuertek // 1991, Unknown -bsuertel // 1991, Unknown -bsuertem // 1991, Unknown -bsuerten // 1991, Unknown -bsuerteo // 1991, Unknown -bsuertep // 1991, Unknown -bsuerteq // 1991, Unknown -bsuerter // 1991, Unknown -bsuertes // 1991, Unknown -bsuertet // 1991, Unknown -bsuerteu // 1991, Unknown +wtchjack // (c) 1996, Video Klein +wtchjacka // (c) 1996, Video Klein +wtchjackb // (c) 1996, Video Klein +wtchjackc // (c) 1996, Video Klein +wtchjackd // (c) 1996, Video Klein +wtchjacke // (c) 1995, Video Klein +wtchjackf // (c) 1995, Video Klein +wtchjackg // (c) 1995, Video Klein +wtchjackh // (c) 1995, Video Klein +wtchjacki // (c) 1995, Video Klein +wtchjackj // (c) 1994, Video Klein pmpoker // (c) 1981 PlayMan royale // Unknown royalea // Unknown @@ -11331,6 +11332,7 @@ poker91 // 1991, Unknown genie // (c) 198? Video Fun Games Ltd. geniea // 198?, Unknown silverga // 1983, Unknown +superdbl // 198? Karateco pokerdub // 198?, Unknown pokerduc // 198?, Unknown bchancep // 198?, Unknown @@ -13312,8 +13314,10 @@ attckexd2 // (c) 1977 Exidy deathrac // (c) 1976 Exidy biplane4 // (c) 1976 Fun Games take5 // (c) 1975 Fun Games -dpatrol // (c) 1977 PSE //knightar // (c) 1976 PSE +bazooka // (c) 1976 PSE +bazookabr // (c) 1977 Taito do Brasil +dpatrol // (c) 1977 PSE //gametree // (c) 1978 PSE vollyrmt // (c) 1973 Ramtek hockyrmt // (c) 1973 Ramtek @@ -13325,8 +13329,6 @@ trivia // (c) 1976 Ramtek monacogp // (c) 1980 Sega monacogpa // (c) 1980 Sega gunman // (c) 1977 Taito -bazooka // (c) 1977 PSE -bazookabr // (c) 1977 Taito do Brasil missilex // (c) 1977 Taito ttblock // (c) 1977 Taito zzblock // (c) 1979 Taito diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 20303cb17c3..43cbf08b594 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -409,7 +409,7 @@ ADDRESS_MAP_END #define USE_FRONTIERS 1 #define USE_FIXED_STV 1 -#include "nl_kidniki.cpp" +#include "nl_kidniki.inc" NETLIST_START(kidniki_interface) diff --git a/src/mame/audio/nl_kidniki.cpp b/src/mame/audio/nl_kidniki.inc index bdb178f82c4..bdb178f82c4 100644 --- a/src/mame/audio/nl_kidniki.cpp +++ b/src/mame/audio/nl_kidniki.inc diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 744c02a6510..bf14364cf10 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -816,6 +816,7 @@ SLOT_INTERFACE_START(cpc464_exp_cards) SLOT_INTERFACE("brunword4", CPC_BRUNWORD_MK4) SLOT_INTERFACE("hd20", CPC_HD20) SLOT_INTERFACE("doubler", CPC_DOUBLER) + SLOT_INTERFACE("transtape", CPC_TRANSTAPE) SLOT_INTERFACE_END SLOT_INTERFACE_START(cpc_exp_cards) @@ -833,6 +834,7 @@ SLOT_INTERFACE_START(cpc_exp_cards) SLOT_INTERFACE("brunword4", CPC_BRUNWORD_MK4) SLOT_INTERFACE("hd20", CPC_HD20) SLOT_INTERFACE("doubler", CPC_DOUBLER) + SLOT_INTERFACE("transtape", CPC_TRANSTAPE) SLOT_INTERFACE_END SLOT_INTERFACE_START(cpcplus_exp_cards) @@ -848,6 +850,7 @@ SLOT_INTERFACE_START(cpcplus_exp_cards) SLOT_INTERFACE("smartwatch", CPC_SMARTWATCH) SLOT_INTERFACE("hd20", CPC_HD20) SLOT_INTERFACE("doubler", CPC_DOUBLER) + SLOT_INTERFACE("transtape", CPC_TRANSTAPE) // Plus compatible? SLOT_INTERFACE_END SLOT_INTERFACE_START(aleste_exp_cards) @@ -865,6 +868,7 @@ SLOT_INTERFACE_START(aleste_exp_cards) SLOT_INTERFACE("brunword4", CPC_BRUNWORD_MK4) SLOT_INTERFACE("hd20", CPC_HD20) SLOT_INTERFACE("doubler", CPC_DOUBLER) + SLOT_INTERFACE("transtape", CPC_TRANSTAPE) SLOT_INTERFACE("magicsound", AL_MAGICSOUND) SLOT_INTERFACE_END diff --git a/src/mame/drivers/c65_old.cpp b/src/mame/drivers/c65_old.cpp deleted file mode 100644 index 97d934ff1db..00000000000 --- a/src/mame/drivers/c65_old.cpp +++ /dev/null @@ -1,648 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Peter Trauner -/*************************************************************************** - - Commodore C65 home computer - PeT mess@utanet.at - - documention - www.funet.fi - -***************************************************************************/ - -/* - -2008 - Driver Updates ---------------------- - -(most of the informations are taken from http://www.zimmers.net/cbmpics/ ) - - -[CBM systems which belong to this driver] - -* Commodore 65 (1989) - -Also known as C64 DX at early stages of the project. It was cancelled -around 1990-1991. Only few units survive (they were sold after Commodore -liquidation in 1994). - -CPU: CSG 4510 (3.54 MHz) -RAM: 128 kilobytes, expandable to 8 megabytes -ROM: 128 kilobytes -Video: CSG 4569 "VIC-III" (6 Video modes; Resolutions from 320x200 to - 1280x400; 80 columns text; Palette of 4096 colors) -Sound: CSG 8580 "SID" x2 (6 voice stereo synthesizer/digital sound - capabilities) -Ports: CSG 4510 (2 Joystick/Mouse ports; CBM Serial port; CBM 'USER' - port; CBM Monitor port; Power and reset switches; C65 bus drive - port; RGBI video port; 2 RCA audio ports; RAM expansion port; C65 - expansion port) -Keyboard: Full-sized 77 key QWERTY (12 programmable function keys; - 4 direction cursor-pad) -Additional Hardware: Built in 3.5" DD disk drive (1581 compatible) -Miscellaneous: Partially implemented Commodore 64 emulation - -[Notes] - -The datasette port was removed here. C65 supports an additional "dumb" -drive externally. It also features, in addition to the standard CBM -bus serial (available in all modes), a Fast and a Burst serial bus -(both available in C65 mode only) - -*/ - - -#include "emu.h" -#include "cpu/m6502/m4510.h" -#include "machine/mos6526.h" -#include "machine/cbm_snqk.h" -#include "includes/c65.h" -#include "bus/cbmiec/cbmiec.h" -#include "machine/ram.h" - -static void cbm_c65_quick_sethiaddress( address_space &space, UINT16 hiaddress ) -{ - space.write_byte(0x82, hiaddress & 0xff); - space.write_byte(0x83, hiaddress >> 8); -} - -QUICKLOAD_LOAD_MEMBER( c65_state, cbm_c65 ) -{ - return general_cbm_loadsnap(image, file_type, quickload_size, m_maincpu->space(AS_PROGRAM), 0, cbm_c65_quick_sethiaddress); -} - -/************************************* - * - * Main CPU memory handlers - * - *************************************/ - -static ADDRESS_MAP_START( c65_mem , AS_PROGRAM, 8, c65_state ) - AM_RANGE(0x00000, 0x07fff) AM_RAMBANK("bank11") - AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank12") - AM_RANGE(0x0a000, 0x0bfff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank13") - AM_RANGE(0x0c000, 0x0cfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank14") - AM_RANGE(0x0d000, 0x0d7ff) AM_READ_BANK("bank4") AM_WRITE_BANK("bank5") - AM_RANGE(0x0d800, 0x0dbff) AM_READ_BANK("bank6") AM_WRITE_BANK("bank7") - AM_RANGE(0x0dc00, 0x0dfff) AM_READ_BANK("bank8") AM_WRITE_BANK("bank9") - AM_RANGE(0x0e000, 0x0ffff) AM_READ_BANK("bank10") AM_WRITE_BANK("bank15") - AM_RANGE(0x10000, 0x1f7ff) AM_RAM - AM_RANGE(0x1f800, 0x1ffff) AM_RAM AM_SHARE("colorram") - - AM_RANGE(0x20000, 0x23fff) AM_ROM /* &c65_dos, maps to 0x8000 */ - AM_RANGE(0x24000, 0x28fff) AM_ROM /* reserved */ - AM_RANGE(0x29000, 0x29fff) AM_ROM AM_SHARE("c65_chargen") - AM_RANGE(0x2a000, 0x2bfff) AM_ROM AM_SHARE("basic") - AM_RANGE(0x2c000, 0x2cfff) AM_ROM AM_SHARE("interface") - AM_RANGE(0x2d000, 0x2dfff) AM_ROM AM_SHARE("chargen") - AM_RANGE(0x2e000, 0x2ffff) AM_ROM AM_SHARE("kernal") - - AM_RANGE(0x30000, 0x31fff) AM_ROM /*&c65_monitor, monitor maps to 0x6000 */ - AM_RANGE(0x32000, 0x37fff) AM_ROM /*&c65_basic, */ - AM_RANGE(0x38000, 0x3bfff) AM_ROM /*&c65_graphics, */ - AM_RANGE(0x3c000, 0x3dfff) AM_ROM /* reserved */ - AM_RANGE(0x3e000, 0x3ffff) AM_ROM /* &c65_kernal, */ - - AM_RANGE(0x40000, 0x7ffff) AM_NOP - /* 8 megabyte full address space! */ -ADDRESS_MAP_END - - -/************************************* - * - * Input Ports - * - *************************************/ - -static INPUT_PORTS_START( c65 ) - PORT_START( "ROW0" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP)) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F5)) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F3)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F7)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INST DEL") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) - - PORT_START( "ROW1" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') - - PORT_START( "ROW2" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') - - PORT_START( "ROW3" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - - PORT_START( "ROW4" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') - - PORT_START( "ROW5" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('[') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('+') - - PORT_START( "ROW6" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91 Pi") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x2191) PORT_CHAR(0x03C0) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('=') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CLR HOME") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(HOME)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR(']') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('*') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xA3') - - PORT_START( "ROW7" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RUN STOP") PORT_CODE(KEYCODE_HOME) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CBM") PORT_CODE(KEYCODE_LALT) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_SHIFT_2) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0x2190) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') - PORT_START("FUNCT") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ESC") PORT_CODE(KEYCODE_F1) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F13 F14") PORT_CODE(KEYCODE_F11) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F11 F12") PORT_CODE(KEYCODE_F10) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F9 F10") PORT_CODE(KEYCODE_F9) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("HELP") PORT_CODE(KEYCODE_F12) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ALT") PORT_CODE(KEYCODE_F2) /* non blocking */ - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("NO SCRL") PORT_CODE(KEYCODE_F4) - - PORT_START( "SPECIAL" ) /* special keys */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Restore") PORT_CODE(KEYCODE_PRTSCR) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) - PORT_CONFNAME( 0x20, 0x00, "(C65) Caps Lock (switch)") PORT_CODE(KEYCODE_F3) - PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) - PORT_CONFSETTING( 0x20, DEF_STR( On ) ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) - - PORT_START("CTRLSEL") /* Controller selection */ - PORT_CONFNAME( 0x07, 0x00, "Gameport A" ) - PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) ) - PORT_CONFSETTING( 0x01, "Paddles 1 & 2" ) - PORT_CONFSETTING( 0x02, "Mouse 1351" ) - PORT_CONFSETTING( 0x03, "Mouse (Non Proportional) 1350" ) - PORT_CONFSETTING( 0x04, "Lightpen" ) -// PORT_CONFSETTING( 0x05, "Koala Pad" ) - PORT_CONFSETTING( 0x06, "Lightgun" ) - PORT_CONFSETTING( 0x07, "No Device Connected" ) - PORT_CONFNAME( 0x70, 0x00, "Gameport B" ) - PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) ) - PORT_CONFSETTING( 0x10, "Paddles 3 & 4" ) -// PORT_CONFSETTING( 0x20, "Mouse 1351" ) -// PORT_CONFSETTING( 0x30, "Mouse (Non Proportional) 1350" ) - PORT_CONFSETTING( 0x70, "No Device Connected" ) - PORT_CONFNAME( 0x80, 0x00, "Swap Gameport A and B") PORT_CODE(KEYCODE_F1) PORT_TOGGLE - PORT_CONFSETTING( 0x00, DEF_STR( No ) ) - PORT_CONFSETTING( 0x80, DEF_STR( Yes ) ) - - PORT_START("JOY1_1B") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED ) - - PORT_START("JOY2_1B") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED ) - - /* Mouse Commodore 1350 was basically working as a Joystick */ - PORT_START("JOY1_2B") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Up") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Down") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Left") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Right") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 1") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 2") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03) - PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) - - /* Still to verify how many mice you were able to plug into a C64 */ - /* Only one, for now */ - PORT_START("JOY2_2B") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) -/* PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_PGUP) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30) - PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) -*/ - PORT_START("PADDLE1") - PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - - PORT_START("PADDLE2") - PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_DOWN) PORT_CODE_INC(KEYCODE_UP) PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH) PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH) PORT_PLAYER(2) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - - PORT_START("PADDLE3") - PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_HOME) PORT_CODE_INC(KEYCODE_PGUP) PORT_PLAYER(3) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - - PORT_START("PADDLE4") - PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_END) PORT_CODE_INC(KEYCODE_PGDN) PORT_PLAYER(4) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - - PORT_START("TRACKX") - PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02) - - PORT_START("TRACKY") - PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02) - - PORT_START("LIGHTX") - PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04) - - PORT_START("LIGHTY") - PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04) - - PORT_START("OTHER") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Paddle 1 Button") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Paddle 2 Button") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Paddle 3 Button") PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Paddle 4 Button") PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Lightpen Signal") PORT_CODE(KEYCODE_LCONTROL) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Mouse Button Left") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Mouse Button Right") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)INPUT_PORTS_END - - -static INPUT_PORTS_START( c65ger ) - PORT_INCLUDE( c65 ) - - PORT_MODIFY( "ROW1" ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Z { Y }") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("3 # { 3 Paragraph }") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') - - PORT_MODIFY( "ROW3" ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Y { Z }") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("7 ' { 7 / }") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - - PORT_MODIFY( "ROW4" ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("0 { = }") PORT_CODE(KEYCODE_0) PORT_CHAR('0') - - PORT_MODIFY( "ROW5" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(", < { ; }") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Paragraph \xE2\x86\x91 { \xc3\xbc }") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0x00A7) PORT_CHAR(0x2191) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(": [ { \xc3\xa4 }") PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('[') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(". > { : }") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("- { ' ` }") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("+ { \xc3\x9f ? }") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('+') - - PORT_MODIFY( "ROW6" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/ ? { - _ }") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Sum Pi { ] \\ }") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x03A3) PORT_CHAR(0x03C0) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("= { # ' }") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('=') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("; ] { \xc3\xb6 }") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR(']') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("* ` { + * }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('*') PORT_CHAR('`') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\\ { [ \xE2\x86\x91 }") PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xa3') - - PORT_MODIFY( "ROW7" ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("_ { < > }") PORT_CODE(KEYCODE_TILDE) PORT_CHAR('_') - - PORT_MODIFY("SPECIAL") /* special keys */ - PORT_DIPNAME( 0x20, 0x00, "(C65) DIN ASC (switch)") PORT_CODE(KEYCODE_F3) - PORT_DIPSETTING( 0x00, "ASC" ) - PORT_DIPSETTING( 0x20, "DIN" ) -INPUT_PORTS_END - - - -/************************************* - * - * Sound definitions - * - *************************************/ - -int c65_state::c64_paddle_read( device_t *device, address_space &space, int which ) -{ - int pot1 = 0xff, pot2 = 0xff, pot3 = 0xff, pot4 = 0xff, temp; - UINT8 cia0porta = machine().device<mos6526_device>("cia_0")->pa_r(space, 0); - int controller1 = ioport("CTRLSEL")->read() & 0x07; - int controller2 = ioport("CTRLSEL")->read() & 0x70; - /* Notice that only a single input is defined for Mouse & Lightpen in both ports */ - switch (controller1) - { - case 0x01: - if (which) - pot2 = ioport("PADDLE2")->read(); - else - pot1 = ioport("PADDLE1")->read(); - break; - - case 0x02: - if (which) - pot2 = ioport("TRACKY")->read(); - else - pot1 = ioport("TRACKX")->read(); - break; - - case 0x03: - if (which && (ioport("JOY1_2B")->read() & 0x20)) /* Joy1 Button 2 */ - pot1 = 0x00; - break; - - case 0x04: - if (which) - pot2 = ioport("LIGHTY")->read(); - else - pot1 = ioport("LIGHTX")->read(); - break; - - case 0x06: - if (which && (ioport("OTHER")->read() & 0x04)) /* Lightpen Signal */ - pot2 = 0x00; - break; - - case 0x00: - case 0x07: - break; - - default: - logerror("Invalid Controller Setting %d\n", controller1); - break; - } - - switch (controller2) - { - case 0x10: - if (which) - pot4 = ioport("PADDLE4")->read(); - else - pot3 = ioport("PADDLE3")->read(); - break; - - case 0x20: - if (which) - pot4 = ioport("TRACKY")->read(); - else - pot3 = ioport("TRACKX")->read(); - break; - - case 0x30: - if (which && (ioport("JOY2_2B")->read() & 0x20)) /* Joy2 Button 2 */ - pot4 = 0x00; - break; - - case 0x40: - if (which) - pot4 = ioport("LIGHTY")->read(); - else - pot3 = ioport("LIGHTX")->read(); - break; - - case 0x60: - if (which && (ioport("OTHER")->read() & 0x04)) /* Lightpen Signal */ - pot4 = 0x00; - break; - - case 0x00: - case 0x70: - break; - - default: - logerror("Invalid Controller Setting %d\n", controller1); - break; - } - - if (ioport("CTRLSEL")->read() & 0x80) /* Swap */ - { - temp = pot1; pot1 = pot3; pot3 = temp; - temp = pot2; pot2 = pot4; pot4 = temp; - } - - switch (cia0porta & 0xc0) - { - case 0x40: - return which ? pot2 : pot1; - - case 0x80: - return which ? pot4 : pot3; - - case 0xc0: - return which ? pot2 : pot1; - - default: - return 0; - } -} - -READ8_MEMBER( c65_state::sid_potx_r ) -{ - return c64_paddle_read(m_sid_r, space, 0); -} - -READ8_MEMBER( c65_state::sid_poty_r ) -{ - return c64_paddle_read(m_sid_r, space, 1); -} - - -/************************************* - * - * VIC III interfaces - * - *************************************/ - -UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_vic->video_update(bitmap, cliprect); - return 0; -} - -READ8_MEMBER(c65_state::c65_lightpen_x_cb) -{ - return ioport("LIGHTX")->read() & ~0x01; -} - -READ8_MEMBER(c65_state::c65_lightpen_y_cb) -{ - return ioport("LIGHTY")->read() & ~0x01; -} - -READ8_MEMBER(c65_state::c65_lightpen_button_cb) -{ - return ioport("OTHER")->read() & 0x04; -} - -READ8_MEMBER(c65_state::c65_c64_mem_r) -{ - return m_memory[offset]; -} - -INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq) -{ - m_vic->raster_interrupt_gen(); -} - -/************************************* - * - * Machine driver - * - *************************************/ - -static MACHINE_CONFIG_START( c65, c65_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M4510, 3500000) /* or VIC6567_CLOCK, */ - MCFG_CPU_PROGRAM_MAP(c65_mem) - MCFG_CPU_VBLANK_INT_DRIVER("screen", c65_state, c65_frame_interrupt) - MCFG_CPU_PERIODIC_INT_DRIVER(c65_state, vic3_raster_irq, VIC6567_HRETRACERATE) - - MCFG_MACHINE_START_OVERRIDE(c65_state, c65 ) - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(525 * 2, 520 * 2) - MCFG_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1) - MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update_c65) - MCFG_SCREEN_PALETTE("vic3:palette") - - MCFG_DEVICE_ADD("vic3", VIC3, 0) - MCFG_VIC3_CPU("maincpu") - MCFG_VIC3_TYPE(VIC4567_NTSC) - MCFG_VIC3_LIGHTPEN_X_CB(READ8(c65_state, c65_lightpen_x_cb)) - MCFG_VIC3_LIGHTPEN_Y_CB(READ8(c65_state, c65_lightpen_y_cb)) - MCFG_VIC3_LIGHTPEN_BUTTON_CB(READ8(c65_state, c65_lightpen_button_cb)) - MCFG_VIC3_DMA_READ_CB(READ8(c65_state, c65_dma_read)) - MCFG_VIC3_DMA_READ_COLOR_CB(READ8(c65_state, c65_dma_read_color)) - MCFG_VIC3_INTERRUPT_CB(WRITELINE(c65_state, c65_vic_interrupt)) - MCFG_VIC3_PORT_CHANGED_CB(WRITE8(c65_state, c65_bankswitch_interface)) - MCFG_VIC3_C64_MEM_R_CB(READ8(c65_state, c65_c64_mem_r)) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("sid_r", MOS8580, 985248) - MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r)) - MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MCFG_SOUND_ADD("sid_l", MOS8580, 985248) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) - - /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", c65_state, cbm_c65, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) - - /* cia */ - MCFG_DEVICE_ADD("cia_0", MOS6526, 3500000) - MCFG_MOS6526_TOD(60) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia0_interrupt)) - MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_a_r)) - MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_b_r)) - MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia0_port_b_w)) - - MCFG_DEVICE_ADD("cia_1", MOS6526, 3500000) - MCFG_MOS6526_TOD(60) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt)) - MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r)) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w)) - - /* floppy from serial bus */ - MCFG_CBM_IEC_ADD(NULL) - - /* internal ram */ - MCFG_RAM_ADD(RAM_TAG) - MCFG_RAM_DEFAULT_SIZE("128K") - MCFG_RAM_EXTRA_OPTIONS("640K,4224K") -MACHINE_CONFIG_END - -static MACHINE_CONFIG_DERIVED( c65pal, c65 ) - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE) - MCFG_SCREEN_SIZE(625 * 2, 520 * 2) - MCFG_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1) - MCFG_SCREEN_PALETTE("vic3:palette") - - MCFG_DEVICE_MODIFY("vic3") - MCFG_VIC3_TYPE(VIC4567_PAL) - - /* sound hardware */ - MCFG_SOUND_REPLACE("sid_r", MOS8580, 1022727) - MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r)) - MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MCFG_SOUND_REPLACE("sid_l", MOS8580, 1022727) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) - - /* cia */ - MCFG_DEVICE_MODIFY("cia_0") - MCFG_MOS6526_TOD(50) - - MCFG_DEVICE_MODIFY("cia_1") - MCFG_MOS6526_TOD(50) -MACHINE_CONFIG_END - - -/************************************* - * - * ROM definition(s) - * - *************************************/ - - -ROM_START( c65 ) - ROM_REGION( 0x400000, "maincpu", 0 ) - ROM_SYSTEM_BIOS( 0, "910111", "V0.9.910111" ) - ROMX_LOAD( "910111.bin", 0x20000, 0x20000, CRC(c5d8d32e) SHA1(71c05f098eff29d306b0170e2c1cdeadb1a5f206), ROM_BIOS(1) ) - ROM_SYSTEM_BIOS( 1, "910523", "V0.9.910523" ) - ROMX_LOAD( "910523.bin", 0x20000, 0x20000, CRC(e8235dd4) SHA1(e453a8e7e5b95de65a70952e9d48012191e1b3e7), ROM_BIOS(2) ) - ROM_SYSTEM_BIOS( 2, "910626", "V0.9.910626" ) - ROMX_LOAD( "910626.bin", 0x20000, 0x20000, CRC(12527742) SHA1(07c185b3bc58410183422f7ac13a37ddd330881b), ROM_BIOS(3) ) - ROM_SYSTEM_BIOS( 3, "910828", "V0.9.910828" ) - ROMX_LOAD( "910828.bin", 0x20000, 0x20000, CRC(3ee40b06) SHA1(b63d970727a2b8da72a0a8e234f3c30a20cbcb26), ROM_BIOS(4) ) - ROM_SYSTEM_BIOS( 4, "911001", "V0.9.911001" ) - ROMX_LOAD( "911001.bin", 0x20000, 0x20000, CRC(0888b50f) SHA1(129b9a2611edaebaa028ac3e3f444927c8b1fc5d), ROM_BIOS(5) ) -ROM_END - -ROM_START( c64dx ) - ROM_REGION( 0x400000, "maincpu", 0 ) - ROM_LOAD( "910429.bin", 0x20000, 0x20000, CRC(b025805c) SHA1(c3b05665684f74adbe33052a2d10170a1063ee7d) ) -ROM_END - -/*************************************************************************** - - Game driver(s) - -***************************************************************************/ - -/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ - -COMP( 1991, c65, 0, 0, c65, c65, c65_state, c65, "Commodore Business Machines", "Commodore 65 Development System (Prototype, NTSC)", MACHINE_NOT_WORKING ) -COMP( 1991, c64dx, c65, 0, c65pal, c65ger, c65_state, c65pal, "Commodore Business Machines", "Commodore 64DX Development System (Prototype, PAL, German)", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 3fd14bec79e..4c89e9e0972 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -378,13 +378,6 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. #include "includes/chihiro.h" #include "includes/xbox.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define LOG_PCI //#define LOG_BASEBOARD @@ -1283,7 +1276,3 @@ ROM_END // 0023 // 0024 GAME( 2009, ccfboxo, ccfboxa, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (GDX-0024)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) /* 0024A */ GAME( 2009, ccfboxa, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (Rev A) (GDX-0024A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp index e5b6beba535..6eac0dd2b84 100644 --- a/src/mame/drivers/exidyttl.cpp +++ b/src/mame/drivers/exidyttl.cpp @@ -4,18 +4,18 @@ Exidy discrete hardware games - Alley Rally (1975) (AR-1A) - Attack (1977) - Death Race (1976) - Destruction Derby (1975) - Hockey / Tennis (Thumper Bumper?) (1974) - Score (1977) + Alley Rally (1976/10) (AR-1A) + Attack (1977/02) + Death Race (1976/04) + Destruction Derby (1976/01) + Hockey / Tennis (Thumper Bumper?) (1974/03) + Score (1977/07) Spiders From Space (1976) - Sting (1974) - Super Death Chase (1977) - Table Foosballer / Table Football (1975) - Table Pinball (1974) - TV Pinball (1974) (PB-4) + Sting (1974/03) + Super Death Chase (1977/10) + Table Foosballer / Table Football (1975/11) + Table Pinball (1974/11) + TV Pinball (1974/11) (PB-4) ***************************************************************************/ @@ -211,8 +211,6 @@ ROM_START( deathrac ) ROM_LOAD( "6331-36.t7", 0x0000, 0x0020, CRC(15e00a2a) SHA1(cd43d227a34e5444ed9d8a4acf5497df9c789c73) ) ROM_END - - GAME( 1977, attckexd, 0, attack, 0, driver_device, 0, ROT0, "Exidy", "Attack (Set 1) [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, attckexd2, attckexd, attack, 0, driver_device, 0, ROT0, "Exidy", "Attack (Set 2) [TTL]", MACHINE_IS_SKELETON ) GAME( 1976, deathrac, 0, deathrac, 0, driver_device, 0, ROT0, "Exidy", "Death Race [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 1d545c8405f..6c365401a77 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -8,7 +8,10 @@ * All detailed RE work done by Kevin 'kevtris' Horton * * TODO: -* * Figure out why it says the first speech line twice; it shouldn't. (It sometimes does this on the sensory chess challenger real hardware) +* * Figure out why it says the first speech line twice; it shouldn't? +* It sometimes does this on Voice Sensory Chess Challenger real hardware. +* It can also be heard on Advanced Talking Chess Challenger real hardware, but not the whole line: +* "I I am Fidelity's chess challenger", instead. * * Get rom locations from pcb (done for UVC, VCC is probably similar) * * correctly hook up 7002/VBRC and 7014/bridgec3 speech so that the z80 is halted while words are being spoken * @@ -49,7 +52,7 @@ Memory map (UVC): I/O map: -------- -00-FF: 8255 port chip [LN edit: 00-03, mirrored over the 00-FF range; program accesses F4-F7] +00-03: 8255 port chip, mirrored over the 00-FF range; program accesses F4-F7 8255 connections: @@ -605,19 +608,19 @@ expect that the software reads these once on startup only. void fidelz80_state::update_display() { // data for the 4x 7seg leds, bits are 0bxABCDEFG - UINT8 out_digit = BITSWAP8( m_digit_data,7,0,1,2,3,4,5,6 ) & 0x7f; + UINT8 out_digit = BITSWAP8(m_digit_data,7,0,1,2,3,4,5,6) & 0x7f; if (m_led_selected&0x04) { output_set_digit_value(0, out_digit); - output_set_led_value(1, m_led_data & 0x01); + output_set_led_value(1, m_led_data); } if (m_led_selected&0x08) { output_set_digit_value(1, out_digit); - output_set_led_value(0, m_led_data & 0x01); + output_set_led_value(0, m_led_data); } if (m_led_selected&0x10) { @@ -629,7 +632,7 @@ void fidelz80_state::update_display() } } -READ8_MEMBER( fidelz80_state::fidelz80_portc_r ) +READ8_MEMBER(fidelz80_state::fidelz80_portc_r) { UINT8 data = 0xff; @@ -653,11 +656,11 @@ READ8_MEMBER( fidelz80_state::fidelz80_portc_r ) return data; } -WRITE8_MEMBER( fidelz80_state::fidelz80_portb_w ) +WRITE8_MEMBER(fidelz80_state::fidelz80_portb_w) { if (!(data & 0x80)) { - m_led_data = (data&0x01); // common for two leds + m_led_data = data & 1; // common for two leds m_led_selected = data; @@ -667,12 +670,12 @@ WRITE8_MEMBER( fidelz80_state::fidelz80_portb_w ) // ignoring the language switch enable for now, is bit 0x40 } -WRITE8_MEMBER( fidelz80_state::fidelz80_portc_w ) +WRITE8_MEMBER(fidelz80_state::fidelz80_portc_w) { m_kp_matrix = data; } -WRITE8_MEMBER( fidelz80_state::cc10_porta_w ) +WRITE8_MEMBER(fidelz80_state::cc10_porta_w) { m_beep->set_state((data & 0x80) ? 0 : 1); @@ -681,12 +684,12 @@ WRITE8_MEMBER( fidelz80_state::cc10_porta_w ) update_display(); } -READ8_MEMBER( fidelz80_state::vcc_portb_r ) +READ8_MEMBER(fidelz80_state::vcc_portb_r) { return (m_speech->bsy_r() != 0) ? 0x80 : 0x00; } -WRITE8_MEMBER( fidelz80_state::vcc_porta_w ) +WRITE8_MEMBER(fidelz80_state::vcc_porta_w) { m_speech->set_volume(15); // hack, s14001a core should assume a volume of 15 unless otherwise stated... m_speech->reg_w(data & 0x3f); @@ -701,9 +704,9 @@ WRITE8_MEMBER( fidelz80_state::vcc_porta_w ) I8255 Device, for VSC ******************************************************************************/ -WRITE8_MEMBER( fidelz80_state::vsc_porta_w ) +WRITE8_MEMBER(fidelz80_state::vsc_porta_w) { - UINT8 out_digit = BITSWAP8( data,7,6,2,1,0,5,4,3 ); + UINT8 out_digit = BITSWAP8(data,7,6,2,1,0,5,4,3); if (m_kp_matrix & 0x01) { @@ -728,9 +731,9 @@ WRITE8_MEMBER( fidelz80_state::vsc_porta_w ) m_speech->reg_w(data & 0x3f); } -WRITE8_MEMBER( fidelz80_state::vsc_portb_w ) +WRITE8_MEMBER(fidelz80_state::vsc_portb_w) { - for (int row=1; row<=8; row++) + for (int row = 1; row <= 8; row++) { if (m_kp_matrix & 0x01) output_set_indexed_value("led_a", row, BIT(data, 8-row)); @@ -751,7 +754,7 @@ WRITE8_MEMBER( fidelz80_state::vsc_portb_w ) } } -WRITE8_MEMBER( fidelz80_state::vsc_portc_w ) +WRITE8_MEMBER(fidelz80_state::vsc_portc_w) { m_kp_matrix = (m_kp_matrix & 0x300) | data; } @@ -760,7 +763,7 @@ WRITE8_MEMBER( fidelz80_state::vsc_portc_w ) PIO Device, for VSC ******************************************************************************/ -READ8_MEMBER( fidelz80_state::vsc_pio_porta_r ) +READ8_MEMBER(fidelz80_state::vsc_pio_porta_r) { UINT8 data = 0; @@ -788,7 +791,7 @@ READ8_MEMBER( fidelz80_state::vsc_pio_porta_r ) return data & 0xff; } -READ8_MEMBER( fidelz80_state::vsc_pio_portb_r ) +READ8_MEMBER(fidelz80_state::vsc_pio_portb_r) { UINT8 data = 0x00; @@ -798,7 +801,7 @@ READ8_MEMBER( fidelz80_state::vsc_pio_portb_r ) return data; } -WRITE8_MEMBER( fidelz80_state::vsc_pio_portb_w ) +WRITE8_MEMBER(fidelz80_state::vsc_pio_portb_w) { m_kp_matrix = (m_kp_matrix & 0xff) | ((data & 0x03)<<8); @@ -955,7 +958,7 @@ READ8_MEMBER(fidelz80_state::mcu_status_r) return m_i8041->upi41_master_r(space, 1); } -WRITE8_MEMBER( fidelz80_state::bridgec_speech_w ) +WRITE8_MEMBER(fidelz80_state::bridgec_speech_w) { // todo: HALT THE z80 here, and set up a callback to poll the s14001a DONE line to resume z80 m_speech->set_volume(15); // hack, s14001a core should assume a volume of 15 unless otherwise stated... @@ -963,13 +966,21 @@ WRITE8_MEMBER( fidelz80_state::bridgec_speech_w ) m_speech->rst_w(BIT(data, 7)); } -void fidelz80_state::machine_reset() +void fidelz80_state::machine_start() { + // zerofill m_led_selected = 0; m_kp_matrix = 0; m_digit_data = 0; m_led_data = 0; memset(m_digit_line_status, 0, sizeof(m_digit_line_status)); + + // register for savestates + save_item(NAME(m_led_selected)); + save_item(NAME(m_kp_matrix)); + save_item(NAME(m_digit_data)); + save_item(NAME(m_led_data)); + save_item(NAME(m_digit_line_status)); } TIMER_DEVICE_CALLBACK_MEMBER(fidelz80_state::nmi_timer) @@ -1009,7 +1020,7 @@ static ADDRESS_MAP_START(bridgec_z80_mem, AS_PROGRAM, 8, fidelz80_state) AM_RANGE(0x2000, 0x3fff) AM_ROM // 8k rom AM_RANGE(0x4000, 0x5fff) AM_ROM // 8k rom AM_RANGE(0x6000, 0x63ff) AM_RAM AM_MIRROR(0x1c00) // 1k ram (2114*2) mirrored 8 times - AM_RANGE(0xE000, 0xE000) AM_WRITE(bridgec_speech_w) AM_MIRROR(0x1FFF) // write to speech chip, halts cpu + AM_RANGE(0xe000, 0xe000) AM_WRITE(bridgec_speech_w) AM_MIRROR(0x1fff) // write to speech chip, halts cpu ADDRESS_MAP_END static ADDRESS_MAP_START(fidel_z80_io, AS_IO, 8, fidelz80_state) @@ -1059,7 +1070,7 @@ INPUT_CHANGED_MEMBER(fidelz80_state::bridgec_trigger_reset) } static INPUT_PORTS_START( fidelz80 ) - PORT_START("LEVEL") // cc10 only + PORT_START("LEVEL") // cc10 only PORT_CONFNAME( 0x80, 0x00, "Number of levels" ) PORT_CONFSETTING( 0x00, "10" ) PORT_CONFSETTING( 0x80, "3" ) @@ -1248,6 +1259,7 @@ INPUT_PORTS_END ******************************************************************************/ static MACHINE_CONFIG_START( cc10, fidelz80_state ) + /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(cc10_z80_mem) @@ -1266,12 +1278,13 @@ static MACHINE_CONFIG_START( cc10, fidelz80_state ) MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, fidelz80_portc_w)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO( "mono" ) - MCFG_SOUND_ADD( "beeper", BEEP, 0 ) - MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("beeper", BEEP, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END static MACHINE_CONFIG_START( vcc, fidelz80_state ) + /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(vcc_z80_mem) @@ -1297,6 +1310,7 @@ static MACHINE_CONFIG_START( vcc, fidelz80_state ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( vsc, fidelz80_state ) + /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(vsc_mem) @@ -1325,6 +1339,7 @@ static MACHINE_CONFIG_START( vsc, fidelz80_state ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( bridgec, fidelz80_state ) + /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2) // 2.5MHz MCFG_CPU_PROGRAM_MAP(bridgec_z80_mem) @@ -1341,9 +1356,9 @@ static MACHINE_CONFIG_START( bridgec, fidelz80_state ) MCFG_I8243_ADD("i8243", NOOP, WRITE8(fidelz80_state,digit_w)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO( "mono" ) + MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("speech", S14001A, 25000) // around 25khz - MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END @@ -1417,10 +1432,10 @@ ROM_END Drivers ******************************************************************************/ -/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ -COMP( 1978, cc10, 0, 0, cc10, fidelz80, driver_device, 0, "Fidelity Electronics", "Chess Challenger 10 (Model CC10/BCC)", MACHINE_NOT_WORKING ) -COMP( 1979, vcc, 0, 0, vcc, fidelz80, driver_device, 0, "Fidelity Electronics", "Talking Chess Challenger (model VCC)", MACHINE_NOT_WORKING ) -COMP( 1979, vbrc, 0, 0, bridgec, bridgec, driver_device, 0, "Fidelity Electronics", "Bridge Challenger (model VBRC/7002)", MACHINE_NOT_WORKING ) -COMP( 1980, uvc, vcc, 0, vcc, fidelz80, driver_device, 0, "Fidelity Electronics", "Advanced Talking Chess Challenger (model UVC)", MACHINE_NOT_WORKING ) -COMP( 1980, bridgec3, vbrc, 0, bridgec, bridgec, driver_device, 0, "Fidelity Electronics", "Bridge Challenger 3 (model 7014)", MACHINE_NOT_WORKING ) -COMP( 1980, vsc, 0, 0, vsc, vsc, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (model VSC)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK ) +/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */ +COMP( 1978, cc10, 0, 0, cc10, fidelz80, driver_device, 0, "Fidelity Electronics", "Chess Challenger 10 (Model CC10/BCC)", MACHINE_NOT_WORKING ) +COMP( 1979, vcc, 0, 0, vcc, fidelz80, driver_device, 0, "Fidelity Electronics", "Talking Chess Challenger (model VCC)", MACHINE_NOT_WORKING ) +COMP( 1979, vbrc, 0, 0, bridgec, bridgec, driver_device, 0, "Fidelity Electronics", "Bridge Challenger (model VBRC/7002)", MACHINE_NOT_WORKING ) +COMP( 1980, uvc, vcc, 0, vcc, fidelz80, driver_device, 0, "Fidelity Electronics", "Advanced Talking Chess Challenger (model UVC)", MACHINE_NOT_WORKING ) +COMP( 1980, bridgec3, vbrc, 0, bridgec, bridgec, driver_device, 0, "Fidelity Electronics", "Bridge Challenger 3 (model 7014)", MACHINE_NOT_WORKING ) +COMP( 1980, vsc, 0, 0, vsc, vsc, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (model VSC)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK ) diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 56541fb22d9..d4c60df3d00 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -24,10 +24,35 @@ * Jack Potten's Poker (set 7, Royale GFX), 198?, Bootleg. * Jack Potten's Poker (set 8, Australian), 198?, Bootleg. * Good Luck, 198?, Unknown. - * Super Double (French), 198?, Karateco. * Jack Potten's Poker (NGold, set 1), 198?, Unknown. * Jack Potten's Poker (NGold, set 2), 198?, Unknown. * Jack Potten's Poker (NGold, set 3), 198?, Unknown. + * Buena Suerte (Spanish, set 1), 1990, Unknown. + * Buena Suerte (Spanish, set 2), 1991, Unknown. + * Buena Suerte (Spanish, set 3), 1991, Unknown. + * Buena Suerte (Spanish, set 4), 1991, Unknown. + * Buena Suerte (Spanish, set 5), 1991, Unknown. + * Buena Suerte (Spanish, set 6), 1991, Unknown. + * Buena Suerte (Spanish, set 7), 1991, Unknown. + * Buena Suerte (Spanish, set 8), 1991, Unknown. + * Buena Suerte (Spanish, set 9), 1991, Unknown. + * Buena Suerte (Spanish, set 10), 1991, Unknown. + * Buena Suerte (Spanish, set 11), 1991, Unknown. + * Buena Suerte (Spanish, set 12), 1991, Unknown. + * Buena Suerte (Spanish, set 13), 1991, Unknown. + * Buena Suerte (Spanish, set 14), 1991, Unknown. + * Buena Suerte (Spanish, set 15), 1991, Unknown. + * Buena Suerte (Spanish, set 16), 1991, Unknown. + * Buena Suerte (Spanish, set 17), 1991, Unknown. + * Buena Suerte (Spanish, set 18), 1991, Unknown. + * Buena Suerte (Spanish, set 19), 1991, Unknown. + * Buena Suerte (Spanish, set 20), 1991, Unknown. + * Buena Suerte (Spanish, set 21), 1991, Unknown. + * Buena Suerte (Spanish, set 22), 1991, Unknown. + * Falcons Wild - World Wide Poker, 1983, Falcon. + * Falcons Wild - World Wide Poker (VK set 1), 1990, Video Klein. + * Falcons Wild - World Wide Poker (VK set 2), 1990, Video Klein. + * Falcons Wild - Wild Card 1991, 1991, TVG. * Witch Card (Video Klein CPU box, set 1), 1991, Video Klein. * Witch Card (Video Klein CPU box, set 2), 1991, Video Klein. * Witch Card (Spanish, witch game, set 1), 1991, Unknown. @@ -82,32 +107,6 @@ * Witch Jack (Export, 6T/12T ver 0.87), 1992-1996, Video Klein. * Witch Jack (Export, 6T/12T ver 0.87-88), 1992-1996, Video Klein. * Witch Jack (Export, 6T/12T ver 0.87-89), 1992-1996, Video Klein. - * Buena Suerte (Spanish, set 1), 1990, Unknown. - * Buena Suerte (Spanish, set 2), 1991, Unknown. - * Buena Suerte (Spanish, set 3), 1991, Unknown. - * Buena Suerte (Spanish, set 4), 1991, Unknown. - * Buena Suerte (Spanish, set 5), 1991, Unknown. - * Buena Suerte (Spanish, set 6), 1991, Unknown. - * Buena Suerte (Spanish, set 7), 1991, Unknown. - * Buena Suerte (Spanish, set 8), 1991, Unknown. - * Buena Suerte (Spanish, set 9), 1991, Unknown. - * Buena Suerte (Spanish, set 10), 1991, Unknown. - * Buena Suerte (Spanish, set 11), 1991, Unknown. - * Buena Suerte (Spanish, set 12), 1991, Unknown. - * Buena Suerte (Spanish, set 13), 1991, Unknown. - * Buena Suerte (Spanish, set 14), 1991, Unknown. - * Buena Suerte (Spanish, set 15), 1991, Unknown. - * Buena Suerte (Spanish, set 16), 1991, Unknown. - * Buena Suerte (Spanish, set 17), 1991, Unknown. - * Buena Suerte (Spanish, set 18), 1991, Unknown. - * Buena Suerte (Spanish, set 19), 1991, Unknown. - * Buena Suerte (Spanish, set 20), 1991, Unknown. - * Buena Suerte (Spanish, set 21), 1991, Unknown. - * Buena Suerte (Spanish, set 22), 1991, Unknown. - * Falcons Wild - World Wide Poker, 1983, Falcon. - * Falcons Wild - World Wide Poker (VK set 1), 1990, Video Klein. - * Falcons Wild - World Wide Poker (VK set 2), 1990, Video Klein. - * Falcons Wild - Wild Card 1991, 1991, TVG. * PlayMan Poker (German), 1981, PM / Beck Elektronik. * Super Loco 93 (Spanish, set 1), 1993, Unknown. * Super Loco 93 (Spanish, set 2), 1993, Unknown. @@ -124,6 +123,7 @@ * Genie (ICP-1, set 2), 198?, Unknown. * Silver Game, 1983, Unknown. * Casino Poker (Ver PM86LO-35-5, German), 1987, PM / Beck Elektronik. + * Super Double (French), 198?, Karateco. * "Unknown French poker game", 198?, Unknown. * "Unknown encrypted poker game", 198?, Unknown. * "Unknown Sisteme France Poker", 198?, Sisteme France. @@ -1046,6 +1046,18 @@ - Added games & technical notes. + [2015-11-09] + + - Renamed and rearranged the parent/clone relationship + of Witch Jack sets. + - Added partial decryption to the ICP1 daughterboard games. + (currently only pokerduc set). Since it's just partial, + commented out the code for now.... + - Added port impulse to the Golden Poker's second coin slot. + This is needed for both royale sets. + - Some fixes and clean-ups. + + TODO: - Missing PIA connections. @@ -1772,7 +1784,7 @@ static INPUT_PORTS_START( goldnpkr ) PORT_START("IN0-3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn Mode") PORT_CODE(KEYCODE_F2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("D-31") PORT_CODE(KEYCODE_E) /* O.A.R? (D-31 in schematics) */ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coupon (Note In)") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(3) PORT_NAME("Coupon (Note In)") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Coin In") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("Weight (Coupon In)") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -4487,16 +4499,16 @@ ROM_START( potnpkrf ) ROM_LOAD( "prg.bin", 0x4000, 0x4000, CRC(d7a932a2) SHA1(c940ea90378a631c217a09c4a9e73c382acaa48d) ) ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ ROM_LOAD( "3.bin", 0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) ) /* text layer */ ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END /* Unknown australian hard to dump set @@ -4520,6 +4532,31 @@ ROM_START( potnpkrg ) ROM_LOAD( "bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END +/* Unknown australian set + String "just 4 fun" replaces the "insert coins" one. +*/ +ROM_START( potnpkrh ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "unk_2732.15a", 0x2000, 0x1000, CRC(441ad1b2) SHA1(248b8e03723989c7766b50858c9a5d0abbb5e055) ) + ROM_LOAD( "unk_2732.17a", 0x3000, 0x1000, CRC(9d72e145) SHA1(526d88c70e03bcff18072436ca3d498a0bb39913) ) + + /* Backcard logo is different, showing 'FR'. The rest matches the common char gfx */ + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "unk_2716.8a", 0x1000, 0x0800, CRC(a138afa6) SHA1(80c6d11086f78e36dfc01c15b23e70667fcf17fc) ) /* char ROM */ + + /* Backplane at 5a has two bits different against the common cards gfx + Offsets 0x380 and 0x400, bit0 is set to 0 */ + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "unk_2716.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "unk_2716.5a", 0x0800, 0x0800, CRC(daf38d03) SHA1(6b518494688756ad7b753fdec46b6392c4a9ebbe) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "unk_2716.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + + ROM_START( goodluck ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "goodluck_glh6b.bin", 0x0000, 0x8000, CRC(2cfa4a2c) SHA1(720e2900f3a0ef2632aa201a63b5eba0570e6aa3) ) @@ -4534,39 +4571,9 @@ ROM_START( goodluck ) ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END -/**************************************************** - - Super Double (Karateco) - - French text with some intentional typos to fit size. - Uses both 0x2000..0x3fff and 0x7000..0x7fff ROM range. - - This is either the game advertised as "The Double", - or a successor thereof. - -*****************************************************/ - -ROM_START( superdbl ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "sd6", 0x7000, 0x1000, CRC(3cf1ccb8) SHA1(c589ddf2e97abb9d95375d0964fd0aa6f7e2e468) ) - ROM_LOAD( "sd7", 0x2000, 0x1000, CRC(f5136f82) SHA1(f086cd5495097ede037ea6cae584e95bfcd7b239) ) - ROM_LOAD( "8", 0x3000, 0x1000, CRC(157332c2) SHA1(3c66200c49641b9d876c5fa134dd2f0e80136beb) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4", 0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) ) /* text layer */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "1", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "2", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "3", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "tbp24sa10n.7d", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END /************************************************************ @@ -4635,338 +4642,7 @@ ROM_START( ngoldb ) ROM_END -/******************************* WITCH CARD SETS *******************************/ - -/* Witch Card (Video Klein) - Video Klein original with epoxy block module -*/ - ROM_START( witchcrd ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "epoxy_27128.bin", 0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) ) /* epoxy block program ROM */ - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "wc4.7a", 0x2000, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) ) /* text layer */ - ROM_LOAD( "wc4.7a", 0x2800, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0200, "proms", 0 ) - ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ - ROM_LOAD( "epoxy_82s129.bin", 0x0100, 0x0100, CRC(f0c012b1) SHA1(5502977404172e8c5b9fbf305581a406668ad1d9) ) /* original epoxy block PROM */ -ROM_END - -/* Witch Card (Spanish, set 1) - Unknown argentine manufacturer. -*/ -ROM_START( witchcda ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "w_card.256", 0x0000, 0x8000, CRC(63a471f8) SHA1(96a2140e2da0050e7865a6662f707cf024130832) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END - -/* Witch Card (Spanish, set 2) - Unknown argentine manufacturer. -*/ -ROM_START( witchcdb ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "w_card.128", 0x4000, 0x4000, CRC(11ecac96) SHA1(717709b31f3dfa09be321c14fbf0e95d492ad2f2) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END - -/* Witch Card (English, no witch game) - Hack? -*/ -ROM_START( witchcdc ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wc_sbruj.256", 0x0000, 0x8000, CRC(5689ae41) SHA1(c7a624ec881204137489b147ce66cc9a9900650a) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "bs_4_wc.032", 0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END - -/*************************************** - - Witch Card (German, WC3050, set 1 ) - - TV GAME ELEKTRONIK 1994 - PROMA - CASINOVERSION WC3050 - -***************************************/ - - ROM_START( witchcdd ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "12a.bin", 0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) ) - - ROM_REGION( 0x6000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "ce-3-tvg.bin", 0x4000, 0x2000, CRC(54b51497) SHA1(8c3a74377fde8c7c5a6b277a9c1e717e6bdd98f8) ) /* text layer */ - - ROM_REGION( 0x6000, "gfx2", 0 ) - ROM_LOAD( "ce-1-tvg.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "ce-2-tvg.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ - ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "tbp24s10n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/* Witch Card (Video Klein) - Video Klein original with epoxy block module. - Alt set.... -*/ - ROM_START( witchcde ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "27128_epoxy.bin", 0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) ) /* epoxy block program ROM */ - - ROM_REGION( 0x4000, "temp", 0 ) - ROM_LOAD( "wc1.a2", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) - ROM_LOAD( "wc2.a4", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) - ROM_LOAD( "wc3.a5", 0x2000, 0x1000, CRC(a03f2d68) SHA1(6d81b1e92f40f7150498b65941d5a9ab64a89790) ) - ROM_LOAD( "wc4.a7", 0x3000, 0x1000, CRC(d3694522) SHA1(0f66ff2dd5c7ac9bf91fa9f48eb9f356572e814c) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_COPY( "temp", 0x3800, 0x1000, 0x0800 ) /* 0800-0fff of wc4.a7 - charset */ - - ROM_REGION( 0x1800, "gfx2", 0 ) /* 2nd half of each ROM */ - ROM_COPY( "temp", 0x0800, 0x0000, 0x0800 ) /* 0800-0fff of wc1.a2 - regular cards gfx, bitplane 1 */ - ROM_COPY( "temp", 0x1800, 0x0800, 0x0800 ) /* 0800-0fff of wc2.a4 - regular cards gfx, bitplane 2 */ - ROM_COPY( "temp", 0x2800, 0x1000, 0x0800 ) /* 0800-0fff of wc3.a5 - regular cards gfx, bitplane 3 */ - - ROM_REGION( 0x0200, "proms", 0 ) - ROM_LOAD( "24s10.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ - ROM_LOAD( "24s10_epoxy.bin", 0x0100, 0x0100, CRC(ddfd7034) SHA1(78dee69ab4ba759485ee7f00446c2d86f08cc50f) ) /* original epoxy block PROM */ -ROM_END - -/* Witch Card (English, witch game, lights) - PCB by PM. Hybrid hardware. - - Copyright 1983/84/85 - W.BECK ELEKTRONIK -*/ -ROM_START( witchcdf ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "$25.bin", 0x5000, 0x1000, CRC(afd6cb4a) SHA1(4c769e1c724bada5875e028781086c32967953a1) ) - ROM_LOAD( "$26.bin", 0x6000, 0x1000, CRC(ad11960c) SHA1(2b562cfe9401e21c9dcd90307165e2c2d1acfc5b) ) - ROM_LOAD( "$27.bin", 0x7000, 0x1000, CRC(e6f9c973) SHA1(f209d13d1565160bc2c05c6c4fce73d14a9a56ab) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "$14.bin", 0x2000, 0x1000, CRC(19b68bec) SHA1(b8ef17ba5545e2f104cd2783e5f1c97c400fcbbc) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "11.bin", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "12.bin", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "13.bin", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "wc_bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/******************************************* - - Witch Card (Falcon) - Original Falcon PCB marked - "831 1.1 MADE IN JAPAN" - - Same board as Falcons Wild, but without - extra RAM / ROM / encrypted 2nd CPU. - - AY8910 is present. - -*******************************************/ - -ROM_START( witchcdg ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "6.b9", 0x5000, 0x1000, CRC(70462a63) SHA1(9dfa18bf7d4e0803f2a68e64661ece392a7983cc) ) - ROM_LOAD( "7.b11", 0x6000, 0x1000, CRC(227b3801) SHA1(aebabce01b1abdb42b3e49c38f4fe429e65c1a88) ) - ROM_LOAD( "8.b13", 0x7000, 0x1000, CRC(6bb0059e) SHA1(c5f515b692c3353323aff77f087bf0a92a8d99cf) ) - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "3.b5", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_FILL( 0x0800, 0x0800, 0 ) /* filling the bitplane */ - ROM_LOAD( "2.b3", 0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_FILL( 0x1800, 0x0800, 0 ) /* filling the bitplane */ - ROM_LOAD( "1.b1", 0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_COPY( "gfx2", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ - - ROM_REGION( 0x0100, "proms", 0 ) -// ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ - ROM_LOAD( "tbp24s10n.d2", 0x0000, 0x0100, BAD_DUMP CRC(3db3b9e0) SHA1(c956493d5d754665d214b416e6a473d73c22716c) ) -ROM_END - -/*************************************** - - Witch Card (German, WC3050, set 2 ) - - TV GAME ELEKTRONIK 1994 - PROMA - CASINOVERSION WC3050 - -***************************************/ - -ROM_START( witchcdh ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "prog3000.a12", 0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) ) - - ROM_REGION( 0x6000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "wc3050.a5", 0x4000, 0x2000, CRC(6f35b9c4) SHA1(df86687164f18f2bfe71e73cccd28fe4117e748c) ) /* text layer, alt gfx */ - - ROM_REGION( 0x6000, "gfx2", 0 ) - ROM_LOAD( "wc1.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ // sldh - ROM_LOAD( "wc1.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ // sldh - ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "tbp24s10n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/*************************************** - - Witch Card (German, WC3050, 27-4-94) - - TV GAME ELEKTRONIK 1994 - PROMA - CASINOVERSION WC3050 - -**************************************** - -01.a2 BADADDR --xxxxxxxxxx -02.a4 BADADDR --xxxxxxxxxx -03.a5 1ST AND 2ND HALF IDENTICAL -27s21.d7 FIXED BITS (0000xxxx) - tbp24s10n.7d FIXED BITS (0000xxxx) - ce-2-tvg.bin BADADDR --xxxxxxxxxx - ce-1-tvg.bin BADADDR --xxxxxxxxxx -01.a2 ce-1-tvg.bin IDENTICAL -02.a4 ce-2-tvg.bin IDENTICAL -27s21.d7 tbp24s10n.7d IDENTICAL -03.a5 [2/4] ce-3-tvg.bin [2/4] IDENTICAL -04.a12 [2/4] 12a.bin [2/4] IDENTICAL -03.a5 [2/4] ce-3-tvg.bin [4/4] IDENTICAL -03.a5 [4/4] ce-3-tvg.bin [2/4] IDENTICAL -03.a5 [4/4] ce-3-tvg.bin [4/4] IDENTICAL -04.a12 [1/4] 12a.bin [1/4] 99.609375% -04.a12 [3/4] 12a.bin [3/4] 99.414063% -04.a12 [4/4] 12a.bin [4/4] 96.020508% -03.a5 [1/4] ce-3-tvg.bin [1/4] 88.378906% -03.a5 [3/4] ce-3-tvg.bin [1/4] 88.378906% - -***************************************/ - - ROM_START( witchcdi ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "04.a12", 0x0000, 0x8000, CRC(0f662e02) SHA1(71d7344f63c11082beb4fb4eeb20b04780a9b14c) ) - - ROM_REGION( 0x6000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "03.a5", 0x4000, 0x2000, CRC(f181e5aa) SHA1(44a7696bd223effbc7542142a0c3c623c628071d) ) /* text layer */ - - ROM_REGION( 0x6000, "gfx2", 0 ) - ROM_LOAD( "01.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "02.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ - ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "27s21.d7", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/****************************************** - - Witch Game (Video Klein) - - Another evil hardware from Video Klein - with CPU box. Marked "12T1" - -******************************************/ - -ROM_START( witchgme ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Video Klein */ - ROM_LOAD( "hn58c256p.box12t1", 0x0000, 0x8000, CRC(26c334cb) SHA1(d8368835c88668f09560f6096148a6e528806f65) ) - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "1.2a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_FILL( 0x0800, 0x0800, 0 ) /* filling the bitplane */ - ROM_LOAD( "2.4a", 0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_FILL( 0x1800, 0x0800, 0 ) /* filling the bitplane */ - ROM_LOAD( "3.5a", 0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_COPY( "gfx2", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) - - ROM_REGION( 0x0100, "proms2", 0 ) - ROM_LOAD( "tbp24s10n.2c", 0x0000, 0x0100, CRC(7c2aa098) SHA1(539ff9239b1b553b3883c9f0223aafcf217f9fc7) ) -ROM_END - -/* Witch Game (Video Klein) - Video Klein original with epoxy block module. - Alt set.... -*/ - ROM_START( witchcdk ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wc_epoxy.bin", 0x0000, 0x8000, CRC(33f1acd9) SHA1(2facb3d807b5b2a2978e567d0c1106c0a027621a) ) /* epoxy block program ROM */ - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "wc4.7a", 0x2000, 0x1000, BAD_DUMP CRC(3bf07c44) SHA1(f6e859b142b7d4585b89ca609d8bc85c84fe2b09) ) /* text chars, corrupt */ // sldh - ROM_COPY( "gfx1", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(f59c6fd2) SHA1(bea4b6043728311ca9fff36e2d7e24254af5b97a) ) /* cards deck gfx, bitplane1 */ // sldh - ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0600, "proms", 0 ) - ROM_LOAD( "24s10.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ - ROM_LOAD( "82s137_epoxy.bin", 0x0100, 0x0400, CRC(4ae3ecf5) SHA1(e1e540ae13e7ce5ac6391f325160ec997ea6cc2f) ) /* original epoxy block PROM */ -ROM_END - - -/******************************* BUENA SUERTE SETS *******************************/ +/**************************************** BUENA SUERTE SETS ****************************************/ /* checksum routine at $5827 @@ -5349,202 +5025,43 @@ ROM_START( bsuerteu ) ROM_END -/******************************* FALCONS WILD SETS *******************************/ - -/********************************************* - - Falcons Wild - Wild Card 1991. - 1992-1992 TVG D-6310 GRUENBERG. - (bootleg in real Bonanza hardware). - - dm74s287n.7d FIXED BITS (0000xxxx) - fw1.2a BADADDR x-xxxxxxxxxxx - fw2.4a BADADDR x-xxxxxxxxxxx - fw3.5a 1ST AND 2ND HALF IDENTICAL - nosticker.12a x0xxxxxxxxxxxxxx = 0x00 +/**************************************** VIDEO KLEIN SETS ****************************************/ - fw3.5a is bitrotten. -**********************************************/ +/*********** WITCH CARD SETS *************/ -ROM_START( falcnwld ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild */ - ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) - - ROM_REGION( 0x6000, "temp", 0 ) - ROM_LOAD( "fw1.2a", 0x0000, 0x2000, CRC(d5a58098) SHA1(9c8860949b0adcd20222e9b3e3e8e7e864e8f39f) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "fw2.4a", 0x2000, 0x2000, CRC(b28b7759) SHA1(513229cee451f59f824b7a64932679f91fbb324d) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "fw3.5a", 0x4000, 0x2000, BAD_DUMP CRC(98edfc82) SHA1(e3dd597245b55c3bc6ea86acf80ee024ca28f564) ) /* text layer + cards deck gfx, bitplane3 */ - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ - ROM_COPY( "temp", 0x4000, 0x1000, 0x0800 ) /* first quarter of fw3.5a */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_COPY( "temp", 0x0000, 0x0000, 0x0800 ) /* first quarter of fw1.2a */ - ROM_COPY( "temp", 0x2000, 0x0800, 0x0800 ) /* first quarter of fw2.4a */ - ROM_COPY( "temp", 0x4800, 0x1000, 0x0800 ) /* second quarter of fw3.5a */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "dm74s287n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/************************************ - - Falcon's Wild - World Wide Poker. - 1991, Video Klein - - CPU BOX - -************************************/ - -ROM_START( falcnwlda ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Video Klein */ - ROM_LOAD( "nmc27c256.box", 0x0000, 0x8000, CRC(a0072c55) SHA1(27b84a896ff06a423450d8f0851f42f3e8ec5466) ) - ROM_RELOAD( 0x8000, 0x8000 ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ - ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) ) /* chars gfx */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) ) /* cards deck gfx, bitplane1 */ // sldh - ROM_IGNORE( 0x0800) - ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) /* cards deck gfx, bitplane2 */ // sldh - ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) ) /* cards deck gfx, bitplane3 */ // sldh - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -ROM_START( falcnwldb ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* World Wide Poker / 1992-11-04 */ - ROM_LOAD( "fw12t1_19921104.bin", 0x0000, 0x8000, CRC(8b4f8cac) SHA1(e3bcbadaa157db48a41369a3fcdba536f8ca679e) ) - ROM_RELOAD( 0x8000, 0x8000 ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ - ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) ) /* chars gfx */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) ) /* cards deck gfx, bitplane1 */ // sldh - ROM_IGNORE( 0x0800) - ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) /* cards deck gfx, bitplane2 */ // sldh - ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) ) /* cards deck gfx, bitplane3 */ // sldh - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/*********************************************** - - Falcon's Wild - World Wide Poker - 1983, Falcon. - - Original Falcon PCB marked - "831 1.1 MADE IN JAPAN" - - Same board as Witch Card (Falcon), but with - extra RAM + ROM + encrypted 2nd CPU + AY8910. - - The encrypted 40-pin CPU is scratched, - and seems based on a Z80. - -***********************************************/ - -ROM_START( falcnwldc ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Falcon original */ -// ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) - ROM_LOAD( "4.b6", 0x3000, 0x1000, CRC(88684a8f) SHA1(5ffa0808b502e93ddcb8f13929008aec2836a773) ) - ROM_LOAD( "5.b8", 0x4000, 0x1000, CRC(aa5de05c) SHA1(98559b35c7c31a41b1818a6e60ec82f43a5d1b4a) ) - ROM_LOAD( "6-syncmod.b9", 0x5000, 0x1000, CRC(21cfa807) SHA1(ff908a5a43b3736494127539d6485648d8be1a9a) ) // ok - ROM_LOAD( "7.b11", 0x6000, 0x1000, CRC(d63bba8e) SHA1(09902574985a945117ec22d738c94fee72e673af) ) - ROM_LOAD( "8.b13", 0x7000, 0x1000, CRC(251d6abf) SHA1(2384ae674bfbe96c19a3b66c7efa1e5e8b444f48) ) // ok - - ROM_REGION( 0x10000, "mcu", 0 ) - ROM_LOAD( "9.f10", 0x0000, 0x1000, CRC(22f1c52a) SHA1(6429a802e92f6b77446550a303567798a231f6d7) ) // MCU prg - - ROM_REGION( 0x6000, "temp", 0 ) - ROM_LOAD( "1.b1", 0x0000, 0x1000, CRC(fd95955d) SHA1(e5c029bc5683d06c2e5250c1271613232a058fcd) ) - ROM_LOAD( "2.b3", 0x1000, 0x0800, CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) - ROM_LOAD( "3.b4", 0x1800, 0x0800, CRC(d9246780) SHA1(4ceb24131ec6208b742ba80373201aa53c50732d) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ - ROM_COPY( "temp", 0x0800, 0x1000, 0x0800 ) /* second half of 1.b1 */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_COPY( "temp", 0x1800, 0x0000, 0x0800 ) /* first half of 3.b4 */ - ROM_COPY( "temp", 0x1000, 0x0800, 0x0800 ) /* whole 2.b3 */ - ROM_COPY( "temp", 0x0000, 0x1000, 0x0800 ) /* first half of 1.b1 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "falcon_1.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - - -/******************************* OTHER SETS *******************************/ - -ROM_START( pmpoker ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "2-5.bin", 0x5000, 0x1000, CRC(3446a643) SHA1(e67854e3322e238c17fed4e05282922028b5b5ea) ) - ROM_LOAD( "2-6.bin", 0x6000, 0x1000, CRC(50d2d026) SHA1(7f58ab176de0f0f7666d87271af69a845faec090) ) - ROM_LOAD( "2-7.bin", 0x7000, 0x1000, CRC(a9ab972e) SHA1(477441b7ff3acae3a5d5a3e4c2a428e0b3121534) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "1-4.bin", 0x1000, 0x0800, CRC(62b9f90d) SHA1(39c61a01225027572fdb75543bb6a78ed74bb2fb) ) /* text layer */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "1-1.bin", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "1-2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "1-3.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "tbp24sa10n.7d", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END - -ROM_START( royale ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "royalex.bin", 0x4000, 0x4000, CRC(ef370617) SHA1(0fc5679e9787aeea3bc592b36efcaa20e859f912) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "royalechr.bin", 0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) ) /* text layer */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "royale3.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "royale2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "royale1.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END - -ROM_START( royalea ) +/* Witch Card (Video Klein) + Video Klein original with epoxy block module +*/ + ROM_START( witchcrd ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "royal.256", 0x0000, 0x8000, CRC(9d7fdb79) SHA1(05cae00bca0f6ae696c69f531cb0fa2104ff696a) ) + ROM_LOAD( "epoxy_27128.bin", 0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) ) /* epoxy block program ROM */ ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "royalechr.bin", 0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) ) /* text layer */ + ROM_LOAD( "wc4.7a", 0x2000, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) ) /* text layer */ + ROM_LOAD( "wc4.7a", 0x2800, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) ) /* text layer */ - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "royale3.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "royale2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "royale1.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_REGION( 0x0200, "proms", 0 ) + ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ + ROM_LOAD( "epoxy_82s129.bin", 0x0100, 0x0100, CRC(f0c012b1) SHA1(5502977404172e8c5b9fbf305581a406668ad1d9) ) /* original epoxy block PROM */ ROM_END -ROM_START( sloco93 ) +/* Witch Card (Spanish, set 1) + Unknown argentine manufacturer. +*/ +ROM_START( witchcda ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "locoloco.128", 0x4000, 0x4000, CRC(f626a770) SHA1(afbd33b3f65b8a781c716a3d6e5447aa817d856c) ) + ROM_LOAD( "w_card.256", 0x0000, 0x8000, CRC(63a471f8) SHA1(96a2140e2da0050e7865a6662f707cf024130832) ) ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "confloco.032", 0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) ) /* text layer */ + ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) ) /* text layer */ ROM_REGION( 0x3000, "gfx2", 0 ) ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ @@ -5555,13 +5072,16 @@ ROM_START( sloco93 ) ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END -ROM_START( sloco93a ) +/* Witch Card (Spanish, set 2) + Unknown argentine manufacturer. +*/ +ROM_START( witchcdb ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "locoloco.256", 0x0000, 0x8000, CRC(ab037b0b) SHA1(16f811daaed5bf7b72549db85755c5274dfee310) ) + ROM_LOAD( "w_card.128", 0x4000, 0x4000, CRC(11ecac96) SHA1(717709b31f3dfa09be321c14fbf0e95d492ad2f2) ) ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "confloco.032", 0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) ) /* text layer */ + ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) ) /* text layer */ ROM_REGION( 0x3000, "gfx2", 0 ) ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ @@ -5572,19 +5092,16 @@ ROM_START( sloco93a ) ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END -/* - checksum routine at $5f3e - protect $4000+ & $7ff9. - (see cmp at $5f6b) - balanced at $7ff8. +/* Witch Card (English, no witch game) + Hack? */ -ROM_START( maverik ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* maverik: Maverik (ind arg, fixed, changed logo) */ - ROM_LOAD( "maverik.bin", 0x0000, 0x8000, CRC(65a986e9) SHA1(2e825d3fb2346036357af0e12d3a75b5ef6cfd0d) ) +ROM_START( witchcdc ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "wc_sbruj.256", 0x0000, 0x8000, CRC(5689ae41) SHA1(c7a624ec881204137489b147ce66cc9a9900650a) ) ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "bs_4_wc.032", 0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) ) /* text layer */ ROM_REGION( 0x3000, "gfx2", 0 ) ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ @@ -5595,337 +5112,245 @@ ROM_START( maverik ) ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END -/***************************** - - Brasil XX sets... - - ****************************/ -ROM_START( brasil86 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil86.128: Brasil 86, BS clone. */ - ROM_LOAD( "brasil86.128", 0x4000, 0x4000, CRC(0e88b434) SHA1(80f921c277f4253c29ee80e9cfb046ade1f66300) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ +/*************************************** - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + Witch Card (German, WC3050, set 1 ) - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END + TV GAME ELEKTRONIK 1994 + PROMA + CASINOVERSION WC3050 -ROM_START( brasil87 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil87.128: Brasil 87, BS clone. */ - ROM_LOAD( "brasil87.128", 0x4000, 0x4000, CRC(6cfdaea9) SHA1(0704e61c1c573e99e130c22787b529ac5544c631) ) +***************************************/ +ROM_START( witchcdd ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "12a.bin", 0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) ) - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + ROM_REGION( 0x6000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "ce-3-tvg.bin", 0x4000, 0x2000, CRC(54b51497) SHA1(8c3a74377fde8c7c5a6b277a9c1e717e6bdd98f8) ) /* text layer */ - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + ROM_REGION( 0x6000, "gfx2", 0 ) + ROM_LOAD( "ce-1-tvg.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "ce-2-tvg.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ + ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_LOAD( "tbp24s10n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END -ROM_START( brasil89 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89.128: Brasil 89, BS clone. */ - ROM_LOAD( "brasil89.128", 0x4000, 0x4000, CRC(9030e0db) SHA1(d073ed0ddd3e5df6a3387e10e05ca34bc491eb35) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END +/* Witch Card (Video Klein) + Video Klein original with epoxy block module. + Alt set.... +*/ + ROM_START( witchcde ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "27128_epoxy.bin", 0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) ) /* epoxy block program ROM */ -ROM_START( brasil89a ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89a.128: Brasil 89a, BS clone. */ - ROM_LOAD( "brasil89a.128", 0x4000, 0x4000, CRC(41a93a99) SHA1(70eeaddbdd9d3a587d1330b81d21d881ab0a8c91) ) + ROM_REGION( 0x4000, "temp", 0 ) + ROM_LOAD( "wc1.a2", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) + ROM_LOAD( "wc2.a4", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) + ROM_LOAD( "wc3.a5", 0x2000, 0x1000, CRC(a03f2d68) SHA1(6d81b1e92f40f7150498b65941d5a9ab64a89790) ) + ROM_LOAD( "wc4.a7", 0x3000, 0x1000, CRC(d3694522) SHA1(0f66ff2dd5c7ac9bf91fa9f48eb9f356572e814c) ) - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_COPY( "temp", 0x3800, 0x1000, 0x0800 ) /* 0800-0fff of wc4.a7 - charset */ - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + ROM_REGION( 0x1800, "gfx2", 0 ) /* 2nd half of each ROM */ + ROM_COPY( "temp", 0x0800, 0x0000, 0x0800 ) /* 0800-0fff of wc1.a2 - regular cards gfx, bitplane 1 */ + ROM_COPY( "temp", 0x1800, 0x0800, 0x0800 ) /* 0800-0fff of wc2.a4 - regular cards gfx, bitplane 2 */ + ROM_COPY( "temp", 0x2800, 0x1000, 0x0800 ) /* 0800-0fff of wc3.a5 - regular cards gfx, bitplane 3 */ - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_REGION( 0x0200, "proms", 0 ) + ROM_LOAD( "24s10.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ + ROM_LOAD( "24s10_epoxy.bin", 0x0100, 0x0100, CRC(ddfd7034) SHA1(78dee69ab4ba759485ee7f00446c2d86f08cc50f) ) /* original epoxy block PROM */ ROM_END -ROM_START( brasil93 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil93.128: Brasil 93, BS clone. No lights */ - ROM_LOAD( "brasil93.128", 0x4000, 0x4000, CRC(cc25909f) SHA1(635184022bcb8936c396cb9fcfa6367fcae906fb) ) - - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ - - ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ -ROM_END +/* Witch Card (English, witch game, lights) + PCB by PM. Hybrid hardware. -ROM_START( poker91 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_pok91.bin: Poker 91. Based on witchcrd */ - ROM_LOAD( "bs_pok91.bin", 0x0000, 0x8000, CRC(90c88b45) SHA1(9b5842075ece5f96a6869d7a8c874dee2b2abde2) ) + Copyright 1983/84/85 + W.BECK ELEKTRONIK +*/ +ROM_START( witchcdf ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "$25.bin", 0x5000, 0x1000, CRC(afd6cb4a) SHA1(4c769e1c724bada5875e028781086c32967953a1) ) + ROM_LOAD( "$26.bin", 0x6000, 0x1000, CRC(ad11960c) SHA1(2b562cfe9401e21c9dcd90307165e2c2d1acfc5b) ) + ROM_LOAD( "$27.bin", 0x7000, 0x1000, CRC(e6f9c973) SHA1(f209d13d1565160bc2c05c6c4fce73d14a9a56ab) ) ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "$14.bin", 0x2000, 0x1000, CRC(19b68bec) SHA1(b8ef17ba5545e2f104cd2783e5f1c97c400fcbbc) ) /* text layer */ ROM_REGION( 0x3000, "gfx2", 0 ) - ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + ROM_LOAD( "11.bin", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "12.bin", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "13.bin", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_LOAD( "wc_bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END -/**************************************************** - - Genie (Video Fun Games Ltd.) - Skill game. Only for amusement. - - PCB is a heavily modified Golden Poker hardware. - Silkscreened "ICP-1". - - CPU: 1x SY6502. - Video: 1x HD6845P CRTC. - I/O: 2x HD6821P PIAs. - - Sound: Discrete. - - RAMs: 2x M5L5101LP-1. - - ROMs: 2x 2732 for program. (2m.16a, 3m.17a) - 1x 2716 for char gen. (4.8a) - 3x 2716 for gfx bitplanes. (1.4a, 2.6a, 3.7a) - - 1x Reset switch. (R.SW) - 1x 8 DIP switches bank. - 1x 2x10 Edge connector. (GM1) - 1x 2x22 Edge connector. (GM2) - - -*****************************************************/ - -ROM_START( genie ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "2m.16a", 0x2000, 0x1000, CRC(30df75f5) SHA1(0696fb3db0b9927e6366db7316d605914ff8d464) ) - ROM_LOAD( "3m.17a", 0x3000, 0x1000, CRC(9d67f5c9) SHA1(d3bc13ce07a7b1713544756d7723dd0bcd59cd1a) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4.8a", 0x1000, 0x0800, CRC(1cdd1db9) SHA1(1940c6654b4a892abc3e4557666d341f407ac54f) ) /* chars gfx */ +/******************************************* - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) ) /* tiles, bitplane1 */ - ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) ) /* tiles, bitplane2 */ - ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(151e4af7) SHA1(a44feaa69a00a6db31c018267b8b67a248e7c66e) ) /* tiles, bitplane3 */ + Witch Card (Falcon) + Original Falcon PCB marked + "831 1.1 MADE IN JAPAN" - ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM, otherwise the game isn't stable */ - ROM_LOAD( "genie_nvram.bin", 0x0000, 0x0800, CRC(1b062ae7) SHA1(9d01635f3968d4b91b4a5d9fadfaf6edd0dea7ba) ) + Same board as Falcons Wild, but without + extra RAM / ROM / encrypted 2nd CPU. - ROM_REGION( 0x0100, "proms", 0 ) /* using original golden poker color prom */ - ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END + AY8910 is present. -// Unknown on Blue PCB ICP-1 -// Attract works, but hang when coin. -// Need to improve the memory map... -// checking the connected CPU addressing lines. -// and guess how map the ROM 15a (vectors + a few routines) -ROM_START( geniea ) +*******************************************/ +ROM_START( witchcdg ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "2732.16a", 0x2000, 0x1000, CRC(c96ef87b) SHA1(a67f290d13fbe33dc7c29271be6f5ef0ec13e927) ) - ROM_LOAD( "2732.17a", 0x3000, 0x1000, CRC(dcbfc29b) SHA1(a512b4bd4ab682810d8c432cca03f4320df9928b) ) - ROM_LOAD( "2732.15a", 0x7000, 0x1000, CRC(7137aa06) SHA1(1a2af7dfe41e54fc9c3b4e641319d1a504e84a18) ) + ROM_LOAD( "6.b9", 0x5000, 0x1000, CRC(70462a63) SHA1(9dfa18bf7d4e0803f2a68e64661ece392a7983cc) ) + ROM_LOAD( "7.b11", 0x6000, 0x1000, CRC(227b3801) SHA1(aebabce01b1abdb42b3e49c38f4fe429e65c1a88) ) + ROM_LOAD( "8.b13", 0x7000, 0x1000, CRC(6bb0059e) SHA1(c5f515b692c3353323aff77f087bf0a92a8d99cf) ) -// ROM_REGION( 0x1000, "temp", 0 ) // Only has vectors and a couple of routines. Just till know how to map it... -// ROM_LOAD( "2732.15a", 0x7000, 0x1000, CRC(7137aa06) SHA1(1a2af7dfe41e54fc9c3b4e641319d1a504e84a18) ) + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "3.b5", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_FILL( 0x0800, 0x0800, 0 ) /* filling the bitplane */ + ROM_LOAD( "2.b3", 0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_FILL( 0x1800, 0x0800, 0 ) /* filling the bitplane */ + ROM_LOAD( "1.b1", 0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) ) /* cards deck gfx, bitplane3 */ ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "2732.9a", 0x2000, 0x1000, BAD_DUMP CRC(ffb7bca3) SHA1(b58175c0342f963cb42a04195e296db952e071b6) ) /* chars + bitplane3 */ - - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "2716.4a", 0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) ) /* tiles, bitplane1 */ - ROM_LOAD( "2716.6a", 0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) ) /* tiles, bitplane2 */ - ROM_COPY( "gfx1", 0x2800, 0x1000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_COPY( "gfx2", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ - ROM_REGION( 0x0100, "proms", 0 ) /* using original golden poker color prom */ - ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) + ROM_REGION( 0x0100, "proms", 0 ) +// ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ + ROM_LOAD( "tbp24s10n.d2", 0x0000, 0x0100, BAD_DUMP CRC(3db3b9e0) SHA1(c956493d5d754665d214b416e6a473d73c22716c) ) ROM_END +/*************************************** -/**************************************************** - - Silver Game. - 1983. - - 6502 CPU - 2*6821 ios - mc6845 video chip - 10mhz (?) xtal - - There are French strings related to the game, so maybe is - a leftover, or maybe there is a unknown way to switch the - language. - + Witch Card (German, WC3050, set 2 ) -*****************************************************/ + TV GAME ELEKTRONIK 1994 + PROMA + CASINOVERSION WC3050 -ROM_START( silverga ) +***************************************/ +ROM_START( witchcdh ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "14", 0x5000, 0x1000, CRC(e4691878) SHA1(376c3910030f27517d798aac759553d5634b8ffc) ) - ROM_LOAD( "55", 0x6000, 0x2000, CRC(aad57b3c) SHA1(9508026c1a7b227a70d89ad2f7245e75a615b932) ) + ROM_LOAD( "prog3000.a12", 0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) ) - ROM_REGION( 0x3000, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */ + ROM_REGION( 0x6000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "wc3050.a5", 0x4000, 0x2000, CRC(6f35b9c4) SHA1(df86687164f18f2bfe71e73cccd28fe4117e748c) ) /* text layer, alt gfx */ - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "11", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "12", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_COPY( "gfx1", 0x2800, 0x1000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd half of the char rom */ + ROM_REGION( 0x6000, "gfx2", 0 ) + ROM_LOAD( "wc1.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ // sldh + ROM_LOAD( "wc1.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ // sldh + ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "s287", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) + ROM_LOAD( "tbp24s10n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END -/*************************************************************** - - Casino Poker - 1987, PM / Beck Elektronik - - 1x Xtal 10.000 MHz. - 1x UM6502A - 2x UM6521A - 1x UM6845 - - GFX ROMS 051, 052, 053 and 054 have duplicated halves. +/*************************************** - Bipolar PROM 24sa10 is filled with 0x09, so has at least - fixed bits 0 and 3 along the whole data. Needs a redump - using a supported EEPROM programmer. + Witch Card (German, WC3050, 27-4-94) - Discrete sound circuitry was traced, being identical to the Golden Poker one. - Only difference is the PC617 replaced by one PC817. + TV GAME ELEKTRONIK 1994 + PROMA + CASINOVERSION WC3050 - The sound is ugly and seems that was programmed that way. +**************************************** -***************************************************************/ +01.a2 BADADDR --xxxxxxxxxx +02.a4 BADADDR --xxxxxxxxxx +03.a5 1ST AND 2ND HALF IDENTICAL +27s21.d7 FIXED BITS (0000xxxx) + tbp24s10n.7d FIXED BITS (0000xxxx) + ce-2-tvg.bin BADADDR --xxxxxxxxxx + ce-1-tvg.bin BADADDR --xxxxxxxxxx +01.a2 ce-1-tvg.bin IDENTICAL +02.a4 ce-2-tvg.bin IDENTICAL +27s21.d7 tbp24s10n.7d IDENTICAL +03.a5 [2/4] ce-3-tvg.bin [2/4] IDENTICAL +04.a12 [2/4] 12a.bin [2/4] IDENTICAL +03.a5 [2/4] ce-3-tvg.bin [4/4] IDENTICAL +03.a5 [4/4] ce-3-tvg.bin [2/4] IDENTICAL +03.a5 [4/4] ce-3-tvg.bin [4/4] IDENTICAL +04.a12 [1/4] 12a.bin [1/4] 99.609375% +04.a12 [3/4] 12a.bin [3/4] 99.414063% +04.a12 [4/4] 12a.bin [4/4] 96.020508% +03.a5 [1/4] ce-3-tvg.bin [1/4] 88.378906% +03.a5 [3/4] ce-3-tvg.bin [1/4] 88.378906% -ROM_START( caspoker ) +***************************************/ +ROM_START( witchcdi ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "234.bin", 0x4000, 0x1000, CRC(174bc526) SHA1(faef01484f0e0ea769d7bd2c5ad03369a6fdf037) ) - ROM_LOAD( "235.bin", 0x5000, 0x1000, CRC(2e43552f) SHA1(5fbe0e62dec960850ef5f937254858fcd4da9e64) ) - ROM_LOAD( "236.bin", 0x6000, 0x1000, CRC(3f4cfa39) SHA1(e2750a9c5d12c668e599181ee3972c5d78bd0006) ) - ROM_LOAD( "237.bin", 0x7000, 0x1000, CRC(b411d0c4) SHA1(0617cd312026da78a171fc23f4788393d70371cf) ) - - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "054.bin", 0x1000, 0x0800, CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) ) /* text chars */ - ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + ROM_LOAD( "04.a12", 0x0000, 0x8000, CRC(0f662e02) SHA1(71d7344f63c11082beb4fb4eeb20b04780a9b14c) ) - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "051.bin", 0x0000, 0x0800, CRC(82d823e5) SHA1(75bdf427a6204ef87444be0d8b06a07c5a2fc38f) ) /* cards deck gfx, bitplane1 */ - ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ - ROM_LOAD( "052.bin", 0x0800, 0x0800, CRC(eda12738) SHA1(ec7806c2bf1a238f489459c3c3653f43febaa464) ) /* cards deck gfx, bitplane2 */ - ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ - ROM_LOAD( "053.bin", 0x1000, 0x0800, CRC(d147ae0a) SHA1(dfdf0a42eb0a6f2afc9f301b0cf01411085247bd) ) /* cards deck gfx, bitplane3 */ - ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + ROM_REGION( 0x6000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x4000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "03.a5", 0x4000, 0x2000, CRC(f181e5aa) SHA1(44a7696bd223effbc7542142a0c3c623c628071d) ) /* text layer */ - ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM, otherwise settings parameters are incorrect */ - ROM_LOAD( "caspoker_nvram.bin", 0x0000, 0x0800, CRC(be6e2671) SHA1(aef1b09d09e07eb39480a7901ed8535f74e461fa) ) + ROM_REGION( 0x6000, "gfx2", 0 ) + ROM_LOAD( "01.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "02.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) ) /* cards deck gfx, bitplane2 */ + ROM_COPY( "gfx1", 0x4800, 0x4000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ - ROM_REGION( 0x0100, "proms", 0 ) /* from other games */ - ROM_LOAD( "24sa10.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "27s21.d7", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END -/**************************************************** - - Unknown poker game, set 1. - 198?. - - There are French strings related to the game into - the program ROM. +/****************************************** - The dump lacks of 1 program ROM located at 17a. - (empty socket in the PCB picture) + Witch Game (Video Klein) -*****************************************************/ + Another evil hardware from Video Klein + with CPU box. Marked "12T1" -ROM_START( pokerdub ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "15a_f_83.15a", 0x2000, 0x1000, CRC(06571884) SHA1(6823f5d4a2fc5adf51f1588273f808a2a25a15bc) ) - ROM_LOAD( "unknown.17a", 0x3000, 0x1000, NO_DUMP ) +******************************************/ +ROM_START( witchgme ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* Video Klein */ + ROM_LOAD( "hn58c256p.box12t1", 0x0000, 0x8000, CRC(26c334cb) SHA1(d8368835c88668f09560f6096148a6e528806f65) ) - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "4.8a", 0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) ) /* char ROM (cracked title) */ + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "1.2a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_FILL( 0x0800, 0x0800, 0 ) /* filling the bitplane */ + ROM_LOAD( "2.4a", 0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_FILL( 0x1800, 0x0800, 0 ) /* filling the bitplane */ + ROM_LOAD( "3.5a", 0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) ) /* text layer */ - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_COPY( "gfx2", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "s287.8c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -ROM_END - -/**************************************************** - - Unknown poker game, set 2. - 198?. - - This one is totally encrypted. - The PCB has a daughterboard coated with some plastic - or epoxy resin. - - Char ROM is identical to the Witch Card one. + ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) -*****************************************************/ + ROM_REGION( 0x0100, "proms2", 0 ) + ROM_LOAD( "tbp24s10n.2c", 0x0000, 0x0100, CRC(7c2aa098) SHA1(539ff9239b1b553b3883c9f0223aafcf217f9fc7) ) +ROM_END -ROM_START( pokerduc ) +/* Witch Game (Video Klein) + Video Klein original with epoxy block module. + Alt set.... +*/ + ROM_START( witchcdk ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "b", 0x5000, 0x1000, CRC(8627fba5) SHA1(b94665f0bf425ff71f78c1258f910323c2a948f0) ) - ROM_LOAD( "c", 0x6000, 0x1000, CRC(b35b4108) SHA1(6504ba55511637334c65e88ee5c60b1503b854b3) ) - ROM_LOAD( "d", 0x7000, 0x1000, CRC(c48096ed) SHA1(279ba433369c7dc9cd902a19200e889eea45d115) ) + ROM_LOAD( "wc_epoxy.bin", 0x0000, 0x8000, CRC(33f1acd9) SHA1(2facb3d807b5b2a2978e567d0c1106c0a027621a) ) /* epoxy block program ROM */ - ROM_REGION( 0x1800, "gfx1", 0 ) - ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "a.8a", 0x1000, 0x0800, CRC(c70a3e49) SHA1(eb2f15b344f4dec5f05701415848c854bb27aaa3) ) /* char ROM (cracked title) */ + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "wc4.7a", 0x2000, 0x1000, BAD_DUMP CRC(3bf07c44) SHA1(f6e859b142b7d4585b89ca609d8bc85c84fe2b09) ) /* text chars, corrupt */ // sldh + ROM_COPY( "gfx1", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ - ROM_REGION( 0x1800, "gfx2", 0 ) - ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ - ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ - ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - ROM_IGNORE( 0x0800) /* identical halves */ + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(f59c6fd2) SHA1(bea4b6043728311ca9fff36e2d7e24254af5b97a) ) /* cards deck gfx, bitplane1 */ // sldh + ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "tbp24s10.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) + ROM_REGION( 0x0600, "proms", 0 ) + ROM_LOAD( "24s10.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ + ROM_LOAD( "82s137_epoxy.bin", 0x0100, 0x0400, CRC(4ae3ecf5) SHA1(e1e540ae13e7ce5ac6391f325160ec997ea6cc2f) ) /* original epoxy block PROM */ ROM_END @@ -6032,7 +5457,7 @@ ROM_END /**************************************************** - Wild Witch (Video Klein) + Wild Witch sets... Another evil hardware from Video Klein with CPU box. @@ -8253,7 +7678,7 @@ ROM_END /************************************************ - Witch Up & Down + Witch Up & Down sets... (1988, Video Klein) 16 gfx banks!!!. @@ -8923,7 +8348,7 @@ ROM_END /********************************************* - Witch Jack + Witch Jack sets... 1992-1996 Video Klein *********************************************/ @@ -9021,14 +8446,14 @@ ROM_START( wtchjack ) /* Witch Jack 0.87-89 / 1996-10-08, GFX OK */ ROM_END -ROM_START( wtchjacka ) /* Witch Jackpot 0.25 / 1994-11-24 */ +ROM_START( wtchjacka ) /* Witch Jack 0.87-88 / 1996-10-02, GFX OK */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x5015.bin", 0x8000, 0x8000, CRC(bc0e6b78) SHA1(29482035f6122385447009abd695ed52fc669158) ) + ROM_LOAD( "wj5x5088.bin", 0x8000, 0x8000, CRC(08143537) SHA1(ef16531bcf955daded1be406dd3f61f37070298c) ) ROM_REGION( 0x18000, "temp", 0 ) - ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) - ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, BAD_DUMP CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) - ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) + ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) + ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) + ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) ROM_REGION( 0x1800, "gfx0", 0 ) ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ @@ -9114,14 +8539,14 @@ ROM_START( wtchjacka ) /* Witch Jackpot 0.25 / 1994-11-24 */ ROM_END -ROM_START( wtchjackb ) /* Witch Jack 0.40 / 1995-02-27 */ +ROM_START( wtchjackb ) /* Witch Jack 0.87 / 1996-07-16, GFX OK */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x5040.bin", 0x8000, 0x8000, CRC(2f0f1d7a) SHA1(048d0641a4e03a77f4964898ad2c224cb487aa36) ) + ROM_LOAD( "wj5x5087.bin", 0x8000, 0x8000, CRC(b027d8a5) SHA1(f06b92cc7aacadca1b8c98bda19efa670596891c) ) ROM_REGION( 0x18000, "temp", 0 ) - ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) - ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, BAD_DUMP CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) - ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) + ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) + ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) + ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) ROM_REGION( 0x1800, "gfx0", 0 ) ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ @@ -9207,9 +8632,9 @@ ROM_START( wtchjackb ) /* Witch Jack 0.40 / 1995-02-27 */ ROM_END -ROM_START( wtchjackc ) /* Witch Jack 0.40T / 1995-02-27, Not Working */ +ROM_START( wtchjackc ) /* Witch Jack 0.70S / 1996-03-26 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x5t40.bin", 0x8000, 0x8000, CRC(a3a4f1d3) SHA1(16dcaf880134f10152703cb3ca81dfcbe48bff8b) ) + ROM_LOAD( "wj5x570s.bin", 0x8000, 0x8000, CRC(294e3ac6) SHA1(e58c38ae341dcb48572f8852ec858ef8433c6f95) ) ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9300,9 +8725,9 @@ ROM_START( wtchjackc ) /* Witch Jack 0.40T / 1995-02-27, Not Working */ ROM_END -ROM_START( wtchjackd ) /* Witch Jack 0.62 / 1995-08-02 */ +ROM_START( wtchjackd ) /* Witch Jack 0.70P / 1996-03-26 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x563.bin", 0x8000, 0x8000, CRC(55e74382) SHA1(af0a890c55db36e8a2f847ea103858cc7b7115be) ) // + ROM_LOAD( "wj5x570p.bin", 0x8000, 0x8000, CRC(d77d8119) SHA1(c8999e3c55257750f27f1683f5b416e8e4e4297d) ) ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9393,9 +8818,9 @@ ROM_START( wtchjackd ) /* Witch Jack 0.62 / 1995-08-02 */ ROM_END -ROM_START( wtchjacke ) /* Witch Jack 0.64 / 1995-09-13 */ +ROM_START( wtchjacke ) /* Witch Jack 0.65 / 1995-10-19 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x564p.bin", 0x8000, 0x8000, CRC(7ee61b69) SHA1(313b750a7949f4d08cdf79c068d01ed91fc66dce) ) + ROM_LOAD( "wj5x565p.bin", 0x8000, 0x8000, CRC(20c23876) SHA1(ca2309766a68ba280d71b3b62e00d38d70b8536a) ) ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9486,9 +8911,9 @@ ROM_START( wtchjacke ) /* Witch Jack 0.64 / 1995-09-13 */ ROM_END -ROM_START( wtchjackf ) /* Witch Jack 0.65 / 1995-10-19 */ +ROM_START( wtchjackf ) /* Witch Jack 0.64 / 1995-09-13 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x565p.bin", 0x8000, 0x8000, CRC(20c23876) SHA1(ca2309766a68ba280d71b3b62e00d38d70b8536a) ) + ROM_LOAD( "wj5x564p.bin", 0x8000, 0x8000, CRC(7ee61b69) SHA1(313b750a7949f4d08cdf79c068d01ed91fc66dce) ) ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9579,9 +9004,9 @@ ROM_START( wtchjackf ) /* Witch Jack 0.65 / 1995-10-19 */ ROM_END -ROM_START( wtchjackg ) /* Witch Jack 0.70S / 1996-03-26 */ +ROM_START( wtchjackg ) /* Witch Jack 0.62 / 1995-08-02 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x570s.bin", 0x8000, 0x8000, CRC(294e3ac6) SHA1(e58c38ae341dcb48572f8852ec858ef8433c6f95) ) + ROM_LOAD( "wj5x563.bin", 0x8000, 0x8000, CRC(55e74382) SHA1(af0a890c55db36e8a2f847ea103858cc7b7115be) ) // ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9672,9 +9097,9 @@ ROM_START( wtchjackg ) /* Witch Jack 0.70S / 1996-03-26 */ ROM_END -ROM_START( wtchjackh ) /* Witch Jack 0.70P / 1996-03-26 */ +ROM_START( wtchjackh ) /* Witch Jack 0.40T / 1995-02-27, Not Working */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x570p.bin", 0x8000, 0x8000, CRC(d77d8119) SHA1(c8999e3c55257750f27f1683f5b416e8e4e4297d) ) + ROM_LOAD( "wj5x5t40.bin", 0x8000, 0x8000, CRC(a3a4f1d3) SHA1(16dcaf880134f10152703cb3ca81dfcbe48bff8b) ) ROM_REGION( 0x18000, "temp", 0 ) ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) @@ -9765,14 +9190,14 @@ ROM_START( wtchjackh ) /* Witch Jack 0.70P / 1996-03-26 */ ROM_END -ROM_START( wtchjacki ) /* Witch Jack 0.87 / 1996-07-16, GFX OK */ +ROM_START( wtchjacki ) /* Witch Jack 0.40 / 1995-02-27 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x5087.bin", 0x8000, 0x8000, CRC(b027d8a5) SHA1(f06b92cc7aacadca1b8c98bda19efa670596891c) ) + ROM_LOAD( "wj5x5040.bin", 0x8000, 0x8000, CRC(2f0f1d7a) SHA1(048d0641a4e03a77f4964898ad2c224cb487aa36) ) ROM_REGION( 0x18000, "temp", 0 ) - ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) - ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) - ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) + ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) + ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, BAD_DUMP CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) + ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) ROM_REGION( 0x1800, "gfx0", 0 ) ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ @@ -9858,14 +9283,14 @@ ROM_START( wtchjacki ) /* Witch Jack 0.87 / 1996-07-16, GFX OK */ ROM_END -ROM_START( wtchjackj ) /* Witch Jack 0.87-88 / 1996-10-02, GFX OK */ +ROM_START( wtchjackj ) /* Witch Jackpot 0.25 / 1994-11-24 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "wj5x5088.bin", 0x8000, 0x8000, CRC(08143537) SHA1(ef16531bcf955daded1be406dd3f61f37070298c) ) + ROM_LOAD( "wj5x5015.bin", 0x8000, 0x8000, CRC(bc0e6b78) SHA1(29482035f6122385447009abd695ed52fc669158) ) ROM_REGION( 0x18000, "temp", 0 ) - ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) - ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) - ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) + ROM_LOAD( "wj5x5_1zs.bin", 0x00000, 0x8000, BAD_DUMP CRC(a780ba7f) SHA1(dde75187df298392333cfe1a19beed5b9d172aad) ) + ROM_LOAD( "wj5x5_2zs.bin", 0x08000, 0x8000, BAD_DUMP CRC(0f4e9f82) SHA1(a22bbbf0130dd6ece61189ce81a3376213617509) ) + ROM_LOAD( "wj5x5_3zs.bin", 0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) ) ROM_REGION( 0x1800, "gfx0", 0 ) ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ @@ -9951,6 +9376,603 @@ ROM_START( wtchjackj ) /* Witch Jack 0.87-88 / 1996-10-02, GFX OK */ ROM_END +/******************************* FALCONS WILD SETS *******************************/ + + +/********************************************* + + Falcons Wild - Wild Card 1991. + 1992-1992 TVG D-6310 GRUENBERG. + (bootleg in real Bonanza hardware). + + dm74s287n.7d FIXED BITS (0000xxxx) + fw1.2a BADADDR x-xxxxxxxxxxx + fw2.4a BADADDR x-xxxxxxxxxxx + fw3.5a 1ST AND 2ND HALF IDENTICAL + nosticker.12a x0xxxxxxxxxxxxxx = 0x00 + + fw3.5a is bitrotten. + +**********************************************/ +ROM_START( falcnwld ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild */ + ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) + + ROM_REGION( 0x6000, "temp", 0 ) + ROM_LOAD( "fw1.2a", 0x0000, 0x2000, CRC(d5a58098) SHA1(9c8860949b0adcd20222e9b3e3e8e7e864e8f39f) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "fw2.4a", 0x2000, 0x2000, CRC(b28b7759) SHA1(513229cee451f59f824b7a64932679f91fbb324d) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "fw3.5a", 0x4000, 0x2000, BAD_DUMP CRC(98edfc82) SHA1(e3dd597245b55c3bc6ea86acf80ee024ca28f564) ) /* text layer + cards deck gfx, bitplane3 */ + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ + ROM_COPY( "temp", 0x4000, 0x1000, 0x0800 ) /* first quarter of fw3.5a */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_COPY( "temp", 0x0000, 0x0000, 0x0800 ) /* first quarter of fw1.2a */ + ROM_COPY( "temp", 0x2000, 0x0800, 0x0800 ) /* first quarter of fw2.4a */ + ROM_COPY( "temp", 0x4800, 0x1000, 0x0800 ) /* second quarter of fw3.5a */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "dm74s287n.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +/************************************ + + Falcon's Wild - World Wide Poker. + 1991, Video Klein + + CPU BOX + +************************************/ +ROM_START( falcnwlda ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Video Klein */ + ROM_LOAD( "nmc27c256.box", 0x0000, 0x8000, CRC(a0072c55) SHA1(27b84a896ff06a423450d8f0851f42f3e8ec5466) ) + ROM_RELOAD( 0x8000, 0x8000 ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ + ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) ) /* chars gfx */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) ) /* cards deck gfx, bitplane1 */ // sldh + ROM_IGNORE( 0x0800) + ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) /* cards deck gfx, bitplane2 */ // sldh + ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) ) /* cards deck gfx, bitplane3 */ // sldh + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +ROM_START( falcnwldb ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* World Wide Poker / 1992-11-04 */ + ROM_LOAD( "fw12t1_19921104.bin", 0x0000, 0x8000, CRC(8b4f8cac) SHA1(e3bcbadaa157db48a41369a3fcdba536f8ca679e) ) + ROM_RELOAD( 0x8000, 0x8000 ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ + ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) ) /* chars gfx */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) ) /* cards deck gfx, bitplane1 */ // sldh + ROM_IGNORE( 0x0800) + ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) /* cards deck gfx, bitplane2 */ // sldh + ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) ) /* cards deck gfx, bitplane3 */ // sldh + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "n82s137f.box", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +/*********************************************** + + Falcon's Wild - World Wide Poker + 1983, Falcon. + + Original Falcon PCB marked + "831 1.1 MADE IN JAPAN" + + Same board as Witch Card (Falcon), but with + extra RAM + ROM + encrypted 2nd CPU + AY8910. + + The encrypted 40-pin CPU is scratched, + and seems based on a Z80. + +***********************************************/ +ROM_START( falcnwldc ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Falcon original */ +// ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) + ROM_LOAD( "4.b6", 0x3000, 0x1000, CRC(88684a8f) SHA1(5ffa0808b502e93ddcb8f13929008aec2836a773) ) + ROM_LOAD( "5.b8", 0x4000, 0x1000, CRC(aa5de05c) SHA1(98559b35c7c31a41b1818a6e60ec82f43a5d1b4a) ) + ROM_LOAD( "6-syncmod.b9", 0x5000, 0x1000, CRC(21cfa807) SHA1(ff908a5a43b3736494127539d6485648d8be1a9a) ) // ok + ROM_LOAD( "7.b11", 0x6000, 0x1000, CRC(d63bba8e) SHA1(09902574985a945117ec22d738c94fee72e673af) ) + ROM_LOAD( "8.b13", 0x7000, 0x1000, CRC(251d6abf) SHA1(2384ae674bfbe96c19a3b66c7efa1e5e8b444f48) ) // ok + + ROM_REGION( 0x10000, "mcu", 0 ) + ROM_LOAD( "9.f10", 0x0000, 0x1000, CRC(22f1c52a) SHA1(6429a802e92f6b77446550a303567798a231f6d7) ) // MCU prg + + ROM_REGION( 0x6000, "temp", 0 ) + ROM_LOAD( "1.b1", 0x0000, 0x1000, CRC(fd95955d) SHA1(e5c029bc5683d06c2e5250c1271613232a058fcd) ) + ROM_LOAD( "2.b3", 0x1000, 0x0800, CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) ) + ROM_LOAD( "3.b4", 0x1800, 0x0800, CRC(d9246780) SHA1(4ceb24131ec6208b742ba80373201aa53c50732d) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ + ROM_COPY( "temp", 0x0800, 0x1000, 0x0800 ) /* second half of 1.b1 */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_COPY( "temp", 0x1800, 0x0000, 0x0800 ) /* first half of 3.b4 */ + ROM_COPY( "temp", 0x1000, 0x0800, 0x0800 ) /* whole 2.b3 */ + ROM_COPY( "temp", 0x0000, 0x1000, 0x0800 ) /* first half of 1.b1 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "falcon_1.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + + +/**************************************** OTHER SETS ****************************************/ + + +ROM_START( pmpoker ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "2-5.bin", 0x5000, 0x1000, CRC(3446a643) SHA1(e67854e3322e238c17fed4e05282922028b5b5ea) ) + ROM_LOAD( "2-6.bin", 0x6000, 0x1000, CRC(50d2d026) SHA1(7f58ab176de0f0f7666d87271af69a845faec090) ) + ROM_LOAD( "2-7.bin", 0x7000, 0x1000, CRC(a9ab972e) SHA1(477441b7ff3acae3a5d5a3e4c2a428e0b3121534) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "1-4.bin", 0x1000, 0x0800, CRC(62b9f90d) SHA1(39c61a01225027572fdb75543bb6a78ed74bb2fb) ) /* text layer */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "1-1.bin", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "1-2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "1-3.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "tbp24sa10n.7d", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( royale ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "royalex.bin", 0x4000, 0x4000, CRC(ef370617) SHA1(0fc5679e9787aeea3bc592b36efcaa20e859f912) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "royalechr.bin", 0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) ) /* text layer */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "royale3.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "royale2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "royale1.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( royalea ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "royal.256", 0x0000, 0x8000, CRC(9d7fdb79) SHA1(05cae00bca0f6ae696c69f531cb0fa2104ff696a) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "royalechr.bin", 0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) ) /* text layer */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "royale3.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "royale2.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "royale1.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( sloco93 ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "locoloco.128", 0x4000, 0x4000, CRC(f626a770) SHA1(afbd33b3f65b8a781c716a3d6e5447aa817d856c) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "confloco.032", 0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( sloco93a ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "locoloco.256", 0x0000, 0x8000, CRC(ab037b0b) SHA1(16f811daaed5bf7b72549db85755c5274dfee310) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "confloco.032", 0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +/* + checksum routine at $5f3e + protect $4000+ & $7ff9. + (see cmp at $5f6b) + balanced at $7ff8. +*/ +ROM_START( maverik ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* maverik: Maverik (ind arg, fixed, changed logo) */ + ROM_LOAD( "maverik.bin", 0x0000, 0x8000, CRC(65a986e9) SHA1(2e825d3fb2346036357af0e12d3a75b5ef6cfd0d) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +/***************************** + + Brasil XX sets... + + ****************************/ +ROM_START( brasil86 ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil86.128: Brasil 86, BS clone. */ + ROM_LOAD( "brasil86.128", 0x4000, 0x4000, CRC(0e88b434) SHA1(80f921c277f4253c29ee80e9cfb046ade1f66300) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( brasil87 ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil87.128: Brasil 87, BS clone. */ + ROM_LOAD( "brasil87.128", 0x4000, 0x4000, CRC(6cfdaea9) SHA1(0704e61c1c573e99e130c22787b529ac5544c631) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( brasil89 ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89.128: Brasil 89, BS clone. */ + ROM_LOAD( "brasil89.128", 0x4000, 0x4000, CRC(9030e0db) SHA1(d073ed0ddd3e5df6a3387e10e05ca34bc491eb35) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( brasil89a ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89a.128: Brasil 89a, BS clone. */ + ROM_LOAD( "brasil89a.128", 0x4000, 0x4000, CRC(41a93a99) SHA1(70eeaddbdd9d3a587d1330b81d21d881ab0a8c91) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( brasil93 ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil93.128: Brasil 93, BS clone. No lights */ + ROM_LOAD( "brasil93.128", 0x4000, 0x4000, CRC(cc25909f) SHA1(635184022bcb8936c396cb9fcfa6367fcae906fb) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +ROM_START( poker91 ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_pok91.bin: Poker 91. Based on witchcrd */ + ROM_LOAD( "bs_pok91.bin", 0x0000, 0x8000, CRC(90c88b45) SHA1(9b5842075ece5f96a6869d7a8c874dee2b2abde2) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) ) /* text layer */ + + ROM_REGION( 0x3000, "gfx2", 0 ) + ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "5.bin", 0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +/**************************************************** + + Genie (Video Fun Games Ltd.) + Skill game. Only for amusement. + + PCB is a heavily modified Golden Poker hardware. + Silkscreened "ICP-1". + + CPU: 1x SY6502. + Video: 1x HD6845P CRTC. + I/O: 2x HD6821P PIAs. + + Sound: Discrete. + + RAMs: 2x M5L5101LP-1. + + ROMs: 2x 2732 for program. (2m.16a, 3m.17a) + 1x 2716 for char gen. (4.8a) + 3x 2716 for gfx bitplanes. (1.4a, 2.6a, 3.7a) + + 1x Reset switch. (R.SW) + 1x 8 DIP switches bank. + 1x 2x10 Edge connector. (GM1) + 1x 2x22 Edge connector. (GM2) + + +*****************************************************/ +ROM_START( genie ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "2m.16a", 0x2000, 0x1000, CRC(30df75f5) SHA1(0696fb3db0b9927e6366db7316d605914ff8d464) ) + ROM_LOAD( "3m.17a", 0x3000, 0x1000, CRC(9d67f5c9) SHA1(d3bc13ce07a7b1713544756d7723dd0bcd59cd1a) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4.8a", 0x1000, 0x0800, CRC(1cdd1db9) SHA1(1940c6654b4a892abc3e4557666d341f407ac54f) ) /* chars gfx */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) ) /* tiles, bitplane1 */ + ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) ) /* tiles, bitplane2 */ + ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(151e4af7) SHA1(a44feaa69a00a6db31c018267b8b67a248e7c66e) ) /* tiles, bitplane3 */ + + ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM, otherwise the game isn't stable */ + ROM_LOAD( "genie_nvram.bin", 0x0000, 0x0800, CRC(1b062ae7) SHA1(9d01635f3968d4b91b4a5d9fadfaf6edd0dea7ba) ) + + ROM_REGION( 0x0100, "proms", 0 ) /* using original golden poker color prom */ + ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +// Unknown on Blue PCB ICP-1 +// In fact alt set of Genie... +ROM_START( geniea ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "2732.16a", 0x2000, 0x1000, CRC(c96ef87b) SHA1(a67f290d13fbe33dc7c29271be6f5ef0ec13e927) ) + ROM_LOAD( "2732.17a", 0x3000, 0x1000, CRC(dcbfc29b) SHA1(a512b4bd4ab682810d8c432cca03f4320df9928b) ) + ROM_LOAD( "2732.15a", 0x7000, 0x1000, CRC(7137aa06) SHA1(1a2af7dfe41e54fc9c3b4e641319d1a504e84a18) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "2732.9a", 0x2000, 0x1000, BAD_DUMP CRC(ffb7bca3) SHA1(b58175c0342f963cb42a04195e296db952e071b6) ) /* chars + bitplane3 */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "2716.4a", 0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) ) /* tiles, bitplane1 */ + ROM_LOAD( "2716.6a", 0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) ) /* tiles, bitplane2 */ + ROM_COPY( "gfx1", 0x2800, 0x1000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */ + + ROM_REGION( 0x0100, "proms", 0 ) /* using original golden poker color prom */ + ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + + +/**************************************************** + + Silver Game. + 1983. + + 6502 CPU + 2*6821 ios + mc6845 video chip + 10mhz (?) xtal + + There are French strings related to the game, so maybe is + a leftover, or maybe there is a unknown way to switch the + language. + + +*****************************************************/ +ROM_START( silverga ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "14", 0x5000, 0x1000, CRC(e4691878) SHA1(376c3910030f27517d798aac759553d5634b8ffc) ) + ROM_LOAD( "55", 0x6000, 0x2000, CRC(aad57b3c) SHA1(9508026c1a7b227a70d89ad2f7245e75a615b932) ) + + ROM_REGION( 0x3000, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "11", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "12", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_COPY( "gfx1", 0x2800, 0x1000, 0x0800 ) /* cards deck gfx, bitplane3. found in the 2nd half of the char rom */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "s287", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +/*************************************************************** + + Casino Poker + 1987, PM / Beck Elektronik + + 1x Xtal 10.000 MHz. + 1x UM6502A + 2x UM6521A + 1x UM6845 + + GFX ROMS 051, 052, 053 and 054 have duplicated halves. + + Bipolar PROM 24sa10 is filled with 0x09, so has at least + fixed bits 0 and 3 along the whole data. Needs a redump + using a supported EEPROM programmer. + + Discrete sound circuitry was traced, being identical to the Golden Poker one. + Only difference is the PC617 replaced by one PC817. + + The sound is ugly and seems that was programmed that way. + +***************************************************************/ +ROM_START( caspoker ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "234.bin", 0x4000, 0x1000, CRC(174bc526) SHA1(faef01484f0e0ea769d7bd2c5ad03369a6fdf037) ) + ROM_LOAD( "235.bin", 0x5000, 0x1000, CRC(2e43552f) SHA1(5fbe0e62dec960850ef5f937254858fcd4da9e64) ) + ROM_LOAD( "236.bin", 0x6000, 0x1000, CRC(3f4cfa39) SHA1(e2750a9c5d12c668e599181ee3972c5d78bd0006) ) + ROM_LOAD( "237.bin", 0x7000, 0x1000, CRC(b411d0c4) SHA1(0617cd312026da78a171fc23f4788393d70371cf) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "054.bin", 0x1000, 0x0800, CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) ) /* text chars */ + ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "051.bin", 0x0000, 0x0800, CRC(82d823e5) SHA1(75bdf427a6204ef87444be0d8b06a07c5a2fc38f) ) /* cards deck gfx, bitplane1 */ + ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + ROM_LOAD( "052.bin", 0x0800, 0x0800, CRC(eda12738) SHA1(ec7806c2bf1a238f489459c3c3653f43febaa464) ) /* cards deck gfx, bitplane2 */ + ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + ROM_LOAD( "053.bin", 0x1000, 0x0800, CRC(d147ae0a) SHA1(dfdf0a42eb0a6f2afc9f301b0cf01411085247bd) ) /* cards deck gfx, bitplane3 */ + ROM_IGNORE( 0x0800) /* identical halves, discarding the 2nd half */ + + ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM, otherwise settings parameters are incorrect */ + ROM_LOAD( "caspoker_nvram.bin", 0x0000, 0x0800, CRC(be6e2671) SHA1(aef1b09d09e07eb39480a7901ed8535f74e461fa) ) + + ROM_REGION( 0x0100, "proms", 0 ) /* from other games */ + ROM_LOAD( "24sa10.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +/**************************************************** + + Super Double (Karateco) + + French text with some intentional typos to fit size. + Uses both 0x2000..0x3fff and 0x7000..0x7fff ROM range. + + This is either the game advertised as "The Double", + or a successor thereof. + +*****************************************************/ +ROM_START( superdbl ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "sd6", 0x7000, 0x1000, CRC(3cf1ccb8) SHA1(c589ddf2e97abb9d95375d0964fd0aa6f7e2e468) ) + ROM_LOAD( "sd7", 0x2000, 0x1000, CRC(f5136f82) SHA1(f086cd5495097ede037ea6cae584e95bfcd7b239) ) + ROM_LOAD( "8", 0x3000, 0x1000, CRC(157332c2) SHA1(3c66200c49641b9d876c5fa134dd2f0e80136beb) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4", 0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) ) /* text layer */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "1", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "2", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "3", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "tbp24sa10n.7d", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ +ROM_END + +/**************************************************** + + Unknown poker game, set 1. + 198?. + + There are French strings related to the game into + the program ROM. + + The dump lacks of 1 program ROM located at 17a. + (empty socket in the PCB picture) + +*****************************************************/ +ROM_START( pokerdub ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "15a_f_83.15a", 0x2000, 0x1000, CRC(06571884) SHA1(6823f5d4a2fc5adf51f1588273f808a2a25a15bc) ) + ROM_LOAD( "unknown.17a", 0x3000, 0x1000, NO_DUMP ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "4.8a", 0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) ) /* char ROM (cracked title) */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "s287.8c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + +/**************************************************** + + Unknown poker game, set 2. + 198?. + + This one is totally encrypted. + The PCB has a daughterboard coated with some plastic + or epoxy resin. + + Char ROM is identical to the Witch Card one. + +*****************************************************/ +ROM_START( pokerduc ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "b", 0x5000, 0x1000, CRC(8627fba5) SHA1(b94665f0bf425ff71f78c1258f910323c2a948f0) ) + ROM_LOAD( "c", 0x6000, 0x1000, CRC(b35b4108) SHA1(6504ba55511637334c65e88ee5c60b1503b854b3) ) + ROM_LOAD( "d", 0x7000, 0x1000, CRC(c48096ed) SHA1(279ba433369c7dc9cd902a19200e889eea45d115) ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_FILL( 0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */ + ROM_LOAD( "a.8a", 0x1000, 0x0800, CRC(c70a3e49) SHA1(eb2f15b344f4dec5f05701415848c854bb27aaa3) ) /* char ROM (cracked title) */ + + ROM_REGION( 0x1800, "gfx2", 0 ) + ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ + ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ + ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) ) /* cards deck gfx, bitplane3 */ + ROM_IGNORE( 0x0800) /* identical halves */ + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "tbp24s10.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) +ROM_END + /* Bonne Chance! @@ -9966,7 +9988,6 @@ ROM_END 5f63 */ - ROM_START( bchancep ) /* Bonne Chance! with PIAs 6821 */ ROM_REGION( 0x3000, "gfx", 0 ) ROM_LOAD( "84.bin", 0x0000, 0x1000, CRC(31f8104e) SHA1(b99f79019517ca90c48e9f303f41256d68faea91) ) /* cards deck gfx bitplane 3, identical halves */ @@ -10023,7 +10044,6 @@ ROM_END in banks of 0x4000 each. */ - ROM_START( pokermon ) ROM_REGION( 0x10000, "maincpu", 0 ) /* 2 programs, selectable via DIP switch */ ROM_LOAD( "mbv_bi.bin", 0x0000, 0x8000, CRC(da00e08a) SHA1(98e52915178e29ab3ae674e6b895da14626d3dd8) ) @@ -10068,7 +10088,6 @@ ROM_START( pokersis ) ROM_LOAD( "n82s129n.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END - /* Super 98', running in the ICP-1 boardset. @@ -10076,7 +10095,6 @@ ROM_END Please read the 'Games Notes' section for game and debug notes / issues... */ - ROM_START( super98 ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27c256.17a", 0x0000, 0x8000, CRC(dfa319c5) SHA1(e1b2ef40350ee1f40272604cbe33b245210de003) ) @@ -10396,53 +10414,42 @@ DRIVER_INIT_MEMBER(goldnpkr_state, vkdlswwv) And repeat for every 0x100 segments... - So... - - 0000-0007 ok. - 0008-000f XOR 0x04 - 0010-0017 XOR 0x02 - 0018-001f XOR 0x06 - - 0020-0027 ok. - 0028-002f XOR 0x04 - 0030-0037 XOR 0x02 - 0038-003f XOR 0x06 - - 0040-0047 XOR 0x01 - 0048-004f XOR 0x05 - 0050-0057 XOR 0x03 - 0058-005f XOR 0x07 - - 0060-0067 XOR 0x01 - 0068-006f XOR 0x05 - 0070-0077 XOR 0x03 - 0078-007f XOR 0x07 - - 0080-0087 XOR 0x40 - 0088-008f XOR 0x44 - 0090-0097 XOR 0x42 - 0098-009f XOR 0x46 - - 00a0-00a7 XOR 0x40 - 00a8-00af XOR 0x44 - 00b0-00b7 XOR 0x42 - 00b8-00bf XOR 0x46 - - 00c0-00c7 XOR 0x41 - 00c8-00cf XOR 0x45 - 00d0-00d7 XOR 0x43 - 00d8-00df XOR 0x47 - - 00e0-00e7 XOR 0x41 - 00e8-00ef XOR 0x45 - 00f0-00f7 XOR 0x43 - 00f8-00ff XOR 0x47 - + If you apply these XOR's to get 00's, the code has no sense, + so something is missing. For now will comment out the partial + decryption code... + ***********************************************/ DRIVER_INIT_MEMBER(goldnpkr_state, icp1db) { - /* nothing yet... */ +/* + int i; + UINT8 *ROM = memregion("maincpu")->base(); + + unsigned char rawData[256] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, + 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, + 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, + 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, + 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, + 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, + 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, + 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, + 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, + 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, + 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, + 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, + 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, + 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, + 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, + }; + + for (i = 0; i < 0x10000; i++) + { + ROM[i] = ROM[i] ^ rawData[i & 0xff]; + } +*/ } /********************************************** @@ -10534,72 +10541,11 @@ GAMEL( 198?, potnpkrd, pottnpkr, pottnpkr, potnpkrc, driver_device, 0, GAMEL( 198?, potnpkre, pottnpkr, pottnpkr, pottnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 6)", 0, layout_goldnpkr ) GAMEL( 198?, potnpkrf, pottnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 7, Royale GFX)", 0, layout_goldnpkr ) GAMEL( 198?, potnpkrg, pottnpkr, pottnpkr, potnpkra, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 8, Australian)", 0, layout_goldnpkr ) -GAMEL( 198?, superdbl, pottnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "Karateco", "Super Double (French)", 0, layout_goldnpkr ) +GAMEL( 198?, potnpkrh, pottnpkr, pottnpkr, goldnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 9, 'just 4 fun')", 0, layout_goldnpkr ) GAMEL( 198?, ngold, pottnpkr, pottnpkr, ngold, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 1)", 0, layout_goldnpkr ) GAMEL( 198?, ngolda, pottnpkr, pottnpkr, ngold, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 2)", 0, layout_goldnpkr ) GAMEL( 198?, ngoldb, pottnpkr, pottnpkr, ngoldb, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 3)", 0, layout_goldnpkr ) -GAMEL( 1991, witchcrd, 0, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein?", "Witch Card (Video Klein CPU box, set 1)", 0, layout_goldnpkr ) -GAME( 1991, witchcda, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 1)", 0 ) -GAME( 1991, witchcdb, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 2)", 0 ) -GAME( 1991, witchcdc, witchcrd, witchcrd, witchcdc, driver_device, 0, ROT0, "<unknown>", "Witch Card (English, no witch game)", 0 ) -GAMEL( 1994, witchcdd, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 1 )", 0, layout_goldnpkr ) -GAMEL( 1991, witchcde, witchcrd, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein", "Witch Card (Video Klein CPU box, set 2)", 0, layout_goldnpkr ) -GAMEL( 1985, witchcdf, witchcrd, witchcrd, witchcdf, driver_device, 0, ROT0, "PM / Beck Elektronik", "Witch Card (English, witch game, lamps)", 0, layout_goldnpkr ) -GAMEL( 199?, witchcdg, witchcrd, wcfalcon, witchcrd, driver_device, 0, ROT0, "Falcon", "Witch Card (Falcon, enhanced sound)", 0, layout_goldnpkr ) -GAMEL( 1994, witchcdh, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 2 )", 0, layout_goldnpkr ) -GAMEL( 1994, witchcdi, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, 27-4-94)", 0, layout_goldnpkr ) - -GAMEL( 1991, witchgme, 0, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 1)", 0, layout_goldnpkr ) -GAMEL( 1997, witchcdk, witchgme, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr ) - -GAMEL( 1994, witchjol, 0, wcrdxtnd, witchjol, goldnpkr_state, vkdlsa, ROT0, "Video Klein", "Jolli Witch (Export, 6T/12T ver 1.57D)", 0, layout_goldnpkr ) - -GAMEL( 2001, wldwitch, 0, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsww, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.84A)", 0, layout_goldnpkr ) /* Ver 184A, 2001-09-12 */ -GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwa, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-SP)", 0, layout_goldnpkr ) /* Ver 157-SP, 1992-12-25 */ -GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-TE)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 157-TE, 1992-12-25 */ -GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A)", 0, layout_goldnpkr ) /* Ver 162A, 1994-04-26 */ -GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B)", 0, layout_goldnpkr ) /* Ver 162B, 1994-04-26 */ -GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A-F)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 162A-F, 1994-04-26 */ -GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A alt)", 0, layout_goldnpkr ) /* Ver 162A alt, 1994-11-03 */ -GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B alt)", 0, layout_goldnpkr ) /* Ver 162B alt, 1994-11-03 */ -GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A)", 0, layout_goldnpkr ) /* Ver 165A, 1995-11-16 */ -GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-S)", 0, layout_goldnpkr ) /* Ver 165A-S (Fast Deal), 1996-03-26 */ -GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0, layout_goldnpkr ) /* Ver 165A-S alt (Fast Deal), 1996-05-26 */ -GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-N)", 0, layout_goldnpkr ) /* Ver 165A-N, 1996-05-29 */ -GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A beta)", 0, layout_goldnpkr ) /* Ver 170A-beta, 1996-06-25 */ -GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A)", 0, layout_goldnpkr ) /* Ver 170A, 1996-09-30 */ -GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A alt)", 0, layout_goldnpkr ) /* Ver 170A alt, 1997-06-11 */ -GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwo, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0, layout_goldnpkr ) /* Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11 */ -GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwp, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A)", 0, layout_goldnpkr ) /* Ver 174A (no D-UP, no payout), 1998-09-20 */ -GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsb, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A alt)", 0, layout_goldnpkr ) /* Ver 174A alt, box, 1998-09-25 */ -GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwr, ROT0, "Video Klein", "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0, layout_goldnpkr ) /* Ver 175A-E (English), 1999-01-11 */ -GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswws, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.76A)", 0, layout_goldnpkr ) /* Ver 176A, 1999-??-?? */ -GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwt, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.77A)", 0, layout_goldnpkr ) /* Ver 177A, 1999-??-?? */ -GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwu, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.79A)", 0, layout_goldnpkr ) /* Ver 179A, 2000-05-10 */ -GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwv, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.83A)", 0, layout_goldnpkr ) /* Ver 183A, 2001-06-13 */ - -GAMEL( 1998, wupndown, 0, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 1.02)", 0, layout_upndown ) /* Ver 1.02, 1998-10-26 */ -GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0, layout_upndown ) /* Ver 0.99, 1998-04-09 */ -GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0, layout_upndown ) /* Ver 0.99, 1998-03-23 */ -GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0, layout_upndown ) /* Ver 0.99 alt, 1998-05-11 */ -GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99T)", 0, layout_upndown ) /* Ver 0.99T, 1998-03-23 */ - -GAMEL( 1992, wstrike, 0, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01A)", 0, layout_goldnpkr ) -GAMEL( 1992, wstrikea, wstrike, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01B)", 0, layout_goldnpkr ) - -GAMEL( 1996, wtchjack, 0, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-89)", 0, layout_goldnpkr ) /* Ver 0.87-89 / 1996-10-08 GFX OK */ -GAMEL( 1994, wtchjacka, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.25 / 1994-11-24 */ -GAMEL( 1995, wtchjackb, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.40 / 1995-02-27 */ -GAMEL( 1995, wtchjackc, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40T)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 0.40T / 1995-02-27 */ -GAMEL( 1995, wtchjackd, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.62)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.62 / 1995-08-02 */ -GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.64)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.64 / 1995-09-13 */ -GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.65)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.65 / 1995-10-19 */ -GAMEL( 1996, wtchjackg, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70S)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70S / 1996-03-26 */ -GAMEL( 1996, wtchjackh, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70P)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70P / 1996-03-26 */ -GAMEL( 1996, wtchjacki, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87)", 0, layout_goldnpkr ) /* Ver 0.87 / 1996-07-16, GFX OK */ -GAMEL( 1996, wtchjackj, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-88)", 0, layout_goldnpkr ) /* Ver 0.87-88 / 1996-10-02, GFX OK */ - GAMEL( 1990, bsuerte, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 1)", 0, layout_goldnpkr ) GAMEL( 1991, bsuertea, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 2)", 0, layout_goldnpkr ) GAMEL( 1991, bsuerteb, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 3)", 0, layout_goldnpkr ) @@ -10629,6 +10575,67 @@ GAMEL( 1990, falcnwlda, falcnwld, wildcard, wildcard, driver_device, 0, GAMEL( 1990, falcnwldb, falcnwld, wildcard, wildcard, driver_device, 0, ROT0, "Video Klein", "Falcons Wild - World Wide Poker (Video Klein, set 2)", 0, layout_goldnpkr ) GAME( 1983, falcnwldc, falcnwld, wildcrdb, wildcard, goldnpkr_state, flcnw, ROT0, "Falcon", "Falcons Wild - World Wide Poker (Falcon original)", MACHINE_NOT_WORKING ) +GAMEL( 1991, witchcrd, 0, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein?", "Witch Card (Video Klein CPU box, set 1)", 0, layout_goldnpkr ) +GAME( 1991, witchcda, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 1)", 0 ) +GAME( 1991, witchcdb, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 2)", 0 ) +GAME( 1991, witchcdc, witchcrd, witchcrd, witchcdc, driver_device, 0, ROT0, "<unknown>", "Witch Card (English, no witch game)", 0 ) +GAMEL( 1994, witchcdd, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 1 )", 0, layout_goldnpkr ) +GAMEL( 1991, witchcde, witchcrd, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein", "Witch Card (Video Klein CPU box, set 2)", 0, layout_goldnpkr ) +GAMEL( 1985, witchcdf, witchcrd, witchcrd, witchcdf, driver_device, 0, ROT0, "PM / Beck Elektronik", "Witch Card (English, witch game, lamps)", 0, layout_goldnpkr ) +GAMEL( 199?, witchcdg, witchcrd, wcfalcon, witchcrd, driver_device, 0, ROT0, "Falcon", "Witch Card (Falcon, enhanced sound)", 0, layout_goldnpkr ) +GAMEL( 1994, witchcdh, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 2 )", 0, layout_goldnpkr ) +GAMEL( 1994, witchcdi, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, 27-4-94)", 0, layout_goldnpkr ) + +GAMEL( 1991, witchgme, 0, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 1)", 0, layout_goldnpkr ) +GAMEL( 1997, witchcdk, witchgme, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr ) + +GAMEL( 1994, witchjol, 0, wcrdxtnd, witchjol, goldnpkr_state, vkdlsa, ROT0, "Video Klein", "Jolli Witch (Export, 6T/12T ver 1.57D)", 0, layout_goldnpkr ) + +GAMEL( 2001, wldwitch, 0, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsww, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.84A)", 0, layout_goldnpkr ) /* Ver 184A, 2001-09-12 */ +GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwa, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-SP)", 0, layout_goldnpkr ) /* Ver 157-SP, 1992-12-25 */ +GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-TE)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 157-TE, 1992-12-25 */ +GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A)", 0, layout_goldnpkr ) /* Ver 162A, 1994-04-26 */ +GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B)", 0, layout_goldnpkr ) /* Ver 162B, 1994-04-26 */ +GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A-F)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 162A-F, 1994-04-26 */ +GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A alt)", 0, layout_goldnpkr ) /* Ver 162A alt, 1994-11-03 */ +GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B alt)", 0, layout_goldnpkr ) /* Ver 162B alt, 1994-11-03 */ +GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A)", 0, layout_goldnpkr ) /* Ver 165A, 1995-11-16 */ +GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-S)", 0, layout_goldnpkr ) /* Ver 165A-S (Fast Deal), 1996-03-26 */ +GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0, layout_goldnpkr ) /* Ver 165A-S alt (Fast Deal), 1996-05-26 */ +GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A-N)", 0, layout_goldnpkr ) /* Ver 165A-N, 1996-05-29 */ +GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A beta)", 0, layout_goldnpkr ) /* Ver 170A-beta, 1996-06-25 */ +GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A)", 0, layout_goldnpkr ) /* Ver 170A, 1996-09-30 */ +GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.70A alt)", 0, layout_goldnpkr ) /* Ver 170A alt, 1997-06-11 */ +GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwo, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0, layout_goldnpkr ) /* Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11 */ +GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwp, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A)", 0, layout_goldnpkr ) /* Ver 174A (no D-UP, no payout), 1998-09-20 */ +GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsb, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.74A alt)", 0, layout_goldnpkr ) /* Ver 174A alt, box, 1998-09-25 */ +GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwr, ROT0, "Video Klein", "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0, layout_goldnpkr ) /* Ver 175A-E (English), 1999-01-11 */ +GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswws, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.76A)", 0, layout_goldnpkr ) /* Ver 176A, 1999-??-?? */ +GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwt, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.77A)", 0, layout_goldnpkr ) /* Ver 177A, 1999-??-?? */ +GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwu, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.79A)", 0, layout_goldnpkr ) /* Ver 179A, 2000-05-10 */ +GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwv, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.83A)", 0, layout_goldnpkr ) /* Ver 183A, 2001-06-13 */ + +GAMEL( 1998, wupndown, 0, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 1.02)", 0, layout_upndown ) /* Ver 1.02, 1998-10-26 */ +GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0, layout_upndown ) /* Ver 0.99, 1998-04-09 */ +GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0, layout_upndown ) /* Ver 0.99, 1998-03-23 */ +GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0, layout_upndown ) /* Ver 0.99 alt, 1998-05-11 */ +GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99T)", 0, layout_upndown ) /* Ver 0.99T, 1998-03-23 */ + +GAMEL( 1992, wstrike, 0, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01A)", 0, layout_goldnpkr ) +GAMEL( 1992, wstrikea, wstrike, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01B)", 0, layout_goldnpkr ) + +GAMEL( 1996, wtchjack, 0, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-89)", 0, layout_goldnpkr ) /* Ver 0.87-89 / 1996-10-08 GFX OK */ +GAMEL( 1996, wtchjacka, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-88)", 0, layout_goldnpkr ) /* Ver 0.87-88 / 1996-10-02, GFX OK */ +GAMEL( 1996, wtchjackb, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87)", 0, layout_goldnpkr ) /* Ver 0.87 / 1996-07-16, GFX OK */ +GAMEL( 1996, wtchjackc, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70S)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70S / 1996-03-26 */ +GAMEL( 1996, wtchjackd, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70P)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70P / 1996-03-26 */ +GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.65)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.65 / 1995-10-19 */ +GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.64)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.64 / 1995-09-13 */ +GAMEL( 1995, wtchjackg, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.62)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.62 / 1995-08-02 */ +GAMEL( 1995, wtchjackh, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40T)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 0.40T / 1995-02-27 */ +GAMEL( 1995, wtchjacki, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.40 / 1995-02-27 */ +GAMEL( 1994, wtchjackj, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.25 / 1994-11-24 */ + /*************************************** OTHER SETS ***************************************/ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */ @@ -10649,6 +10656,7 @@ GAME( 198?, geniea, genie, geniea, geniea, driver_device, 0, GAMEL( 1983, silverga, 0, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Silver Game", 0, layout_goldnpkr ) GAME( 1987, caspoker, 0, goldnpkr, caspoker, driver_device, 0, ROT0, "PM / Beck Elektronik", "Casino Poker (Ver PM86LO-35-5, German)", MACHINE_IMPERFECT_COLORS ) +GAMEL( 198?, superdbl, pottnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "Karateco", "Super Double (French)", 0, layout_goldnpkr ) GAME( 198?, pokerdub, 0, pottnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "unknown French poker game", MACHINE_NOT_WORKING ) // lacks of 2nd program ROM. GAME( 198?, pokerduc, 0, goldnpkr, goldnpkr, goldnpkr_state, icp1db, ROT0, "<unknown>", "unknown encrypted poker game", MACHINE_NOT_WORKING ) // encrypted. diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index d3f739a36bc..db0a65e5dd1 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -6236,32 +6236,32 @@ static INPUT_PORTS_START( cmpacman ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> PB0 */ PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:!1") /* OK */ + PORT_DIPNAME( 0x01, 0x01, "Unknown" ) PORT_DIPLOCATION("DSW1:!1") /* not checked */ PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "Hopper Out Switch" ) PORT_DIPLOCATION("DSW1:!2") /* OK */ + PORT_DIPNAME( 0x02, 0x02, "Hopper Out Switch" ) PORT_DIPLOCATION("DSW1:!2") /* not checked */ PORT_DIPSETTING( 0x02, "Active Low" ) PORT_DIPSETTING( 0x00, "Active High" ) - PORT_DIPNAME( 0x04, 0x04, "Payout Mode" ) PORT_DIPLOCATION("DSW1:!3") /* OK */ + PORT_DIPNAME( 0x04, 0x04, "Payout Mode" ) PORT_DIPLOCATION("DSW1:!3") /* not checked */ PORT_DIPSETTING( 0x04, "Payout Switch" ) PORT_DIPSETTING( 0x00, "Automatic" ) - PORT_DIPNAME( 0x08, 0x00, "W-UP '7'" ) PORT_DIPLOCATION("DSW1:!4") /* not checked */ - PORT_DIPSETTING( 0x08, "Loss" ) - PORT_DIPSETTING( 0x00, "Even" ) - PORT_DIPNAME( 0x10, 0x00, "W-UP Pay Rate" ) PORT_DIPLOCATION("DSW1:!5") /* OK */ + PORT_DIPNAME( 0x08, 0x00, "'7' In Double Up Game" ) PORT_DIPLOCATION("DSW1:!4") /* OK */ + PORT_DIPSETTING( 0x00, "Lose" ) + PORT_DIPSETTING( 0x08, "Even" ) + PORT_DIPNAME( 0x10, 0x00, "Double Up Game Pay Rate" ) PORT_DIPLOCATION("DSW1:!5") /* OK */ PORT_DIPSETTING( 0x00, "80%" ) PORT_DIPSETTING( 0x10, "90%" ) - PORT_DIPNAME( 0x20, 0x00, "W-UP Game" ) PORT_DIPLOCATION("DSW1:!6") /* OK */ + PORT_DIPNAME( 0x20, 0x00, "Double Up Game" ) PORT_DIPLOCATION("DSW1:!6") /* OK */ PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0xc0, 0xc0, "Bet Max" ) PORT_DIPLOCATION("DSW1:!7,!8") /* OK */ + PORT_DIPNAME( 0xc0, 0xc0, "Bet Max" ) PORT_DIPLOCATION("DSW1:!7,!8") /* OK */ PORT_DIPSETTING( 0x00, "16" ) PORT_DIPSETTING( 0x40, "32" ) PORT_DIPSETTING( 0x80, "64" ) PORT_DIPSETTING( 0xc0, "96" ) PORT_START("DSW2") - PORT_DIPNAME( 0x07, 0x00, "Main Game Pay Rate" ) PORT_DIPLOCATION("DSW2:!1,!2,!3") /* OK */ + PORT_DIPNAME( 0x07, 0x00, "Main Game Pay Rate" ) PORT_DIPLOCATION("DSW2:!1,!2,!3") /* OK */ PORT_DIPSETTING( 0x07, "55%" ) PORT_DIPSETTING( 0x06, "60%" ) PORT_DIPSETTING( 0x05, "65%" ) @@ -6270,18 +6270,18 @@ static INPUT_PORTS_START( cmpacman ) PORT_DIPSETTING( 0x02, "80%" ) PORT_DIPSETTING( 0x01, "85%" ) PORT_DIPSETTING( 0x00, "90%" ) - PORT_DIPNAME( 0x18, 0x00, "Hopper Limit" ) PORT_DIPLOCATION("DSW2:!4,!5") /* OK */ + PORT_DIPNAME( 0x18, 0x00, "Hopper Limit" ) PORT_DIPLOCATION("DSW2:!4,!5") /* not checked */ PORT_DIPSETTING( 0x18, "300" ) PORT_DIPSETTING( 0x10, "500" ) PORT_DIPSETTING( 0x08, "1000" ) PORT_DIPSETTING( 0x00, "Unlimited" ) - PORT_DIPNAME( 0x20, 0x00, "100 Odds Sound" ) PORT_DIPLOCATION("DSW2:!6") /* not checked */ + PORT_DIPNAME( 0x20, 0x00, "100 Odds Sound" ) PORT_DIPLOCATION("DSW2:!6") /* not checked */ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x20, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Key-In Type" ) PORT_DIPLOCATION("DSW2:!7") /* OK */ + PORT_DIPNAME( 0x40, 0x40, "Key-In Type" ) PORT_DIPLOCATION("DSW2:!7") /* OK */ PORT_DIPSETTING( 0x40, "A-Type" ) PORT_DIPSETTING( 0x00, "B-Type" ) - PORT_DIPNAME( 0x80, 0x00, "Center Super 7 Bet Limit" ) PORT_DIPLOCATION("DSW2:!8") /* related with DSW 4-6 */ + PORT_DIPNAME( 0x80, 0x00, "Center Super 7 Bet Limit" ) PORT_DIPLOCATION("DSW2:!8") /* related with DSW 4-6 */ PORT_DIPSETTING( 0x80, "Unlimited" ) PORT_DIPSETTING( 0x00, "Limited" ) @@ -6318,11 +6318,14 @@ static INPUT_PORTS_START( cmpacman ) PORT_INCLUDE( cmv4_dsw4 ) /* Display Of Payout Limit not working; all others OK */ PORT_INCLUDE( cmv4_dsw5 ) + PORT_MODIFY("DSW5") /* Display of Doll On Demo only affects payout table screen */ /* Coin In Limit OK */ - /* Condition For 3 Kind Of Bonus not checked */ + /* Condition For 3 Kind Of Bonus OK */ /* Display Of Doll At All Fr. Bonus not checked */ - /* DSW5-7 listed as unused */ + PORT_DIPNAME( 0x40, 0x40, "Card Shuffle Animation" ) PORT_DIPLOCATION("DSW5:7") /* OK */ + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) /* Test Mode For Disp. Of Doll not working */ INPUT_PORTS_END diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index a1de28a0cf4..e793b648ab5 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -667,14 +667,6 @@ ALL VROM ROMs are 16M MASK #include "includes/model3.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - void model3_state::update_irq_state() { if ((m_irq_enable & m_irq_state) || m_scsi_irq_state) @@ -6059,7 +6051,3 @@ GAME( 1998, magtruck, 0, model3_21_5881, eca, model3_state, magtruc GAME( 1999, eca, 0, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (Export)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1999, ecau, eca, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (USA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1999, ecap, eca, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (US location test?)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 5ae8044ca02..c7d3e78d405 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -86,6 +86,28 @@ return +c8000000: + 8011e384: + if((a2000000.w & 0xfff0 != 0x0080) (c417_r, 808e or 008e) + +10.w = 2 + +16.w = 42 + +16.w = 23c0 + +10.w = 3 + 801deaf0.w *0x28 -> +12.w (fixed) + + + + +':maincpu' (801142FC): unmapped program memory write to 0C800010 = 00020000 & FFFF0000 +':maincpu' (801143A8): unmapped program memory write to 0C800010 = 00020000 & FFFF0000 +':maincpu' (801143B4): unmapped program memory write to 0C800014 = 00000042 & 0000FFFF +':maincpu' (801143C0): unmapped program memory write to 0C800014 = 000023C0 & 0000FFFF +':maincpu' (801143CC): unmapped program memory write to 0C800010 = 00030000 & FFFF0000 +':maincpu' (801143E0): unmapped program memory write to 0C800010 = 00000000 & 0000FFFF +':maincpu' (801143E0): unmapped program memory write to 0C800010 = 00000000 & 0000FFFF +':maincpu' (801143E0): unmapped program memory write to 0C800010 = 00000000 & 0000FFFF +':maincpu' (801143E0): unmapped program memory write to 0C800010 = 00000000 & 0000FFFF + **************************************************************************** Namco System 23 and Super System 23 Hardware Overview (last updated 7th April 2013 at 12.49am) @@ -1523,6 +1545,8 @@ public: DECLARE_WRITE16_MEMBER(iob_p6_w); DECLARE_READ8_MEMBER(iob_gun_r); DECLARE_READ16_MEMBER(iob_analog_r); + DECLARE_WRITE16_MEMBER(c435_state_pio_w); + DECLARE_WRITE16_MEMBER(c435_state_reset_w); DECLARE_DRIVER_INIT(s23); TILE_GET_INFO_MEMBER(TextTilemapGetInfo); DECLARE_VIDEO_START(s23); @@ -1537,17 +1561,23 @@ public: UINT16 nthword(const UINT32 *pSource, int offs); inline INT32 u32_to_s24(UINT32 v); inline INT32 u32_to_s10(UINT32 v); + float f24_to_f32(UINT32 v); + INT32 *c435_getv(UINT16 id); INT16 *c435_getm(UINT16 id); + void c435_state_set_interrupt(const UINT16 *param); + void c435_state_set_projection_matrix_line(const UINT16 *param); + void c435_state_set(UINT16 type, const UINT16 *param); + int c435_get_state_entry_size(UINT16 type); + void c435_matrix_matrix_mul(); void c435_matrix_set(); void c435_vector_set(); void c435_matrix_vector_mul(); void c435_vector_matrix_mul(); - void c435_scaling_set(); - void c435_state_set_interrupt(); void c435_state_set(); + void c435_scaling_set(); void c435_render(); void c435_flush(); @@ -1602,6 +1632,28 @@ inline INT32 namcos23_state::u32_to_s10(UINT32 v) return v & 0x200 ? v | 0xfffffe00 : v & 0x1ff; } +float namcos23_state::f24_to_f32(UINT32 v) +{ + // 8 bits exponent, 16 mantissa + // mantissa is 16-bits signed, 2-complement + // value is m * 2**(e-46) + // 1 is e=32, m=0x4000, -1 is e=31, m=0x8000 + + // This code turns it into a standard float + if(!v) + return 0; + + UINT32 r = v & 0x8000 ? 0x80000000 : 0; + UINT16 m = r ? -v : v; + UINT8 e = (v >> 16) + 0x60; + while(!(m & 0x8000)) { + m <<= 1; + e--; + } + + r = r | (e << 23) | ((m & 0x7fff) << 8); + return *(float *)&r; +} INLINE UINT8 light(UINT8 c, float l) { @@ -1632,12 +1684,88 @@ INT16 *namcos23_state::c435_getm(UINT16 id) return m_matrices[id]; } +void namcos23_state::c435_state_set_interrupt(const UINT16 *param) +{ + if(param[0] & 1) + update_main_interrupts(m_main_irqcause | MAIN_C435_IRQ); + else + update_main_interrupts(m_main_irqcause & ~MAIN_C435_IRQ); +} + +void namcos23_state::c435_state_set_projection_matrix_line(const UINT16 *param) +{ + // timecrs2: + // sx = 640/2, sy = 480/2, t = tan(fov/2) (fov=45 degrees) + // line 1: 1 0 -(sx-a)/(sx/t) 0 -1 0 -(sx+a)/(sx/t) 0 + // line 2: 0 1 -(sy-b)/(sx/t) 0 0 -1 -(sy+b)/(sx/t) 0 + // line 3: 0 0 -1 c 0 0 0 sx/t + + char buf[4096]; + char *p = buf; + p += sprintf(p, "projection matrix line:"); + for(int i=0; i<8; i++) + p += sprintf(p, " %f", f24_to_f32((param[2*i+1] << 16) | param[2*i+2])); + p += sprintf(p, "\n"); + logerror(buf); +} + +void namcos23_state::c435_state_set(UINT16 type, const UINT16 *param) +{ + switch(type) { + case 0x0001: c435_state_set_interrupt(param); break; + case 0x00c8: c435_state_set_projection_matrix_line(param); break; + default: { + char buf[4096]; + char *p = buf; + p += sprintf(buf, "WARNING: Unhandled state type %04x :", type); + for(int i=0; i<c435_get_state_entry_size(type); i++) + p += sprintf(p, " %04x", param[i]); + p += sprintf(p, "\n"); + logerror(buf); + break; + } + } +} + +WRITE16_MEMBER(namcos23_state::c435_state_reset_w) +{ + m_c435_buffer_pos = 0; +} + +WRITE16_MEMBER(namcos23_state::c435_state_pio_w) +{ + m_c435_buffer[m_c435_buffer_pos++] = data; + int psize = c435_get_state_entry_size(m_c435_buffer[0]); + if(m_c435_buffer_pos < psize+1) + return; + c435_state_set(m_c435_buffer[0], m_c435_buffer+1); + m_c435_buffer_pos = 0; +} + +int namcos23_state::c435_get_state_entry_size(UINT16 type) +{ + switch(type) { + case 0x0001: return 1; + case 0x0009: return 19; + case 0x0042: return 41; + case 0x0046: return 13; + case 0x00c0: return 33; + case 0x00c6: return 13; + case 0x00c8: return 17; + default: + logerror("WARNING: Unknown size for state type %04x\n", type); + return -1; + } +} + void namcos23_state::c435_matrix_matrix_mul() // 0.0 { if((m_c435_buffer[0] & 0xf) != 4) { logerror("WARNING: c435_matrix_matrix_mul with size %d\n", m_c435_buffer[0] & 0xf); return; } + if(m_c435_buffer[0] != 0x0004) + logerror("WARNING: c435_matrix_matrix_mul header %04x\n", m_c435_buffer[0]); if(m_c435_buffer[3] != 0xffff) logerror("WARNING: c435_matrix_matrix_mul with +2=%04x\n", m_c435_buffer[3]); @@ -1663,6 +1791,10 @@ void namcos23_state::c435_matrix_vector_mul() // 0.1 return; } + if(m_c435_buffer[0] != 0x0814 && m_c435_buffer[0] != 0x1014) + logerror("WARNING: c435_matrix_vector_mul header %04x\n", m_c435_buffer[0]); + + if(m_c435_buffer[3] != 0xffff) { INT32 *t = c435_getv(m_c435_buffer[1]); const INT16 *m = c435_getm(m_c435_buffer[2]); @@ -1690,6 +1822,10 @@ void namcos23_state::c435_matrix_set() // 0.4 logerror("WARNING: c435_matrix_set with size %d\n", m_c435_buffer[0] & 0xf); return; } + + if(m_c435_buffer[0] != 0x004a) + logerror("WARNING: c435_matrix_set header %04x\n", m_c435_buffer[0]); + INT16 *t = c435_getm(m_c435_buffer[1]); for(int i=0; i<9; i++) t[i] = m_c435_buffer[i+2]; @@ -1701,6 +1837,9 @@ void namcos23_state::c435_vector_set() // 0.5 logerror("WARNING: c435_vector_set with size %d\n", m_c435_buffer[0] & 0xf); return; } + if(m_c435_buffer[0] != 0x057) + logerror("WARNING: c435_vector_set header %04x\n", m_c435_buffer[0]); + INT32 *t = c435_getv(m_c435_buffer[1]); for(int i=0; i<3; i++) t[i] = u32_to_s24((m_c435_buffer[2*i+2] << 16) | m_c435_buffer[2*i+3]); @@ -1715,36 +1854,26 @@ void namcos23_state::c435_scaling_set() // 4.4 m_scaling = m_c435_buffer[1]; } -void namcos23_state::c435_state_set_interrupt() // 4.f.0001 -{ - if(m_c435_buffer[0] != 0x4f02) { - logerror("WARNING: c435_state_set_interrupt with size %d\n", m_c435_buffer[0] & 0xff); - return; - } - if(m_c435_buffer[2] & 1) - update_main_interrupts(m_main_irqcause | MAIN_C435_IRQ); - else - update_main_interrupts(m_main_irqcause & ~MAIN_C435_IRQ); -} - void namcos23_state::c435_state_set() // 4.f { if((m_c435_buffer[0] & 0xff) == 0) { - logerror("WARNING: c435_state_set with size %d\n", m_c435_buffer[0] & 0xff); + logerror("WARNING: c435_state_set with zero size\n"); return; } - switch(m_c435_buffer[1]) { - case 0x0001: c435_state_set_interrupt(); break; - default: - logerror("WARNING: c435_state_set(%04x, ...)\n", m_c435_buffer[1]); - break; + int size = c435_get_state_entry_size(m_c435_buffer[1]); + if(size != (m_c435_buffer[0] & 0xff)-1) + { + logerror("WARNING: c435_state_set size disagreement (type=%04x, got %d, expected %d)\n", m_c435_buffer[1], (m_c435_buffer[0] & 0xff)-1, size); + return; } + + c435_state_set(m_c435_buffer[1], m_c435_buffer+2); } void namcos23_state::c435_render() // 8 { if((m_c435_buffer[0] & 0xf) != 3) { - logerror("WARNING: c435_render with size %d, header %04x", m_c435_buffer[0] & 0xf, m_c435_buffer[0]); + logerror("WARNING: c435_render with size %d, header %04x\n", m_c435_buffer[0] & 0xf, m_c435_buffer[0]); return; } @@ -1768,13 +1897,16 @@ void namcos23_state::c435_render() // 8 re->model.scaling = use_scaling ? m_scaling / 16384.0 : 1.0; memcpy(re->model.m, m, sizeof(re->model.m)); memcpy(re->model.v, v, sizeof(re->model.v)); + // re->model.v[2] *= 768/420.0; + if(0) - fprintf(stderr, "Render %04x (%f %f %f %f %f %f %f %f %f) (%f %f %f)\n", + logerror("Render %04x (%f %f %f %f %f %f %f %f %f) (%f %f %f) %f\n", re->model.model, re->model.m[0]/16384.0, re->model.m[1]/16384.0, re->model.m[2]/16384.0, re->model.m[3]/16384.0, re->model.m[4]/16384.0, re->model.m[5]/16384.0, re->model.m[6]/16384.0, re->model.m[7]/16384.0, re->model.m[8]/16384.0, - re->model.v[0]/16384.0, re->model.v[1]/16384.0, re->model.v[2]/16384.0); + re->model.v[0]/16384.0, re->model.v[1]/16384.0, re->model.v[2]/16384.0, + re->model.scaling); render.count[render.cur]++; } @@ -1830,10 +1962,13 @@ void namcos23_state::c435_pio_w(UINT16 data) } if(!known) { - logerror("c435 -"); + char buf[4096]; + char *p = buf; + p += sprintf(p, "c435 -"); for(int i=0; i<m_c435_buffer_pos; i++) - logerror(" %04x", m_c435_buffer[i]); - logerror("\n"); + p += sprintf(p, " %04x", m_c435_buffer[i]); + p += sprintf(p, "\n"); + logerror(buf); } m_c435_buffer_pos = 0; @@ -1930,8 +2065,14 @@ void namcos23_state::render_project(poly_vertex &pv) // 640/(3.125/3.75) = 768 // 480/(2.34375/3.75) = 768 - pv.x = 320 + 768 * pv.x; - pv.y = 240 - 768 * pv.y; +#if 1 + pv.x = 320 + 768*pv.x; + pv.y = 240 - 768*pv.y; +#else + pv.x = 320 + 410*pv.x; + pv.y = 240 - 410*pv.y; +#endif + pv.p[0] = 1.0f / pv.p[0]; } @@ -1957,6 +2098,14 @@ static UINT32 render_texture_lookup_nocache_point(running_machine &machine, cons void namcos23_state::render_one_model(const namcos23_render_entry *re) { render_t &render = m_render; + if(re->model.model < 0x80) { + logerror("WARNING: model %02x requested\n", re->model.model); + return; + } + + if(re->model.model == 3486) + return; + UINT32 adr = m_ptrom[re->model.model]; if(adr >= m_ptrom_limit) { logerror("WARNING: model %04x base address %08x out-of-bounds - pointram?\n", re->model.model, adr); @@ -2761,6 +2910,8 @@ static ADDRESS_MAP_START( s23_map, AS_PROGRAM, 32, namcos23_state ) AM_RANGE(0x0a000000, 0x0affffff) AM_ROM AM_REGION("data", 0x1000000) AM_MIRROR(0x1000000) AM_RANGE(0x0c000000, 0x0c00001f) AM_READWRITE16(c412_r, c412_w, 0xffffffff) AM_RANGE(0x0c400000, 0x0c400007) AM_READWRITE16(c421_r, c421_w, 0xffffffff) + AM_RANGE(0x0c800010, 0x0c800013) AM_WRITE16(c435_state_reset_w, 0xffff0000) + AM_RANGE(0x0c800014, 0x0c800017) AM_WRITE16(c435_state_pio_w, 0x0000ffff) AM_RANGE(0x0d000000, 0x0d00000f) AM_READWRITE16(ctl_r, ctl_w, 0xffffffff) AM_RANGE(0x0e800000, 0x0e800003) AM_READWRITE16(sub_comm_r, sub_comm_w, 0xffffffff) // not sure AM_RANGE(0x0fc00000, 0x0fffffff) AM_WRITENOP AM_ROM AM_REGION("user1", 0) @@ -2904,7 +3055,7 @@ READ16_MEMBER(namcos23_state::mcu_pb_r) WRITE16_MEMBER(namcos23_state::mcu_pb_w) { - m_sub_portb = (m_sub_portb & 0x80) | (data & 0x7f); + m_sub_portb = (m_sub_portb & 0xc0) | (data & 0x3f); m_rtc->ce_w((m_sub_portb & 0x20) && (m_sub_porta & 1)); m_settings->ce_w((m_sub_portb & 0x20) && !(m_sub_porta & 1)); } diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index dec0205d9b5..460a48bcf72 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1580,14 +1580,6 @@ Sushi Bar #include "includes/naomi.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - #define CPU_CLOCK (200000000) READ64_MEMBER(naomi_state::naomi_arm_r ) @@ -9437,7 +9429,3 @@ GAME( 2006, mslug6, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega GAME( 2006, xtrmhnt2, awbios, aw2c, aw2c, naomi_state, xtrmhnt2, ROT0, "Sega", "Extreme Hunting 2", GAME_FLAGS ) GAME( 2008, claychal, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega", "Sega Clay Challenge", GAME_FLAGS ) GAME( 2009, basschal, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega", "Sega Bass Fishing Challenge", GAME_FLAGS ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp index 16375d94db5..4334c82cc0d 100644 --- a/src/mame/drivers/pse.cpp +++ b/src/mame/drivers/pse.cpp @@ -7,18 +7,18 @@ Game Name DATA ------------------------------------- 1-2-4 Cocktail Table (197?) UNKNOWN - Bazooka (1977) YES - Desert Patrol (1977) YES - Espana (cabinet) (197?) NO - Frenzy (1975) UNKNOWN - Game Tree (1978) YES - Hodge Podge (197?) UNKNOWN - Knights in Armor (1976) YES - Maneater (1975) YES + Bazooka (1976/11) YES + Desert Patrol (1977/11) YES + Espana (cabinet) (1975/10) NO + Frenzy (1975/08) UNKNOWN + Game Tree (1978/02) YES + Hodge Podge (1975?) NO + Knights in Armor (1976/06) YES + Maneater (1975/11) YES Play Five (1975?) UNKNOWN - Scandia (cabinet) (1975) NO + Scandia (cabinet) (1975/08) NO Two Game (1974) UNKNOWN - U.N. Command (1977) UNKNOWN + U.N. Command (1977) YES? ***************************************************************************/ @@ -79,8 +79,8 @@ static NETLIST_START(pse) // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, psettl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") + // NETDEV_ANALOG_CALLBACK(sound_cb, sound, psettl_state, sound_cb, "") + // NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -120,6 +120,29 @@ MACHINE_CONFIG_END ***************************************************************************/ +ROM_START( bazooka ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 ) + ROM_LOAD( "bd2.k1", 0x0000, 0x0200, CRC(c9e9ed15) SHA1(624bbc10942a386040aef161b96d64021a842c9f) ) // 6341-1 - gfx: tank, truck, jeep motorcycle + ROM_LOAD( "bd2.k4", 0x0200, 0x0200, CRC(c5a74df9) SHA1(2846a039e9bf372f3aa0b88ed89f9029eb7f797c) ) // 6341-1 - gfx: ambulance, stretcher, explosion + ROM_LOAD( "bd1.d2", 0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) // 6341-1 or 82s115 + ROM_LOAD( "bd1.e2", 0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) // 6341-1 or 82s115 + ROM_LOAD( "bd2.e6", 0x0800, 0x0020, CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // 82123 + ROM_LOAD( "bd2.e7", 0x0820, 0x0020, CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // 82123 +ROM_END + +ROM_START( bazookabr ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 ) + ROM_LOAD( "1", 0x0000, 0x0200, CRC(edc34cb0) SHA1(f76a81833b015784e55b33189e9058cd24922f9b) ) + ROM_LOAD( "2", 0x0200, 0x0200, CRC(3e78e4c2) SHA1(814509eb773bfa87f1df933214f079e7dd2a8fa2) ) + ROM_LOAD( "3", 0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) + ROM_LOAD( "4", 0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) + ROM_LOAD( "bd2.e6", 0x0800, 0x0020, BAD_DUMP CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // not dumped, taken from PSE set + ROM_LOAD( "bd2.e7", 0x0820, 0x0020, BAD_DUMP CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // not dumped, taken from PSE set +ROM_END ROM_START( dpatrol ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) @@ -168,7 +191,8 @@ ROM_START( gametree ) ROM_END */ - -GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON ) -//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON ) -//GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON ) +GAME( 1976, bazooka, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON ) +GAME( 1977, bazookabr, bazooka, pse, 0, driver_device, 0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON ) +GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON ) +//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON ) +//GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index d00b3fc596b..adcc50dd6c0 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -1242,7 +1242,6 @@ ROM_START( samuraia ) ROM_END ROM_START( sngkace ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* Main CPU Code */ ROM_LOAD32_WORD_SWAP( "1-u127.bin", 0x000000, 0x040000, CRC(6c45b2f8) SHA1(08473297e174f3a6d67043f3b16f4e6b9c68b826) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2-u126.bin", 0x000002, 0x040000, CRC(845a6760) SHA1(3b8fed294e28d9d8ef5cb5ec88b9ade396146a48) ) // 3&2 @@ -1262,7 +1261,29 @@ ROM_START( sngkace ) ROM_REGION( 0x040000, "spritelut", 0 ) /* Sprites LUT */ ROM_LOAD( "u11.bin", 0x000000, 0x040000, CRC(11a04d91) SHA1(5d146a9a39a70f2ee212ceab9a5469598432449e) ) // x1xxxxxxxxxxxxxxxx = 0xFF +ROM_END + + +ROM_START( sngkacea ) // the roms have a very visible "." symbol after the number, it might indicate a newer revision. + ROM_REGION( 0x100000, "maincpu", 0 ) /* Main CPU Code */ + ROM_LOAD32_WORD_SWAP( "1.-u127.bin", 0x000000, 0x040000, CRC(3a43708d) SHA1(f38d22304f8957c6d81c8946a8a03676965d4dd4) ) // 1&0 + ROM_LOAD32_WORD_SWAP( "2.-u126.bin", 0x000002, 0x040000, CRC(7aa50c46) SHA1(bad250f64c6d796a61be5e2eb71e2f5774f4278e) ) // 3&2 + + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_LOAD( "3-u58.bin", 0x00000, 0x20000, CRC(310f5c76) SHA1(dbfd1c5a7a514bccd89fc4f7191744cf76bb745d) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(00a546cb) SHA1(30a8679b49928d5fcbe58b5eecc2ebd08173adf8) ) + + ROM_REGION( 0x200000, "gfx2", 0 ) /* Layers 0 + 1 */ + ROM_LOAD( "u34.bin", 0x000000, 0x100000, CRC(e6a75bd8) SHA1(1aa84ea54584b6c8b2846194b48bf6d2afa67fee) ) + ROM_LOAD( "u35.bin", 0x100000, 0x100000, CRC(c4ca0164) SHA1(c75422de2e0127cdc23d8c223b674a5bd85b00fb) ) + ROM_REGION( 0x100000, "ymsnd", 0 ) /* Samples */ + ROM_LOAD( "u68.bin", 0x000000, 0x100000, CRC(9a7f6c34) SHA1(c549b209bce1d2c6eeb512db198ad20c3f5fb0ea) ) + + ROM_REGION( 0x040000, "spritelut", 0 ) /* Sprites LUT */ + ROM_LOAD( "u11.bin", 0x000000, 0x040000, CRC(11a04d91) SHA1(5d146a9a39a70f2ee212ceab9a5469598432449e) ) // x1xxxxxxxxxxxxxxxx = 0xFF ROM_END @@ -1992,8 +2013,9 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945bl) ***************************************************************************/ -GAME( 1993, samuraia, 0, sngkace, samuraia, psikyo_state, sngkace, ROT270, "Psikyo", "Samurai Aces (World)", MACHINE_SUPPORTS_SAVE ) // Banpresto? -GAME( 1993, sngkace, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan)", MACHINE_SUPPORTS_SAVE ) // Banpresto? +GAME( 1993, samuraia, 0, sngkace, samuraia, psikyo_state, sngkace, ROT270, "Psikyo", "Samurai Aces (World)", MACHINE_SUPPORTS_SAVE ) // Banpresto? +GAME( 1993, sngkace, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) // Banpresto? +GAME( 1993, sngkacea, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 2)", MACHINE_SUPPORTS_SAVE ) // Banpresto? GAME( 1994, gunbird, 0, gunbird, gunbird, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (World)", MACHINE_SUPPORTS_SAVE ) GAME( 1994, gunbirdk, gunbird, gunbird, gunbirdj, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (Korea)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index ef28a63b065..94893d71975 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -703,14 +703,17 @@ static INPUT_PORTS_START( mjgtaste ) PORT_START("INPUTS") PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_COIN2 ) - + PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x00000020, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x00000040, 0x00000040, "Tilt (Enables Debug Mode)" ) /* Debug stuff. Resets EEPROM? */ PORT_DIPSETTING( 0x00000040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) - + PORT_BIT( 0x00ffff80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) /* start for joystick */ + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index fb61ade9b78..ba08627823d 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -571,18 +571,19 @@ MACHINE_CONFIG_END /* Rom Defs. */ +// one of the high score tables in attract mode ends up corrupt on this set due to the game triggering a text dialog box, is this due to a timing error? ROM_START( shadfrce ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "32a12-01.34", 0x00001, 0x40000, CRC(04501198) SHA1(50f981c13f9ed19d681d494376018ba86464ea13) ) /* US Version 2 */ - ROM_LOAD16_BYTE( "32a13-01.26", 0x00000, 0x40000, CRC(b8f8a05c) SHA1(bd9d4218a7cf57b56aec1f7e710e02af8471f9d7) ) - ROM_LOAD16_BYTE( "32a14-0.33", 0x80001, 0x40000, CRC(08279be9) SHA1(1833526b23feddb58b21874070ad2bf3b6be8dca) ) - ROM_LOAD16_BYTE( "32a15-0.14", 0x80000, 0x40000, CRC(bfcadfea) SHA1(1caa9fc30d8622ce4c7221039c446e99cc8f5346) ) + ROM_LOAD16_BYTE( "32a12-011.34", 0x00001, 0x40000, CRC(0c041e08) SHA1(7b9d52cb1f6bc217c6e64287bd9630aa37243513) ) /* World Version 3 */ + ROM_LOAD16_BYTE( "32a13-010.26", 0x00000, 0x40000, CRC(00985361) SHA1(e9da1b096b25a6ee46bab6230dda66dccdd4bed8) ) + ROM_LOAD16_BYTE( "32a14-010.33", 0x80001, 0x40000, CRC(ea03ca25) SHA1(7af1ee7c36c70f80ba1e096473b5786b205ab00b) ) + ROM_LOAD16_BYTE( "32j15-01.14", 0x80000, 0x40000, CRC(3dc3a84a) SHA1(166ad91b93192d94e3f6d2fe6dde02f59d334f75) ) // matches Japan version 2, not US version 2 ROM_REGION( 0x10000, "audiocpu", 0 ) /* Z80 Code */ ROM_LOAD( "32j10-0.42", 0x00000, 0x10000, CRC(65daf475) SHA1(7144332b2d17af8645e22e1926b33113db0d20e2) ) ROM_REGION( 0x020000, "chars", 0 ) /* Chars */ - ROM_LOAD( "32a11-0.55", 0x00000, 0x20000, CRC(cfaf5e77) SHA1(eab76e085f695c74cc868aaf95f04ff2acf66ee9) ) + ROM_LOAD( "32j11-0.55", 0x00000, 0x20000, CRC(7252d993) SHA1(43f7de381841039aa290486aafb98e2cf3b8579b) ) ROM_REGION( 0xa00000, "sprites", 0 ) /* Sprite Tiles */ ROM_LOAD( "32j4-0.12", 0x000000, 0x200000, CRC(1ebea5b6) SHA1(35bd49dda9ad75326d45ffb10c87d83fc4f1b7a8) ) @@ -600,18 +601,18 @@ ROM_START( shadfrce ) ROM_LOAD( "32j9-0.76", 0x000000, 0x080000, CRC(16001e81) SHA1(67928d2024f963aee91f1498b6f4c76101d2f3b8) ) ROM_END -ROM_START( shadfrcej ) +ROM_START( shadfrceu ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "32a12-011.34", 0x00001, 0x40000, CRC(0c041e08) SHA1(7b9d52cb1f6bc217c6e64287bd9630aa37243513) ) /* Japan Version 3 */ - ROM_LOAD16_BYTE( "32a13-010.26", 0x00000, 0x40000, CRC(00985361) SHA1(e9da1b096b25a6ee46bab6230dda66dccdd4bed8) ) - ROM_LOAD16_BYTE( "32a14-010.33", 0x80001, 0x40000, CRC(ea03ca25) SHA1(7af1ee7c36c70f80ba1e096473b5786b205ab00b) ) - ROM_LOAD16_BYTE( "32j15-01.14", 0x80000, 0x40000, CRC(3dc3a84a) SHA1(166ad91b93192d94e3f6d2fe6dde02f59d334f75) ) + ROM_LOAD16_BYTE( "32a12-01.34", 0x00001, 0x40000, CRC(04501198) SHA1(50f981c13f9ed19d681d494376018ba86464ea13) ) /* US Version 2 */ + ROM_LOAD16_BYTE( "32a13-01.26", 0x00000, 0x40000, CRC(b8f8a05c) SHA1(bd9d4218a7cf57b56aec1f7e710e02af8471f9d7) ) + ROM_LOAD16_BYTE( "32a14-0.33", 0x80001, 0x40000, CRC(08279be9) SHA1(1833526b23feddb58b21874070ad2bf3b6be8dca) ) + ROM_LOAD16_BYTE( "32a15-0.14", 0x80000, 0x40000, CRC(bfcadfea) SHA1(1caa9fc30d8622ce4c7221039c446e99cc8f5346) ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* Z80 Code */ ROM_LOAD( "32j10-0.42", 0x00000, 0x10000, CRC(65daf475) SHA1(7144332b2d17af8645e22e1926b33113db0d20e2) ) ROM_REGION( 0x020000, "chars", 0 ) /* Chars */ - ROM_LOAD( "32j11-0.55", 0x00000, 0x20000, CRC(7252d993) SHA1(43f7de381841039aa290486aafb98e2cf3b8579b) ) + ROM_LOAD( "32a11-0.55", 0x00000, 0x20000, CRC(cfaf5e77) SHA1(eab76e085f695c74cc868aaf95f04ff2acf66ee9) ) ROM_REGION( 0xa00000, "sprites", 0 ) /* Sprite Tiles */ ROM_LOAD( "32j4-0.12", 0x000000, 0x200000, CRC(1ebea5b6) SHA1(35bd49dda9ad75326d45ffb10c87d83fc4f1b7a8) ) @@ -629,7 +630,7 @@ ROM_START( shadfrcej ) ROM_LOAD( "32j9-0.76", 0x000000, 0x080000, CRC(16001e81) SHA1(67928d2024f963aee91f1498b6f4c76101d2f3b8) ) ROM_END -ROM_START( shadfrcejv2 ) +ROM_START( shadfrcej ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "32j12-01.34", 0x00001, 0x40000, CRC(38fdbe1d) SHA1(476d8ef2c0d2a8c568ce44631f93f8c730f91b08) ) /* Japan Version 2 */ ROM_LOAD16_BYTE( "32j13-01.26", 0x00000, 0x40000, CRC(6e1df6f1) SHA1(c165553fe967b437413dd7ddc87a267548dd0ca9) ) @@ -659,6 +660,6 @@ ROM_START( shadfrcejv2 ) ROM_END -GAME( 1993, shadfrce, 0, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (US Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) -GAME( 1993, shadfrcej, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (Japan Version 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) -GAME( 1993, shadfrcejv2, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (Japan Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) +GAME( 1993, shadfrce, 0, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (World, Version 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) +GAME( 1993, shadfrceu, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (US, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) +GAME( 1993, shadfrcej, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (Japan, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index db4d1842cc3..da054feb016 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -11,13 +11,6 @@ #include "cpu/ssem/ssem.h" #include "imagedev/snapquik.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - class ssem_state : public driver_device { public: @@ -649,7 +642,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ COMP(1948, ssem, 0, 0, ssem, ssem, driver_device, 0, "Manchester University", "Small-Scale Experimental Machine (SSEM), 'Baby'", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp index c7622bf62c5..609c24ea32f 100644 --- a/src/mame/drivers/taitottl.cpp +++ b/src/mame/drivers/taitottl.cpp @@ -195,33 +195,6 @@ ROM_START( gunman ) ROM_LOAD( "gn01.b9", 0x0000, 0x0800, CRC(69474a3a) SHA1(7396f1be991a0e6207eaa79e0206a5286a8d615d) ) ROM_END - -ROM_START( bazooka ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 ) - ROM_LOAD( "bd2.k1", 0x0000, 0x0200, CRC(c9e9ed15) SHA1(624bbc10942a386040aef161b96d64021a842c9f) ) // 6341-1 - gfx: tank, truck, jeep motorcycle - ROM_LOAD( "bd2.k4", 0x0200, 0x0200, CRC(c5a74df9) SHA1(2846a039e9bf372f3aa0b88ed89f9029eb7f797c) ) // 6341-1 - gfx: ambulance, stretcher, explosion - ROM_LOAD( "bd1.d2", 0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) // 6341-1 or 82s115 - ROM_LOAD( "bd1.e2", 0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) // 6341-1 or 82s115 - ROM_LOAD( "bd2.e6", 0x0800, 0x0020, CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // 82123 - ROM_LOAD( "bd2.e7", 0x0820, 0x0020, CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // 82123 -ROM_END - - -ROM_START( bazookabr ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 ) - ROM_LOAD( "1", 0x0000, 0x0200, CRC(edc34cb0) SHA1(f76a81833b015784e55b33189e9058cd24922f9b) ) - ROM_LOAD( "2", 0x0200, 0x0200, CRC(3e78e4c2) SHA1(814509eb773bfa87f1df933214f079e7dd2a8fa2) ) - ROM_LOAD( "3", 0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) - ROM_LOAD( "4", 0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) - ROM_LOAD( "bd2.e6", 0x0800, 0x0020, BAD_DUMP CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // not dumped, taken from PSE set - ROM_LOAD( "bd2.e7", 0x0820, 0x0020, BAD_DUMP CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // not dumped, taken from PSE set -ROM_END - - /* Missile-X @@ -279,8 +252,6 @@ ROM_END GAME( 1977, gunman, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Gunman [TTL]", MACHINE_IS_SKELETON ) -GAME( 1977, bazooka, 0, taitottl, 0, driver_device, 0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON ) // clone of Taito Cross Fire - or is Cross Fire a clone of PSE Bazooka? -GAME( 1977, bazookabr, bazooka, taitottl, 0, driver_device, 0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, missilex, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Missile-X [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, ttblock, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "T.T. Block [TTL]", MACHINE_IS_SKELETON ) GAME( 1979, zzblock, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Zun Zun Block [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 30e74caa743..619b7dc36d0 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -31,6 +31,7 @@ #include "bus/cpc/hd20.h" #include "bus/cpc/magicsound.h" #include "bus/cpc/doubler.h" +#include "bus/cpc/transtape.h" #include "machine/ram.h" #include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" diff --git a/src/mame/includes/chihiro.h b/src/mame/includes/chihiro.h index 8c27277fe47..c91a9a23fdb 100644 --- a/src/mame/includes/chihiro.h +++ b/src/mame/includes/chihiro.h @@ -232,11 +232,10 @@ public: depthbuffer = NULL; displayedtarget = NULL; puller_channel = 0; - puller_subchannel = 0; puller_waiting = 0; debug_grab_texttype = -1; debug_grab_textfile = NULL; - waitvblank_used = 0; + waitvblank_used = 1; memset(vertex_attribute_words, 0, sizeof(vertex_attribute_words)); memset(vertex_attribute_offset, 0, sizeof(vertex_attribute_offset)); } @@ -254,9 +253,10 @@ public: int geforce_commandkind(UINT32 word); UINT32 geforce_object_offset(UINT32 handle); void geforce_read_dma_object(UINT32 handle, UINT32 &offset, UINT32 &size); + void geforce_assign_object(address_space &space, UINT32 chanel, UINT32 subchannel, UINT32 address); int geforce_exec_method(address_space &space, UINT32 channel, UINT32 subchannel, UINT32 method, UINT32 address, int &countlen); UINT32 texture_get_texel(int number, int x, int y); - UINT8 *read_pixel(int x, int y, UINT32 c[4]); + UINT8 *read_pixel(int x, int y, INT32 c[4]); void write_pixel(int x, int y, UINT32 color, UINT32 depth); void combiner_initialize_registers(UINT32 argb8[6]); void combiner_initialize_stage(int stage_number); @@ -496,7 +496,6 @@ public: int vertex_attribute_offset[16]; emu_timer *puller_timer; int puller_channel; - int puller_subchannel; int puller_waiting; address_space *puller_space; UINT32 dilated0[16][2048]; @@ -660,15 +659,16 @@ public: NV2A_RT_DEPTH_FORMAT_Z16 = 0x0001, NV2A_RT_DEPTH_FORMAT_Z24S8 = 0x0002 }; - enum NV2A_COLOR_FORMAT { - NV2A_COLOR_FORMAT_X1R5G6B5 = 0x0002, - NV2A_COLOR_FORMAT_R5G6B5 = 0x0003, - NV2A_COLOR_FORMAT_UNKNOWN4 = 0x0004, - NV2A_COLOR_FORMAT_X8R8G8B8 = 0x0005, - NV2A_COLOR_FORMAT_X1A7R8G8B8 = 0x0007, - NV2A_COLOR_FORMAT_A8R8G8B8 = 0x0008, - NV2A_COLOR_FORMAT_B8 = 0x0009, - NV2A_COLOR_FORMAT_G8B8 = 0x000a + NV2A_COLOR_FORMAT_X1R5G5B5_Z1R5G5B5 = 1, + NV2A_COLOR_FORMAT_X1R5G5B5_X1R5G5B5 = 2, + NV2A_COLOR_FORMAT_R5G6B5 = 3, + NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8 = 4, + NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8 = 5, + NV2A_COLOR_FORMAT_X1A7R8G8B8_Z1A7R8G8B8 = 6, + NV2A_COLOR_FORMAT_X1A7R8G8B8_X1A7R8G8B8 = 7, + NV2A_COLOR_FORMAT_A8R8G8B8 = 8, + NV2A_COLOR_FORMAT_B8 = 9, + NV2A_COLOR_FORMAT_G8B8 = 10 }; }; diff --git a/src/mame/includes/fidelz80.h b/src/mame/includes/fidelz80.h index 64f47809e4c..7af877b275c 100644 --- a/src/mame/includes/fidelz80.h +++ b/src/mame/includes/fidelz80.h @@ -2,7 +2,7 @@ // copyright-holders:Kevin Horton,Jonathan Gevaryahu,Sandro Ronco /*************************************************************************** - fidelz80.h + Fidelity Electronics Z80 based board driver ****************************************************************************/ @@ -19,12 +19,12 @@ class fidelz80_state : public driver_device public: fidelz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_speech(*this, "speech"), - m_beep(*this, "beeper"), - m_i8041(*this, "mcu"), - m_i8243(*this, "i8243") - { } + m_maincpu(*this, "maincpu"), + m_speech(*this, "speech"), + m_beep(*this, "beeper"), + m_i8041(*this, "mcu"), + m_i8243(*this, "i8243") + { } required_device<cpu_device> m_maincpu; optional_device<s14001a_device> m_speech; @@ -32,25 +32,23 @@ public: optional_device<i8041_device> m_i8041; optional_device<i8243_device> m_i8243; - UINT16 m_kp_matrix; // keypad/leds matrix - UINT8 m_led_data; // data for the two individual leds, in 0bxxxx12xx format - UINT8 m_led_selected; // 5 bit selects for 7 seg leds and for common other leds, bits are (7seg leds are 0 1 2 3, common other leds are C) 0bxx3210xc - UINT16 m_digit_data; // data for seg leds + UINT16 m_kp_matrix; // keypad/leds matrix + UINT8 m_led_data; // data for the two individual leds, in 0bxxxx12xx format + UINT8 m_led_selected; // 5 bit selects for 7 seg leds and for common other leds, bits are (7seg leds are 0 1 2 3, common other leds are C) 0bxx3210xc + UINT16 m_digit_data; // data for seg leds UINT8 m_digit_line_status[4]; // prevent overwrite of m_digit_data - virtual void machine_reset(); - //model VCC/UVC void update_display(); - DECLARE_READ8_MEMBER( fidelz80_portc_r ); - DECLARE_WRITE8_MEMBER( fidelz80_portb_w ); - DECLARE_WRITE8_MEMBER( fidelz80_portc_w ); - DECLARE_WRITE8_MEMBER( cc10_porta_w ); - DECLARE_READ8_MEMBER( vcc_portb_r ); - DECLARE_WRITE8_MEMBER( vcc_porta_w ); + DECLARE_READ8_MEMBER(fidelz80_portc_r); + DECLARE_WRITE8_MEMBER(fidelz80_portb_w); + DECLARE_WRITE8_MEMBER(fidelz80_portc_w); + DECLARE_WRITE8_MEMBER(cc10_porta_w); + DECLARE_READ8_MEMBER(vcc_portb_r); + DECLARE_WRITE8_MEMBER(vcc_porta_w); //model 7014 and VBC - DECLARE_WRITE8_MEMBER(bridgec_speech_w ); + DECLARE_WRITE8_MEMBER(bridgec_speech_w); DECLARE_WRITE8_MEMBER(kp_matrix_w); DECLARE_READ8_MEMBER(unknown_r); DECLARE_READ8_MEMBER(unknown2_r); @@ -73,6 +71,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer); DECLARE_WRITE8_MEMBER(digit_w); + + virtual void machine_start(); }; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 652979dd13d..33dcff4409f 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -83,5 +83,5 @@ public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof(screen_device &screen, bool state); - void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offset ); + void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); }; diff --git a/src/mame/layout/cmpacman.lay b/src/mame/layout/cmpacman.lay index 7f7513bbc7c..01b1e240b0d 100644 --- a/src/mame/layout/cmpacman.lay +++ b/src/mame/layout/cmpacman.lay @@ -47,7 +47,7 @@ <color red="1.0" green="0.5" blue="0.0" /> </rect> <rect state="0"> - <color red="0.15" green="0.075" blue="0.0" /> + <color red="0.5" green="0.25" blue="0.0" /> </rect> <text string="TAKE"> <color red="0.0" green="0.0" blue="0.0" /> @@ -134,7 +134,7 @@ <color red="0.7" green="0.35" blue="0.0" /> </rect> <rect state="0"> - <color red="0.1" green="0.05" blue="0.0" /> + <color red="0.4" green="0.2" blue="0.0" /> </rect> </element> diff --git a/src/mame/machine/c65_old.cpp b/src/mame/machine/c65_old.cpp deleted file mode 100644 index 3a582cfb0ae..00000000000 --- a/src/mame/machine/c65_old.cpp +++ /dev/null @@ -1,1339 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Peter Trauner -/*************************************************************************** - commodore c65 home computer - peter.trauner@jk.uni-linz.ac.at - documention - www.funet.fi - ***************************************************************************/ - -#include "emu.h" - -#include "includes/c65.h" -#include "cpu/m6502/m4510.h" -#include "sound/mos6581.h" -#include "machine/mos6526.h" -#include "bus/cbmiec/cbmiec.h" -#include "machine/ram.h" -#include "video/vic4567.h" -#include "imagedev/cassette.h" -#include "crsshair.h" -#include "formats/cbm_tap.h" - -#define VERBOSE_LEVEL 0 -#define DBG_LOG( MACHINE, N, M, A ) \ - do { \ - if(VERBOSE_LEVEL >= N) \ - { \ - if( M ) \ - logerror("%11.6f: %-24s", MACHINE.time().as_double(), (char*) M ); \ - logerror A; \ - } \ - } while (0) - - - -/*********************************************** - - Input Reading - Common Components - -***********************************************/ - -/* These are needed by c64, c65 and c128, each machine has also additional specific -components in its INTERRUPT_GEN */ - -/* keyboard lines */ -UINT8 c64_keyline[10]; - -void cbm_common_init(void) -{ - int i; - - for (i = 0; i < ARRAY_LENGTH(c64_keyline); i++) - c64_keyline[i] = 0xff; -} - -static TIMER_CALLBACK( lightpen_tick ) -{ - if (((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x04) || ((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x06)) - { - /* enable lightpen crosshair */ - crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_ALL); - } - else - { - /* disable lightpen crosshair */ - crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_NONE); - } -} - -void cbm_common_interrupt( device_t *device ) -{ - int value, i; - int controller1 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x07; - int controller2 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x70; - static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" }; - - /* Lines 0-7 : common keyboard */ - for (i = 0; i < 8; i++) - { - value = 0xff; - value &= ~device->machine().root_device().ioport(c64ports[i])->read(); - - /* Shift Lock is mapped on Left Shift */ - if ((i == 1) && (device->machine().root_device().ioport("SPECIAL")->read() & 0x40)) - value &= ~0x80; - - c64_keyline[i] = value; - } - - - value = 0xff; - switch(controller1) - { - case 0x00: - value &= ~device->machine().root_device().ioport("JOY1_1B")->read(); /* Joy1 Directions + Button 1 */ - break; - - case 0x01: - if (device->machine().root_device().ioport("OTHER")->read() & 0x40) /* Paddle2 Button */ - value &= ~0x08; - if (device->machine().root_device().ioport("OTHER")->read() & 0x80) /* Paddle1 Button */ - value &= ~0x04; - break; - - case 0x02: - if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */ - value &= ~0x10; - if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */ - value &= ~0x01; - break; - - case 0x03: - value &= ~(device->machine().root_device().ioport("JOY1_2B")->read() & 0x1f); /* Joy1 Directions + Button 1 */ - break; - - case 0x04: -/* was there any input on the lightpen? where is it mapped? */ -// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */ -// value &= ?? ; - break; - - case 0x07: - break; - - default: - logerror("Invalid Controller 1 Setting %d\n", controller1); - break; - } - - c64_keyline[8] = value; - - - value = 0xff; - switch(controller2) - { - case 0x00: - value &= ~device->machine().root_device().ioport("JOY2_1B")->read(); /* Joy2 Directions + Button 1 */ - break; - - case 0x10: - if (device->machine().root_device().ioport("OTHER")->read() & 0x10) /* Paddle4 Button */ - value &= ~0x08; - if (device->machine().root_device().ioport("OTHER")->read() & 0x20) /* Paddle3 Button */ - value &= ~0x04; - break; - - case 0x20: - if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */ - value &= ~0x10; - if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */ - value &= ~0x01; - break; - - case 0x30: - value &= ~(device->machine().root_device().ioport("JOY2_2B")->read() & 0x1f); /* Joy2 Directions + Button 1 */ - break; - - case 0x40: -/* was there any input on the lightpen? where is it mapped? */ -// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */ -// value &= ?? ; - break; - - case 0x70: - break; - - default: - logerror("Invalid Controller 2 Setting %d\n", controller2); - break; - } - - c64_keyline[9] = value; - -// vic2_frame_interrupt does nothing so this is not necessary -// vic2_frame_interrupt (device); - - /* check if lightpen has been chosen as input: if so, enable crosshair */ - device->machine().scheduler().timer_set(attotime::zero, FUNC(lightpen_tick)); - - set_led_status (device->machine(), 1, device->machine().root_device().ioport("SPECIAL")->read() & 0x40 ? 1 : 0); /* Shift Lock */ - set_led_status (device->machine(), 0, device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ? 1 : 0); /* Joystick Swap */ -} - - -/*********************************************** - - CIA Common Handlers - -***********************************************/ - -/* These are shared by c64, c65 and c128. c65 and c128 also have additional specific -components (to select/read additional keyboard lines) */ - -/* - * CIA 0 - Port A - * bits 7-0 keyboard line select - * bits 7,6: paddle select( 01 port a, 10 port b) - * bit 4: joystick a fire button - * bits 3,2: Paddles port a fire button - * bits 3-0: joystick a direction - * - * CIA 0 - Port B - * bits 7-0: keyboard raw values - * bit 4: joystick b fire button, lightpen select - * bits 3,2: paddle b fire buttons (left,right) - * bits 3-0: joystick b direction - * - * flag cassette read input, serial request in - * irq to irq connected - */ - -UINT8 cbm_common_cia0_port_a_r( device_t *device, UINT8 output_b ) -{ - UINT8 value = 0xff; - - if (!(output_b & 0x80)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x80)) t &= ~0x80; - if (!(c64_keyline[6] & 0x80)) t &= ~0x40; - if (!(c64_keyline[5] & 0x80)) t &= ~0x20; - if (!(c64_keyline[4] & 0x80)) t &= ~0x10; - if (!(c64_keyline[3] & 0x80)) t &= ~0x08; - if (!(c64_keyline[2] & 0x80)) t &= ~0x04; - if (!(c64_keyline[1] & 0x80)) t &= ~0x02; - if (!(c64_keyline[0] & 0x80)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x40)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x40)) t &= ~0x80; - if (!(c64_keyline[6] & 0x40)) t &= ~0x40; - if (!(c64_keyline[5] & 0x40)) t &= ~0x20; - if (!(c64_keyline[4] & 0x40)) t &= ~0x10; - if (!(c64_keyline[3] & 0x40)) t &= ~0x08; - if (!(c64_keyline[2] & 0x40)) t &= ~0x04; - if (!(c64_keyline[1] & 0x40)) t &= ~0x02; - if (!(c64_keyline[0] & 0x40)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x20)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x20)) t &= ~0x80; - if (!(c64_keyline[6] & 0x20)) t &= ~0x40; - if (!(c64_keyline[5] & 0x20)) t &= ~0x20; - if (!(c64_keyline[4] & 0x20)) t &= ~0x10; - if (!(c64_keyline[3] & 0x20)) t &= ~0x08; - if (!(c64_keyline[2] & 0x20)) t &= ~0x04; - if (!(c64_keyline[1] & 0x20)) t &= ~0x02; - if (!(c64_keyline[0] & 0x20)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x10)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x10)) t &= ~0x80; - if (!(c64_keyline[6] & 0x10)) t &= ~0x40; - if (!(c64_keyline[5] & 0x10)) t &= ~0x20; - if (!(c64_keyline[4] & 0x10)) t &= ~0x10; - if (!(c64_keyline[3] & 0x10)) t &= ~0x08; - if (!(c64_keyline[2] & 0x10)) t &= ~0x04; - if (!(c64_keyline[1] & 0x10)) t &= ~0x02; - if (!(c64_keyline[0] & 0x10)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x08)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x08)) t &= ~0x80; - if (!(c64_keyline[6] & 0x08)) t &= ~0x40; - if (!(c64_keyline[5] & 0x08)) t &= ~0x20; - if (!(c64_keyline[4] & 0x08)) t &= ~0x10; - if (!(c64_keyline[3] & 0x08)) t &= ~0x08; - if (!(c64_keyline[2] & 0x08)) t &= ~0x04; - if (!(c64_keyline[1] & 0x08)) t &= ~0x02; - if (!(c64_keyline[0] & 0x08)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x04)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x04)) t &= ~0x80; - if (!(c64_keyline[6] & 0x04)) t &= ~0x40; - if (!(c64_keyline[5] & 0x04)) t &= ~0x20; - if (!(c64_keyline[4] & 0x04)) t &= ~0x10; - if (!(c64_keyline[3] & 0x04)) t &= ~0x08; - if (!(c64_keyline[2] & 0x04)) t &= ~0x04; - if (!(c64_keyline[1] & 0x04)) t &= ~0x02; - if (!(c64_keyline[0] & 0x04)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x02)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x02)) t &= ~0x80; - if (!(c64_keyline[6] & 0x02)) t &= ~0x40; - if (!(c64_keyline[5] & 0x02)) t &= ~0x20; - if (!(c64_keyline[4] & 0x02)) t &= ~0x10; - if (!(c64_keyline[3] & 0x02)) t &= ~0x08; - if (!(c64_keyline[2] & 0x02)) t &= ~0x04; - if (!(c64_keyline[1] & 0x02)) t &= ~0x02; - if (!(c64_keyline[0] & 0x02)) t &= ~0x01; - value &= t; - } - - if (!(output_b & 0x01)) - { - UINT8 t = 0xff; - if (!(c64_keyline[7] & 0x01)) t &= ~0x80; - if (!(c64_keyline[6] & 0x01)) t &= ~0x40; - if (!(c64_keyline[5] & 0x01)) t &= ~0x20; - if (!(c64_keyline[4] & 0x01)) t &= ~0x10; - if (!(c64_keyline[3] & 0x01)) t &= ~0x08; - if (!(c64_keyline[2] & 0x01)) t &= ~0x04; - if (!(c64_keyline[1] & 0x01)) t &= ~0x02; - if (!(c64_keyline[0] & 0x01)) t &= ~0x01; - value &= t; - } - - if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ) - value &= c64_keyline[8]; - else - value &= c64_keyline[9]; - - return value; -} - -UINT8 cbm_common_cia0_port_b_r( device_t *device, UINT8 output_a ) -{ - UINT8 value = 0xff; - - if (!(output_a & 0x80)) value &= c64_keyline[7]; - if (!(output_a & 0x40)) value &= c64_keyline[6]; - if (!(output_a & 0x20)) value &= c64_keyline[5]; - if (!(output_a & 0x10)) value &= c64_keyline[4]; - if (!(output_a & 0x08)) value &= c64_keyline[3]; - if (!(output_a & 0x04)) value &= c64_keyline[2]; - if (!(output_a & 0x02)) value &= c64_keyline[1]; - if (!(output_a & 0x01)) value &= c64_keyline[0]; - - if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ) - value &= c64_keyline[9]; - else - value &= c64_keyline[8]; - - return value; -} - - -/*********************************************** - - CBM Cartridges - -***********************************************/ - - -/* All the cartridge specific code has been moved - to machine/ drivers. Once more informations - surface about the cart expansions for systems - in c65.c, c128.c, cbmb.c and pet.c, the shared - code could be refactored to have here the - common functions */ - - - -/*********************************************** - - CBM Datasette Tapes - -***********************************************/ - -#if 0 -const cassette_interface cbm_cassette_interface = -{ - cbm_cassette_formats, - NULL, - (cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED), - NULL -}; -#endif - - -/*UINT8 *c65_basic; */ -/*UINT8 *c65_kernal; */ -/*UINT8 *c65_dos; */ -/*UINT8 *c65_monitor; */ -/*UINT8 *c65_graphics; */ - - -void c65_state::c65_nmi( ) -{ - if (m_nmilevel != (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq) /* KEY_RESTORE */ - { - m_maincpu->set_input_line(INPUT_LINE_NMI, (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq); - - m_nmilevel = (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq; - } -} - - -/*********************************************** - - CIA Interfaces - -***********************************************/ - -/* - * CIA 0 - Port A keyboard line select - * CIA 0 - Port B keyboard line read - * - * flag cassette read input, serial request in - * irq to irq connected - * - * see machine/cbm.c - */ - -READ8_MEMBER(c65_state::c65_cia0_port_a_r) -{ - UINT8 cia0portb = m_cia0->pb_r(space, 0); - - return cbm_common_cia0_port_a_r(m_cia0, cia0portb); -} - -READ8_MEMBER(c65_state::c65_cia0_port_b_r) -{ - UINT8 value = 0xff; - UINT8 cia0porta = m_cia0->pa_r(space, 0); - - value &= cbm_common_cia0_port_b_r(m_cia0, cia0porta); - - if (!(m_6511_port & 0x02)) - value &= m_keyline; - - return value; -} - -WRITE8_MEMBER(c65_state::c65_cia0_port_b_w) -{ -// was there lightpen support in c65 video chip? -// vic3_device *vic3 = machine().device<vic3_device>("vic3"); -// vic3->lightpen_write(data & 0x10); -} - -void c65_state::c65_irq( int level ) -{ - if (level != m_old_level) - { - DBG_LOG(machine(), 3, "mos4510", ("irq %s\n", level ? "start" : "end")); - m_maincpu->set_input_line(M4510_IRQ_LINE, level); - m_old_level = level; - } -} - -/* is this correct for c65 as well as c64? */ -WRITE_LINE_MEMBER(c65_state::c65_cia0_interrupt) -{ - m_cia0_irq = state; - c65_irq(state || m_vicirq); -} - -/* is this correct for c65 as well as c64? */ -WRITE_LINE_MEMBER(c65_state::c65_vic_interrupt) -{ -#if 1 - if (state != m_vicirq) - { - c65_irq (state || m_cia0_irq); - m_vicirq = state; - } -#endif -} - -/* - * CIA 1 - Port A - * bit 7 serial bus data input - * bit 6 serial bus clock input - * bit 5 serial bus data output - * bit 4 serial bus clock output - * bit 3 serial bus atn output - * bit 2 rs232 data output - * bits 1-0 vic-chip system memory bank select - * - * CIA 1 - Port B - * bit 7 user rs232 data set ready - * bit 6 user rs232 clear to send - * bit 5 user - * bit 4 user rs232 carrier detect - * bit 3 user rs232 ring indicator - * bit 2 user rs232 data terminal ready - * bit 1 user rs232 request to send - * bit 0 user rs232 received data - * - * flag restore key or rs232 received data input - * irq to nmi connected ? - */ -READ8_MEMBER(c65_state::c65_cia1_port_a_r) -{ - UINT8 value = 0xff; - - if (!m_iec->clk_r()) - value &= ~0x40; - - if (!m_iec->data_r()) - value &= ~0x80; - - return value; -} - -WRITE8_MEMBER(c65_state::c65_cia1_port_a_w) -{ - static const int helper[4] = {0xc000, 0x8000, 0x4000, 0x0000}; - - m_iec->atn_w(!BIT(data, 3)); - m_iec->clk_w(!BIT(data, 4)); - m_iec->data_w(!BIT(data, 5)); - - m_vicaddr = m_memory + helper[data & 0x03]; -} - -WRITE_LINE_MEMBER(c65_state::c65_cia1_interrupt) -{ - m_cia1_irq = state; - c65_nmi(); -} - -/*********************************************** - - Memory Handlers - -***********************************************/ - -/* processor has only 1 mega address space !? */ -/* and system 8 megabyte */ -/* dma controller and bankswitch hardware ?*/ -READ8_MEMBER( c65_state::c65_read_mem ) -{ - UINT8 result; - if (offset <= 0x0ffff) - result = m_memory[offset]; - else - result = space.read_byte(offset); - return result; -} - -WRITE8_MEMBER( c65_state::c65_write_mem ) -{ - if (offset <= 0x0ffff) - m_memory[offset] = data; - else - space.write_byte(offset, data); -} - -/* dma chip at 0xd700 - used: - writing banknumber to offset 2 - writing hibyte to offset 1 - writing lobyte to offset 0 - cpu holded, dma transfer(data at address) executed, cpu activated - - command data: - 0 command (0 copy, 3 fill) - 1,2 length - 3,4,5 source - 6,7,8 dest - 9 subcommand - 10 mod - - version 1: - seldom copy (overlapping) from 0x402002 to 0x402008 - (making place for new line in basic area) - for whats this bit 0x400000, or is this really the address? - maybe means add counter to address for access, - so allowing up or down copies, and reordering copies - - version 2: - cmd 0x30 used for this -*/ -void c65_state::c65_dma_port_w( int offset, int value ) -{ - PAIR pair, src, dst, len; - UINT8 cmd, fill; - int i; - address_space &space = m_maincpu->space(AS_PROGRAM); - - switch (offset & 3) - { - case 2: - case 1: - m_dma.data[offset & 3] = value; - break; - case 0: - pair.b.h3 = 0; - pair.b.h2 = m_dma.data[2]; - pair.b.h = m_dma.data[1]; - pair.b.l = m_dma.data[0]=value; - cmd = c65_read_mem(space, pair.d++); - len.w.h = 0; - len.b.l = c65_read_mem(space, pair.d++); - len.b.h = c65_read_mem(space, pair.d++); - src.b.h3 = 0; - fill = src.b.l = c65_read_mem(space, pair.d++); - src.b.h = c65_read_mem(space, pair.d++); - src.b.h2 = c65_read_mem(space, pair.d++); - dst.b.h3 = 0; - dst.b.l = c65_read_mem(space, pair.d++); - dst.b.h = c65_read_mem(space, pair.d++); - dst.b.h2 = c65_read_mem(space, pair.d++); - - switch (cmd) - { - case 0: - if (src.d == 0x3ffff) m_dump_dma = 1; - if (m_dump_dma) - DBG_LOG(space.machine(), 1,"dma copy job", - ("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1) ) ); - if ((m_dma.version == 1) - && ( (src.d&0x400000) || (dst.d & 0x400000))) - { - if (!(src.d & 0x400000)) - { - dst.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d--, c65_read_mem(space, src.d++)); - } - else if (!(dst.d & 0x400000)) - { - src.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, c65_read_mem(space, src.d--)); - } - else - { - src.d &= ~0x400000; - dst.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, --dst.d, c65_read_mem(space, --src.d)); - } - } - else - { - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, c65_read_mem(space, src.d++)); - } - break; - case 3: - DBG_LOG(space.machine(), 3,"dma fill job", - ("len:%.4x value:%.2x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, fill, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1))); - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, fill); - break; - case 0x30: - DBG_LOG(space.machine(), 1,"dma copy down", - ("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1) ) ); - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d--,c65_read_mem(space, src.d--)); - break; - default: - DBG_LOG(space.machine(), 1,"dma job", - ("cmd:%.2x len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - cmd,len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1))); - } - break; - default: - DBG_LOG(space.machine(), 1, "dma chip write", ("%.3x %.2x\n", offset, value)); - break; - } -} - -int c65_state::c65_dma_port_r( int offset ) -{ - /* offset 3 bit 7 in progress ? */ - DBG_LOG(machine(), 2, "dma chip read", ("%.3x\n", offset)); - return 0x7f; -} - -void c65_state::c65_6511_port_w( int offset, int value ) -{ - if (offset == 7) - { - m_6511_port = value; - } - DBG_LOG(machine(), 2, "r6511 write", ("%.2x %.2x\n", offset, value)); -} - -int c65_state::c65_6511_port_r( int offset ) -{ - int data = 0xff; - - if (offset == 7) - { - if (ioport("SPECIAL")->read() & 0x20) - data &= ~1; - } - DBG_LOG(machine(), 2, "r6511 read", ("%.2x\n", offset)); - - return data; -} - -/* one docu states custom 4191 disk controller - (for 2 1MB MFM disk drives, 1 internal, the other extern (optional) 1565 - with integrated 512 byte buffer - - 0->0 reset ? - - 0->1, 0->0, wait until 2 positiv, 1->0 ??? - - 0->0, 0 not 0 means no drive ???, other system entries - - - reg 0 write/read - 0,1 written - bit 1 set - bit 2 set - bit 3 set - bit 4 set - - - reg 0 read - bit 0 - bit 1 - bit 2 - 0..2 ->$1d4 - - reg 1 write - $01 written - $18 written - $46 written - $80 written - $a1 written - $01 written, dec - $10 written - - reg 2 read/write?(lsr) - bit 2 - bit 4 - bit 5 busy waiting until zero, then reading reg 7 - bit 6 operation not activ flag!? or set overflow pin used - bit 7 busy flag? - - reg 3 read/write?(rcr) - bit 1 - bit 3 - bit 7 busy flag? - - reg 4 - track?? - 0 written - read -> $1d2 - cmp #$50 - bcs - - - reg 5 - sector ?? - 1 written - read -> $1d3 - cmp #$b bcc - - - reg 6 - head ?? - 0 written - read -> $1d1 - cmp #2 bcc - - reg 7 read - #4e written - 12 times 0, a1 a1 a1 fe written - - reg 8 read - #ff written - 16 times #ff written - - reg 9 - #60 written - -might use the set overflow input - -$21a6c 9a6c format -$21c97 9c97 write operation -$21ca0 9ca0 get byte? -$21cab 9cab read reg 7 -$21caf 9caf write reg 7 -$21cb3 -*/ - -#define FDC_LOST 4 -#define FDC_CRC 8 -#define FDC_RNF 0x10 -#define FDC_BUSY 0x80 -#define FDC_IRQ 0x200 - -#define FDC_CMD_MOTOR_SPIN_UP 0x10 - -#if 0 -void c65_state::c65_fdc_state(void) -{ - switch (m_fdc.state) - { - case FDC_CMD_MOTOR_SPIN_UP: - if (machine().time() - m_fdc.time) - { - m_fdc.state = 0; - m_fdc.status &= ~FDC_BUSY; - } - break; - } -} -#endif - -void c65_state::c65_fdc_w( int offset, int data ) -{ - DBG_LOG(machine(), 1, "fdc write", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data)); - switch (offset & 0xf) - { - case 0: - m_fdc.reg[0] = data; - break; - case 1: - m_fdc.reg[1] = data; - switch (data & 0xf9) - { - case 0x20: // wait for motor spin up - m_fdc.status &= ~(FDC_IRQ|FDC_LOST|FDC_CRC|FDC_RNF); - m_fdc.status |= FDC_BUSY; - m_fdc.time = machine().time(); - m_fdc.state = FDC_CMD_MOTOR_SPIN_UP; - break; - case 0: // cancel - m_fdc.status &= ~(FDC_BUSY); - m_fdc.state = 0; - break; - case 0x80: // buffered write - case 0x40: // buffered read - case 0x81: // unbuffered write - case 0x41: // unbuffered read - case 0x30:case 0x31: // step - break; - } - break; - case 2: case 3: // read only - break; - case 4: - m_fdc.reg[offset & 0xf] = data; - m_fdc.track = data; - break; - case 5: - m_fdc.reg[offset & 0xf] = data; - m_fdc.sector = data; - break; - case 6: - m_fdc.reg[offset & 0xf] = data; - m_fdc.head = data; - break; - case 7: - m_fdc.buffer[m_fdc.cpu_pos++] = data; - break; - default: - m_fdc.reg[offset & 0xf] = data; - break; - } -} - -int c65_state::c65_fdc_r( int offset ) -{ - UINT8 data = 0; - switch (offset & 0xf) - { - case 0: - data = m_fdc.reg[0]; - break; - case 1: - data = m_fdc.reg[1]; - break; - case 2: - data = m_fdc.status; - break; - case 3: - data = m_fdc.status >> 8; - break; - case 4: - data = m_fdc.track; - break; - case 5: - data = m_fdc.sector; - break; - case 6: - data = m_fdc.head; - break; - case 7: - data = m_fdc.buffer[m_fdc.cpu_pos++]; - break; - default: - data = m_fdc.reg[offset & 0xf]; - break; - } - DBG_LOG(machine(), 1, "fdc read", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data)); - return data; -} - -/* version 1 ramcheck - write 0:0 - read write read write 80000,90000,f0000 - write 0:8 - read write read write 80000,90000,f0000 - - version 2 ramcheck??? - read 0: - write 0:0 - read 0: - first read and second read bit 0x80 set --> nothing - write 0:0 - read 0 - write 0:ff -*/ - -READ8_MEMBER( c65_state::c65_ram_expansion_r ) -{ - UINT8 data = 0xff; - if (m_ram->size() > (128 * 1024)) - data = m_expansion_ram.reg; - return data; -} - -WRITE8_MEMBER( c65_state::c65_ram_expansion_w ) -{ - offs_t expansion_ram_begin; - offs_t expansion_ram_end; - - if (m_ram->size() > (128 * 1024)) - { - m_expansion_ram.reg = data; - - expansion_ram_begin = 0x80000; - expansion_ram_end = 0x80000 + (m_ram->size() - 128*1024) - 1; - - if (data == 0x00) { - space.install_readwrite_bank(expansion_ram_begin, expansion_ram_end,"bank16"); - membank("bank16")->set_base(m_ram->pointer() + 128*1024); - } else { - space.nop_readwrite(expansion_ram_begin, expansion_ram_end); - } - } -} - -WRITE8_MEMBER( c65_state::c65_write_io ) -{ - mos6581_device *sid_0 = machine().device<mos6581_device>("sid_r"); - mos6581_device *sid_1 = machine().device<mos6581_device>("sid_l"); - vic3_device *vic3 = machine().device<vic3_device>("vic3"); - - switch (offset & 0xf00) - { - case 0x000: - if (offset < 0x80) - vic3->port_w(space, offset & 0x7f, data); - else if (offset < 0xa0) - c65_fdc_w(offset & 0x1f, data); - else - { - c65_ram_expansion_w(space, offset & 0x1f, data, mem_mask); - /*ram expansion crtl optional */ - } - break; - case 0x100: - case 0x200: - case 0x300: - vic3->palette_w(space, offset - 0x100, data); - break; - case 0x400: - if (offset<0x420) /* maybe 0x20 */ - sid_0->write(space, offset & 0x3f, data); - else if (offset<0x440) - sid_1->write(space, offset & 0x3f, data); - else - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data)); - break; - case 0x500: - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data)); - break; - case 0x600: - c65_6511_port_w(offset & 0xff,data); - break; - case 0x700: - c65_dma_port_w(offset & 0xff, data); - break; - } -} - -WRITE8_MEMBER( c65_state::c65_write_io_dc00 ) -{ - switch (offset & 0xf00) - { - case 0x000: - m_cia0->write(space, offset, data); - break; - case 0x100: - m_cia1->write(space, offset, data); - break; - case 0x200: - case 0x300: - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset+0xc00, data)); - break; - } -} - -READ8_MEMBER( c65_state::c65_read_io ) -{ - mos6581_device *sid_0 = machine().device<mos6581_device>("sid_r"); - mos6581_device *sid_1 = machine().device<mos6581_device>("sid_l"); - vic3_device *vic3 = machine().device<vic3_device>("vic3"); - - switch (offset & 0xf00) - { - case 0x000: - if (offset < 0x80) - return vic3->port_r(space, offset & 0x7f); - if (offset < 0xa0) - return c65_fdc_r(offset & 0x1f); - else - { - return c65_ram_expansion_r(space, offset & 0x1f, mem_mask); - /*return; ram expansion crtl optional */ - } - case 0x100: - case 0x200: - case 0x300: - /* read only !? */ - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x400: - if (offset < 0x420) - return sid_0->read(space, offset & 0x3f); - if (offset < 0x440) - return sid_1->read(space, offset & 0x3f); - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x500: - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x600: - return c65_6511_port_r(offset&0xff); - case 0x700: - return c65_dma_port_r(offset&0xff); - } - return 0xff; -} - -READ8_MEMBER( c65_state::c65_read_io_dc00 ) -{ - switch (offset & 0x300) - { - case 0x000: - return m_cia0->read(space, offset); - case 0x100: - return m_cia1->read(space, offset); - case 0x200: - case 0x300: - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset+0xc00)); - break; - } - return 0xff; -} - - -/* -d02f: - init a5 96 written (seems to be switch to c65 or vic3 mode) - go64 0 written -*/ - -/* bit 1 external sync enable (genlock) - bit 2 palette enable - bit 6 vic3 c65 character set */ -WRITE8_MEMBER(c65_state::c65_bankswitch_interface) -{ - DBG_LOG(machine(), 2, "c65 bankswitch", ("%.2x\n",data)); - - if (m_io_on) - { - if (data & 1) - { - membank("bank8")->set_base(m_colorram + 0x400); - membank("bank9")->set_base(m_colorram + 0x400); - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9"); - } - else - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this)); - } - } - - m_io_dc00_on = !(data & 1); -#if 0 - /* cartridge roms !?*/ - if (data & 0x08) - membank("bank1")->set_base(m_roml); - else - membank("bank1")->set_base(m_memory + 0x8000); - - if (data & 0x10) - membank("bank2")->set_base(m_basic); - else - membank("bank2")->set_base(m_memory + 0xa000); -#endif - if ((m_old_value^data) & 0x20) - { - /* bankswitching faulty when doing actual page */ - if (data & 0x20) - membank("bank3")->set_base(m_basic); - else - membank("bank3")->set_base(m_memory + 0xc000); - } - m_charset_select = data & 0x40; -#if 0 - /* cartridge roms !?*/ - if (data & 0x80) - membank("bank8")->set_base(m_kernal); - else - membank("bank6")->set_base(m_memory + 0xe000); -#endif - m_old_value = data; -} - -void c65_state::c65_bankswitch( ) -{ - int data, loram, hiram, charen; - - data = 0x00; // machine().device<m4510_device>("maincpu")->get_port(); - if (data == m_old_data) - return; - - DBG_LOG(machine(), 1, "bankswitch", ("%d\n", data & 7)); - loram = (data & 1) ? 1 : 0; - hiram = (data & 2) ? 1 : 0; - charen = (data & 4) ? 1 : 0; - - if ((!m_game && m_exrom) || (loram && hiram && !m_exrom)) - membank("bank1")->set_base(m_roml); - else - membank("bank1")->set_base(m_memory + 0x8000); - - if ((!m_game && m_exrom && hiram) || (!m_exrom)) - membank("bank2")->set_base(m_romh); - else if (loram && hiram) - membank("bank2")->set_base(m_basic); - else - membank("bank2")->set_base(m_memory + 0xa000); - - if ((!m_game && m_exrom) || (charen && (loram || hiram))) - { - m_io_on = 1; - membank("bank6")->set_base(m_colorram); - membank("bank7")->set_base(m_colorram); - - if (m_io_dc00_on) - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this)); - } - else - { - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9"); - membank("bank8")->set_base(m_colorram + 0x400); - membank("bank9")->set_base(m_colorram + 0x400); - } - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0d000, 0x0d7ff, read8_delegate(FUNC(c65_state::c65_read_io),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0d000, 0x0d7ff, write8_delegate(FUNC(c65_state::c65_write_io),this)); - } - else - { - m_io_on = 0; - membank("bank5")->set_base(m_memory + 0xd000); - membank("bank7")->set_base(m_memory + 0xd800); - membank("bank9")->set_base(m_memory + 0xdc00); - if (!charen && (loram || hiram)) - { - membank("bank4")->set_base(m_chargen); - membank("bank6")->set_base(m_chargen + 0x800); - membank("bank8")->set_base(m_chargen + 0xc00); - } - else - { - membank("bank4")->set_base(m_memory + 0xd000); - membank("bank6")->set_base(m_memory + 0xd800); - membank("bank8")->set_base(m_memory + 0xdc00); - } - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0d000, 0x0d7ff, "bank4"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0d000, 0x0d7ff, "bank5"); - } - - if (!m_game && m_exrom) - { - membank("bank10")->set_base(m_romh); - } - else - { - if (hiram) - { - membank("bank10")->set_base(m_kernal); - } - else - { - membank("bank10")->set_base(m_memory + 0xe000); - } - } - m_old_data = data; -} - -#ifdef UNUSED_FUNCTION -void c65_state::c65_colorram_write( int offset, int value ) -{ - m_colorram[offset & 0x7ff] = value | 0xf0; -} -#endif - -/* - * only 14 address lines - * a15 and a14 portlines - * 0x1000-0x1fff, 0x9000-0x9fff char rom - */ -READ8_MEMBER(c65_state::c65_dma_read) -{ - if (!m_game && m_exrom) - { - if (offset < 0x3000) - return m_memory[offset]; - return m_romh[offset & 0x1fff]; - } - if ((m_vicaddr == m_memory) || (m_vicaddr == m_memory + 0x8000)) - { - if (offset < 0x1000) - return m_vicaddr[offset & 0x3fff]; - if (offset < 0x2000) { - if (m_charset_select) - return m_chargen[offset & 0xfff]; - else - return m_chargen[offset & 0xfff]; - } - return m_vicaddr[offset & 0x3fff]; - } - return m_vicaddr[offset & 0x3fff]; -} - -READ8_MEMBER(c65_state::c65_dma_read_color) -{ - if (m_c64mode) - return m_colorram[offset & 0x3ff] & 0xf; - return m_colorram[offset & 0x7ff]; -} - -void c65_state::c65_common_driver_init( ) -{ - m_memory = auto_alloc_array_clear(machine(), UINT8, 0x10000); - membank("bank11")->set_base(m_memory + 0x00000); - membank("bank12")->set_base(m_memory + 0x08000); - membank("bank13")->set_base(m_memory + 0x0a000); - membank("bank14")->set_base(m_memory + 0x0c000); - membank("bank15")->set_base(m_memory + 0x0e000); - - cbm_common_init(); - m_keyline = 0xff; - - m_pal = 0; - m_charset_select = 0; - m_6511_port = 0xff; - m_vicirq = 0; - m_old_data = -1; - - /* C65 had no datasette port */ - m_tape_on = 0; - m_game = 1; - m_exrom = 1; - - /*memset(m_memory + 0x40000, 0, 0x800000 - 0x40000); */ -} - -DRIVER_INIT_MEMBER(c65_state,c65) -{ - m_dma.version = 2; - c65_common_driver_init(); -} - -DRIVER_INIT_MEMBER(c65_state,c65pal) -{ - m_dma.version = 1; - c65_common_driver_init(); - m_pal = 1; -} - -MACHINE_START_MEMBER(c65_state,c65) -{ - /* clear upper memory */ - memset(m_ram->pointer() + 128*1024, 0xff, m_ram->size() - 128*1024); - -//removed cbm_drive_0_config (SERIAL, 10); -//removed cbm_drive_1_config (SERIAL, 11); - m_vicaddr = m_memory; - - m_c64mode = 0; - - c65_bankswitch_interface(m_maincpu->space(AS_PROGRAM),0,0xff); - c65_bankswitch(); -} - - -INTERRUPT_GEN_MEMBER(c65_state::c65_frame_interrupt) -{ - int value; - - c65_nmi(); - - /* common keys input ports */ - cbm_common_interrupt(&device); - - /* c65 specific: function keys input ports */ - value = 0xff; - - value &= ~ioport("FUNCT")->read(); - m_keyline = value; -} diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index a28b6c17810..324a1a1dfe6 100644 --- a/src/mame/machine/dc.cpp +++ b/src/mame/machine/dc.cpp @@ -14,13 +14,6 @@ #include "machine/naomig1.h" #include "video/powervr2.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define DEBUG_REGISTERS (1) #if DEBUG_REGISTERS @@ -729,6 +722,3 @@ TIMER_DEVICE_CALLBACK_MEMBER(dc_state::dc_scanline) { m_powervr2->pvr_scanline_timer(param); } -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index d0f64fb4067..78b8f714dca 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -11,6 +11,11 @@ Naomi cartridge type M2/3 mapping NAOMI_ROM_OFFSET bit29: ROM size/mapping selection, 0 - 4MB ROM mode, 1 - 8MB ROM mode +bit28: Bank selection. + in the case of flash-based 171-7885A ROM boards two of them can be stacked at once + onto main board. each must be configured as Bank 0 or 1 via some (currently unknown) jumper. + this bit selects which one ROM board will be accessed. + note: if ROM is not mounted its area readed as 0xFF 8MB ROM mode: @@ -166,13 +171,13 @@ void naomi_m2_board::board_advance(UINT32 size) void naomi_m2_board::board_write(offs_t offset, UINT16 data) { if(offset & 0x40000000) { - if((offset & 0x0f000000) == 0x02000000) { + if(offset & 0x00020000) { offset &= RAM_SIZE-1; ram[offset] = data; ram[offset+1] = data >> 8; return; } - switch(offset & 0x1fffffff) { + switch(offset & 0x1ffff) { case 0x1fff8: m_cryptdevice->set_addr_low(data); return; case 0x1fffa: m_cryptdevice->set_addr_high(data); return; case 0x1fffc: m_cryptdevice->set_subkey(data); return; diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index ebb0d6fa631..ac0b3ea2b0f 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -16,13 +16,6 @@ #include "includes/chihiro.h" #include "includes/xbox.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define LOG_PCI //#define LOG_OHCI //#define USB_ENABLED @@ -1197,7 +1190,7 @@ static UINT32 hubintiasbridg_pci_r(device_t *busdevice, device_t *device, int fu static void hubintiasbridg_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask) { #ifdef LOG_PCI - if (reg >= 16) device->logerror(" bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask); + if (reg >= 16) busdevice->logerror(" bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask); #endif } @@ -1216,7 +1209,7 @@ static UINT32 dummy_pci_r(device_t *busdevice, device_t *device, int function, i static void dummy_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask) { #ifdef LOG_PCI - if (reg >= 16) device->logerror(" bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask); + if (reg >= 16) busdevice->logerror(" bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask); #endif } @@ -1536,7 +1529,3 @@ MACHINE_CONFIG_START(xbox_base, xbox_base_state) MCFG_SCREEN_UPDATE_DRIVER(xbox_base_state, screen_update_callback) MCFG_SCREEN_VBLANK_DRIVER(xbox_base_state, vblank_callback) MACHINE_CONFIG_END - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/chihiro.cpp index 732d5b86d21..cba362d3e52 100644 --- a/src/mame/video/chihiro.cpp +++ b/src/mame/video/chihiro.cpp @@ -1240,7 +1240,7 @@ UINT32 nv2a_renderer::texture_get_texel(int number, int x, int y) } } -inline UINT8 *nv2a_renderer::read_pixel(int x, int y, UINT32 c[4]) +inline UINT8 *nv2a_renderer::read_pixel(int x, int y, INT32 c[4]) { UINT32 offset; UINT32 color; @@ -1261,8 +1261,8 @@ inline UINT8 *nv2a_renderer::read_pixel(int x, int y, UINT32 c[4]) c[1] = pal6bit((color & 0x07e0) >> 5); c[0] = pal5bit(color & 0x1f); return (UINT8 *)addr16; - case NV2A_COLOR_FORMAT_UNKNOWN4: - case NV2A_COLOR_FORMAT_X8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8: addr = (UINT32 *)((UINT8 *)rendertarget + offset); color = *addr; @@ -1295,7 +1295,7 @@ void nv2a_renderer::write_pixel(int x, int y, UINT32 color, UINT32 depth) UINT32 *daddr32; UINT16 *daddr16; UINT32 deptsten; - UINT32 c[4], fb[4], s[4], d[4], cc[4]; + INT32 c[4], fb[4], s[4], d[4], cc[4]; UINT32 dep, sten, stenc, stenv; bool stencil_passed; bool depth_passed; @@ -1854,16 +1854,16 @@ void nv2a_renderer::write_pixel(int x, int y, UINT32 color, UINT32 depth) if (color_mask != 0) { UINT32 ct,ft,w; - ct = (c[3] << 24) | (c[2] << 16) | (c[1] << 8) | c[0]; - ft = (fb[3] << 24) | (fb[2] << 16) | (fb[1] << 8) | fb[0]; + ct = ((UINT32)c[3] << 24) | ((UINT32)c[2] << 16) | ((UINT32)c[1] << 8) | (UINT32)c[0]; + ft = ((UINT32)fb[3] << 24) | ((UINT32)fb[2] << 16) | ((UINT32)fb[1] << 8) | (UINT32)fb[0]; w = (ft & ~color_mask) | (ct & color_mask); switch (colorformat_rendertarget) { case NV2A_COLOR_FORMAT_R5G6B5: w = ((w >> 8) & 0xf800) + ((w >> 5) & 0x7e0) + ((w >> 3) & 0x1f); *((UINT16 *)addr) = (UINT16)w; break; - case NV2A_COLOR_FORMAT_UNKNOWN4: - case NV2A_COLOR_FORMAT_X8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8: *((UINT32 *)addr) = w; break; case NV2A_COLOR_FORMAT_A8R8G8B8: @@ -2862,7 +2862,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN m = 1; // possible buffers: color, depth, stencil // clear framebuffer - if (data & 0xf0) { + if ((data & 0xf0) == 0xf0) { if (bytespixel_rendertarget == 4) { bitmap_rgb32 bm(rendertarget, (limits_rendertarget.right() + 1) * m, (limits_rendertarget.bottom() + 1) * m, pitch_rendertarget / 4); @@ -2913,8 +2913,8 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN case NV2A_COLOR_FORMAT_R5G6B5: bytespixel_rendertarget = 2; break; - case NV2A_COLOR_FORMAT_UNKNOWN4: - case NV2A_COLOR_FORMAT_X8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8: + case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8: case NV2A_COLOR_FORMAT_A8R8G8B8: bytespixel_rendertarget = 4; break; @@ -4018,10 +4018,28 @@ UINT32 nv2a_renderer::screen_update_callback(screen_device &screen, bitmap_rgb32 return 0; } +void nv2a_renderer::geforce_assign_object(address_space & space, UINT32 chanel, UINT32 subchannel, UINT32 address) +{ + int handle, objclass; + + handle = space.read_dword(address); + handle = geforce_object_offset(handle); +#ifdef LOG_NV2A + machine().logerror(" assign to subchannel %d object at %d", subch, handle); +#endif + channel[chanel][subchannel].object.objhandle = handle; + handle = ramin[handle / 4]; + objclass = handle & 0xff; +#ifdef LOG_NV2A + machine().logerror(" class %03X\n", objclass); +#endif + channel[chanel][subchannel].object.objclass = objclass; +} + TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) { - int chanel, subchannel; - int method, count, handle, objclass; + int chanel; + int method, count; UINT32 *dmaput, *dmaget; UINT32 cmd, cmdtype; int countlen; @@ -4030,9 +4048,8 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) UINT32 subch; chanel = puller_channel; - subchannel = puller_subchannel; - dmaput = &channel[chanel][subchannel].regs[0x40 / 4]; - dmaget = &channel[chanel][subchannel].regs[0x44 / 4]; + dmaput = &channel[chanel][0].regs[0x40 / 4]; + dmaget = &channel[chanel][0].regs[0x44 / 4]; while (*dmaget != *dmaput) { cmd = space->read_dword(*dmaget); *dmaget += 4; @@ -4041,11 +4058,11 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) { case 6: // jump #ifdef LOG_NV2A - printf("jump dmaget %08X", *dmaget); + machine().logerror("jump dmaget %08X", *dmaget); #endif *dmaget = cmd & 0xfffffffc; #ifdef LOG_NV2A - printf(" -> %08X\n\r", *dmaget); + machine().logerror(" -> %08X\n\r", *dmaget); #endif break; case 0: // increasing method @@ -4053,18 +4070,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) subch = (cmd >> 13) & 7; count = (cmd >> 18) & 2047; if ((method == 0) && (count == 1)) { - handle = space->read_dword(*dmaget); - handle = geforce_object_offset(handle); -#ifdef LOG_NV2A - machine().logerror(" assign to subchannel %d object at %d", subch, handle); -#endif - channel[chanel][subch].object.objhandle = handle; - handle = ramin[handle / 4]; - objclass = handle & 0xff; -#ifdef LOG_NV2A - machine().logerror(" class %03X\n", objclass); -#endif - channel[chanel][subch].object.objclass = objclass; + geforce_assign_object(*space, chanel, subch, *dmaget); *dmaget += 4; } else { @@ -4093,18 +4099,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) subch = (cmd >> 13) & 7; count = (cmd >> 18) & 2047; if ((method == 0) && (count == 1)) { - handle = space->read_dword(*dmaget); - handle = geforce_object_offset(handle); -#ifdef LOG_NV2A - machine().logerror(" assign to subchannel %d object at %d", subch, handle); -#endif - channel[chanel][subch].object.objhandle = handle; - handle = ramin[handle / 4]; - objclass = handle & 0xff; -#ifdef LOG_NV2A - machine().logerror(" class %03X\n", objclass); -#endif - channel[chanel][subch].object.objclass = objclass; + geforce_assign_object(*space, chanel, subch, *dmaget); *dmaget += 4; } else { @@ -4125,18 +4120,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) count = space->read_dword(*dmaget); *dmaget += 4; if ((method == 0) && (count == 1)) { - handle = space->read_dword(*dmaget); - handle = geforce_object_offset(handle); -#ifdef LOG_NV2A - machine().logerror(" assign to subchannel %d object at %d", subch, handle); -#endif - channel[chanel][subch].object.objhandle = handle; - handle = ramin[handle / 4]; - objclass = handle & 0xff; -#ifdef LOG_NV2A - machine().logerror(" class %03X\n", objclass); -#endif - channel[chanel][subch].object.objclass = objclass; + geforce_assign_object(*space, chanel, subch, *dmaget); *dmaget += 4; } else { @@ -4294,16 +4278,16 @@ WRITE32_MEMBER(nv2a_renderer::geforce_w) subchannel = (suboffset >> (13 - 2)) & 7; suboffset = suboffset & 0x7ff; //machine().logerror("NV_2A: write channel[%02X,%d,%04X]=%08X\n",chanel,subchannel,suboffset*4,data & mem_mask); + COMBINE_DATA(&channel[chanel][subchannel].regs[suboffset]); if (suboffset >= 0x80 / 4) return; - COMBINE_DATA(&channel[chanel][subchannel].regs[suboffset]); if ((suboffset == 0x40 / 4) || (suboffset == 0x44 / 4)) { // DMA_PUT or DMA_GET UINT32 *dmaput, *dmaget; - dmaput = &channel[chanel][subchannel].regs[0x40 / 4]; - dmaget = &channel[chanel][subchannel].regs[0x44 / 4]; + dmaput = &channel[chanel][0].regs[0x40 / 4]; + dmaget = &channel[chanel][0].regs[0x44 / 4]; //printf("dmaget %08X dmaput %08X\n\r",*dmaget,*dmaput); - if ((*dmaput == 0x048cf000) && (*dmaget == 0x07f4d000)) { + if ((*dmaput == 0x048cf000) && (*dmaget == 0x07f4d000)) { // only for outr2 *dmaget = *dmaput; puller_waiting = 0; puller_timer->enable(false); @@ -4312,7 +4296,6 @@ WRITE32_MEMBER(nv2a_renderer::geforce_w) if (*dmaget != *dmaput) { if (puller_waiting == 0) { puller_channel = chanel; - puller_subchannel = subchannel; puller_space = &space; puller_timer->enable(); puller_timer->adjust(attotime::zero); diff --git a/src/mame/video/shadfrce.cpp b/src/mame/video/shadfrce.cpp index c492790efb5..8b68a623b61 100644 --- a/src/mame/video/shadfrce.cpp +++ b/src/mame/video/shadfrce.cpp @@ -101,7 +101,7 @@ WRITE16_MEMBER(shadfrce_state::bg1scrolly_w) -void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offset ) +void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) { /* | ---- ---- hhhf Fe-Y | ---- ---- yyyy yyyy | ---- ---- TTTT TTTT | ---- ---- tttt tttt | | ---- ---- -pCc cccX | ---- ---- xxxx xxxx | ---- ---- ---- ---- | ---- ---- ---- ---- | */ @@ -121,42 +121,29 @@ void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c UINT16 *finish = m_spvideoram_old; UINT16 *source = finish + 0x2000/2 - 8; int hcount; - while (source >= finish) + while( source>=finish ) { + int ypos = 0x100 - (((source[0] & 0x0003) << 8) | (source[1] & 0x00ff)); + int xpos = (((source[4] & 0x0001) << 8) | (source[5] & 0x00ff)) + 1; + int tile = ((source[2] & 0x00ff) << 8) | (source[3] & 0x00ff); + int height = (source[0] & 0x00e0) >> 5; int enable = ((source[0] & 0x0004)); - - if (enable) - { - int ypos = 0x100 - (((source[0] & 0x0003) << 8) | (source[1] & 0x00ff)); - int height = ((source[0] & 0x00e0) >> 5) ; - height += 1; - - int bottom = ypos + y_offset; - int top = bottom - height * 16; - - if (top > cliprect.max_y || bottom <= cliprect.min_y) - { - source -= 8; - continue; - } - - int xpos = (((source[4] & 0x0001) << 8) | (source[5] & 0x00ff)) + 1; - int tile = ((source[2] & 0x00ff) << 8) | (source[3] & 0x00ff); - int flipx = ((source[0] & 0x0010) >> 4); - int flipy = ((source[0] & 0x0008) >> 3); - int pal = ((source[4] & 0x003e)); - int pri_mask = (source[4] & 0x0040) ? 0x02 : 0x00; - - if (pal & 0x20) pal ^= 0x60; /* skip hole */ - - - for (hcount = 0; hcount < height; hcount++) { - gfx->prio_transpen(bitmap, cliprect, tile + hcount, pal, flipx, flipy, xpos, bottom-16, screen.priority(), pri_mask, 0); - gfx->prio_transpen(bitmap, cliprect, tile + hcount, pal, flipx, flipy, xpos - 0x200, bottom-16, screen.priority(), pri_mask, 0); // x wraparound - bottom -= 16; + int flipx = ((source[0] & 0x0010) >> 4); + int flipy = ((source[0] & 0x0008) >> 3); + int pal = ((source[4] & 0x003e)); + int pri_mask = (source[4] & 0x0040) ? 0x02 : 0x00; + + if (pal & 0x20) pal ^= 0x60; /* skip hole */ + + height++; + if (enable) { + for (hcount=0;hcount<height;hcount++) { + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); } } - source-=8; } } @@ -169,8 +156,7 @@ UINT32 shadfrce_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap { m_bg1tilemap->draw(screen, bitmap, cliprect, 0,0); m_bg0tilemap->draw(screen, bitmap, cliprect, 0,1); - draw_sprites(screen,bitmap,cliprect, 0); - draw_sprites(screen,bitmap,cliprect, 0x200); // y-wrap + draw_sprites(screen,bitmap,cliprect); m_fgtilemap->draw(screen, bitmap, cliprect, 0,0); } else diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp index e8ac5891766..181b5c149fa 100644 --- a/src/osd/modules/debugger/debugint.cpp +++ b/src/osd/modules/debugger/debugint.cpp @@ -17,7 +17,6 @@ #include "debug/debugvw.h" #include "debug/dvdisasm.h" #include "debug/dvmemory.h" -#include "debug/dvstate.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" @@ -151,10 +150,8 @@ class DView_edit DISABLE_COPYING(DView_edit); public: - DView_edit() - { } - ~DView_edit() - { } + DView_edit(): active(0), container(NULL) { } + ~DView_edit() { } int active; render_container * container; std::string str; @@ -1131,7 +1128,6 @@ static void render_editor(DView_edit *editor) x1 += UI_BOX_LR_BORDER; x2 -= UI_BOX_LR_BORDER; y1 += UI_BOX_TB_BORDER; - y2 -= UI_BOX_TB_BORDER; /* draw the text within it */ editor->container->manager().machine().ui().draw_text_full(editor->container, editor->str.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp index 5f07e0d3057..b7bf048adae 100644 --- a/src/osd/modules/debugger/debugwin.cpp +++ b/src/osd/modules/debugger/debugwin.cpp @@ -22,11 +22,9 @@ #include "win/uimetrics.h" #include "emu.h" -#include "uiinput.h" #include "debugger.h" #include "window.h" -#include "winmain.h" #include "../../windows/input.h" diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp index a55c7b7885f..50c0fced670 100644 --- a/src/osd/modules/debugger/win/consolewininfo.cpp +++ b/src/osd/modules/debugger/win/consolewininfo.cpp @@ -9,7 +9,6 @@ #include "consolewininfo.h" #include "debugviewinfo.h" -#include "disasmviewinfo.h" #include "uimetrics.h" #include "debug/debugcon.h" @@ -84,7 +83,7 @@ consolewin_info::consolewin_info(debugger_windows_interface &debugger) : set_cpu(*debug_cpu_get_visible_cpu(machine())); // mark the edit box as the default focus and set it - set_default_focus(); + editwin_info::set_default_focus(); return; cleanup: diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp index 55b806b0056..1e36655d65d 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.cpp +++ b/src/osd/modules/debugger/win/debugviewinfo.cpp @@ -315,7 +315,7 @@ void debugview_info::draw_contents(HDC windc) // loop twice; once to fill the background and once to draw the text for (int iter = 0; iter < 2; iter++) { - COLORREF fgcolor = RGB(0x00,0x00,0x00); + COLORREF fgcolor; COLORREF bgcolor = RGB(0xff,0xff,0xff); HBRUSH bgbrush = NULL; int last_attrib = -1; diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp index 078a87c15c7..79468e3793b 100644 --- a/src/osd/modules/debugger/win/debugwininfo.cpp +++ b/src/osd/modules/debugger/win/debugwininfo.cpp @@ -11,9 +11,6 @@ #include "debugviewinfo.h" #include "debug/debugcpu.h" -#include "imagedev/cassette.h" - -#include "strconv.h" #include "window.h" #include "winutf8.h" diff --git a/src/osd/modules/debugger/win/disasmwininfo.cpp b/src/osd/modules/debugger/win/disasmwininfo.cpp index 5d9c72f3fc6..ae7e3894458 100644 --- a/src/osd/modules/debugger/win/disasmwininfo.cpp +++ b/src/osd/modules/debugger/win/disasmwininfo.cpp @@ -11,11 +11,6 @@ #include "debugviewinfo.h" #include "disasmviewinfo.h" #include "uimetrics.h" - -#include "debugger.h" -#include "debug/debugcon.h" -#include "debug/debugcpu.h" - #include "winutf8.h" @@ -38,14 +33,14 @@ disasmwin_info::disasmwin_info(debugger_windows_interface &debugger) : update_caption(); // recompute the children once to get the maxwidth - recompute_children(); + disasmwin_info::recompute_children(); // position the window and recompute children again SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW); - recompute_children(); + disasmwin_info::recompute_children(); // mark the edit box as the default focus and set it - set_default_focus(); + editwin_info::set_default_focus(); } diff --git a/src/osd/modules/debugger/win/logwininfo.cpp b/src/osd/modules/debugger/win/logwininfo.cpp index c623245db72..6610e8a296f 100644 --- a/src/osd/modules/debugger/win/logwininfo.cpp +++ b/src/osd/modules/debugger/win/logwininfo.cpp @@ -38,7 +38,7 @@ logwin_info::logwin_info(debugger_windows_interface &debugger) : SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW); // recompute the children - recompute_children(); + debugwin_info::recompute_children(); } diff --git a/src/osd/modules/debugger/win/memorywininfo.cpp b/src/osd/modules/debugger/win/memorywininfo.cpp index 0c67bdf01da..e925dbaa26b 100644 --- a/src/osd/modules/debugger/win/memorywininfo.cpp +++ b/src/osd/modules/debugger/win/memorywininfo.cpp @@ -59,14 +59,14 @@ memorywin_info::memorywin_info(debugger_windows_interface &debugger) : update_caption(); // recompute the children once to get the maxwidth - recompute_children(); + memorywin_info::recompute_children(); // position the window and recompute children again SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW); - recompute_children(); + memorywin_info::recompute_children(); // mark the edit box as the default focus and set it - set_default_focus(); + editwin_info::set_default_focus(); } diff --git a/src/osd/modules/debugger/win/pointswininfo.cpp b/src/osd/modules/debugger/win/pointswininfo.cpp index 5ed28a17e16..6dd56cc50cc 100644 --- a/src/osd/modules/debugger/win/pointswininfo.cpp +++ b/src/osd/modules/debugger/win/pointswininfo.cpp @@ -46,7 +46,7 @@ pointswin_info::pointswin_info(debugger_windows_interface &debugger) : SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW); // recompute the children - recompute_children(); + debugwin_info::recompute_children(); } diff --git a/src/osd/modules/debugger/win/uimetrics.cpp b/src/osd/modules/debugger/win/uimetrics.cpp index 17a74bf73e7..aebbf1cfe06 100644 --- a/src/osd/modules/debugger/win/uimetrics.cpp +++ b/src/osd/modules/debugger/win/uimetrics.cpp @@ -31,7 +31,6 @@ ui_metrics::ui_metrics(osd_options const &options) : m_debug_font = CreateFont(-MulDiv((size <= 0) ? 9 : size, GetDeviceCaps(temp_dc, LOGPIXELSY), 72), 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FIXED_PITCH, t_face); osd_free(t_face); - t_face = NULL; if (m_debug_font == NULL) fatalerror("Unable to create debugger font\n"); diff --git a/src/osd/modules/font/font_none.cpp b/src/osd/modules/font/font_none.cpp index 5021eef9d58..7ea689c8f35 100644 --- a/src/osd/modules/font/font_none.cpp +++ b/src/osd/modules/font/font_none.cpp @@ -21,7 +21,6 @@ public: virtual bool open(const char *font_path, const char *name, int &height); virtual void close(); virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs); -private: }; bool osd_font_none::open(const char *font_path, const char *_name, int &height) diff --git a/src/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp index 26454c96810..e6ae37bdfc6 100644 --- a/src/osd/modules/font/font_windows.cpp +++ b/src/osd/modules/font/font_windows.cpp @@ -34,8 +34,9 @@ //------------------------------------------------- class osd_font_windows : public osd_font -{ +{ public: + osd_font_windows(): m_font(NULL) { } virtual ~osd_font_windows() { } virtual bool open(const char *font_path, const char *name, int &height); diff --git a/src/osd/modules/midi/none.cpp b/src/osd/modules/midi/none.cpp index 6195aa78d89..12e15558a4d 100644 --- a/src/osd/modules/midi/none.cpp +++ b/src/osd/modules/midi/none.cpp @@ -41,9 +41,6 @@ public: virtual bool poll(); virtual int read(UINT8 *pOut); virtual void write(UINT8 data); - -private: - //int dummy; }; osd_midi_device *none_module::create_midi_device() diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index 02dad28ffc1..df92b0b9a37 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -44,8 +44,9 @@ static const int RX_EVENT_BUF_SIZE = 512; #define MIDI_EOX 0xf7 class osd_midi_device_pm : public osd_midi_device -{ +{ public: + osd_midi_device_pm(): pmStream(NULL), xmit_cnt(0), last_status(0), rx_sysex(false) { } virtual ~osd_midi_device_pm() { } virtual bool open_input(const char *devname); virtual bool open_output(const char *devname); @@ -208,7 +209,6 @@ bool osd_midi_device_pm::open_output(const char *devname) { return false; } - return false; } void osd_midi_device_pm::close() diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp index 3f3e20ef7f4..833548cfabb 100644 --- a/src/osd/modules/netdev/pcap.cpp +++ b/src/osd/modules/netdev/pcap.cpp @@ -168,7 +168,7 @@ netdev_pcap::netdev_pcap(const char *name, class device_network_interface *ifdev m_p = NULL; return; } - set_mac(get_mac()); + netdev_pcap::set_mac(get_mac()); #ifdef SDLMAME_MACOSX m_ctx.head = 0; @@ -206,7 +206,7 @@ int netdev_pcap::send(UINT8 *buf, int len) ret = pcap_sendpacket_dl(m_p, buf, len); printf("sent packet length %d, returned %d\n", len, ret); return ret ? len : 0; - return (!pcap_sendpacket_dl(m_p, buf, len))?len:0; + //return (!pcap_sendpacket_dl(m_p, buf, len))?len:0; } int netdev_pcap::recv_dev(UINT8 **buf) diff --git a/src/osd/modules/render/d3d/d3d9intf.cpp b/src/osd/modules/render/d3d/d3d9intf.cpp index f6ed962e5f6..d6751b6ca21 100644 --- a/src/osd/modules/render/d3d/d3d9intf.cpp +++ b/src/osd/modules/render/d3d/d3d9intf.cpp @@ -18,7 +18,6 @@ // MAMEOS headers #include "d3dintf.h" -#include "winmain.h" @@ -83,7 +82,6 @@ base *drawd3d9_init(void) { osd_printf_verbose("Direct3D: Unable to find Direct3DCreate9\n"); FreeLibrary(dllhandle); - dllhandle = NULL; return NULL; } @@ -93,7 +91,6 @@ base *drawd3d9_init(void) { osd_printf_verbose("Direct3D: Error attempting to initialize Direct3D9\n"); FreeLibrary(dllhandle); - dllhandle = NULL; return NULL; } diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 202227eba39..8c099c23dbf 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -29,7 +29,6 @@ #include "render.h" #include "ui/ui.h" #include "rendutil.h" -#include "options.h" #include "emuopts.h" #include "aviio.h" #include "png.h" @@ -39,7 +38,6 @@ #include "d3dintf.h" #include "winmain.h" #include "window.h" -#include "config.h" #include "d3dcomm.h" #include "modules/render/drawd3d.h" #include "strconv.h" @@ -74,7 +72,14 @@ static direct3dx9_loadeffect_ptr g_load_effect = NULL; // shader manager constructor //============================================================ -shaders::shaders() +shaders::shaders(): + d3dintf(NULL), machine(NULL), d3d(NULL), num_screens(0), curr_screen(0), curr_frame(0), write_ini(false), read_ini(false), hlsl_prescale_x(0), hlsl_prescale_y(0), bloom_count(0), + vecbuf_type(), vecbuf_index(0), vecbuf_count(0), avi_output_file(NULL), avi_frame(0), avi_copy_surface(NULL), avi_copy_texture(NULL), avi_final_target(NULL), avi_final_texture(NULL), + black_surface(NULL), black_texture(NULL), render_snap(false), snap_rendered(false), snap_copy_target(NULL), snap_copy_texture(NULL), snap_target(NULL), snap_texture(NULL), + snap_width(0), snap_height(0), lines_pending(false), backbuffer(NULL), curr_effect(NULL), default_effect(NULL), prescale_effect(NULL), post_effect(NULL), distortion_effect(NULL), + focus_effect(NULL), phosphor_effect(NULL), deconverge_effect(NULL), color_effect(NULL), yiq_encode_effect(NULL), yiq_decode_effect(NULL), bloom_effect(NULL), + downsample_effect(NULL), vector_effect(NULL), fsfx_vertices(NULL), curr_texture(NULL), curr_render_target(NULL), curr_poly(NULL) + { master_enable = false; vector_enable = true; @@ -3336,7 +3341,7 @@ static file_error open_next(d3d::renderer *d3d, emu_file &file, const char *temp // find length of the device name int end1 = snapstr.find("/", pos + 3); int end2 = snapstr.find("%", pos + 3); - int end = -1; + int end; if ((end1 != -1) && (end2 != -1)) { diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index 05350b95c25..96901a5cd67 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -20,6 +20,8 @@ // TYPE DEFINITIONS //============================================================ +struct slider_state; + namespace d3d { class effect; diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 68a0f2d404c..c10e539dd31 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -27,19 +27,15 @@ // MAME headers #include "emu.h" #include "render.h" -#include "ui/ui.h" + #include "rendutil.h" -#include "options.h" #include "emuopts.h" #include "aviio.h" -#include "png.h" // MAMEOS headers #include "modules/render/d3d/d3dintf.h" #include "winmain.h" #include "window.h" -#include "config.h" -#include "strconv.h" #include "modules/render/d3d/d3dcomm.h" #include "drawd3d.h" @@ -616,20 +612,11 @@ texture_info *texture_manager::find_texinfo(const render_texinfo *texinfo, UINT3 } renderer::renderer(osd_window *window) - : osd_renderer(window, FLAG_NONE) + : osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(NULL), m_gamma_supported(0), m_pixformat(), + m_vertexbuf(NULL), m_lockedbuf(NULL), m_numverts(0), m_vectorbatch(NULL), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0), + m_screen_format(), m_last_texture(NULL), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0), + m_last_wrap(), m_last_modmode(0), m_hlsl_buf(NULL), m_shaders(NULL), m_shaders_options(NULL), m_texture_manager(NULL), m_line_count(0) { - m_device = NULL; - m_restarting = false; - m_shaders = NULL; - m_shaders_options = NULL; - m_numverts = 0; - m_numpolys = 0; - m_vertexbuf = NULL; - m_lockedbuf = NULL; - m_vectorbatch = NULL; - m_last_texture = NULL; - m_hlsl_buf = NULL; - m_texture_manager = NULL; } int renderer::initialize() diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp index 01abda6ad6d..0240b8fc26e 100644 --- a/src/osd/modules/render/drawdd.cpp +++ b/src/osd/modules/render/drawdd.cpp @@ -17,13 +17,11 @@ #include "emu.h" #include "render.h" #include "rendutil.h" -#include "options.h" #include "rendersw.inc" // MAMEOS headers #include "winmain.h" #include "window.h" -#include "config.h" @@ -40,7 +38,10 @@ class renderer_dd : public osd_renderer { public: renderer_dd(osd_window *window) - : osd_renderer(window, FLAG_NONE), + : osd_renderer(window, FLAG_NONE), + width(0), + height(0), + refresh(0), //adapter(0), adapter_ptr(NULL), clearouter(0), diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp index ee7bc229935..08bd81666ca 100644 --- a/src/osd/modules/render/drawnone.cpp +++ b/src/osd/modules/render/drawnone.cpp @@ -32,8 +32,6 @@ public: virtual void record() { }; virtual void toggle_fsfx() { }; virtual void destroy(); - -private: }; //============================================================ diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index 5a139c4054b..de04e04a580 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -19,7 +19,6 @@ // MAME headers #include "osdcomm.h" #include "emu.h" -#include "options.h" #include "emuopts.h" #ifndef OSD_WINDOWS diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp index 19c5f7055ed..01610e2a9d3 100644 --- a/src/osd/modules/sound/direct_sound.cpp +++ b/src/osd/modules/sound/direct_sound.cpp @@ -174,7 +174,7 @@ private: memcpy(m_bytes2, (UINT8 const *)data + m_locked1, bytes - m_locked1); } - result = unlock(); + unlock(); return DS_OK; } HRESULT clear() @@ -189,7 +189,7 @@ private: assert(0U == m_locked2); memset(m_bytes1, 0, m_locked1); - result = unlock(); + unlock(); return DS_OK; } diff --git a/src/osd/modules/sync/work_osd.cpp b/src/osd/modules/sync/work_osd.cpp index 34a3c6b5851..e5582584666 100644 --- a/src/osd/modules/sync/work_osd.cpp +++ b/src/osd/modules/sync/work_osd.cpp @@ -444,12 +444,12 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call osd_work_item *item; // first allocate a new work item; try the free list first - INT32 lockslot = osd_scalable_lock_acquire(queue->lock); + INT32 myslot = osd_scalable_lock_acquire(queue->lock); do { item = (osd_work_item *)queue->free; } while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item); - osd_scalable_lock_release(queue->lock, lockslot); + osd_scalable_lock_release(queue->lock, myslot); // if nothing, allocate something new if (item == NULL) diff --git a/src/osd/sdl/sdldir.cpp b/src/osd/sdl/sdldir.cpp index 5ec1b2fca32..251210ba400 100644 --- a/src/osd/sdl/sdldir.cpp +++ b/src/osd/sdl/sdldir.cpp @@ -9,7 +9,7 @@ //============================================================ #ifdef SDLMAME_WIN32 -#include "../windows/windir.c" +#include "../windows/windir.cpp" #else #ifndef _LARGEFILE64_SOURCE diff --git a/src/osd/sdl/sdlfile.cpp b/src/osd/sdl/sdlfile.cpp index 7e3226d497a..a0a49801a95 100644 --- a/src/osd/sdl/sdlfile.cpp +++ b/src/osd/sdl/sdlfile.cpp @@ -9,8 +9,8 @@ //============================================================ #ifdef SDLMAME_WIN32 -#include "../windows/winfile.c" -#include "../windows/winutil.c" +#include "../windows/winfile.cpp" +#include "../windows/winutil.cpp" #else #ifndef _LARGEFILE64_SOURCE diff --git a/src/osd/sdl/sdlptty_unix.cpp b/src/osd/sdl/sdlptty_unix.cpp index abe4ba8db0b..bd1751c15c2 100644 --- a/src/osd/sdl/sdlptty_unix.cpp +++ b/src/osd/sdl/sdlptty_unix.cpp @@ -19,6 +19,7 @@ # include <termios.h> # include <libutil.h> #elif defined(SDLMAME_NETBSD) || defined(SDLMAME_MACOSX) +# include <termios.h> # include <util.h> #elif defined(SDLMAME_OPENBSD) # include <termios.h> diff --git a/src/osd/sdl/sdlptty_win32.cpp b/src/osd/sdl/sdlptty_win32.cpp index e9944a75c5a..fca49a12a99 100644 --- a/src/osd/sdl/sdlptty_win32.cpp +++ b/src/osd/sdl/sdlptty_win32.cpp @@ -9,4 +9,4 @@ // //============================================================ -#include "../windows/winptty.c" +#include "../windows/winptty.cpp" diff --git a/src/osd/sdl/sdlsocket.cpp b/src/osd/sdl/sdlsocket.cpp index efc06d17a7f..549729bf3e2 100644 --- a/src/osd/sdl/sdlsocket.cpp +++ b/src/osd/sdl/sdlsocket.cpp @@ -9,7 +9,7 @@ //============================================================ #ifdef SDLMAME_WIN32 -#include "../windows/winsocket.c" +#include "../windows/winsocket.cpp" #else #include <stdio.h> diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp index 3eedf040127..ea1da56cc5a 100644 --- a/src/osd/strconv.cpp +++ b/src/osd/strconv.cpp @@ -13,7 +13,6 @@ // MAMEOS headers #include "strconv.h" -#include "unicode.h" #if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) //============================================================ @@ -120,7 +119,7 @@ int osd_uchar_from_osdchar(UINT32 *uchar, const char *osdchar, size_t count) } #else - +#include "unicode.h" //============================================================ // osd_uchar_from_osdchar //============================================================ diff --git a/src/osd/windows/input.cpp b/src/osd/windows/input.cpp index 078fa665098..0fca59e2fe9 100644 --- a/src/osd/windows/input.cpp +++ b/src/osd/windows/input.cpp @@ -122,7 +122,7 @@ class device_info { public: device_info(running_machine &machine) - : m_machine(machine) { } + : head(NULL), next(NULL), name(NULL), poll(NULL), device(NULL), m_machine(machine) { } running_machine &machine() const { return m_machine; } diff --git a/src/osd/windows/output.cpp b/src/osd/windows/output.cpp index f21818efab8..41f2fd26201 100644 --- a/src/osd/windows/output.cpp +++ b/src/osd/windows/output.cpp @@ -12,7 +12,6 @@ // MAME headers #include "emu.h" -#include "osdepend.h" #include "winmain.h" // MAMEOS headers #include "output.h" diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp index 23854c18554..4f53cb49813 100644 --- a/src/osd/windows/video.cpp +++ b/src/osd/windows/video.cpp @@ -13,11 +13,7 @@ // MAME headers #include "emu.h" #include "emuopts.h" -#include "osdepend.h" -#include "video/vector.h" #include "render.h" -#include "rendutil.h" -#include "ui/ui.h" #include "uiinput.h" // MAMEOS headers @@ -26,7 +22,6 @@ #include "window.h" #include "input.h" #include "strconv.h" -#include "config.h" //============================================================ // CONSTANTS @@ -113,7 +108,7 @@ void windows_osd_interface::video_exit() win_monitor_info::win_monitor_info(const HMONITOR handle, const char *monitor_device, float aspect) : osd_monitor_info(&m_handle, monitor_device, aspect), m_handle(handle) { - refresh(); + win_monitor_info::refresh(); } win_monitor_info::~win_monitor_info() diff --git a/src/osd/windows/winclip.cpp b/src/osd/windows/winclip.cpp index a951b525cc1..7717f4e6188 100644 --- a/src/osd/windows/winclip.cpp +++ b/src/osd/windows/winclip.cpp @@ -76,7 +76,7 @@ static char *convert_ansi(LPCVOID data) char *osd_get_clipboard_text(void) { - char *result = NULL; + char *result; // try to access unicode text result = get_clipboard_text_by_format(CF_UNICODETEXT, convert_wide); diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp index 8e682d5ccc8..21a264ec8e4 100644 --- a/src/osd/windows/window.cpp +++ b/src/osd/windows/window.cpp @@ -23,7 +23,6 @@ // MAME headers #include "emu.h" -#include "emuopts.h" #include "uiinput.h" // MAMEOS headers @@ -31,8 +30,6 @@ #include "window.h" #include "video.h" #include "input.h" -#include "strconv.h" -#include "config.h" #include "winutf8.h" #include "winutil.h" @@ -617,7 +614,7 @@ void winwindow_update_cursor_state(running_machine &machine) RECT bounds; // hide cursor - while (ShowCursor(FALSE) >= -1) ; + while (ShowCursor(FALSE) >= -1) { }; ShowCursor(TRUE); // store the cursor position @@ -632,7 +629,7 @@ void winwindow_update_cursor_state(running_machine &machine) else { // show cursor - while (ShowCursor(TRUE) < 1) ; + while (ShowCursor(TRUE) < 1) { }; ShowCursor(FALSE); // allow cursor to move freely diff --git a/src/osd/windows/winfile.cpp b/src/osd/windows/winfile.cpp index 86ce65a0ef7..5c4bd309070 100644 --- a/src/osd/windows/winfile.cpp +++ b/src/osd/windows/winfile.cpp @@ -20,7 +20,6 @@ // MAMEOS headers #include "strconv.h" #include "winutil.h" -#include "winutf8.h" #include "winfile.h" @@ -187,10 +186,8 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length, break; case WINFILE_SOCKET: return win_read_socket(file, buffer, offset, length, actual); - break; case WINFILE_PTTY: return win_read_ptty(file, buffer, offset, length, actual); - break; } return FILERR_NONE; @@ -226,10 +223,8 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l break; case WINFILE_SOCKET: return win_write_socket(file, buffer, offset, length, actual); - break; case WINFILE_PTTY: return win_write_ptty(file, buffer, offset, length, actual); - break; } return FILERR_NONE; @@ -274,10 +269,8 @@ file_error osd_truncate(osd_file *file, UINT64 offset) break; case WINFILE_SOCKET: return FILERR_FAILURE; - break; case WINFILE_PTTY: return FILERR_FAILURE; - break; } return FILERR_NONE; diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 13ad19b2d36..3a5bb5eff67 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -29,11 +29,6 @@ #include "winmain.h" #include "window.h" #include "video.h" -#include "input.h" -#include "output.h" -#include "config.h" -#include "osdepend.h" -#include "strconv.h" #include "winutf8.h" #include "winutil.h" #include "debugger.h" @@ -416,7 +411,7 @@ int main(int argc, char *argv[]) // parse config and cmdline options - DWORD result = 0; + DWORD result; { windows_options options; windows_osd_interface osd(options); @@ -1353,7 +1348,8 @@ FPTR symbol_manager::get_text_section_base() //------------------------------------------------- sampling_profiler::sampling_profiler(UINT32 max_seconds, UINT8 stack_depth = 0) - : m_thread(NULL), + : m_target_thread(NULL), + m_thread(NULL), m_thread_id(0), m_thread_exit(false), m_stack_depth(stack_depth), diff --git a/src/osd/windows/winsocket.cpp b/src/osd/windows/winsocket.cpp index 0824967634c..78c3a6161d4 100644 --- a/src/osd/windows/winsocket.cpp +++ b/src/osd/windows/winsocket.cpp @@ -16,11 +16,6 @@ // MAME headers #include "osdcore.h" -// MAMEOS headers -#include "strconv.h" -#include "winutil.h" -#include "winutf8.h" - #include "winfile.h" const char *winfile_socket_identifier = "socket."; diff --git a/src/osd/windows/winutf8.cpp b/src/osd/windows/winutf8.cpp index 19d1517d151..7be40039192 100644 --- a/src/osd/windows/winutf8.cpp +++ b/src/osd/windows/winutf8.cpp @@ -235,7 +235,7 @@ HWND win_create_window_ex_utf8(DWORD exstyle, const char* classname, const char* int x, int y, int width, int height, HWND parent, HMENU menu, HINSTANCE instance, void* param) { - TCHAR* t_classname = NULL; + TCHAR* t_classname; TCHAR* t_windowname = NULL; HWND result = 0; diff --git a/src/osd/windows/winutil.cpp b/src/osd/windows/winutil.cpp index c34e358492b..3d32bf92e6d 100644 --- a/src/osd/windows/winutil.cpp +++ b/src/osd/windows/winutil.cpp @@ -12,7 +12,6 @@ // MAMEOS headers #include "winutil.h" -#include "strconv.h" //============================================================ // win_error_to_file_error |