summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/segas32.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-07-07 02:40:29 +1000
committer Vas Crabb <vas@vastheman.com>2018-07-07 02:40:29 +1000
commitc3fb11c2c98a5c28ece6a27093a0f9def350ac64 (patch)
treec68b38f05ed1d32358add721fda7f45e8803479f /src/mame/drivers/segas32.cpp
parent5d9e33b786d7ef452317439359f3cbd8cc920513 (diff)
devcb3
There are multiple issues with the current device callbacks: * They always dispatch through a pointer-to-member * Chained callbacks are a linked list so the branch unit can't predict the early * There's a runtime decision made on the left/right shift direction * There are runtime NULL checks on various objects * Binding a lambda isn't practical * Arbitrary transformations are not supported * When chaining callbacks it isn't clear what the MCFG_DEVCB_ modifiers apply to * It isn't possible to just append to a callback in derived configuration * The macros need a magic, hidden local called devcb * Moving code that uses the magic locals around is error-prone * Writing the MCFG_ macros to make a device usable is a pain * You can't discover applicable MCFG_ macros with intellisense * Macros are not scoped * Using an inappropriate macro isn't detected at compile time * Lots of other things This changeset overcomes the biggest obstacle to remving MCFG_ macros altogether. Essentially, to allow a devcb to be configured, call .bind() and expose the result (a bind target for the callback). Bind target methods starting with "set" repace the current callbacks; methods starting with "append" append to them. You can't reconfigure a callback after resolving it. There's no need to use a macro matching the handler signatures - use FUNC for everything. Current device is implied if no tag/finder is supplied (no need for explicit this). Lambdas are supported, and the memory space and offset are optional. These kinds of things work: * .read_cb().set([this] () { return something; }); * .read_cb().set([this] (offs_t offset) { return ~offset; }); * .write_cb().set([this] (offs_t offset, u8 data) { m_array[offset] = data; }); * .write_cb().set([this] (int state) { some_var = state; }); Arbitrary transforms are allowed, and they can modify offset/mask for example: * .read_cb().set(FUNC(my_state::handler)).transform([] (u8 data) { return bitswap<4>(data, 1, 3, 0, 2); }); * .read_cb().set(m_dev, FUNC(some_device::member)).transform([] (offs_t &offset, u8 data) { offset ^= 3; return data; }); It's possible to stack arbitrary transforms, at the cost of compile time (the whole transform stack gets inlined at compile time). Shifts count as an arbitrary transform, but mask/exor does not. Order of mask/shift/exor now matters. Modifications are applied in the specified order. These are NOT EQUIVALENT: * .read_cb().set(FUNC(my_state::handler)).mask(0x06).lshift(2); * .read_cb().set(FUNC(my_state::handler)).lshift(2).mask(0x06); The bit helper no longer reverses its behaviour for read callbacks, and I/O ports are no longer aware of the field mask. Binding a read callback to no-op is not supported - specify a constant. The GND and VCC aliases have been removed intentionally - they're TTL-centric, and were already being abused. Other quirks have been preserved, including write logger only logging when the data is non-zero (quite unhelpful in many of the cases where it's used). Legacy syntax is still supported for simple cases, but will be phased out. New devices should not have MCFG_ macros. I don't think I've missed any fundamental issues, but if I've broken something, let me know.
Diffstat (limited to 'src/mame/drivers/segas32.cpp')
-rw-r--r--src/mame/drivers/segas32.cpp92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 1ad0169693c..33f91ab8279 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -2207,26 +2207,26 @@ MACHINE_CONFIG_START(segas32_state::device_add_mconfig)
MCFG_DEVICE_PROGRAM_MAP(system32_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas32_state, start_of_vblank_int)
- MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MCFG_DEVICE_PROGRAM_MAP(system32_sound_map)
- MCFG_DEVICE_IO_MAP(system32_sound_portmap)
-
- MCFG_DEVICE_ADD("io_chip", SEGA_315_5296, 0) // unknown clock
- MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_A"))
- MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_A"))
- MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_A"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_0_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
- MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_A"))
- MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_A"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_0_w))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segas32_state, tilebank_external_w))
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_0_w))
- MCFG_315_5296_OUT_CNT2_CB(INPUTLINE("soundcpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
-
- MCFG_DEVICE_ADD("eeprom", EEPROM_SERIAL_93C46_16BIT)
+ Z80(config, m_soundcpu, MASTER_CLOCK/4);
+ m_soundcpu->set_addrmap(AS_PROGRAM, &segas32_state::system32_sound_map);
+ m_soundcpu->set_addrmap(AS_IO, &segas32_state::system32_sound_portmap);
+
+ sega_315_5296_device &io_chip(SEGA_315_5296(config, "io_chip", 0)); // unknown clock
+ io_chip.in_pa_callback().set_ioport("P1_A");
+ io_chip.in_pb_callback().set_ioport("P2_A");
+ io_chip.in_pc_callback().set_ioport("PORTC_A");
+ io_chip.out_pd_callback().set(FUNC(segas32_state::misc_output_0_w));
+ io_chip.out_pd_callback().append("eeprom", FUNC(eeprom_serial_93cxx_device::di_write)).bit(7);
+ io_chip.out_pd_callback().append("eeprom", FUNC(eeprom_serial_93cxx_device::cs_write)).bit(5);
+ io_chip.out_pd_callback().append("eeprom", FUNC(eeprom_serial_93cxx_device::clk_write)).bit(6);
+ io_chip.in_pe_callback().set_ioport("SERVICE12_A");
+ io_chip.in_pf_callback().set_ioport("SERVICE34_A");
+ io_chip.out_pg_callback().set(FUNC(segas32_state::sw2_output_0_w));
+ io_chip.out_ph_callback().set(FUNC(segas32_state::tilebank_external_w));
+ io_chip.out_cnt1_callback().set(FUNC(segas32_state::display_enable_0_w));
+ io_chip.out_cnt2_callback().set_inputline(m_soundcpu, INPUT_LINE_RESET).invert();
+
+ EEPROM_SERIAL_93C46_16BIT(config, "eeprom");
MCFG_TIMER_DRIVER_ADD("v60_irq0", segas32_state, signal_v60_irq_callback)
MCFG_TIMER_DRIVER_ADD("v60_irq1", segas32_state, signal_v60_irq_callback)
@@ -2524,32 +2524,32 @@ MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig)
MCFG_DEVICE_PROGRAM_MAP(multi32_sound_map)
MCFG_DEVICE_IO_MAP(multi32_sound_portmap)
- MCFG_DEVICE_ADD("io_chip_0", SEGA_315_5296, 0) // unknown clock
- MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_A"))
- MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_A"))
- MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_A"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_0_w))
- MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_A"))
- MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_A"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_0_w))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segas32_state, tilebank_external_w))
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_0_w))
- MCFG_315_5296_OUT_CNT2_CB(INPUTLINE("soundcpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
-
- MCFG_DEVICE_ADD("io_chip_1", SEGA_315_5296, 0) // unknown clock
- MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_B"))
- MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_B"))
- MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_B"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_1_w))
- MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_B"))
- MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_B"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_1_w))
- MCFG_315_5296_OUT_PORTH_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_1_w))
-
- MCFG_DEVICE_ADD("eeprom", EEPROM_SERIAL_93C46_16BIT)
+ sega_315_5296_device &io_chip_0(SEGA_315_5296(config, "io_chip_0", 0)); // unknown clock
+ io_chip_0.in_pa_callback().set_ioport("P1_A");
+ io_chip_0.in_pb_callback().set_ioport("P2_A");
+ io_chip_0.in_pc_callback().set_ioport("PORTC_A");
+ io_chip_0.out_pd_callback().set(FUNC(segas32_state::misc_output_0_w));
+ io_chip_0.in_pe_callback().set_ioport("SERVICE12_A");
+ io_chip_0.in_pf_callback().set_ioport("SERVICE34_A");
+ io_chip_0.out_pg_callback().set(FUNC(segas32_state::sw2_output_0_w));
+ io_chip_0.out_ph_callback().set(FUNC(segas32_state::tilebank_external_w));
+ io_chip_0.out_cnt1_callback().set(FUNC(segas32_state::display_enable_0_w));
+ io_chip_0.out_cnt2_callback().set_inputline(m_soundcpu, INPUT_LINE_RESET).invert();
+
+ sega_315_5296_device &io_chip_1(SEGA_315_5296(config, "io_chip_1", 0)); // unknown clock
+ io_chip_1.in_pa_callback().set_ioport("P1_B");
+ io_chip_1.in_pb_callback().set_ioport("P2_B");
+ io_chip_1.in_pc_callback().set_ioport("PORTC_B");
+ io_chip_1.out_pd_callback().set(FUNC(segas32_state::misc_output_1_w));
+ io_chip_1.in_pe_callback().set_ioport("SERVICE12_B");
+ io_chip_1.in_pf_callback().set_ioport("SERVICE34_B");
+ io_chip_1.out_pg_callback().set(FUNC(segas32_state::sw2_output_1_w));
+ io_chip_1.out_ph_callback().set("eeprom", FUNC(eeprom_serial_93cxx_device::di_write)).bit(7);
+ io_chip_1.out_ph_callback().append("eeprom", FUNC(eeprom_serial_93cxx_device::cs_write)).bit(5);
+ io_chip_1.out_ph_callback().append("eeprom", FUNC(eeprom_serial_93cxx_device::clk_write)).bit(6);
+ io_chip_1.out_cnt1_callback().set(FUNC(segas32_state::display_enable_1_w));
+
+ EEPROM_SERIAL_93C46_16BIT(config, "eeprom");
MCFG_TIMER_DRIVER_ADD("v60_irq0", segas32_state, signal_v60_irq_callback)
MCFG_TIMER_DRIVER_ADD("v60_irq1", segas32_state, signal_v60_irq_callback)