summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jangou.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jangou.cpp')
-rw-r--r--src/mame/drivers/jangou.cpp102
1 files changed, 49 insertions, 53 deletions
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index 1bc6fb59389..f35b4a257f1 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -164,18 +164,18 @@ void jangou_state::jangou_palette(palette_device &palette) const
bit0 = BIT(color_prom[i], 0);
bit1 = BIT(color_prom[i], 1);
bit2 = BIT(color_prom[i], 2);
- int const r = combine_3_weights(weights_rg, bit0, bit1, bit2);
+ int const r = combine_weights(weights_rg, bit0, bit1, bit2);
// green component
bit0 = BIT(color_prom[i], 3);
bit1 = BIT(color_prom[i], 4);
bit2 = BIT(color_prom[i], 5);
- int const g = combine_3_weights(weights_rg, bit0, bit1, bit2);
+ int const g = combine_weights(weights_rg, bit0, bit1, bit2);
// blue component
bit0 = BIT(color_prom[i], 6);
bit1 = BIT(color_prom[i], 7);
- int const b = combine_2_weights(weights_b, bit0, bit1);
+ int const b = combine_weights(weights_b, bit0, bit1);
palette.set_pen_color(i, rgb_t(r, g, b));
}
@@ -870,25 +870,25 @@ MACHINE_RESET_MEMBER(jangou_state,jngolady)
}
/* Note: All frequencies and dividers are unverified */
-MACHINE_CONFIG_START(jangou_state::jangou)
-
+void jangou_state::jangou(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("cpu0", Z80, MASTER_CLOCK / 8)
- MCFG_DEVICE_PROGRAM_MAP(cpu0_map)
- MCFG_DEVICE_IO_MAP(cpu0_io)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jangou_state, irq0_line_hold)
+ Z80(config, m_cpu_0, MASTER_CLOCK / 8);
+ m_cpu_0->set_addrmap(AS_PROGRAM, &jangou_state::cpu0_map);
+ m_cpu_0->set_addrmap(AS_IO, &jangou_state::cpu0_io);
+ m_cpu_0->set_vblank_int("screen", FUNC(jangou_state::irq0_line_hold));
- MCFG_DEVICE_ADD("cpu1", Z80, MASTER_CLOCK / 8)
- MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
- MCFG_DEVICE_IO_MAP(cpu1_io)
+ Z80(config, m_cpu_1, MASTER_CLOCK / 8);
+ m_cpu_1->set_addrmap(AS_PROGRAM, &jangou_state::cpu1_map);
+ m_cpu_1->set_addrmap(AS_IO, &jangou_state::cpu1_io);
- MCFG_JANGOU_BLITTER_ADD("blitter", MASTER_CLOCK/4)
+ JANGOU_BLITTER(config, "blitter", MASTER_CLOCK/4);
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4,320,0,256,264,16,240) // assume same as nightgal.cpp
- MCFG_SCREEN_UPDATE_DRIVER(jangou_state, screen_update_jangou)
- MCFG_SCREEN_PALETTE(m_palette)
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_raw(MASTER_CLOCK/4,320,0,256,264,16,240); // assume same as nightgal.cpp
+ screen.set_screen_update(FUNC(jangou_state::screen_update_jangou));
+ screen.set_palette(m_palette);
PALETTE(config, m_palette, FUNC(jangou_state::jangou_palette), 32);
@@ -902,66 +902,62 @@ MACHINE_CONFIG_START(jangou_state::jangou)
aysnd.port_b_read_callback().set(FUNC(jangou_state::input_system_r));
aysnd.add_route(ALL_OUTPUTS, "mono", 0.40);
- MCFG_DEVICE_ADD("cvsd", HC55516, MASTER_CLOCK / 1024)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
-MACHINE_CONFIG_END
+ HC55516(config, m_cvsd, MASTER_CLOCK / 1024);
+ m_cvsd->add_route(ALL_OUTPUTS, "mono", 0.60);
+}
-MACHINE_CONFIG_START(jangou_state::jngolady)
+void jangou_state::jngolady(machine_config &config)
+{
jangou(config);
/* basic machine hardware */
+ m_cpu_0->set_addrmap(AS_PROGRAM, &jangou_state::jngolady_cpu0_map);
- MCFG_DEVICE_MODIFY("cpu0")
- MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu0_map)
-
- MCFG_DEVICE_MODIFY("cpu1")
- MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu1_map)
- MCFG_DEVICE_IO_MAP(jngolady_cpu1_io)
+ m_cpu_1->set_addrmap(AS_PROGRAM, &jangou_state::jngolady_cpu1_map);
+ m_cpu_1->set_addrmap(AS_IO, &jangou_state::jngolady_cpu1_io);
- MCFG_DEVICE_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
- MCFG_DEVICE_PROGRAM_MAP(nsc_map)
+ NSC8105(config, m_nsc, MASTER_CLOCK / 8);
+ m_nsc->set_addrmap(AS_PROGRAM, &jangou_state::nsc_map);
MCFG_MACHINE_START_OVERRIDE(jangou_state,jngolady)
MCFG_MACHINE_RESET_OVERRIDE(jangou_state,jngolady)
/* sound hardware */
- MCFG_DEVICE_REMOVE("cvsd")
+ config.device_remove("cvsd");
- MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(*this, jangou_state, jngolady_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
-MACHINE_CONFIG_END
+ MSM5205(config, m_msm, XTAL(400'000));
+ m_msm->vck_legacy_callback().set(FUNC(jangou_state::jngolady_vclk_cb));
+ m_msm->set_prescaler_selector(msm5205_device::S96_4B);
+ m_msm->add_route(ALL_OUTPUTS, "mono", 0.80);
+}
-MACHINE_CONFIG_START(jangou_state::cntrygrl)
+void jangou_state::cntrygrl(machine_config &config)
+{
jangou(config);
/* basic machine hardware */
+ m_cpu_0->set_addrmap(AS_PROGRAM, &jangou_state::cntrygrl_cpu0_map);
+ m_cpu_0->set_addrmap(AS_IO, &jangou_state::cntrygrl_cpu0_io);
- MCFG_DEVICE_MODIFY("cpu0")
- MCFG_DEVICE_PROGRAM_MAP(cntrygrl_cpu0_map )
- MCFG_DEVICE_IO_MAP(cntrygrl_cpu0_io )
-
- MCFG_DEVICE_REMOVE("cpu1")
+ config.device_remove("cpu1");
MCFG_MACHINE_START_OVERRIDE(jangou_state,common)
MCFG_MACHINE_RESET_OVERRIDE(jangou_state,common)
/* sound hardware */
- MCFG_DEVICE_REMOVE("cvsd")
- MCFG_DEVICE_REMOVE("soundlatch")
-MACHINE_CONFIG_END
+ config.device_remove("cvsd");
+ config.device_remove("soundlatch");
+}
-MACHINE_CONFIG_START(jangou_state::roylcrdn)
+void jangou_state::roylcrdn(machine_config &config)
+{
jangou(config);
/* basic machine hardware */
+ m_cpu_0->set_addrmap(AS_PROGRAM, &jangou_state::roylcrdn_cpu0_map);
+ m_cpu_0->set_addrmap(AS_IO, &jangou_state::roylcrdn_cpu0_io);
- MCFG_DEVICE_MODIFY("cpu0")
- MCFG_DEVICE_PROGRAM_MAP(roylcrdn_cpu0_map )
- MCFG_DEVICE_IO_MAP(roylcrdn_cpu0_io )
-
- MCFG_DEVICE_REMOVE("cpu1")
+ config.device_remove("cpu1");
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
@@ -969,9 +965,9 @@ MACHINE_CONFIG_START(jangou_state::roylcrdn)
MCFG_MACHINE_RESET_OVERRIDE(jangou_state,common)
/* sound hardware */
- MCFG_DEVICE_REMOVE("cvsd")
- MCFG_DEVICE_REMOVE("soundlatch")
-MACHINE_CONFIG_END
+ config.device_remove("cvsd");
+ config.device_remove("soundlatch");
+}
/*************************************