summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2021-02-08 13:17:29 +0100
committer Olivier Galibert <galibert@pobox.com>2021-02-08 13:33:58 +0100
commitb13d4347de1108ef1a4e1f292288b7c9e4525527 (patch)
treea68e4701ae5faf49b6e3715f3e43ffd81c571be8
parentf7b671e1c041244d0a85d176d7a9d38fe42d17b1 (diff)
Revert "swim" and "apple2gs/iwm: Work", wip pushed by mistake
-rw-r--r--src/devices/machine/iwm.cpp5
-rw-r--r--src/mame/drivers/apple2gs.cpp4
-rw-r--r--src/mame/drivers/mac128.cpp2
-rw-r--r--src/mame/includes/mac.h2
4 files changed, 6 insertions, 7 deletions
diff --git a/src/devices/machine/iwm.cpp b/src/devices/machine/iwm.cpp
index b1a9830cd4c..c408ea6741b 100644
--- a/src/devices/machine/iwm.cpp
+++ b/src/devices/machine/iwm.cpp
@@ -219,7 +219,7 @@ u8 iwm_device::control(int offset, u8 data)
m_rw = MODE_IDLE;
}
- if(1) {
+ if(0) {
u8 s = m_control & 0xc0;
const char *slot = "?";
if(s == 0x00 && !m_active)
@@ -388,7 +388,6 @@ void iwm_device::sync()
if(is_sync()) {
if(m_rsh >= 0x80) {
m_data = m_rsh;
- logerror("%s %010d DATAR2 %s %02x\n", cycles_to_time(m_last_sync).to_string(), m_last_sync, m_floppy->tag(), m_data);
m_rsh = 0;
} else if(m_rsh >= 0x04) {
m_data = m_rsh;
@@ -399,7 +398,7 @@ void iwm_device::sync()
} else if(m_rsh >= 0x80) {
m_data = m_rsh;
m_async_update = 0;
- logerror("%s %010d DATAR %s %02x\n", cycles_to_time(m_last_sync).to_string(), m_last_sync, m_floppy->tag(), m_data);
+ // logerror("%s %010d DATAR %s %02x\n", cycles_to_time(m_last_sync).to_string(), m_last_sync, m_floppy->tag(), m_data);
m_rsh = 0;
}
break;
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 9146c767bdd..08cba6a6b9a 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -53,7 +53,7 @@
#define RUN_ADB_MICRO (0)
#define LOG_ADB (0)
-#define NEW_IWM (1)
+#define NEW_IWM (0)
#include "screen.h"
#include "softlist.h"
@@ -726,7 +726,7 @@ private:
m_slow_counter += 0x0001999a; \
int cycles = (m_slow_counter >> 16) & 0xffff; \
m_slow_counter &= 0xffff; \
- if(0) m_maincpu->adjust_icount(-cycles); \
+ m_maincpu->adjust_icount(-cycles); \
} \
}
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index 27358ab6303..a1e5a25e914 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -101,7 +101,7 @@ part number 338-6523 (later Macs use a PLCC version which Apple numbered
#include "emu.h"
-#define NEW_IWM 1
+#define NEW_IWM 0
#include "machine/macrtc.h"
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 48a26b51efb..2585fa8de49 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -33,7 +33,7 @@
#include "emupal.h"
#include "screen.h"
-#define NEW_SWIM 1
+#define NEW_SWIM 0
#define MAC_SCREEN_NAME "screen"
#define MAC_539X_1_TAG "539x_1"