summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2012-04-29 20:57:03 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2012-04-29 20:57:03 +0000
commitb42f5f2f9c94046b57a202fbc6dfb1e8fd5af56c (patch)
treeee891f571da71e6e9c092d1bdddcc812fe4cf6c9
parentd107402a5ce17bea8aa8fdc96e8a9cb353f6c685 (diff)
Fix invalid ISO C syntax in neogeo driver noted by Clang [Balrog, R. Belmont]
-rw-r--r--src/mame/drivers/neogeo.c17
-rw-r--r--src/mame/includes/neogeo.h4
2 files changed, 15 insertions, 6 deletions
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 518ae9cdb2f..9694f86d028 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -169,6 +169,11 @@
static UINT8 *memcard_data;
static UINT16 *save_ram;
+static const char *audio_banks[4] =
+{
+ NEOGEO_BANK_AUDIO_CPU_CART_BANK0, NEOGEO_BANK_AUDIO_CPU_CART_BANK1, NEOGEO_BANK_AUDIO_CPU_CART_BANK2, NEOGEO_BANK_AUDIO_CPU_CART_BANK3
+};
+
/*************************************
*
@@ -708,7 +713,7 @@ static void set_audio_cpu_banking( running_machine &machine )
int region;
for (region = 0; region < 4; region++)
- state->membank(NEOGEO_BANK_AUDIO_CPU_CART_BANK + region)->set_entry(state->m_audio_cpu_banks[region]);
+ state->membank(audio_banks[region])->set_entry(state->m_audio_cpu_banks[region]);
}
@@ -808,7 +813,7 @@ static void audio_cpu_banking_init( running_machine &machine )
for (bank = 0; bank < 0x100; bank++)
{
UINT32 bank_address = 0x10000 + (((bank << (11 + region)) & 0x3ffff) & address_mask);
- state->membank(NEOGEO_BANK_AUDIO_CPU_CART_BANK + region)->configure_entry(bank, &rgn[bank_address]);
+ state->membank(audio_banks[region])->configure_entry(bank, &rgn[bank_address]);
}
}
@@ -1114,10 +1119,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, neogeo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK)
- AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
- AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
- AM_RANGE(0xe000, 0xefff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 1)
- AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 0)
+ AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK3)
+ AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK2)
+ AM_RANGE(0xe000, 0xefff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK1)
+ AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK0)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index ad1c5915b48..24e4d18f8b8 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -20,6 +20,10 @@
#define NEOGEO_VBLANK_RELOAD_HPOS (0x11f)
#define NEOGEO_BANK_AUDIO_CPU_CART_BANK "audio_cart"
+#define NEOGEO_BANK_AUDIO_CPU_CART_BANK0 "audio_cart0"
+#define NEOGEO_BANK_AUDIO_CPU_CART_BANK1 "audio_cart1"
+#define NEOGEO_BANK_AUDIO_CPU_CART_BANK2 "audio_cart2"
+#define NEOGEO_BANK_AUDIO_CPU_CART_BANK3 "audio_cart3"
/* do not use 2, 3 and 4 */
#define NEOGEO_BANK_CARTRIDGE "cartridge"
#define NEOGEO_BANK_BIOS "bios"