diff options
Diffstat (limited to 'src/mame/nintendo/sfcbox.cpp')
-rw-r--r-- | src/mame/nintendo/sfcbox.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/nintendo/sfcbox.cpp b/src/mame/nintendo/sfcbox.cpp index 5f5865b824d..2458dab5e7a 100644 --- a/src/mame/nintendo/sfcbox.cpp +++ b/src/mame/nintendo/sfcbox.cpp @@ -142,8 +142,8 @@ public: void sfcbox(machine_config &config); protected: - virtual void machine_start() override; - virtual void machine_reset() override; + virtual void machine_start() override ATTR_COLD; + virtual void machine_reset() override ATTR_COLD; private: required_device<cpu_device> m_bios; @@ -159,10 +159,10 @@ private: void port_83_w(uint8_t data); void snes_map_0_w(uint8_t data); void snes_map_1_w(uint8_t data); - void sfcbox_io(address_map &map); - void sfcbox_map(address_map &map); - void snes_map(address_map &map); - void spc_map(address_map &map); + void sfcbox_io(address_map &map) ATTR_COLD; + void sfcbox_map(address_map &map) ATTR_COLD; + void snes_map(address_map &map) ATTR_COLD; + void spc_map(address_map &map) ATTR_COLD; }; uint32_t sfcbox_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) @@ -297,13 +297,13 @@ void sfcbox_state::sfcbox_io(address_map &map) static INPUT_PORTS_START( snes ) PORT_START("RTC_R") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("s3520cf", s3520cf_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("s3520cf", FUNC(s3520cf_device::read_bit)) PORT_START("RTC_W") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", s3520cf_device, set_clock_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", s3520cf_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", s3520cf_device, set_dir_line) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", s3520cf_device, set_cs_line) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", FUNC(s3520cf_device::set_clock_line)) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", FUNC(s3520cf_device::write_bit)) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", FUNC(s3520cf_device::set_dir_line)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("s3520cf", FUNC(s3520cf_device::set_cs_line)) /* TODO: verify these */ PORT_START("KEY") @@ -317,7 +317,7 @@ static INPUT_PORTS_START( snes ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Play Mode 1 Button") PORT_START("OSD_CS") - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mb90082", mb90082_device, set_cs_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mb90082", FUNC(mb90082_device::set_cs_line)) PORT_START("SERIAL1_DATA1") PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button B") PORT_PLAYER(1) @@ -468,13 +468,12 @@ void sfcbox_state::sfcbox(machine_config &config) S3520CF(config, m_s3520cf); /* RTC */ /* sound hardware */ - SPEAKER(config, "lspeaker").front_left(); - SPEAKER(config, "rspeaker").front_right(); + SPEAKER(config, "speaker", 2).front(); - S_DSP(config, m_s_dsp, XTAL(24'576'000) / 12); + S_DSP(config, m_s_dsp, XTAL(24'576'000)); m_s_dsp->set_addrmap(0, &sfcbox_state::spc_map); - m_s_dsp->add_route(0, "lspeaker", 1.00); - m_s_dsp->add_route(1, "rspeaker", 1.00); + m_s_dsp->add_route(0, "speaker", 1.00, 0); + m_s_dsp->add_route(1, "speaker", 1.00, 1); /* video hardware */ /* TODO: the screen should actually superimpose, but for the time being let's just separate outputs */ |