Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-07 02:50:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

micro3d.cpp: Correct and simplify device tags (nw)

Browse Source
This commit is contained in:
AJR 2017-11-08 09:40:02 -05:00
parent 3e8e2b2526
commit d92ecdbbf7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/drivers/micro3d.cpp
View File

@ -214,8 +214,8 @@ static ADDRESS_MAP_START( hostmem, AS_PROGRAM, 16, micro3d_state )
AM_RANGE(0x980000, 0x980001) AM_DEVREADWRITE8("adc", adc0844_device, read, write, 0x00ff) AM_RANGE(0x980000, 0x980001) AM_DEVREADWRITE8("adc", adc0844_device, read, write, 0x00ff)
AM_RANGE(0x9a0000, 0x9a0007) AM_DEVREADWRITE("vgb", tms34010_device, host_r, host_w) AM_RANGE(0x9a0000, 0x9a0007) AM_DEVREADWRITE("vgb", tms34010_device, host_r, host_w)
AM_RANGE(0x9c0000, 0x9c0001) AM_NOP /* Lamps */ AM_RANGE(0x9c0000, 0x9c0001) AM_NOP /* Lamps */
AM_RANGE(0x9e0000, 0x9e002f) AM_DEVREADWRITE8("mc68901", mc68901_device, read, write, 0xff00) AM_RANGE(0x9e0000, 0x9e002f) AM_DEVREADWRITE8("mfp", mc68901_device, read, write, 0xff00)
AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff00) AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0xff00)
AM_RANGE(0xa20000, 0xa20001) AM_READ(micro3d_encoder_h_r) AM_RANGE(0xa20000, 0xa20001) AM_READ(micro3d_encoder_h_r)
AM_RANGE(0xa40002, 0xa40003) AM_READ(micro3d_encoder_l_r) AM_RANGE(0xa40002, 0xa40003) AM_READ(micro3d_encoder_l_r)
ADDRESS_MAP_END ADDRESS_MAP_END
@ -319,14 +319,14 @@ static MACHINE_CONFIG_START( micro3d )
MCFG_MCS51_SERIAL_TX_CB(WRITE8(micro3d_state, data_from_i8031)) MCFG_MCS51_SERIAL_TX_CB(WRITE8(micro3d_state, data_from_i8031))
MCFG_MCS51_SERIAL_RX_CB(READ8(micro3d_state, data_to_i8031)) MCFG_MCS51_SERIAL_RX_CB(READ8(micro3d_state, data_to_i8031))
MCFG_MC68681_ADD("duart68681", XTAL_3_6864MHz) MCFG_MC68681_ADD("duart", XTAL_3_6864MHz)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler)) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("monitor", rs232_port_device, write_txd)) MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("monitor", rs232_port_device, write_txd))
MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb)) MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb))
MCFG_MC68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r)) MCFG_MC68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r))
MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w))
MCFG_DEVICE_ADD("mc68901", MC68901, 4000000) MCFG_DEVICE_ADD("mfp", MC68901, 4000000)
MCFG_MC68901_TIMER_CLOCK(4000000) MCFG_MC68901_TIMER_CLOCK(4000000)
MCFG_MC68901_RX_CLOCK(0) MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0) MCFG_MC68901_TX_CLOCK(0)
@ -347,10 +347,10 @@ static MACHINE_CONFIG_START( micro3d )
MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_PALETTE("palette")
MCFG_RS232_PORT_ADD("monitor", default_rs232_devices, nullptr) MCFG_RS232_PORT_ADD("monitor", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w)) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w))
MCFG_ADC0844_ADD("adc") MCFG_ADC0844_ADD("adc")
MCFG_ADC0844_INTR_CB(DEVWRITELINE("mc68901", mc68901_device, i3_w)) MCFG_ADC0844_INTR_CB(DEVWRITELINE("mfp", mc68901_device, i3_w))
MCFG_ADC0844_CH1_CB(IOPORT("THROTTLE")) MCFG_ADC0844_CH1_CB(IOPORT("THROTTLE"))
MCFG_ADC0844_CH2_CB(READ8(micro3d_state, adc_volume_r)) MCFG_ADC0844_CH2_CB(READ8(micro3d_state, adc_volume_r))

4
src/mame/includes/micro3d.h
View File

@ -54,7 +54,7 @@ public:
m_drmath(*this, "drmath"), m_drmath(*this, "drmath"),
m_vgb(*this, "vgb"), m_vgb(*this, "vgb"),
m_palette(*this, "palette"), m_palette(*this, "palette"),
m_duart68681(*this, "duart68681"), m_duart(*this, "duart"),
m_noise_1(*this, "noise_1"), m_noise_1(*this, "noise_1"),
m_noise_2(*this, "noise_2"), m_noise_2(*this, "noise_2"),
m_vertex(*this, "vertex"), m_vertex(*this, "vertex"),
@ -72,7 +72,7 @@ public:
required_device<cpu_device> m_drmath; required_device<cpu_device> m_drmath;
required_device<tms34010_device> m_vgb; required_device<tms34010_device> m_vgb;
required_device<palette_device> m_palette; required_device<palette_device> m_palette;
required_device<mc68681_device> m_duart68681; required_device<mc68681_device> m_duart;
required_device<micro3d_sound_device> m_noise_1; required_device<micro3d_sound_device> m_noise_1;
required_device<micro3d_sound_device> m_noise_2; required_device<micro3d_sound_device> m_noise_2;
required_memory_region m_vertex; required_memory_region m_vertex;

4
src/mame/machine/micro3d.cpp
View File

@ -34,7 +34,7 @@
WRITE_LINE_MEMBER(micro3d_state::duart_irq_handler) WRITE_LINE_MEMBER(micro3d_state::duart_irq_handler)
{ {
m_maincpu->set_input_line_and_vector(3, state, m_duart68681->get_irq_vector()); m_maincpu->set_input_line_and_vector(3, state, m_duart->get_irq_vector());
} }
WRITE_LINE_MEMBER(micro3d_state::duart_txb) WRITE_LINE_MEMBER(micro3d_state::duart_txb)
@ -52,7 +52,7 @@ READ8_MEMBER(micro3d_state::data_to_i8031)
WRITE8_MEMBER(micro3d_state::data_from_i8031) WRITE8_MEMBER(micro3d_state::data_from_i8031)
{ {
m_duart68681->rx_b_w(data); m_duart->rx_b_w(data);
} }
/* /*