summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/hng64.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/hng64.cpp')
-rw-r--r--src/mame/drivers/hng64.cpp59
1 files changed, 22 insertions, 37 deletions
diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp
index 2598f38de5c..569c85e461b 100644
--- a/src/mame/drivers/hng64.cpp
+++ b/src/mame/drivers/hng64.cpp
@@ -2315,21 +2315,6 @@ void hng64_state::ioport4_w(uint8_t data)
/***********************************************
- Other port accesses from MCU side
-
-***********************************************/
-
-uint8_t hng64_state::anport0_r() { return m_an_in[0]->read(); }
-uint8_t hng64_state::anport1_r() { return m_an_in[1]->read(); }
-uint8_t hng64_state::anport2_r() { return m_an_in[2]->read(); }
-uint8_t hng64_state::anport3_r() { return m_an_in[3]->read(); }
-uint8_t hng64_state::anport4_r() { return m_an_in[4]->read(); }
-uint8_t hng64_state::anport5_r() { return m_an_in[5]->read(); }
-uint8_t hng64_state::anport6_r() { return m_an_in[6]->read(); }
-uint8_t hng64_state::anport7_r() { return m_an_in[7]->read(); }
-
-/***********************************************
-
Serial Accesses from MCU side
***********************************************/
@@ -2418,14 +2403,14 @@ void hng64_state::hng64(machine_config &config)
//iomcu.p6_out_cb().set(FUNC(hng64_state::ioport6_w)); // the IO MCU code uses the ADC which shares pins with port 6, meaning port 6 isn't used as an IO port
iomcu.p7_out_cb().set(FUNC(hng64_state::ioport7_w)); // configuration / clocking for shared ram (port 0) accesses
// most likely the analog inputs, up to a maximum of 8
- iomcu.an0_in_cb().set(FUNC(hng64_state::anport0_r));
- iomcu.an1_in_cb().set(FUNC(hng64_state::anport1_r));
- iomcu.an2_in_cb().set(FUNC(hng64_state::anport2_r));
- iomcu.an3_in_cb().set(FUNC(hng64_state::anport3_r));
- iomcu.an4_in_cb().set(FUNC(hng64_state::anport4_r));
- iomcu.an5_in_cb().set(FUNC(hng64_state::anport5_r));
- iomcu.an6_in_cb().set(FUNC(hng64_state::anport6_r));
- iomcu.an7_in_cb().set(FUNC(hng64_state::anport7_r));
+ iomcu.an0_in_cb().set_ioport("AN0");
+ iomcu.an1_in_cb().set_ioport("AN1");
+ iomcu.an2_in_cb().set_ioport("AN2");
+ iomcu.an3_in_cb().set_ioport("AN3");
+ iomcu.an4_in_cb().set_ioport("AN4");
+ iomcu.an5_in_cb().set_ioport("AN5");
+ iomcu.an6_in_cb().set_ioport("AN6");
+ iomcu.an7_in_cb().set_ioport("AN7");
// network related?
iomcu.serial0_out_cb().set(FUNC(hng64_state::sio0_w));
//iomcu.serial1_out_cb().set(FUNC(hng64_state::sio1_w)); // not initialized / used
@@ -2439,14 +2424,14 @@ void hng64_state::hng64_default(machine_config &config)
hng64(config);
hng64_lamps_device &lamps(HNG64_LAMPS(config, m_lamps, 0));
- lamps.lamps0_out_cb().set(FUNC(hng64_state::hng64_default_lamps0_w));
- lamps.lamps1_out_cb().set(FUNC(hng64_state::hng64_default_lamps1_w));
- lamps.lamps2_out_cb().set(FUNC(hng64_state::hng64_default_lamps2_w));
- lamps.lamps3_out_cb().set(FUNC(hng64_state::hng64_default_lamps3_w));
- lamps.lamps4_out_cb().set(FUNC(hng64_state::hng64_default_lamps4_w));
- lamps.lamps5_out_cb().set(FUNC(hng64_state::hng64_default_lamps5_w));
- lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_default_lamps6_w));
- lamps.lamps7_out_cb().set(FUNC(hng64_state::hng64_default_lamps7_w));
+ lamps.lamps_out_cb<0>().set(FUNC(hng64_state::hng64_default_lamps_w<0>));
+ lamps.lamps_out_cb<1>().set(FUNC(hng64_state::hng64_default_lamps_w<1>));
+ lamps.lamps_out_cb<2>().set(FUNC(hng64_state::hng64_default_lamps_w<2>));
+ lamps.lamps_out_cb<3>().set(FUNC(hng64_state::hng64_default_lamps_w<3>));
+ lamps.lamps_out_cb<4>().set(FUNC(hng64_state::hng64_default_lamps_w<4>));
+ lamps.lamps_out_cb<5>().set(FUNC(hng64_state::hng64_default_lamps_w<5>));
+ lamps.lamps_out_cb<6>().set(FUNC(hng64_state::hng64_default_lamps_w<6>));
+ lamps.lamps_out_cb<7>().set(FUNC(hng64_state::hng64_default_lamps_w<7>));
}
void hng64_state::hng64_drive(machine_config &config)
@@ -2454,9 +2439,9 @@ void hng64_state::hng64_drive(machine_config &config)
hng64(config);
hng64_lamps_device &lamps(HNG64_LAMPS(config, m_lamps, 0));
- lamps.lamps5_out_cb().set(FUNC(hng64_state::hng64_drive_lamps5_w)); // force feedback steering
- lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_drive_lamps6_w)); // lamps + coin counter
- lamps.lamps7_out_cb().set(FUNC(hng64_state::hng64_drive_lamps7_w)); // lamps
+ lamps.lamps_out_cb<5>().set(FUNC(hng64_state::hng64_drive_lamps5_w)); // force feedback steering
+ lamps.lamps_out_cb<6>().set(FUNC(hng64_state::hng64_drive_lamps6_w)); // lamps + coin counter
+ lamps.lamps_out_cb<7>().set(FUNC(hng64_state::hng64_drive_lamps7_w)); // lamps
}
void hng64_state::hng64_shoot(machine_config &config)
@@ -2464,8 +2449,8 @@ void hng64_state::hng64_shoot(machine_config &config)
hng64(config);
hng64_lamps_device &lamps(HNG64_LAMPS(config, m_lamps, 0));
- lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_shoot_lamps6_w)); // start lamps (some missing?!)
- lamps.lamps7_out_cb().set(FUNC(hng64_state::hng64_shoot_lamps7_w)); // gun lamps
+ lamps.lamps_out_cb<6>().set(FUNC(hng64_state::hng64_shoot_lamps6_w)); // start lamps (some missing?!)
+ lamps.lamps_out_cb<7>().set(FUNC(hng64_state::hng64_shoot_lamps7_w)); // gun lamps
}
void hng64_state::hng64_fight(machine_config &config)
@@ -2473,7 +2458,7 @@ void hng64_state::hng64_fight(machine_config &config)
hng64(config);
hng64_lamps_device &lamps(HNG64_LAMPS(config, m_lamps, 0));
- lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_fight_lamps6_w)); // coin counters
+ lamps.lamps_out_cb<6>().set(FUNC(hng64_state::hng64_fight_lamps6_w)); // coin counters
}