From 85ce5818c1171001062d9d27d53f1b93cbdbb608 Mon Sep 17 00:00:00 2001 From: DavidHaywood <28625134+DavidHaywood@users.noreply.github.com> Date: Thu, 24 Jan 2019 12:09:15 +0000 Subject: [PATCH] (nw) --- src/mame/machine/xavix.cpp | 25 ++++++------------------- src/mame/machine/xavix_io.cpp | 3 +++ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/mame/machine/xavix.cpp b/src/mame/machine/xavix.cpp index 505e43ac159..ce54e995846 100644 --- a/src/mame/machine/xavix.cpp +++ b/src/mame/machine/xavix.cpp @@ -513,13 +513,8 @@ void xavix_state::write_io1(uint8_t data, uint8_t direction) uint8_t xavix_i2c_state::read_io1(uint8_t direction) { uint8_t ret = m_in1->read(); - - if (!(direction & 0x08)) - { - ret &= ~0x08; - ret |= (m_i2cmem->read_sda() & 1) << 3; - } - + ret &= ~0x08; + ret |= (m_i2cmem->read_sda() & 1) << 3; return ret; } @@ -547,13 +542,8 @@ void xavix_i2c_state::write_io1(uint8_t data, uint8_t direction) uint8_t xavix_i2c_cart_state::read_io1(uint8_t direction) { uint8_t ret = m_in1->read(); - - if (!(direction & 0x08)) - { - ret &= ~0x08; - ret |= (m_i2cmem->read_sda() & 1) << 3; - } - + ret &= ~0x08; + ret |= (m_i2cmem->read_sda() & 1) << 3; return ret; } @@ -579,11 +569,8 @@ uint8_t xavix_i2c_lotr_state::read_io1(uint8_t direction) ret ^= (machine().rand() & 0x02); ret ^= (machine().rand() & 0x04); - if (!(direction & 0x08)) - { - ret &= ~0x08; - ret |= (m_i2cmem->read_sda() & 1) << 3; - } + ret &= ~0x08; + ret |= (m_i2cmem->read_sda() & 1) << 3; return ret; } diff --git a/src/mame/machine/xavix_io.cpp b/src/mame/machine/xavix_io.cpp index 9aaba17999f..e08a8cecc31 100644 --- a/src/mame/machine/xavix_io.cpp +++ b/src/mame/machine/xavix_io.cpp @@ -1,6 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +// TODO: hook this back up, and work out why taikodp eeprom breaks when it is hooked up. epo_efdx breakage is expected because that requires an ugly hack to get to the title +// note, eeproms don't work properly in most games at the moment, but no behavioral change was expected with taikodp + #include "emu.h" #include "xavix_io.h"