From 95fca8ed8e15e0c94e35541589017d0cde455ec6 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 13 Apr 2013 17:35:03 +0000 Subject: [PATCH] let's enforce naming convention (nw) --- src/mame/drivers/djmain.c | 8 ++++---- src/mame/drivers/hexion.c | 12 ++++++------ src/mame/drivers/konamigq.c | 8 ++++---- src/mame/drivers/plygonet.c | 8 ++++---- src/mame/drivers/ultrsprt.c | 6 +++--- src/mame/drivers/zr107.c | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 52d3efbe74b..b5849d3628e 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -441,8 +441,8 @@ static ADDRESS_MAP_START( memory_map, AS_PROGRAM, 32, djmain_state ) AM_RANGE(0x580000, 0x58003f) AM_DEVREADWRITE_LEGACY("k056832", k056832_long_r, k056832_long_w) // VIDEO REG (tilemap) AM_RANGE(0x590000, 0x590007) AM_WRITE(unknown590000_w) // ?? AM_RANGE(0x5a0000, 0x5a005f) AM_DEVWRITE_LEGACY("k055555", k055555_long_w) // 055555: priority encoder - AM_RANGE(0x5b0000, 0x5b04ff) AM_DEVREADWRITE8("konami1", k054539_device, read, write, 0xff00ff00) - AM_RANGE(0x5b0000, 0x5b04ff) AM_DEVREADWRITE8("konami2", k054539_device, read, write, 0x00ff00ff) + AM_RANGE(0x5b0000, 0x5b04ff) AM_DEVREADWRITE8("k054539_1", k054539_device, read, write, 0xff00ff00) + AM_RANGE(0x5b0000, 0x5b04ff) AM_DEVREADWRITE8("k054539_2", k054539_device, read, write, 0x00ff00ff) AM_RANGE(0x5c0000, 0x5c0003) AM_READ8(inp1_r, 0xffffffff) // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches) AM_RANGE(0x5c8000, 0x5c8003) AM_READ8(inp2_r, 0xffffffff) // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches) AM_RANGE(0x5d0000, 0x5d0003) AM_WRITE(light_ctrl_1_w) // light/coin blocker control @@ -1473,12 +1473,12 @@ static MACHINE_CONFIG_START( djmain, djmain_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami1", 48000, k054539_config) + MCFG_K054539_ADD("k054539_1", 48000, k054539_config) MCFG_SOUND_CONFIG(k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_K054539_ADD("konami2", 48000, k054539_config) + MCFG_K054539_ADD("k054539_2", 48000, k054539_config) MCFG_SOUND_CONFIG(k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index 88ba619b47c..e6b8404cc37 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -118,11 +118,11 @@ static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8, hexion_state ) AM_RANGE(0xa000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xdffe) AM_READWRITE(hexion_bankedram_r, hexion_bankedram_w) AM_RANGE(0xdfff, 0xdfff) AM_WRITE(hexion_bankctrl_w) - AM_RANGE(0xe800, 0xe87f) AM_DEVREADWRITE("konami", k051649_device, k051649_waveform_r, k051649_waveform_w) - AM_RANGE(0xe880, 0xe889) AM_DEVWRITE("konami", k051649_device, k051649_frequency_w) - AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE("konami", k051649_device, k051649_volume_w) - AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE("konami", k051649_device, k051649_keyonoff_w) - AM_RANGE(0xe8e0, 0xe8ff) AM_DEVREADWRITE("konami", k051649_device, k051649_test_r, k051649_test_w) + AM_RANGE(0xe800, 0xe87f) AM_DEVREADWRITE("k051649", k051649_device, k051649_waveform_r, k051649_waveform_w) + AM_RANGE(0xe880, 0xe889) AM_DEVWRITE("k051649", k051649_device, k051649_frequency_w) + AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE("k051649", k051649_device, k051649_volume_w) + AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE("k051649", k051649_device, k051649_keyonoff_w) + AM_RANGE(0xe8e0, 0xe8ff) AM_DEVREADWRITE("k051649", k051649_device, k051649_test_r, k051649_test_w) AM_RANGE(0xf000, 0xf00f) AM_DEVREADWRITE_LEGACY("k053252",k053252_r,k053252_w) AM_RANGE(0xf200, 0xf200) AM_DEVWRITE("oki", okim6295_device, write) AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW1") @@ -247,7 +247,7 @@ static MACHINE_CONFIG_START( hexion, hexion_state ) MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - MCFG_K051649_ADD("konami", 24000000/16) + MCFG_K051649_ADD("k051649", 24000000/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 138a085147b..9dfbd4e3c7d 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -239,8 +239,8 @@ WRITE16_MEMBER(konamigq_state::tms57002_control_word_w) static ADDRESS_MAP_START( konamigq_sound_map, AS_PROGRAM, 16, konamigq_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM - AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami1", k054539_device, read, write, 0xff00) - AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami2", k054539_device, read, write, 0x00ff) + AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_1", k054539_device, read, write, 0xff00) + AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_2", k054539_device, read, write, 0x00ff) AM_RANGE(0x300000, 0x300001) AM_READWRITE(tms57002_data_word_r,tms57002_data_word_w) AM_RANGE(0x400000, 0x40000f) AM_WRITE(sndcomm68k_w) AM_RANGE(0x400010, 0x40001f) AM_READ(sndcomm68k_r) @@ -339,11 +339,11 @@ static MACHINE_CONFIG_START( konamigq, konamigq_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami1", 48000, k054539_config) + MCFG_K054539_ADD("k054539_1", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_K054539_ADD("konami2", 48000, k054539_config) + MCFG_K054539_ADD("k054539_2", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index d7ab6d248b4..dc9b842a755 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -561,9 +561,9 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, polygonet_state ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0x0000, 0xbfff) AM_WRITENOP AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_device, read, write) + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("k054539_1", k054539_device, read, write) AM_RANGE(0xe230, 0xe3ff) AM_RAM - AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE("konami2", k054539_device, read, write) + AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE("k054539_2", k054539_device, read, write) AM_RANGE(0xe630, 0xe7ff) AM_RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_byte_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_byte_r) @@ -652,11 +652,11 @@ static MACHINE_CONFIG_START( plygonet, polygonet_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami1", 48000, k054539_config) + MCFG_K054539_ADD("k054539_1", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_K054539_ADD("konami2", 48000, k054539_config) + MCFG_K054539_ADD("k054539_2", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index b41f34e0696..a8c9c5d4f52 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -162,7 +162,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16, ultrsprt_state ) AM_RANGE(0x00100000, 0x00101fff) AM_RAM AM_RANGE(0x00200000, 0x00200007) AM_WRITE(K056800_68k_w) AM_RANGE(0x00200008, 0x0020000f) AM_READ(K056800_68k_r) - AM_RANGE(0x00400000, 0x004002ff) AM_DEVREADWRITE8("konami", k054539_device, read, write, 0xffff) + AM_RANGE(0x00400000, 0x004002ff) AM_DEVREADWRITE8("k054539", k054539_device, read, write, 0xffff) ADDRESS_MAP_END /*****************************************************************************/ @@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( ultrsprt, ultrsprt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami", 48000, k054539_config) + MCFG_K054539_ADD("k054539", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -272,7 +272,7 @@ ROM_START( fiveside ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD("479_a05.bin", 0x000000, 0x20000, CRC(251ae299) SHA1(5ffd74357e3c6ddb3a208c39a3b32b53fea90282)) - ROM_REGION(0x100000, "konami", 0) /* Sound roms */ + ROM_REGION(0x100000, "k054539", 0) /* Sound roms */ ROM_LOAD("479_a06.bin", 0x000000, 0x80000, CRC(8d6ac8a2) SHA1(7c4b8bd47cddc766cbdb6a486acc9221be55b579)) ROM_LOAD("479_a07.bin", 0x080000, 0x80000, CRC(75835df8) SHA1(105b95c16f2ce6902c2e4c9c2fd9f2f7a848c546)) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 794be3e3a22..a1bbf849104 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -480,8 +480,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16, zr107_state ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x100000, 0x103fff) AM_RAM /* Work RAM */ - AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami1", k054539_device, read, write, 0xff00) - AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami2", k054539_device, read, write, 0x00ff) + AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_1", k054539_device, read, write, 0xff00) + AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_2", k054539_device, read, write, 0x00ff) AM_RANGE(0x400000, 0x40000f) AM_DEVWRITE_LEGACY("k056800", k056800_sound_w) AM_RANGE(0x400010, 0x40001f) AM_DEVREAD_LEGACY("k056800", k056800_sound_r) AM_RANGE(0x580000, 0x580001) AM_WRITENOP @@ -774,11 +774,11 @@ static MACHINE_CONFIG_START( zr107, zr107_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami1", 48000, k054539_config) + MCFG_K054539_ADD("k054539_1", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_K054539_ADD("konami2", 48000, k054539_config) + MCFG_K054539_ADD("k054539_2", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) @@ -831,11 +831,11 @@ static MACHINE_CONFIG_START( jetwave, zr107_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_K054539_ADD("konami1", 48000, k054539_config) + MCFG_K054539_ADD("k054539_1", 48000, k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_K054539_ADD("konami2", 48000, k054539_config) + MCFG_K054539_ADD("k054539_2", 48000, k054539_config) MCFG_SOUND_CONFIG(k054539_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)