summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar angelosa <salese_corp_ltd@email.it>2017-05-27 14:03:24 +0200
committerGravatarGravatar angelosa <salese_corp_ltd@email.it>2017-05-27 14:03:24 +0200
commit79dadfbb3a42507fe67f82991c5d522d6e422c36 (patch) (github)
tree3f5046f2a8ccc0d84067053c6420f8c3a7028b3d
parent1c96b2d1b9ab7513f167d08984db07005557e234 (diff)
downloadmame-s32_kokoroji.tar.bz2
mame-s32_kokoroji.zip
Revert mb89352 changes: they breaks x68k SCSI even more than it currently is (nw)s32_kokoroji
-rw-r--r--src/devices/machine/mb89352.cpp9
-rw-r--r--src/mame/drivers/segas32.cpp4
-rw-r--r--src/mame/drivers/x68k.cpp3
3 files changed, 9 insertions, 7 deletions
diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp
index 9a17332503a..0cde218e996 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -6,6 +6,7 @@
* Should be compatible with the MB87030/31, and MB89351
*
* Used on the Sharp X68000 Super, X68000 XVI and X68030 (internal), and on SCSI expansion cards for any X680x0 (external)
+ * Also used in Sega's Soreike Kokology 1/2 (drives CD-ROM)
*
* Registers (based on datasheet):
*
@@ -470,7 +471,7 @@ WRITE8_MEMBER( mb89352_device::mb89352_w )
m_line_status |= MB89352_LINE_BSY;
m_spc_status &= ~SSTS_TARG_CONNECTED;
m_spc_status |= SSTS_INIT_CONNECTED;
- //m_spc_status |= SSTS_SPC_BSY;
+ m_spc_status |= SSTS_SPC_BSY;
m_ints |= INTS_COMMAND_COMPLETE;
if(m_int_enable != 0)
m_irq_cb(1);
@@ -546,8 +547,8 @@ WRITE8_MEMBER( mb89352_device::mb89352_w )
else
set_phase(phase);
logerror("Command executed: ");
- m_spc_status &= ~SSTS_SPC_BSY;
- m_ints |= INTS_COMMAND_COMPLETE;
+ //m_spc_status &= ~SSTS_SPC_BSY;
+ //m_ints |= INTS_COMMAND_COMPLETE;
for(x=0;x<m_command_index;x++)
logerror(" %02x",m_command[x]);
@@ -608,7 +609,7 @@ WRITE8_MEMBER( mb89352_device::mb89352_w )
else
set_phase(phase);
logerror("Command executed: ");
- m_ints |= INTS_COMMAND_COMPLETE;
+ //m_ints |= INTS_COMMAND_COMPLETE;
for(x=0;x<m_command_index;x++)
logerror(" %02x",m_command[x]);
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 5733a8a3c7f..d62cadeef4c 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -553,7 +553,7 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the
* TODO: Kokoroji hangs if CD comms are handled with current mb89352 core.
* We currently hide this behind a compile switch to aid development
*/
-#define S32_KOKOROJI_TEST_CD 1
+#define S32_KOKOROJI_TEST_CD 0
DEFINE_DEVICE_TYPE(SEGA_S32_PCB, segas32_state, "segas32_pcb", "Sega System 32 PCB")
@@ -5639,7 +5639,7 @@ GAME( 1993, jparkj, jpark, sega_system32_analog, jpark, segas32_new_state,
GAME( 1993, jparkja, jpark, sega_system32_analog, jpark, segas32_new_state, jpark, ROT0, "Sega", "Jurassic Park (Japan, Deluxe)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1993, jparkjc, jpark, sega_system32_analog, jpark, segas32_new_state, jpark, ROT0, "Sega", "Jurassic Park (Japan, Rev A, Conversion)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, kokoroj2, 0, sega_system32_cd, kokoroj2, segas32_new_state, radr, ROT0, "Sega", "Soreike Kokology Vol. 2 - Kokoro no Tanteikyoku", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_PRINTER) /* uses an Audio CD */
+GAME( 1993, kokoroj2, 0, sega_system32_cd, kokoroj2, segas32_new_state, radr, ROT0, "Sega / IVS", "Soreike Kokology Vol. 2 - Kokoro no Tanteikyoku", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_PRINTER) /* uses an Audio CD */
GAME( 1990, radm, 0, sega_system32_analog, radm, segas32_new_state, radm, ROT0, "Sega", "Rad Mobile (World)", MACHINE_IMPERFECT_GRAPHICS ) /* Released in 02.1991 */
GAME( 1990, radmu, radm, sega_system32_analog, radm, segas32_new_state, radm, ROT0, "Sega", "Rad Mobile (US)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index d22d206b9a5..7b7735bebbe 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -128,6 +128,7 @@
#include "bus/x68k/x68k_scsiext.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
+#include "bus/scsi/scsicd.h"
#include "softlist.h"
#include "speaker.h"
@@ -1751,7 +1752,7 @@ static MACHINE_CONFIG_DERIVED( x68ksupr, x68000 )
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE4, "harddisk", SCSIHD, SCSI_ID_3)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE5, "harddisk", SCSIHD, SCSI_ID_4)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE6, "harddisk", SCSIHD, SCSI_ID_5)
- MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE7, "harddisk", SCSIHD, SCSI_ID_6)
+ MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE7, "cdrom", SCSICD, SCSI_ID_6)
MCFG_DEVICE_ADD("mb89352", MB89352A, 0)
MCFG_LEGACY_SCSI_PORT("scsi")