From 57a4e35ff11e63cc3331cfe19c31eaa56870ece8 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Thu, 17 Apr 2014 02:22:46 +0000 Subject: [PATCH] Submit for regression test. --- src/mame/drivers/model2.c | 7 +++++++ src/mame/includes/model2.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 42089e96ef3..89438f004d7 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1561,6 +1561,12 @@ READ8_MEMBER(model2_state::virtuacop_lightgun_offscreen_r) return (special_res >> ((offset & 1)*8)) & 0xff; } +/* Apparently original Model 2 doesn't have fifo control? */ +READ32_MEMBER(model2_state::model2o_fifoctrl_r) +{ + return 0xffffffff; +} + /* original Model 2 overrides */ static ADDRESS_MAP_START( model2o_mem, AS_PROGRAM, 32, model2_state ) AM_RANGE(0x00200000, 0x0021ffff) AM_RAM @@ -1571,6 +1577,7 @@ static ADDRESS_MAP_START( model2o_mem, AS_PROGRAM, 32, model2_state ) AM_RANGE(0x00884000, 0x00887fff) AM_READWRITE(copro_fifo_r, copro_fifo_w) AM_RANGE(0x00980000, 0x00980003) AM_READWRITE(copro_ctl1_r,copro_ctl1_w) + AM_RANGE(0x00980004, 0x00980007) AM_READ(model2o_fifoctrl_r) AM_RANGE(0x00980008, 0x0098000b) AM_WRITE(geo_ctl1_w) AM_RANGE(0x009c0000, 0x009cffff) AM_READWRITE(model2_serial_r, model2o_serial_w) diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 8e91184ae0a..fc1479b4a25 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -117,6 +117,7 @@ public: DECLARE_WRITE32_MEMBER(ctrl0_w); DECLARE_WRITE32_MEMBER(analog_2b_w); DECLARE_READ32_MEMBER(fifoctl_r); + DECLARE_READ32_MEMBER(model2o_fifoctrl_r); DECLARE_READ32_MEMBER(videoctl_r); DECLARE_WRITE32_MEMBER(videoctl_w); DECLARE_WRITE32_MEMBER(rchase2_devices_w);