Skip to content

Commit

Permalink
m6801: remove i/o ports tri-state callback
Browse files Browse the repository at this point in the history
  • Loading branch information
@happppp
happppp committed Jun 16, 2023
1 parent 3f3b6c7 commit c1ceb6e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 35 deletions.
30 changes: 13 additions & 17 deletions src/devices/cpu/m6800/m6801.cpp
View file
Expand Up @@ -317,7 +317,6 @@ m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, device_type ty
: m6800_cpu_device(mconfig, type, tag, owner, clock, insn, cycles, internal)
, m_in_port_func(*this)
, m_out_port_func(*this)
, m_tri_port_func(*this)
, m_out_sc2_func(*this)
, m_out_sertx_func(*this)
, m_sclk_divider(8)
Expand Down Expand Up @@ -358,7 +357,6 @@ hd6301x_cpu_device::hd6301x_cpu_device(const machine_config &mconfig, device_typ
: hd6301_cpu_device(mconfig, type, tag, owner, clock, hd63701_insn, cycles_63701)
, m_in_portx_func(*this)
, m_out_portx_func(*this)
, m_tri_portx_func(*this)
{
m_sclk_divider = 16;
}
Expand Down Expand Up @@ -1023,7 +1021,6 @@ void m6801_cpu_device::device_resolve_objects()

m_in_port_func.resolve_all_safe(0xff);
m_out_port_func.resolve_all_safe();
m_tri_port_func.resolve_all_safe(0xff);
m_out_sc2_func.resolve_safe();
m_out_sertx_func.resolve_safe();
}
Expand All @@ -1034,7 +1031,6 @@ void hd6301x_cpu_device::device_resolve_objects()

m_in_portx_func.resolve_all_safe(0xff);
m_out_portx_func.resolve_all_safe();
m_tri_portx_func.resolve_all_safe(0xff);
}


Expand Down Expand Up @@ -1230,7 +1226,7 @@ void m6801_cpu_device::write_port2()

if ((ddr != 0x1f) && ddr)
{
data = (m_port_data[1] & ddr) | (~ddr & m_tri_port_func[1]());
data = (m_port_data[1] & ddr) | (ddr ^ 0xff);
}

if (m_trcsr & M6801_TRCSR_TE)
Expand All @@ -1254,7 +1250,7 @@ void hd6301x_cpu_device::write_port2()
if (m_tcsr2 & TCSR2_OE2)
ddr |= 0x20;

uint8_t data = (m_port_data[1] & ddr) | (~ddr & m_tri_port_func[1]());
uint8_t data = (m_port_data[1] & ddr) | (ddr ^ 0xff);

if (m_trcsr & M6801_TRCSR_TE)
{
Expand Down Expand Up @@ -1293,7 +1289,7 @@ void m6801_cpu_device::p1_ddr_w(uint8_t data)
if (m_port_ddr[0] != data)
{
m_port_ddr[0] = data;
m_out_port_func[0](0, (m_port_data[0] & m_port_ddr[0]) | (~m_port_ddr[0] & m_tri_port_func[0]()), m_port_ddr[0]);
m_out_port_func[0](0, (m_port_data[0] & m_port_ddr[0]) | (m_port_ddr[0] ^ 0xff), m_port_ddr[0]);
}
}

Expand All @@ -1310,7 +1306,7 @@ void m6801_cpu_device::p1_data_w(uint8_t data)
LOGPORT("Port 1 Data Register: %02x\n", data);

m_port_data[0] = data;
m_out_port_func[0](0, (m_port_data[0] & m_port_ddr[0]) | (~m_port_ddr[0] & m_tri_port_func[0]()), m_port_ddr[0]);
m_out_port_func[0](0, (m_port_data[0] & m_port_ddr[0]) | (m_port_ddr[0] ^ 0xff), m_port_ddr[0]);
}

void m6801_cpu_device::p2_ddr_w(uint8_t data)
Expand Down Expand Up @@ -1361,7 +1357,7 @@ void m6801_cpu_device::p3_ddr_w(uint8_t data)
if (m_port_ddr[2] != data)
{
m_port_ddr[2] = data;
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (~m_port_ddr[2] & m_tri_port_func[2]()), m_port_ddr[2]);
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (m_port_ddr[2] ^ 0xff), m_port_ddr[2]);
}
}

Expand Down Expand Up @@ -1418,7 +1414,7 @@ void m6801_cpu_device::p3_data_w(uint8_t data)
}

m_port_data[2] = data;
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (~m_port_ddr[2] & m_tri_port_func[2]()), m_port_ddr[2]);
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (m_port_ddr[2] ^ 0xff), m_port_ddr[2]);

if (m_p3csr & M6801_P3CSR_OSS)
{
Expand All @@ -1441,7 +1437,7 @@ void hd6301x_cpu_device::p3_data_w(uint8_t data)
LOGPORT("Port 3 Data Register: %02x\n", data);

m_port_data[2] = data;
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (~m_port_ddr[2] & m_tri_port_func[2]()), m_port_ddr[2]);
m_out_port_func[2](0, (m_port_data[2] & m_port_ddr[2]) | (m_port_ddr[2] ^ 0xff), m_port_ddr[2]);
}

uint8_t m6801_cpu_device::p3_csr_r()
Expand All @@ -1468,7 +1464,7 @@ void m6801_cpu_device::p4_ddr_w(uint8_t data)
if (m_port_ddr[3] != data)
{
m_port_ddr[3] = data;
m_out_port_func[3](0, (m_port_data[3] & m_port_ddr[3]) | (~m_port_ddr[3] & m_tri_port_func[3]()), m_port_ddr[3]);
m_out_port_func[3](0, (m_port_data[3] & m_port_ddr[3]) | (m_port_ddr[3] ^ 0xff), m_port_ddr[3]);
}
}

Expand All @@ -1485,7 +1481,7 @@ void m6801_cpu_device::p4_data_w(uint8_t data)
LOGPORT("Port 4 Data Register: %02x\n", data);

m_port_data[3] = data;
m_out_port_func[3](0, (m_port_data[3] & m_port_ddr[3]) | (~m_port_ddr[3] & m_tri_port_func[3]()), m_port_ddr[3]);
m_out_port_func[3](0, (m_port_data[3] & m_port_ddr[3]) | (m_port_ddr[3] ^ 0xff), m_port_ddr[3]);
}

void hd6301y_cpu_device::p5_ddr_w(uint8_t data)
Expand All @@ -1495,7 +1491,7 @@ void hd6301y_cpu_device::p5_ddr_w(uint8_t data)
if (m_portx_ddr[0] != data)
{
m_portx_ddr[0] = data;
m_out_portx_func[0](0, (m_portx_data[0] & m_portx_ddr[0]) | (~m_portx_ddr[0] & m_tri_portx_func[0]()), m_portx_ddr[0]);
m_out_portx_func[0](0, (m_portx_data[0] & m_portx_ddr[0]) | (m_portx_ddr[0] ^ 0xff), m_portx_ddr[0]);
}
}

Expand All @@ -1518,7 +1514,7 @@ void hd6301y_cpu_device::p5_data_w(uint8_t data)
LOGPORT("Port 5 Data Register: %02x\n", data);

m_portx_data[0] = data;
m_out_portx_func[0](0, (m_portx_data[0] & m_portx_ddr[0]) | (~m_portx_ddr[0] & m_tri_portx_func[0]()), m_portx_ddr[0]);
m_out_portx_func[0](0, (m_portx_data[0] & m_portx_ddr[0]) | (m_portx_ddr[0] ^ 0xff), m_portx_ddr[0]);
}

void hd6301x_cpu_device::p6_ddr_w(uint8_t data)
Expand All @@ -1528,7 +1524,7 @@ void hd6301x_cpu_device::p6_ddr_w(uint8_t data)
if (m_portx_ddr[1] != data)
{
m_portx_ddr[1] = data;
m_out_portx_func[1](0, (m_portx_data[1] & m_portx_ddr[1]) | (~m_portx_ddr[1] & m_tri_portx_func[1]()), m_portx_ddr[1]);
m_out_portx_func[1](0, (m_portx_data[1] & m_portx_ddr[1]) | (m_portx_ddr[1] ^ 0xff), m_portx_ddr[1]);
}
}

Expand All @@ -1545,7 +1541,7 @@ void hd6301x_cpu_device::p6_data_w(uint8_t data)
LOGPORT("Port 6 Data Register: %02x\n", data);

m_portx_data[1] = data;
m_out_portx_func[1](0, (m_portx_data[1] & m_portx_ddr[1]) | (~m_portx_ddr[1] & m_tri_portx_func[1]()), m_portx_ddr[1]);
m_out_portx_func[1](0, (m_portx_data[1] & m_portx_ddr[1]) | (m_portx_ddr[1] ^ 0xff), m_portx_ddr[1]);
}

uint8_t hd6301y_cpu_device::p6_data_r()
Expand Down
16 changes: 2 additions & 14 deletions src/devices/cpu/m6800/m6801.h
View file
Expand Up @@ -45,7 +45,7 @@ class m6801_cpu_device : public m6800_cpu_device
public:
m6801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

// port 1-4 I/O
// port 1-4 I/O, DDR is passed through mem_mask
auto in_p1_cb() { return m_in_port_func[0].bind(); }
auto out_p1_cb() { return m_out_port_func[0].bind(); }
auto in_p2_cb() { return m_in_port_func[1].bind(); }
Expand All @@ -55,12 +55,6 @@ class m6801_cpu_device : public m6800_cpu_device
auto in_p4_cb() { return m_in_port_func[3].bind(); }
auto out_p4_cb() { return m_out_port_func[3].bind(); }

// port outputs when in tri-state (high-impedance), default 0xff
auto tri_p1_cb() { return m_tri_port_func[0].bind(); }
auto tri_p2_cb() { return m_tri_port_func[1].bind(); }
auto tri_p3_cb() { return m_tri_port_func[2].bind(); }
auto tri_p4_cb() { return m_tri_port_func[3].bind(); }

auto out_sc2_cb() { return m_out_sc2_func.bind(); }
auto out_ser_tx_cb() { return m_out_sertx_func.bind(); }

Expand Down Expand Up @@ -129,7 +123,6 @@ class m6801_cpu_device : public m6800_cpu_device

devcb_read8::array<4> m_in_port_func;
devcb_write8::array<4> m_out_port_func;
devcb_read8::array<4> m_tri_port_func;

devcb_write_line m_out_sc2_func;
devcb_write_line m_out_sertx_func;
Expand Down Expand Up @@ -259,17 +252,13 @@ class hd6303r_cpu_device : public hd6301_cpu_device
class hd6301x_cpu_device : public hd6301_cpu_device
{
public:
// port 5-7 I/O
// port 5-7 I/O, DDR is passed through mem_mask
auto in_p5_cb() { return m_in_portx_func[0].bind(); }
auto out_p5_cb() { return m_out_portx_func[0].bind(); }
auto in_p6_cb() { return m_in_portx_func[1].bind(); }
auto out_p6_cb() { return m_out_portx_func[1].bind(); }
auto out_p7_cb() { return m_out_portx_func[2].bind(); }

// port outputs when in tri-state (high-impedance), default 0xff
auto tri_p5_cb() { return m_tri_portx_func[0].bind(); }
auto tri_p6_cb() { return m_tri_portx_func[1].bind(); }

// TODO: privatize eventually
void hd6301x_io(address_map &map);

Expand Down Expand Up @@ -318,7 +307,6 @@ class hd6301x_cpu_device : public hd6301_cpu_device

devcb_read8::array<2> m_in_portx_func;
devcb_write8::array<3> m_out_portx_func;
devcb_read8::array<2> m_tri_portx_func;

uint8_t m_portx_ddr[2];
uint8_t m_portx_data[3];
Expand Down
5 changes: 2 additions & 3 deletions src/mame/namco/namcos1.cpp
View file
Expand Up @@ -169,7 +169,6 @@ Address Dir Data Name Description
Preliminary driver by:
Ernesto Corvi
ernesto@imagina.com
Expand Down Expand Up @@ -372,8 +371,9 @@ u8 namcos1_state::dsw_r(offs_t offset)
return 0xf0 | bitswap<4>(m_dsw_sel->output_r(), 0, 1, 2, 3);
}

void namcos1_state::coin_w(u8 data)
void namcos1_state::coin_w(offs_t offset, u8 data, u8 mem_mask)
{
data &= mem_mask;
machine().bookkeeping().coin_lockout_global_w(BIT(~data, 0));
machine().bookkeeping().coin_counter_w(0, BIT(data, 1));
machine().bookkeeping().coin_counter_w(1, BIT(data, 2));
Expand Down Expand Up @@ -1019,7 +1019,6 @@ void namcos1_state::ns1(machine_config &config)
m_mcu->set_addrmap(AS_PROGRAM, &namcos1_state::mcu_map);
m_mcu->in_p1_cb().set_ioport("COIN");
m_mcu->out_p1_cb().set(FUNC(namcos1_state::coin_w));
m_mcu->tri_p1_cb().set_constant(0);
m_mcu->out_p2_cb().set(FUNC(namcos1_state::dac_gain_w));

NAMCO_C117(config, m_c117, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/mame/namco/namcos1.h
View file
Expand Up @@ -120,7 +120,7 @@ class namcos1_state : public driver_device
void audiocpu_irq_ack_w(u8 data);
void mcu_irq_ack_w(u8 data);
u8 dsw_r(offs_t offset);
void coin_w(u8 data);
void coin_w(offs_t offset, u8 data, u8 mem_mask);
void dac_gain_w(u8 data);
void sound_bankswitch_w(u8 data);
void mcu_bankswitch_w(u8 data);
Expand Down

0 comments on commit c1ceb6e

Please sign in to comment.