diff options
Diffstat (limited to 'src/mame/drivers/ti99_4x.cpp')
-rw-r--r-- | src/mame/drivers/ti99_4x.cpp | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index cfd2ee57201..f7ac932a245 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -52,7 +52,7 @@ #include "bus/ti99/internal/evpcconn.h" #include "bus/ti99/joyport/joyport.h" -#include "bus/ti99/peb/peribox.h" +#include "bus/ti99/internal/ioport.h" #include "machine/ram.h" #include "softlist.h" @@ -82,7 +82,7 @@ public: m_cpu(*this, "maincpu"), m_tms9901(*this, TMS9901_TAG), m_gromport(*this, GROMPORT_TAG), - m_peribox(*this, PERIBOX_TAG), + m_ioport(*this, TI99_IOPORT_TAG), m_joyport(*this, JOYPORT_TAG), m_datamux(*this, DATAMUX_TAG), m_video(*this, VDP_TAG), @@ -167,7 +167,7 @@ private: required_device<tms9900_device> m_cpu; required_device<tms9901_device> m_tms9901; required_device<bus::ti99::internal::gromport_device> m_gromport; - required_device<bus::ti99::peb::peribox_device> m_peribox; + required_device<bus::ti99::internal::ioport_device> m_ioport; required_device<bus::ti99::joyport::joyport_device> m_joyport; required_device<bus::ti99::internal::datamux_device> m_datamux; optional_device<tms9928a_device> m_video; @@ -397,7 +397,7 @@ READ8_MEMBER( ti99_4x_state::cruread ) // The QI version does not propagate the CRU signals to the cartridge slot if (m_model != MODEL_4QI) m_gromport->crureadz(space, offset<<4, &value); - m_peribox->crureadz(space, offset<<4, &value); + m_ioport->crureadz(space, offset<<4, &value); return value; } @@ -407,7 +407,7 @@ WRITE8_MEMBER( ti99_4x_state::cruwrite ) if (TRACE_CRU) logerror("ti99_4x: write access to CRU address %04x\n", offset << 1); // The QI version does not propagate the CRU signals to the cartridge slot if (m_model != MODEL_4QI) m_gromport->cruwrite(space, offset<<1, data); - m_peribox->cruwrite(space, offset<<1, data); + m_ioport->cruwrite(space, offset<<1, data); } WRITE8_MEMBER( ti99_4x_state::external_operation ) @@ -637,7 +637,7 @@ READ8_MEMBER( ti99_4x_state::interrupt_level ) WRITE_LINE_MEMBER( ti99_4x_state::clock_out ) { m_datamux->clock_in(state); - m_peribox->clock_in(state); + m_ioport->clock_in(state); } /* @@ -811,8 +811,6 @@ void ti99_4x_state::register_save_state() MACHINE_START_MEMBER(ti99_4x_state,ti99_4) { - m_peribox->senila(CLEAR_LINE); - m_peribox->senilb(CLEAR_LINE); m_nready_combined = 0; m_model = MODEL_4; register_save_state(); @@ -875,11 +873,10 @@ static MACHINE_CONFIG_START( ti99_4 ) // Software list MCFG_SOFTWARE_LIST_ADD("cart_list_ti99", "ti99_cart") - // Peripheral expansion box - MCFG_DEVICE_ADD( PERIBOX_TAG, PERIBOX, 0) - MCFG_PERIBOX_INTA_HANDLER( WRITELINE(ti99_4x_state, extint) ) - MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4x_state, notconnected) ) - MCFG_PERIBOX_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) + // Input/output port + MCFG_IOPORT_ADD( TI99_IOPORT_TAG ) + MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) ) + MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) // Sound hardware MCFG_SPEAKER_STANDARD_MONO("sound_out") @@ -935,8 +932,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(ti99_4x_state,ti99_4a) { - m_peribox->senila(CLEAR_LINE); - m_peribox->senilb(CLEAR_LINE); m_nready_combined = 0; m_model = MODEL_4A; register_save_state(); @@ -995,11 +990,10 @@ static MACHINE_CONFIG_START( ti99_4a ) // Software list MCFG_SOFTWARE_LIST_ADD("cart_list_ti99", "ti99_cart") - // Peripheral expansion box - MCFG_DEVICE_ADD( PERIBOX_TAG, PERIBOX, 0) - MCFG_PERIBOX_INTA_HANDLER( WRITELINE(ti99_4x_state, extint) ) - MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4x_state, notconnected) ) - MCFG_PERIBOX_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) + // Input/output port + MCFG_IOPORT_ADD( TI99_IOPORT_TAG ) + MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) ) + MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) // Sound hardware MCFG_SPEAKER_STANDARD_MONO("sound_out") @@ -1059,8 +1053,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(ti99_4x_state, ti99_4qi) { - m_peribox->senila(CLEAR_LINE); - m_peribox->senilb(CLEAR_LINE); m_model = MODEL_4QI; m_nready_combined = 0; register_save_state(); @@ -1093,8 +1085,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(ti99_4x_state, ti99_4ev) { - m_peribox->senila(CLEAR_LINE); - m_peribox->senilb(CLEAR_LINE); m_nready_combined = 0; m_model = MODEL_4A; // Removing the TMS9928a requires to add a replacement for the GROMCLK. @@ -1159,11 +1149,10 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz ) // Software list MCFG_SOFTWARE_LIST_ADD("cart_list_ti99", "ti99_cart") - // Peripheral expansion box - MCFG_DEVICE_ADD( PERIBOX_TAG, PERIBOX_EV, 0) - MCFG_PERIBOX_INTA_HANDLER( WRITELINE(ti99_4x_state, extint) ) - MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4x_state, notconnected) ) - MCFG_PERIBOX_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) + // Input/output port + MCFG_IOPORT_ADD( TI99_IOPORT_TAG ) + MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) ) + MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) ) // Cassette drives MCFG_SPEAKER_STANDARD_MONO("cass_out") |