Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

74259: Internal cleanups (nw)

Browse Source
This commit is contained in:
AJR 2017-07-24 08:41:47 -04:00 committed by Vas Crabb
parent dab683e78f
commit d20c491781
2 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/devices/machine/74259.cpp
View File

@ -102,10 +102,11 @@ DEFINE_DEVICE_TYPE(CD4099, cd4099_device, "cd4099", "CD4099B Addressable Latch")
// ADDRESSABLE LATCH DEVICE // ADDRESSABLE LATCH DEVICE
//************************************************************************** //**************************************************************************
addressable_latch_device::addressable_latch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) addressable_latch_device::addressable_latch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool clear_active)
: device_t(mconfig, type, tag, owner, clock), : device_t(mconfig, type, tag, owner, clock),
m_q_out_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}, m_q_out_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}},
m_parallel_out_cb(*this) m_parallel_out_cb(*this),
m_clear_active(clear_active)
{ {
} }
@ -299,26 +300,13 @@ WRITE8_MEMBER(addressable_latch_device::clear)
clear_outputs(m_enable ? u8(m_data) << m_address : 0); clear_outputs(m_enable ? u8(m_data) << m_address : 0);
} }
//-------------------------------------------------
// q[0-7]_r - read individual output lines
//-------------------------------------------------
READ_LINE_MEMBER(addressable_latch_device::q0_r) { return BIT(m_q, 0); }
READ_LINE_MEMBER(addressable_latch_device::q1_r) { return BIT(m_q, 1); }
READ_LINE_MEMBER(addressable_latch_device::q2_r) { return BIT(m_q, 2); }
READ_LINE_MEMBER(addressable_latch_device::q3_r) { return BIT(m_q, 3); }
READ_LINE_MEMBER(addressable_latch_device::q4_r) { return BIT(m_q, 4); }
READ_LINE_MEMBER(addressable_latch_device::q5_r) { return BIT(m_q, 5); }
READ_LINE_MEMBER(addressable_latch_device::q6_r) { return BIT(m_q, 6); }
READ_LINE_MEMBER(addressable_latch_device::q7_r) { return BIT(m_q, 7); }
//------------------------------------------------- //-------------------------------------------------
// clear_w - handle clear/reset input // clear_w - handle clear/reset input
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER(addressable_latch_device::clear_w) WRITE_LINE_MEMBER(addressable_latch_device::clear_w)
{ {
m_clear = is_cmos() ? bool(state) : !state; m_clear = bool(state) == m_clear_active;
if (m_clear) if (m_clear)
clear_outputs(m_enable ? u8(m_data) << m_address : 0); clear_outputs(m_enable ? u8(m_data) << m_address : 0);
} }
@ -350,7 +338,7 @@ void addressable_latch_device::clear_outputs(u8 new_q)
//************************************************************************** //**************************************************************************
ls259_device::ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) ls259_device::ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: addressable_latch_device(mconfig, LS259, tag, owner, clock) : addressable_latch_device(mconfig, LS259, tag, owner, clock, false)
{ {
} }
@ -359,7 +347,7 @@ ls259_device::ls259_device(const machine_config &mconfig, const char *tag, devic
//************************************************************************** //**************************************************************************
hc259_device::hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) hc259_device::hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: addressable_latch_device(mconfig, HC259, tag, owner, clock) : addressable_latch_device(mconfig, HC259, tag, owner, clock, false)
{ {
} }
@ -368,7 +356,7 @@ hc259_device::hc259_device(const machine_config &mconfig, const char *tag, devic
//************************************************************************** //**************************************************************************
hct259_device::hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) hct259_device::hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: addressable_latch_device(mconfig, HCT259, tag, owner, clock) : addressable_latch_device(mconfig, HCT259, tag, owner, clock, false)
{ {
} }
@ -377,7 +365,7 @@ hct259_device::hct259_device(const machine_config &mconfig, const char *tag, dev
//************************************************************************** //**************************************************************************
f9334_device::f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) f9334_device::f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: addressable_latch_device(mconfig, F9334, tag, owner, clock) : addressable_latch_device(mconfig, F9334, tag, owner, clock, false)
{ {
} }
@ -386,6 +374,6 @@ f9334_device::f9334_device(const machine_config &mconfig, const char *tag, devic
//************************************************************************** //**************************************************************************
cd4099_device::cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) cd4099_device::cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: addressable_latch_device(mconfig, CD4099, tag, owner, clock) : addressable_latch_device(mconfig, CD4099, tag, owner, clock, true)
{ {
} }

56
src/devices/machine/74259.h
View File

@ -27,31 +27,31 @@
**********************************************************************/ **********************************************************************/
#pragma once
#ifndef DEVICES_MACHINE_74259_H #ifndef DEVICES_MACHINE_74259_H
#define DEVICES_MACHINE_74259_H #define DEVICES_MACHINE_74259_H
#pragma once
//************************************************************************** //**************************************************************************
// CONFIGURATION MACROS // CONFIGURATION MACROS
//************************************************************************** //**************************************************************************
#define MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 0, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<0>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 1, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<1>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 2, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<2>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 3, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<3>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 4, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<4>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 5, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<5>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 6, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<6>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_q_out_cb(*device, 7, DEVCB_##_devcb); devcb = &addressable_latch_device::set_q_out_cb<7>(*device, DEVCB_##_devcb);
#define MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(_devcb) \ #define MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(_devcb) \
devcb = &addressable_latch_device::set_parallel_out_cb(*device, DEVCB_##_devcb); devcb = &addressable_latch_device::set_parallel_out_cb(*device, DEVCB_##_devcb);
@ -65,12 +65,9 @@
class addressable_latch_device : public device_t class addressable_latch_device : public device_t
{ {
public: public:
// construction/destruction
addressable_latch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
// static configuration // static configuration
template<class Object> static devcb_base &set_q_out_cb(device_t &device, int bit, Object object) { return downcast<addressable_latch_device &>(device).m_q_out_cb[bit].set_callback(object); } template<unsigned Bit, class Object> static devcb_base &set_q_out_cb(device_t &device, Object &&object) { return downcast<addressable_latch_device &>(device).m_q_out_cb[Bit].set_callback(std::forward<Object>(object)); }
template<class Object> static devcb_base &set_parallel_out_cb(device_t &device, Object object) { return downcast<addressable_latch_device &>(device).m_parallel_out_cb.set_callback(object); } template<class Object> static devcb_base &set_parallel_out_cb(device_t &device, Object &&object) { return downcast<addressable_latch_device &>(device).m_parallel_out_cb.set_callback(std::forward<Object>(object)); }
// data write handlers // data write handlers
void write_bit(offs_t offset, bool d); void write_bit(offs_t offset, bool d);
@ -81,15 +78,15 @@ public:
DECLARE_WRITE8_MEMBER(write_nibble); DECLARE_WRITE8_MEMBER(write_nibble);
DECLARE_WRITE8_MEMBER(clear); DECLARE_WRITE8_MEMBER(clear);
// read handlers // read handlers (inlined for the sake of optimization)
DECLARE_READ_LINE_MEMBER(q0_r); DECLARE_READ_LINE_MEMBER(q0_r) { return BIT(m_q, 0); }
DECLARE_READ_LINE_MEMBER(q1_r); DECLARE_READ_LINE_MEMBER(q1_r) { return BIT(m_q, 1); }
DECLARE_READ_LINE_MEMBER(q2_r); DECLARE_READ_LINE_MEMBER(q2_r) { return BIT(m_q, 2); }
DECLARE_READ_LINE_MEMBER(q3_r); DECLARE_READ_LINE_MEMBER(q3_r) { return BIT(m_q, 3); }
DECLARE_READ_LINE_MEMBER(q4_r); DECLARE_READ_LINE_MEMBER(q4_r) { return BIT(m_q, 4); }
DECLARE_READ_LINE_MEMBER(q5_r); DECLARE_READ_LINE_MEMBER(q5_r) { return BIT(m_q, 5); }
DECLARE_READ_LINE_MEMBER(q6_r); DECLARE_READ_LINE_MEMBER(q6_r) { return BIT(m_q, 6); }
DECLARE_READ_LINE_MEMBER(q7_r); DECLARE_READ_LINE_MEMBER(q7_r) { return BIT(m_q, 7); }
u8 output_state() const { return m_q; } u8 output_state() const { return m_q; }
// control inputs // control inputs
@ -97,12 +94,13 @@ public:
DECLARE_WRITE_LINE_MEMBER(clear_w); DECLARE_WRITE_LINE_MEMBER(clear_w);
protected: protected:
// construction/destruction
addressable_latch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool clear_active);
// device-level overrides // device-level overrides
virtual void device_start() override; virtual void device_start() override;
virtual void device_reset() override; virtual void device_reset() override;
virtual bool is_cmos() const { return false; }
private: private:
// internal helpers // internal helpers
void update_bit(); void update_bit();
@ -112,6 +110,9 @@ private:
devcb_write_line m_q_out_cb[8]; // output line callback array devcb_write_line m_q_out_cb[8]; // output line callback array
devcb_write8 m_parallel_out_cb; // parallel output option devcb_write8 m_parallel_out_cb; // parallel output option
// miscellaneous configuration
bool m_clear_active; // active state of clear line
// internal state // internal state
u8 m_address; // address input u8 m_address; // address input
bool m_data; // data bit input bool m_data; // data bit input
@ -158,9 +159,6 @@ class cd4099_device : public addressable_latch_device
{ {
public: public:
cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
virtual bool is_cmos() const override { return true; }
}; };
// device type definition // device type definition