diff options
author | Fabio Priuli <etabeta78@users.noreply.github.com> | 2013-05-31 05:59:35 +0000 |
---|---|---|
committer | Fabio Priuli <etabeta78@users.noreply.github.com> | 2013-05-31 05:59:35 +0000 |
commit | 2840892ced17f12e5b135cded2a0c9fcbc97a139 (patch) | |
tree | c60582744ff842ae6ae6361b31b4d40fdd571f76 /src/mame/drivers/bzone.c | |
parent | c43cc8f12f5548d24747a8cb0a93e51b04c3b2c3 (diff) |
modernized the MB14241 and MathBox devices. [Osso]
Diffstat (limited to 'src/mame/drivers/bzone.c')
-rw-r--r-- | src/mame/drivers/bzone.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index be34757f5e6..9ecba8a432e 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -208,7 +208,6 @@ #include "cpu/m6502/m6502.h" #include "video/vector.h" #include "video/avgdvg.h" -#include "machine/mathbox.h" #include "machine/atari_vg.h" #include "includes/bzone.h" #include "sound/pokey.h" @@ -283,9 +282,8 @@ READ8_MEMBER(bzone_state::redbaron_joy_r) WRITE8_MEMBER(bzone_state::redbaron_joysound_w) { - redbaron_sound_device *device = machine().device<redbaron_sound_device>("custom"); m_rb_input_select = data & 1; - device->redbaron_sounds_w(space, offset, data); + m_redbaronsound->sounds_w(space, offset, data); } @@ -306,12 +304,12 @@ static ADDRESS_MAP_START( bzone_map, AS_PROGRAM, 8, bzone_state ) AM_RANGE(0x1200, 0x1200) AM_WRITE_LEGACY(avgdvg_go_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1600, 0x1600) AM_WRITE_LEGACY(avgdvg_reset_w) - AM_RANGE(0x1800, 0x1800) AM_DEVREAD_LEGACY("mathbox", mathbox_status_r) - AM_RANGE(0x1810, 0x1810) AM_DEVREAD_LEGACY("mathbox", mathbox_lo_r) - AM_RANGE(0x1818, 0x1818) AM_DEVREAD_LEGACY("mathbox", mathbox_hi_r) + AM_RANGE(0x1800, 0x1800) AM_DEVREAD("mathbox", mathbox_device, status_r) + AM_RANGE(0x1810, 0x1810) AM_DEVREAD("mathbox", mathbox_device, lo_r) + AM_RANGE(0x1818, 0x1818) AM_DEVREAD("mathbox", mathbox_device, hi_r) AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE("pokey", pokey_device, read, write) AM_RANGE(0x1840, 0x1840) AM_WRITE(bzone_sounds_w) - AM_RANGE(0x1860, 0x187f) AM_DEVWRITE_LEGACY("mathbox", mathbox_go_w) + AM_RANGE(0x1860, 0x187f) AM_DEVWRITE("mathbox", mathbox_device, go_w) AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000) AM_RANGE(0x3000, 0x7fff) AM_ROM ADDRESS_MAP_END @@ -326,16 +324,16 @@ static ADDRESS_MAP_START( redbaron_map, AS_PROGRAM, 8, bzone_state ) AM_RANGE(0x1200, 0x1200) AM_WRITE_LEGACY(avgdvg_go_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1600, 0x1600) AM_WRITE_LEGACY(avgdvg_reset_w) - AM_RANGE(0x1800, 0x1800) AM_DEVREAD_LEGACY("mathbox", mathbox_status_r) + AM_RANGE(0x1800, 0x1800) AM_DEVREAD("mathbox", mathbox_device, status_r) AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN4") - AM_RANGE(0x1804, 0x1804) AM_DEVREAD_LEGACY("mathbox", mathbox_lo_r) - AM_RANGE(0x1806, 0x1806) AM_DEVREAD_LEGACY("mathbox", mathbox_hi_r) + AM_RANGE(0x1804, 0x1804) AM_DEVREAD("mathbox", mathbox_device, lo_r) + AM_RANGE(0x1806, 0x1806) AM_DEVREAD("mathbox", mathbox_device, hi_r) AM_RANGE(0x1808, 0x1808) AM_WRITE(redbaron_joysound_w) /* and select joystick pot also */ AM_RANGE(0x180a, 0x180a) AM_WRITENOP /* sound reset, yet todo */ AM_RANGE(0x180c, 0x180c) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w) AM_RANGE(0x1810, 0x181f) AM_DEVREADWRITE("pokey", pokey_device, read, write) AM_RANGE(0x1820, 0x185f) AM_DEVREADWRITE("earom", atari_vg_earom_device, read, write) - AM_RANGE(0x1860, 0x187f) AM_DEVWRITE_LEGACY("mathbox", mathbox_go_w) + AM_RANGE(0x1860, 0x187f) AM_DEVWRITE("mathbox", mathbox_device, go_w) AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("vectorram") AM_REGION("maincpu", 0x2000) AM_RANGE(0x3000, 0x7fff) AM_ROM ADDRESS_MAP_END |