summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/nmk16.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/nmk16.c')
-rw-r--r--src/mame/drivers/nmk16.c126
1 files changed, 44 insertions, 82 deletions
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index eb70e0d8a05..5a759ab2a0c 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -873,12 +873,12 @@ static void mcu_run(running_machine *machine, UINT8 dsw_setting)
static TIMER_DEVICE_CALLBACK( tdragon_mcu_sim )
{
- mcu_run(timer->machine,1);
+ mcu_run(timer.machine,1);
}
static TIMER_DEVICE_CALLBACK( hachamf_mcu_sim )
{
- mcu_run(timer->machine,0);
+ mcu_run(timer.machine,0);
}
static ADDRESS_MAP_START( tdragon_map, ADDRESS_SPACE_PROGRAM, 16 )
@@ -3567,12 +3567,10 @@ static MACHINE_DRIVER_START( tharrier )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3613,12 +3611,10 @@ static MACHINE_DRIVER_START( manybloc )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3658,12 +3654,10 @@ static MACHINE_DRIVER_START( mustang )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3737,12 +3731,10 @@ static MACHINE_DRIVER_START( bioship )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3781,12 +3773,10 @@ static MACHINE_DRIVER_START( vandyke )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_12MHz/3) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki1", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_12MHz/3) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki2", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3799,7 +3789,7 @@ static MACHINE_DRIVER_START( vandykeb )
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */
- MDRV_CPU_FLAGS(CPU_DISABLE)
+ MDRV_DEVICE_DISABLE()
//MDRV_MACHINE_RESET(NMK004) // no NMK004
@@ -3821,8 +3811,7 @@ static MACHINE_DRIVER_START( vandykeb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3861,12 +3850,10 @@ static MACHINE_DRIVER_START( acrobatm )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4) /* (verified on pcb) */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* on the pcb pin7 is not connected to gnd or +5v! */
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4) /* (verified on pcb) */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* on the pcb pin7 is not connected to gnd or +5v! */
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3940,12 +3927,10 @@ static MACHINE_DRIVER_START( tdragon )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3978,8 +3963,7 @@ static MACHINE_DRIVER_START( ssmissin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki1", OKIM6295, 8000000/8) /* 1 Mhz, pin 7 high */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH) /* 1 Mhz, pin 7 high */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
@@ -4020,12 +4004,10 @@ static MACHINE_DRIVER_START( strahl )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4065,12 +4047,10 @@ static MACHINE_DRIVER_START( hachamf )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4109,12 +4089,10 @@ static MACHINE_DRIVER_START( macross )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4153,12 +4131,10 @@ static MACHINE_DRIVER_START( blkheart )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4197,12 +4173,10 @@ static MACHINE_DRIVER_START( gunnail )
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4240,12 +4214,10 @@ static MACHINE_DRIVER_START( macross2 )
MDRV_SOUND_CONFIG(ym2203_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
@@ -4285,12 +4257,10 @@ static MACHINE_DRIVER_START( tdragon2 )
MDRV_SOUND_CONFIG(ym2203_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
@@ -4329,12 +4299,10 @@ static MACHINE_DRIVER_START( raphero )
MDRV_SOUND_CONFIG(ym2203_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
@@ -4366,12 +4334,10 @@ static MACHINE_DRIVER_START( bjtwin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
@@ -4713,9 +4679,9 @@ static WRITE16_HANDLER( twinactn_flipscreen_w )
static WRITE8_DEVICE_HANDLER( spec2k_oki1_banking_w )
{
if(data == 0xfe)
- okim6295_set_bank_base(device, 0);
+ downcast<okim6295_device *>(device)->set_bank_base(0);
else if(data == 0xff)
- okim6295_set_bank_base(device, 0x40000);
+ downcast<okim6295_device *>(device)->set_bank_base(0x40000);
}
static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
@@ -4741,7 +4707,7 @@ ADDRESS_MAP_END
static WRITE8_DEVICE_HANDLER( twinactn_oki_bank_w )
{
- okim6295_set_bank_base(device, (data & 3) * 0x40000);
+ downcast<okim6295_device *>(device)->set_bank_base((data & 3) * 0x40000);
if (data & (~3))
logerror("%s: invalid oki bank %02x\n", cpuexec_describe_context(device->machine), data);
@@ -4881,8 +4847,7 @@ static MACHINE_DRIVER_START( stagger1 )
MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
- MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_4MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high) /* verified on pcb */
+ MDRV_OKIM6295_ADD("oki1", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
MACHINE_DRIVER_END
@@ -4961,12 +4926,10 @@ static MACHINE_DRIVER_START( firehawk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -5000,8 +4963,7 @@ static MACHINE_DRIVER_START( twinactn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
- MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END