diff options
author | Dirk Best <mail@dirk-best.de> | 2018-05-20 10:50:39 +0200 |
---|---|---|
committer | Dirk Best <mail@dirk-best.de> | 2018-05-20 20:32:29 +0200 |
commit | 53b791f7561a524cd8a6add587402f98d6616990 (patch) | |
tree | 05543e3504472440ddef444ac4e34645f3e2979f /src/mame/machine | |
parent | 36bea4a4ad3f53a2c5eaf9e3ba30bb905f56d1ab (diff) |
315_5338a: Rename ports to match other Sega I/O devices
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/315_5338a.h | 28 | ||||
-rw-r--r-- | src/mame/machine/model1io.cpp | 32 | ||||
-rw-r--r-- | src/mame/machine/model1io.h | 16 | ||||
-rw-r--r-- | src/mame/machine/model1io2.cpp | 32 | ||||
-rw-r--r-- | src/mame/machine/model1io2.h | 16 |
5 files changed, 62 insertions, 62 deletions
diff --git a/src/mame/machine/315_5338a.h b/src/mame/machine/315_5338a.h index 4b60130cfa7..c8ece88c109 100644 --- a/src/mame/machine/315_5338a.h +++ b/src/mame/machine/315_5338a.h @@ -34,46 +34,46 @@ #define MCFG_315_5338A_WRITE_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_write_callback(DEVCB_##_devcb); -#define MCFG_315_5338A_IN0_CB(_devcb) \ +#define MCFG_315_5338A_IN_PA_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<0>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT0_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PA_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<0>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN1_CB(_devcb) \ +#define MCFG_315_5338A_IN_PB_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<1>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT1_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PB_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<1>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN2_CB(_devcb) \ +#define MCFG_315_5338A_IN_PC_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<2>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT2_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PC_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<2>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN3_CB(_devcb) \ +#define MCFG_315_5338A_IN_PD_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<3>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT3_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PD_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<3>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN4_CB(_devcb) \ +#define MCFG_315_5338A_IN_PE_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<4>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT4_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PE_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<4>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN5_CB(_devcb) \ +#define MCFG_315_5338A_IN_PF_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<5>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT5_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PF_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<5>(DEVCB_##_devcb); -#define MCFG_315_5338A_IN6_CB(_devcb) \ +#define MCFG_315_5338A_IN_PG_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_in_callback<6>(DEVCB_##_devcb); -#define MCFG_315_5338A_OUT6_CB(_devcb) \ +#define MCFG_315_5338A_OUT_PG_CB(_devcb) \ devcb = &downcast<sega_315_5338a_device &>(*device).set_out_callback<6>(DEVCB_##_devcb); diff --git a/src/mame/machine/model1io.cpp b/src/mame/machine/model1io.cpp index 212b10009ea..855e35403e4 100644 --- a/src/mame/machine/model1io.cpp +++ b/src/mame/machine/model1io.cpp @@ -137,14 +137,14 @@ MACHINE_CONFIG_START( model1io_device::device_add_mconfig ) MCFG_DEVICE_ADD("io", SEGA_315_5338A, 0) MCFG_315_5338A_READ_CB(READ8(*this, model1io_device, io_r)) MCFG_315_5338A_WRITE_CB(WRITE8(*this, model1io_device, io_w)) - MCFG_315_5338A_OUT0_CB(WRITE8(*this, model1io_device, out0_w)) - MCFG_315_5338A_IN1_CB(READ8(*this, model1io_device, in1_r)) - MCFG_315_5338A_IN2_CB(READ8(*this, model1io_device, in2_r)) - MCFG_315_5338A_IN3_CB(READ8(*this, model1io_device, in3_r)) - MCFG_315_5338A_IN4_CB(READ8(*this, model1io_device, in4_r)) - MCFG_315_5338A_OUT4_CB(WRITE8(*this, model1io_device, out4_w)) - MCFG_315_5338A_OUT5_CB(WRITE8(*this, model1io_device, out5_w)) - MCFG_315_5338A_IN6_CB(READ8(*this, model1io_device, in6_r)) + MCFG_315_5338A_OUT_PA_CB(WRITE8(*this, model1io_device, io_pa_w)) + MCFG_315_5338A_IN_PB_CB(READ8(*this, model1io_device, io_pb_r)) + MCFG_315_5338A_IN_PC_CB(READ8(*this, model1io_device, io_pc_r)) + MCFG_315_5338A_IN_PD_CB(READ8(*this, model1io_device, io_pd_r)) + MCFG_315_5338A_IN_PE_CB(READ8(*this, model1io_device, io_pe_r)) + MCFG_315_5338A_OUT_PE_CB(WRITE8(*this, model1io_device, io_pe_w)) + MCFG_315_5338A_OUT_PF_CB(WRITE8(*this, model1io_device, io_pf_w)) + MCFG_315_5338A_IN_PG_CB(READ8(*this, model1io_device, io_pg_r)) MCFG_DEVICE_ADD("adc", MSM6253, 0) MCFG_MSM6253_IN0_ANALOG_READ(model1io_device, analog0_r) @@ -212,7 +212,7 @@ WRITE8_MEMBER( model1io_device::io_w ) m_write_cb(offset, data, 0xff); } -WRITE8_MEMBER( model1io_device::out0_w ) +WRITE8_MEMBER( model1io_device::io_pa_w ) { // 7------- eeprom clk // -6------ eeprom cs @@ -229,37 +229,37 @@ WRITE8_MEMBER( model1io_device::out0_w ) m_secondary_controls = bool(BIT(data, 0)); } -READ8_MEMBER( model1io_device::in1_r ) +READ8_MEMBER( model1io_device::io_pb_r ) { return m_secondary_controls ? m_in_cb[3](0) : m_in_cb[0](0); } -READ8_MEMBER( model1io_device::in2_r ) +READ8_MEMBER( model1io_device::io_pc_r ) { return m_secondary_controls ? m_in_cb[4](0) : m_in_cb[1](0); } -READ8_MEMBER( model1io_device::in3_r ) +READ8_MEMBER( model1io_device::io_pd_r ) { return m_secondary_controls ? m_in_cb[5](0) : m_in_cb[2](0); } -READ8_MEMBER( model1io_device::in4_r ) +READ8_MEMBER( model1io_device::io_pe_r ) { return m_drive_read_cb(0); } -WRITE8_MEMBER( model1io_device::out4_w ) +WRITE8_MEMBER( model1io_device::io_pe_w ) { m_drive_write_cb(data); } -WRITE8_MEMBER( model1io_device::out5_w ) +WRITE8_MEMBER( model1io_device::io_pf_w ) { m_output_cb(data); } -READ8_MEMBER( model1io_device::in6_r ) +READ8_MEMBER( model1io_device::io_pg_r ) { // 7------- eeprom do // -654---- unknown diff --git a/src/mame/machine/model1io.h b/src/mame/machine/model1io.h index 75e2d42567b..acb2fe5bae9 100644 --- a/src/mame/machine/model1io.h +++ b/src/mame/machine/model1io.h @@ -128,14 +128,14 @@ private: DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); - DECLARE_WRITE8_MEMBER(out0_w); - DECLARE_READ8_MEMBER(in1_r); - DECLARE_READ8_MEMBER(in2_r); - DECLARE_READ8_MEMBER(in3_r); - DECLARE_READ8_MEMBER(in4_r); - DECLARE_WRITE8_MEMBER(out4_w); - DECLARE_WRITE8_MEMBER(out5_w); - DECLARE_READ8_MEMBER(in6_r); + DECLARE_WRITE8_MEMBER(io_pa_w); + DECLARE_READ8_MEMBER(io_pb_r); + DECLARE_READ8_MEMBER(io_pc_r); + DECLARE_READ8_MEMBER(io_pd_r); + DECLARE_READ8_MEMBER(io_pe_r); + DECLARE_WRITE8_MEMBER(io_pe_w); + DECLARE_WRITE8_MEMBER(io_pf_w); + DECLARE_READ8_MEMBER(io_pg_r); ioport_value analog0_r(); ioport_value analog1_r(); diff --git a/src/mame/machine/model1io2.cpp b/src/mame/machine/model1io2.cpp index 3eaa59e5ff9..e52573c83e2 100644 --- a/src/mame/machine/model1io2.cpp +++ b/src/mame/machine/model1io2.cpp @@ -156,14 +156,14 @@ MACHINE_CONFIG_START( model1io2_device::device_add_mconfig ) MCFG_DEVICE_ADD("io", SEGA_315_5338A, 0) MCFG_315_5338A_READ_CB(READ8(*this, model1io2_device, io_r)) MCFG_315_5338A_WRITE_CB(WRITE8(*this, model1io2_device, io_w)) - MCFG_315_5338A_IN0_CB(READ8(*this, model1io2_device, in0_r)) - MCFG_315_5338A_IN1_CB(READ8(*this, model1io2_device, in1_r)) - MCFG_315_5338A_IN2_CB(READ8(*this, model1io2_device, in2_r)) - MCFG_315_5338A_IN4_CB(READ8(*this, model1io2_device, in4_r)) - MCFG_315_5338A_OUT3_CB(WRITE8(*this, model1io2_device, out3_w)) - MCFG_315_5338A_OUT4_CB(WRITE8(*this, model1io2_device, out4_w)) - MCFG_315_5338A_OUT5_CB(WRITE8(*this, model1io2_device, out5_w)) - MCFG_315_5338A_OUT6_CB(WRITE8(*this, model1io2_device, out6_w)) + MCFG_315_5338A_IN_PA_CB(READ8(*this, model1io2_device, io_pa_r)) + MCFG_315_5338A_IN_PB_CB(READ8(*this, model1io2_device, io_pb_r)) + MCFG_315_5338A_IN_PC_CB(READ8(*this, model1io2_device, io_pc_r)) + MCFG_315_5338A_OUT_PD_CB(WRITE8(*this, model1io2_device, io_pd_w)) + MCFG_315_5338A_IN_PE_CB(READ8(*this, model1io2_device, io_pe_r)) + MCFG_315_5338A_OUT_PE_CB(WRITE8(*this, model1io2_device, io_pe_w)) + MCFG_315_5338A_OUT_PF_CB(WRITE8(*this, model1io2_device, io_pf_w)) + MCFG_315_5338A_OUT_PG_CB(WRITE8(*this, model1io2_device, io_pg_w)) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93C45 @@ -279,38 +279,38 @@ WRITE8_MEMBER( model1io2_device::io_w ) m_write_cb(offset, data, 0xff); } -READ8_MEMBER( model1io2_device::in0_r ) +READ8_MEMBER( model1io2_device::io_pa_r ) { return m_in_cb[0](0); } -READ8_MEMBER( model1io2_device::in1_r ) +READ8_MEMBER( model1io2_device::io_pb_r ) { return m_in_cb[1](0); } -READ8_MEMBER( model1io2_device::in2_r ) +READ8_MEMBER( model1io2_device::io_pc_r ) { return m_in_cb[2](0); } -WRITE8_MEMBER( model1io2_device::out3_w ) +WRITE8_MEMBER( model1io2_device::io_pd_w ) { m_output_cb(data); } -READ8_MEMBER( model1io2_device::in4_r ) +READ8_MEMBER( model1io2_device::io_pe_r ) { return m_drive_read_cb(0); } -WRITE8_MEMBER( model1io2_device::out4_w ) +WRITE8_MEMBER( model1io2_device::io_pe_w ) { m_lcd_data = data; m_drive_write_cb(data); } -WRITE8_MEMBER( model1io2_device::out5_w ) +WRITE8_MEMBER( model1io2_device::io_pf_w ) { // 7------- not used? // -6------ eeprom di @@ -329,7 +329,7 @@ WRITE8_MEMBER( model1io2_device::out5_w ) m_lcd->write(space, BIT(data, 0), m_lcd_data); } -WRITE8_MEMBER( model1io2_device::out6_w ) +WRITE8_MEMBER( model1io2_device::io_pg_w ) { // 7------- unknown (input related?) // -6------ control panel switch diff --git a/src/mame/machine/model1io2.h b/src/mame/machine/model1io2.h index 48752d5677b..d191f93d76f 100644 --- a/src/mame/machine/model1io2.h +++ b/src/mame/machine/model1io2.h @@ -120,14 +120,14 @@ private: DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); - DECLARE_READ8_MEMBER(in0_r); - DECLARE_READ8_MEMBER(in1_r); - DECLARE_READ8_MEMBER(in2_r); - DECLARE_READ8_MEMBER(in4_r); - DECLARE_WRITE8_MEMBER(out3_w); - DECLARE_WRITE8_MEMBER(out4_w); - DECLARE_WRITE8_MEMBER(out5_w); - DECLARE_WRITE8_MEMBER(out6_w); + DECLARE_READ8_MEMBER(io_pa_r); + DECLARE_READ8_MEMBER(io_pb_r); + DECLARE_READ8_MEMBER(io_pc_r); + DECLARE_WRITE8_MEMBER(io_pd_w); + DECLARE_READ8_MEMBER(io_pe_r); + DECLARE_WRITE8_MEMBER(io_pe_w); + DECLARE_WRITE8_MEMBER(io_pf_w); + DECLARE_WRITE8_MEMBER(io_pg_w); DECLARE_READ8_MEMBER(fpga_r); DECLARE_WRITE8_MEMBER(fpga_w); |