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

te7750: Corrections, additions and cleanups (nw)

Browse Source
This commit is contained in:
AJR 2017-06-15 20:33:44 -04:00
parent d046fd723f
commit eca1241144
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/devices/machine/te7750.cpp
View File

@ -50,7 +50,7 @@
1 0 0 1 CR0 W W W W W W W W 1 0 0 1 CR0 W W W W W W W W
1 0 1 0 CR1 W* W* W* W* 1 0 1 0 CR1 W* W* W* W*
1 0 1 1 CR2 W* W* W* W* 1 0 1 1 CR2 W* W* W* W*
1 1 0 0 CR3 W* W* W* W* 1 1 0 0 CR3 W* W*
* CR1-CR3 are only writable in soft mode. * CR1-CR3 are only writable in soft mode.
@ -178,7 +178,7 @@ te7750_device::te7750_device(const machine_config &mconfig, const char *tag, dev
: device_t(mconfig, TE7750, tag, owner, clock), : device_t(mconfig, TE7750, tag, owner, clock),
m_input_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}, m_input_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}},
m_output_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}, m_output_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}},
m_ios(*this) m_ios_cb(*this)
{ {
std::fill(std::begin(m_data_dir), std::end(m_data_dir), 0xff); std::fill(std::begin(m_data_dir), std::end(m_data_dir), 0xff);
} }
@ -196,7 +196,7 @@ void te7750_device::device_start()
cb.resolve_safe(); cb.resolve_safe();
// resolve IOS (assume soft mode unless specified) // resolve IOS (assume soft mode unless specified)
m_ios.resolve_safe(0); m_ios_cb.resolve_safe(0);
// save state // save state
save_item(NAME(m_data_latch)); save_item(NAME(m_data_latch));
@ -241,7 +241,7 @@ void te7750_device::set_port_dir(int port, u8 dir)
void te7750_device::set_ios() void te7750_device::set_ios()
{ {
// get state of IOS pins (0 for soft mode, 1-7 for hard mode) // get state of IOS pins (0 for soft mode, 1-7 for hard mode)
u8 ios = m_ios() & 7; u8 ios = m_ios_cb() & 7;
// P1: always input in hard mode; reset to input in soft mode // P1: always input in hard mode; reset to input in soft mode
set_port_dir(0, 0xff); set_port_dir(0, 0xff);
@ -305,7 +305,7 @@ WRITE8_MEMBER(te7750_device::write)
} }
else if (offset == 10) else if (offset == 10)
{ {
if ((m_ios() & 7) != 0) if ((m_ios_cb() & 7) != 0)
logerror("Attempt to write %02X to CR1 in hard mode\n", data); logerror("Attempt to write %02X to CR1 in hard mode\n", data);
else else
{ {
@ -317,7 +317,7 @@ WRITE8_MEMBER(te7750_device::write)
} }
else if (offset == 11) else if (offset == 11)
{ {
if ((m_ios() & 7) != 0) if ((m_ios_cb() & 7) != 0)
logerror("Attempt to write %02X to CR2 in hard mode\n", data); logerror("Attempt to write %02X to CR2 in hard mode\n", data);
else else
{ {
@ -329,7 +329,7 @@ WRITE8_MEMBER(te7750_device::write)
} }
else if (offset == 12) else if (offset == 12)
{ {
if ((m_ios() & 7) != 0) if ((m_ios_cb() & 7) != 0)
logerror("Attempt to write %02X to CR3 in hard mode\n", data); logerror("Attempt to write %02X to CR3 in hard mode\n", data);
else else
{ {

22
src/devices/machine/te7750.h
View File

@ -53,6 +53,9 @@
#define MCFG_TE7750_OUT_PORT9_CB(_devcb) \ #define MCFG_TE7750_OUT_PORT9_CB(_devcb) \
devcb = &te7750_device::set_output_cb(*device, 8, DEVCB_##_devcb); devcb = &te7750_device::set_output_cb(*device, 8, DEVCB_##_devcb);
#define MCFG_TE7750_IOS_CB(_devcb) \
devcb = &te7750_device::set_ios_cb(*device, DEVCB_##_devcb);
//************************************************************************** //**************************************************************************
// TYPE DEFINITIONS // TYPE DEFINITIONS
//************************************************************************** //**************************************************************************
@ -67,16 +70,21 @@ public:
// static configuration // static configuration
template<class Object> template<class Object>
static devcb_base &set_input_cb(device_t &device, int p, Object &&obj) static devcb_base &set_input_cb(device_t &device, int port, Object &&obj)
{ {
assert(p >= 0 && p < 9); assert(port >= 0 && port < 9);
return downcast<te7750_device &>(device).m_input_cb[p].set_callback(std::forward<Object>(obj)); return downcast<te7750_device &>(device).m_input_cb[port].set_callback(std::forward<Object>(obj));
} }
template<class Object> template<class Object>
static devcb_base &set_output_cb(device_t &device, int p, Object &&obj) static devcb_base &set_output_cb(device_t &device, int port, Object &&obj)
{ {
assert(p >= 0 && p < 9); assert(port >= 0 && port < 9);
return downcast<te7750_device &>(device).m_output_cb[p].set_callback(std::forward<Object>(obj)); return downcast<te7750_device &>(device).m_output_cb[port].set_callback(std::forward<Object>(obj));
}
template<class Object>
static devcb_base &set_ios_cb(device_t &device, Object &&obj)
{
return downcast<te7750_device &>(device).m_ios_cb.set_callback(std::forward<Object>(obj));
} }
// bus-compatible interface // bus-compatible interface
@ -98,7 +106,7 @@ private:
devcb_write8 m_output_cb[9]; devcb_write8 m_output_cb[9];
// mode callback // mode callback
devcb_read8 m_ios; devcb_read8 m_ios_cb;
// internal state // internal state
u8 m_data_latch[9]; u8 m_data_latch[9];