From 8c0371128f9492e35814bef4c591a170600ee669 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Tue, 29 Apr 2014 14:18:44 +0000 Subject: [PATCH] nmk112.c: Fix uninitialized members; remove long-unneeded trampoline 8-bit handler (nw) --- src/mame/drivers/cave.c | 2 +- src/mame/drivers/nmk16.c | 2 +- src/mame/drivers/quizpani.c | 3 +-- src/mame/machine/nmk112.c | 10 ++-------- src/mame/machine/nmk112.h | 1 - 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index e4108a58a00..b26814b8e16 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -518,7 +518,7 @@ static ADDRESS_MAP_START( donpachi_map, AS_PROGRAM, 16, cave_state ) /**/AM_RANGE(0xa08000, 0xa08fff) AM_RAM AM_SHARE("paletteram.0") // Palette AM_RANGE(0xb00000, 0xb00003) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // M6295 AM_RANGE(0xb00010, 0xb00013) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff) // - AM_RANGE(0xb00020, 0xb0002f) AM_DEVWRITE("nmk112", nmk112_device, okibank_lsb_w) // + AM_RANGE(0xb00020, 0xb0002f) AM_DEVWRITE8("nmk112", nmk112_device, okibank_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Inputs + EEPROM AM_RANGE(0xd00000, 0xd00001) AM_WRITE(cave_eeprom_msb_w) // EEPROM diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 54c2b49c863..2d751effd90 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -1102,7 +1102,7 @@ static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16, nmk16_state ) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) AM_RANGE(0x084000, 0x084001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) AM_RANGE(0x084010, 0x084011) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff) - AM_RANGE(0x084020, 0x08402f) AM_DEVWRITE("nmk112", nmk112_device, okibank_lsb_w) + AM_RANGE(0x084020, 0x08402f) AM_DEVWRITE8("nmk112", nmk112_device, okibank_w, 0x00ff) AM_RANGE(0x088000, 0x0887ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x094000, 0x094001) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x094002, 0x094003) AM_WRITENOP /* IRQ enable? */ diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index a654b692579..5298afad75b 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -60,7 +60,7 @@ static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16, quizpani_state ) AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* IRQ enable? */ AM_RANGE(0x100018, 0x100019) AM_WRITE(quizpani_tilesbank_w) AM_RANGE(0x104000, 0x104001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) - AM_RANGE(0x104020, 0x104027) AM_DEVWRITE("nmk112", nmk112_device, okibank_lsb_w) + AM_RANGE(0x104020, 0x104027) AM_DEVWRITE8("nmk112", nmk112_device, okibank_w, 0x00ff) AM_RANGE(0x108000, 0x1083ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x108400, 0x1085ff) AM_WRITENOP AM_RANGE(0x10c000, 0x10c007) AM_RAM AM_SHARE("scrollreg") @@ -213,7 +213,6 @@ static MACHINE_CONFIG_START( quizpani, quizpani_state ) MCFG_DEVICE_ADD("nmk112", NMK112, 0) MCFG_NMK112_ROM0("oki") - MCFG_NMK112_ROM1("oki") MACHINE_CONFIG_END ROM_START( quizpani ) diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c index 859641a7bff..cba844a89ee 100644 --- a/src/mame/machine/nmk112.c +++ b/src/mame/machine/nmk112.c @@ -20,6 +20,8 @@ const device_type NMK112 = &device_creator; nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NMK112, "NMK112", tag, owner, clock, "nmk112", __FILE__), m_page_mask(0xff), + m_tag0(NULL), + m_tag1(NULL), m_rom0(NULL), m_rom1(NULL), m_size0(0), @@ -100,14 +102,6 @@ WRITE8_MEMBER( nmk112_device::okibank_w ) do_bankswitch(offset, data); } -WRITE16_MEMBER( nmk112_device::okibank_lsb_w ) -{ - if (ACCESSING_BITS_0_7) - { - okibank_w(space, offset, data & 0xff); - } -} - void nmk112_device::postload_bankswitch() { for (int i = 0; i < 8; i++) diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h index aa95e663556..5f956d410a9 100644 --- a/src/mame/machine/nmk112.h +++ b/src/mame/machine/nmk112.h @@ -23,7 +23,6 @@ public: static void set_page_mask(device_t &device, UINT8 mask) { downcast(device).m_page_mask = ~mask; } DECLARE_WRITE8_MEMBER( okibank_w ); - DECLARE_WRITE16_MEMBER( okibank_lsb_w ); protected: // device-level overrides