Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-29 23:48:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

hp9k_3xx: cleanup dio config

Browse Source 
/332 was missing DIO slots, /310 had no human interface. While at it,
deduplicate the code a bit.
This commit is contained in:
Sven Schnelle 2018-10-09 19:45:48 +02:00
parent 4b00992b76
commit a50222e2d4
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/mame/drivers/hp9k_3xx.cpp
View File

@ -140,6 +140,9 @@ private:
void hp9k382_map(address_map &map);
void hp9k3xx_common(address_map &map);
void add_dio16_bus(machine_config &mconfig);
void add_dio32_bus(machine_config &mconfig);
DECLARE_WRITE_LINE_MEMBER(dio_irq1_w) { m_maincpu->set_input_line_and_vector(M68K_IRQ_1, state, M68K_INT_ACK_AUTOVECTOR); };
DECLARE_WRITE_LINE_MEMBER(dio_irq2_w) { m_maincpu->set_input_line_and_vector(M68K_IRQ_2, state, M68K_INT_ACK_AUTOVECTOR); };
DECLARE_WRITE_LINE_MEMBER(dio_irq3_w) { m_maincpu->set_input_line_and_vector(M68K_IRQ_3, state, M68K_INT_ACK_AUTOVECTOR); };
@ -287,6 +290,35 @@ void hp9k3xx_state::machine_reset()
m_maincpu->set_reset_callback(write_line_delegate(FUNC(hp9k3xx_state::cpu_reset), this));
}
void hp9k3xx_state::add_dio16_bus(machine_config &config)
{
bus::hp_dio::dio16_device &dio16(DIO16(config, "diobus", 0));
dio16.set_cputag(m_maincpu);
dio16.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w));
dio16.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w));
dio16.irq3_out_cb().set(FUNC(hp9k3xx_state::dio_irq3_w));
dio16.irq4_out_cb().set(FUNC(hp9k3xx_state::dio_irq4_w));
dio16.irq5_out_cb().set(FUNC(hp9k3xx_state::dio_irq5_w));
dio16.irq6_out_cb().set(FUNC(hp9k3xx_state::dio_irq6_w));
dio16.irq7_out_cb().set(FUNC(hp9k3xx_state::dio_irq7_w));
}
void hp9k3xx_state::add_dio32_bus(machine_config &config)
{
bus::hp_dio::dio32_device &dio32(DIO32(config, "diobus", 0));
dio32.set_cputag(m_maincpu);
dio32.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w));
dio32.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w));
dio32.irq3_out_cb().set(FUNC(hp9k3xx_state::dio_irq3_w));
dio32.irq4_out_cb().set(FUNC(hp9k3xx_state::dio_irq4_w));
dio32.irq5_out_cb().set(FUNC(hp9k3xx_state::dio_irq5_w));
dio32.irq6_out_cb().set(FUNC(hp9k3xx_state::dio_irq6_w));
dio32.irq7_out_cb().set(FUNC(hp9k3xx_state::dio_irq7_w));
}
READ16_MEMBER(hp9k3xx_state::buserror16_r)
{
m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE);
@ -344,26 +376,19 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k300)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k310)
hp9k300(config);
MCFG_DEVICE_ADD(m_maincpu, M68010, 10000000)
MCFG_DEVICE_PROGRAM_MAP(hp9k310_map)
bus::hp_dio::dio16_device &dio16(DIO16(config, "diobus", 0));
dio16.set_cputag(m_maincpu);
dio16.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w));
dio16.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w));
dio16.irq3_out_cb().set(FUNC(hp9k3xx_state::dio_irq3_w));
dio16.irq4_out_cb().set(FUNC(hp9k3xx_state::dio_irq4_w));
dio16.irq5_out_cb().set(FUNC(hp9k3xx_state::dio_irq5_w));
dio16.irq6_out_cb().set(FUNC(hp9k3xx_state::dio_irq6_w));
dio16.irq7_out_cb().set(FUNC(hp9k3xx_state::dio_irq7_w));
add_dio16_bus(config);
DIO16_SLOT(config, "sl0", 0, "diobus", dio16_cards, "human_interface", false);
DIO16_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false);
DIO16_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98603b", false);
DIO16_SLOT(config, "sl3", 0, "diobus", dio16_cards, "98644", false);
DIO16_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
@ -371,17 +396,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
MCFG_DEVICE_PROGRAM_MAP(hp9k320_map)
hp9k300(config);
bus::hp_dio::dio16_device &dio32(DIO32(config, "diobus", 0));
dio32.set_cputag(m_maincpu);
dio32.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w));
dio32.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w));
dio32.irq3_out_cb().set(FUNC(hp9k3xx_state::dio_irq3_w));
dio32.irq4_out_cb().set(FUNC(hp9k3xx_state::dio_irq4_w));
dio32.irq5_out_cb().set(FUNC(hp9k3xx_state::dio_irq5_w));
dio32.irq6_out_cb().set(FUNC(hp9k3xx_state::dio_irq6_w));
dio32.irq7_out_cb().set(FUNC(hp9k3xx_state::dio_irq7_w));
add_dio32_bus(config);
DIO32_SLOT(config, "sl0", 0, "diobus", dio16_cards, "human_interface", true);
DIO32_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false);
@ -395,17 +410,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k330)
MCFG_DEVICE_PROGRAM_MAP(hp9k330_map)
hp9k300(config);
bus::hp_dio::dio16_device &dio32(DIO32(config, "diobus", 0));
dio32.set_cputag(m_maincpu);
dio32.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w));
dio32.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w));
dio32.irq3_out_cb().set(FUNC(hp9k3xx_state::dio_irq3_w));
dio32.irq4_out_cb().set(FUNC(hp9k3xx_state::dio_irq4_w));
dio32.irq5_out_cb().set(FUNC(hp9k3xx_state::dio_irq5_w));
dio32.irq6_out_cb().set(FUNC(hp9k3xx_state::dio_irq6_w));
dio32.irq7_out_cb().set(FUNC(hp9k3xx_state::dio_irq7_w));
add_dio32_bus(config);
DIO32_SLOT(config, "sl0", 0, "diobus", dio16_cards, "human_interface", true);
DIO32_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false);
@ -419,6 +424,14 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k332)
MCFG_DEVICE_PROGRAM_MAP(hp9k332_map)
hp9k300(config);
add_dio16_bus(config);
DIO16_SLOT(config, "sl0", 0, "diobus", dio16_cards, "human_interface", true);
DIO16_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98603b", false);
DIO16_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98644", false);
DIO16_SLOT(config, "sl3", 0, "diobus", dio16_cards, nullptr, false);
DIO16_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false);
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(hp9k3xx_state, hp_medres_update)