summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/konami/konmedal68k.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/konami/konmedal68k.cpp')
-rw-r--r--src/mame/konami/konmedal68k.cpp49
1 files changed, 25 insertions, 24 deletions
diff --git a/src/mame/konami/konmedal68k.cpp b/src/mame/konami/konmedal68k.cpp
index 217fe15ba5d..29d4ded4c47 100644
--- a/src/mame/konami/konmedal68k.cpp
+++ b/src/mame/konami/konmedal68k.cpp
@@ -21,16 +21,18 @@
***************************************************************************/
#include "emu.h"
+#include "k054156_k054157_k056832.h"
+#include "k055555.h"
+#include "konami_helper.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
-#include "machine/timer.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "sound/ymz280b.h"
-#include "k054156_k054157_k056832.h"
-#include "k055555.h"
-#include "konami_helper.h"
+
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -59,11 +61,11 @@ public:
void gs662(machine_config &config);
protected:
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
+ virtual void machine_start() override ATTR_COLD;
+ virtual void machine_reset() override ATTR_COLD;
+ virtual void video_start() override ATTR_COLD;
- void common_main(address_map &map);
+ void common_main(address_map &map) ATTR_COLD;
uint16_t vrom_r(offs_t offset)
{
@@ -136,11 +138,11 @@ private:
return m_k056832->rom_word_r(offset);
}
- void kzaurus_main(address_map &map);
- void koropens_main(address_map &map);
- void pwrchanc_main(address_map &map);
- void spcpokan_main(address_map &map);
- void gs662_main(address_map &map);
+ void kzaurus_main(address_map &map) ATTR_COLD;
+ void koropens_main(address_map &map) ATTR_COLD;
+ void pwrchanc_main(address_map &map) ATTR_COLD;
+ void spcpokan_main(address_map &map) ATTR_COLD;
+ void gs662_main(address_map &map) ATTR_COLD;
static constexpr int NUM_LAYERS = 4;
@@ -158,12 +160,12 @@ public:
void slot(machine_config &config);
protected:
- virtual void video_start() override;
+ virtual void video_start() override ATTR_COLD;
virtual void tilemap_draw(screen_device& screen, bitmap_rgb32& bitmap, const rectangle& cliprect, int layer, int i) override;
private:
- void slot_main(address_map &map);
+ void slot_main(address_map &map) ATTR_COLD;
};
void konmedal68k_state::video_start()
@@ -363,14 +365,14 @@ static INPUT_PORTS_START( kzaurus )
PORT_BIT( 0xff1f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("IN1")
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r)
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", FUNC(hopper_device::line_r))
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN3 ) // medal
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("OUT")
- PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("hopper", hopper_device, motor_w)
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("hopper", FUNC(hopper_device::motor_w))
PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x07, "Coin Slot 1" ) PORT_DIPLOCATION("SW1:1,2,3")
@@ -568,7 +570,7 @@ static INPUT_PORTS_START( crossmg2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_START("OUT")
- //PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("hopper", hopper_device, motor_w)
+ //PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("hopper", FUNC(hopper_device::motor_w))
PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "DSW" )
@@ -640,7 +642,7 @@ void konmedal68k_state::kzaurus(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &konmedal68k_state::kzaurus_main);
TIMER(config, "scantimer").configure_scanline(FUNC(konmedal68k_state::scanline), "screen", 0, 1);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH);
+ HOPPER(config, "hopper", attotime::from_msec(100));
/* video hardware */
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -660,12 +662,11 @@ void konmedal68k_state::kzaurus(machine_config &config)
K055555(config, m_k055555, 0);
/* sound hardware */
- SPEAKER(config, "lspeaker").front_left();
- SPEAKER(config, "rspeaker").front_right();
+ SPEAKER(config, "speaker", 2).front();
YMZ280B(config, m_ymz, XTAL(33'868'800)/2); // 33.8688 MHz xtal verified on PCB
- m_ymz->add_route(0, "lspeaker", 0.75);
- m_ymz->add_route(1, "rspeaker", 0.75);
+ m_ymz->add_route(0, "speaker", 0.75, 0);
+ m_ymz->add_route(1, "speaker", 0.75, 1);
}
void konmedal68k_state::koropens(machine_config &config)
@@ -809,7 +810,7 @@ ROM_START(spcpokan)
ROM_LOAD("642-a06-14n.bin", 0x000000, 0x080000, CRC(ebcc67cf) SHA1(b2efd41438fa562e8545695b09d124c730a9c8d3))
ROM_LOAD("642-a07-17n.bin", 0x080000, 0x080000, CRC(80da3c5e) SHA1(843db853958ed994185e9d3a156014466e080863))
ROM_LOAD("642-a08-19n.bin", 0x100000, 0x080000, CRC(cfaeba54) SHA1(83a8a7b6a4cfa26d2c804a26d7ab17ed376625f4))
- ROM_LOAD("642-a09-22n.bin", 0x180000, 0x080000, BAD_DUMP CRC(8b01e2cb) SHA1(8a15c2462f0a35136386eeba0d926349fb9f5cf9)) // byte sum should be f9c7, is f9c8 so POST fails
+ ROM_LOAD("642-a09-22n.bin", 0x180000, 0x080000, CRC(8b01e2cb) SHA1(8a15c2462f0a35136386eeba0d926349fb9f5cf9))
ROM_REGION(0x200000, "ymz", 0)
ROM_LOAD("642-a01-2f.bin", 0x000000, 0x080000, CRC(2096c185) SHA1(948ec4bc3896fae5d1f7c478ee7fafd25ef30b74))