summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kchamp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kchamp.cpp')
-rw-r--r--src/mame/drivers/kchamp.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index 07965a544d2..07ea164f6aa 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -406,20 +406,20 @@ void kchamp_state::machine_reset()
MACHINE_CONFIG_START(kchamp_state::kchampvs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kchampvs_map)
- MCFG_CPU_IO_MAP(kchampvs_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
-
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kchampvs_sound_map)
- MCFG_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kchampvs_map)
+ MCFG_DEVICE_IO_MAP(kchampvs_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kchampvs_sound_map)
+ MCFG_DEVICE_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 8C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(kchamp_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(kchamp_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(kchamp_state, sound_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kchamp_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, kchamp_state, sound_reset_w))
MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchampvs)
@@ -431,7 +431,7 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchampvs)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
@@ -444,17 +444,17 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0) // at 4C
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(kchamp_state, msmint)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, kchamp_state, msmint)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -466,20 +466,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kchamp_state::kchamp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kchamp_map)
- MCFG_CPU_IO_MAP(kchamp_io_map)
-
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kchamp_sound_map)
- MCFG_CPU_IO_MAP(kchamp_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kchamp_state, sound_int, 125) /* Hz */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kchamp_map)
+ MCFG_DEVICE_IO_MAP(kchamp_io_map)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kchamp_sound_map)
+ MCFG_DEVICE_IO_MAP(kchamp_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kchamp_state, sound_int, 125) /* Hz */
/* irq's triggered from main cpu */
/* nmi's from 125 Hz clock */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC71
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(kchamp_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(kchamp_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kchamp_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w))
MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchamp)
@@ -491,7 +491,7 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchamp)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
@@ -504,13 +504,13 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // IC11
+ MCFG_DEVICE_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // IC11
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END