summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-11-26 21:18:04 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2020-11-26 21:18:04 +0100
commit461acdffd05b15245e700c8460d3fbef8261bf75 (patch)
treea924d587b50be4bfb43c042ce1c5a62dc249d95c
parent3228002ed4781ece4c5cfae99c8e22247bd53932 (diff)
pce, ti99_8: removed MACHINE_*_MEMBER and VIDEO_START_MEMBER
-rw-r--r--src/mame/drivers/pce.cpp6
-rw-r--r--src/mame/drivers/ti99_8.cpp12
-rw-r--r--src/mame/includes/pce.h25
-rw-r--r--src/mame/machine/pce.cpp4
4 files changed, 24 insertions, 23 deletions
diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp
index 0f5462da29c..0c1a84a2958 100644
--- a/src/mame/drivers/pce.cpp
+++ b/src/mame/drivers/pce.cpp
@@ -319,9 +319,6 @@ void pce_state::pce_common(machine_config &config)
config.set_maximum_quantum(attotime::from_hz(60));
- MCFG_MACHINE_START_OVERRIDE(pce_state, pce )
- MCFG_MACHINE_RESET_OVERRIDE(pce_state, mess_pce )
-
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_raw(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242);
@@ -376,9 +373,6 @@ void pce_state::sgx(machine_config &config)
config.set_maximum_quantum(attotime::from_hz(60));
- MCFG_MACHINE_START_OVERRIDE(pce_state, pce )
- MCFG_MACHINE_RESET_OVERRIDE(pce_state, mess_pce )
-
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_raw(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242);
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 010821b54e7..af38d3507c9 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -192,6 +192,9 @@ Known Issues (MZ, 2019-05-10)
#include "logmacro.h"
+
+namespace {
+
/*
READY bits.
*/
@@ -231,10 +234,6 @@ public:
void driver_reset() override;
private:
- // Machine management
- DECLARE_MACHINE_START(ti99_8);
- DECLARE_MACHINE_RESET(ti99_8);
-
// Processor connections with the main board
uint8_t cruread(offs_t offset);
void cruwrite(offs_t offset, uint8_t data);
@@ -629,7 +628,7 @@ WRITE_LINE_MEMBER( ti99_8_state::extint )
m_tms9901->set_int_line(1, state);
}
-WRITE_LINE_MEMBER( ti99_8_state::notconnected )
+[[maybe_unused]] WRITE_LINE_MEMBER( ti99_8_state::notconnected )
{
LOGMASKED(LOG_INTERRUPTS, "Setting a not connected line ... ignored\n");
}
@@ -888,6 +887,9 @@ ROM_END
#define rom_ti99_8e rom_ti99_8
+} // Anonymous namespace
+
+
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1983, ti99_8, 0, 0, ti99_8_60hz, ti99_8, ti99_8_state, empty_init, "Texas Instruments", "TI-99/8 Computer (US)", MACHINE_SUPPORTS_SAVE )
COMP( 1983, ti99_8e, ti99_8, 0, ti99_8_50hz, ti99_8, ti99_8_state, empty_init, "Texas Instruments", "TI-99/8 Computer (Europe)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h
index 585c911ed01..38cd0f23335 100644
--- a/src/mame/includes/pce.h
+++ b/src/mame/includes/pce.h
@@ -47,10 +47,24 @@ public:
m_a_card(*this, "A_CARD")
{ }
+ void init_sgx();
+ void init_tg16();
+ void init_mess_pce();
+
+ void pce_common(machine_config &config);
+ void pce(machine_config &config);
+ void tg16(machine_config &config);
+ void sgx(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+private:
required_device<h6280_device> m_maincpu;
required_shared_ptr<uint8_t> m_cd_ram;
required_shared_ptr<uint8_t> m_user_ram;
- optional_device<huc6260_device> m_huc6260;
+ required_device<huc6260_device> m_huc6260;
required_device<pce_cart_slot_device> m_cartslot;
optional_device<pce_cd_device> m_cd;
required_ioport_array<5> m_joy;
@@ -70,16 +84,7 @@ public:
uint8_t pce_cd_intf_r(offs_t offset);
uint8_t pce_cd_acard_wram_r(offs_t offset);
void pce_cd_acard_wram_w(offs_t offset, uint8_t data);
- void init_sgx();
- void init_tg16();
- void init_mess_pce();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_MACHINE_START(pce);
- DECLARE_MACHINE_RESET(mess_pce);
- void pce_common(machine_config &config);
- void pce(machine_config &config);
- void tg16(machine_config &config);
- void sgx(machine_config &config);
void pce_io(address_map &map);
void pce_mem(address_map &map);
void sgx_io(address_map &map);
diff --git a/src/mame/machine/pce.cpp b/src/mame/machine/pce.cpp
index 43a811da9d8..1dd3787071c 100644
--- a/src/mame/machine/pce.cpp
+++ b/src/mame/machine/pce.cpp
@@ -94,7 +94,7 @@ void pce_state::init_sgx()
m_io_port_options = PCE_JOY_SIG | CONST_SIG;
}
-MACHINE_START_MEMBER(pce_state,pce)
+void pce_state::machine_start()
{
if (m_cd)
m_cd->late_setup();
@@ -108,7 +108,7 @@ MACHINE_START_MEMBER(pce_state,pce)
save_item(NAME(m_joy_6b_packet));
}
-MACHINE_RESET_MEMBER(pce_state,mess_pce)
+void pce_state::machine_reset()
{
for (auto & elem : m_joy_6b_packet)
elem = 0;