Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 16:01:56 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

z8: Use devcb3 instead of MCFG_ macros (nw)

Browse Source
This commit is contained in:
AJR 2018-11-18 15:23:42 -05:00
parent 27da21bec9
commit 1740b8b2b7
2 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/devices/cpu/z8/z8.h
View File

@ -12,46 +12,18 @@
#pragma once
#define MCFG_Z8_PORT_P0_READ_CB(_devcb) \
downcast<z8_device &>(*device).set_input_cb(0, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P1_READ_CB(_devcb) \
downcast<z8_device &>(*device).set_input_cb(1, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P2_READ_CB(_devcb) \
downcast<z8_device &>(*device).set_input_cb(2, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P3_READ_CB(_devcb) \
downcast<z8_device &>(*device).set_input_cb(3, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P0_WRITE_CB(_devcb) \
downcast<z8_device &>(*device).set_output_cb(0, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P1_WRITE_CB(_devcb) \
downcast<z8_device &>(*device).set_output_cb(1, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P2_WRITE_CB(_devcb) \
downcast<z8_device &>(*device).set_output_cb(2, DEVCB_##_devcb);
#define MCFG_Z8_PORT_P3_WRITE_CB(_devcb) \
downcast<z8_device &>(*device).set_output_cb(3, DEVCB_##_devcb);
class z8_device : public cpu_device
{
public:
// configuration
template<class Object> devcb_base &set_input_cb(int port, Object &&object)
{
assert(port >= 0 && port < 4);
return m_input_cb[port].set_callback(std::forward<Object>(object));
}
template<class Object> devcb_base &set_output_cb(int port, Object &&object)
{
assert(port >= 0 && port < 4);
return m_output_cb[port].set_callback(std::forward<Object>(object));
}
auto p0_in_cb() { return m_input_cb[0].bind(); }
auto p1_in_cb() { return m_input_cb[1].bind(); }
auto p2_in_cb() { return m_input_cb[2].bind(); }
auto p3_in_cb() { return m_input_cb[3].bind(); }
auto p0_out_cb() { return m_output_cb[0].bind(); }
auto p1_out_cb() { return m_output_cb[1].bind(); }
auto p2_out_cb() { return m_output_cb[2].bind(); }
auto p3_out_cb() { return m_output_cb[3].bind(); }
protected:
enum

18
src/mame/drivers/jtc.cpp
View File

@ -64,7 +64,7 @@ public:
void jtc(machine_config &config);
void jtc_mem(address_map &map);
required_device<cpu_device> m_maincpu;
required_device<z8_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<cassette_image_device> m_cassette;
required_device<speaker_sound_device> m_speaker;
@ -812,11 +812,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(jtc_state::basic)
/* basic machine hardware */
MCFG_DEVICE_ADD(UB8830D_TAG, UB8830D, XTAL(8'000'000))
MCFG_DEVICE_PROGRAM_MAP(jtc_mem)
MCFG_Z8_PORT_P2_WRITE_CB(WRITE8(*this, jtc_state, p2_w))
MCFG_Z8_PORT_P3_READ_CB(READ8(*this, jtc_state, p3_r))
MCFG_Z8_PORT_P3_WRITE_CB(WRITE8(*this, jtc_state, p3_w))
UB8830D(config, m_maincpu, XTAL(8'000'000));
m_maincpu->set_addrmap(AS_PROGRAM, &jtc_state::jtc_mem);
m_maincpu->p2_out_cb().set(FUNC(jtc_state::p2_w));
m_maincpu->p3_in_cb().set(FUNC(jtc_state::p3_r));
m_maincpu->p3_out_cb().set(FUNC(jtc_state::p3_w));
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
@ -862,8 +862,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtces23_state::jtces23)
basic(config);
/* basic machine hardware */
MCFG_DEVICE_MODIFY(UB8830D_TAG)
MCFG_DEVICE_PROGRAM_MAP(jtc_es23_mem)
m_maincpu->set_addrmap(AS_PROGRAM, &jtces23_state::jtc_es23_mem);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -884,8 +883,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtces40_state::jtces40)
basic(config);
/* basic machine hardware */
MCFG_DEVICE_MODIFY(UB8830D_TAG)
MCFG_DEVICE_PROGRAM_MAP(jtc_es40_mem)
m_maincpu->set_addrmap(AS_PROGRAM, &jtces40_state::jtc_es40_mem);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)