midwayic: apparent dependency issue,

midway*: small cleanup
This commit is contained in:
hap 2024-04-20 17:10:45 +02:00
parent 5e8ec1710e
commit de58b90e7e
5 changed files with 161 additions and 168 deletions

View file

@ -735,25 +735,28 @@ void midway_ioasic_device::device_start()
{
static const uint8_t shuffle_maps[][16] =
{
{ 0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xa,0xb,0xc,0xd,0xe,0xf }, // WarGods, WG3DH, SFRush, MK4
{ 0x4,0x5,0x6,0x7,0xb,0xa,0x9,0x8,0x3,0x2,0x1,0x0,0xf,0xe,0xd,0xc }, // Blitz, Blitz99
{ 0x7,0x3,0x2,0x0,0x1,0xc,0xd,0xe,0xf,0x4,0x5,0x6,0x8,0x9,0xa,0xb }, // Carnevil
{ 0x8,0x9,0xa,0xb,0x0,0x1,0x2,0x3,0xf,0xe,0xc,0xd,0x4,0x5,0x6,0x7 }, // Calspeed, Gauntlet Legends
{ 0xf,0xe,0xd,0xc,0x4,0x5,0x6,0x7,0x9,0x8,0xa,0xb,0x2,0x3,0x1,0x0 }, // Mace
{ 0xc,0xd,0xe,0xf,0x0,0x1,0x2,0x3,0x7,0x8,0x9,0xb,0xa,0x5,0x6,0x4 }, // Gauntlet Dark Legacy
{ 0x7,0x4,0x5,0x6,0x2,0x0,0x1,0x3,0x8,0x9,0xa,0xb,0xd,0xc,0xe,0xf }, // Vapor TRX
{ 0x7,0x4,0x5,0x6,0x2,0x0,0x1,0x3,0x8,0x9,0xa,0xb,0xd,0xc,0xe,0xf }, // San Francisco Rush: The Rock
{ 0x1,0x2,0x3,0x0,0x4,0x5,0x6,0x7,0xa,0xb,0x8,0x9,0xc,0xd,0xe,0xf }, // Hyperdrive
{ 0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xa,0xb,0xc,0xd,0xe,0xf }, // WarGods, WG3DH, SFRush, MK4
{ 0x4,0x5,0x6,0x7,0xb,0xa,0x9,0x8,0x3,0x2,0x1,0x0,0xf,0xe,0xd,0xc }, // Blitz, Blitz99
{ 0x7,0x3,0x2,0x0,0x1,0xc,0xd,0xe,0xf,0x4,0x5,0x6,0x8,0x9,0xa,0xb }, // Carnevil
{ 0x8,0x9,0xa,0xb,0x0,0x1,0x2,0x3,0xf,0xe,0xc,0xd,0x4,0x5,0x6,0x7 }, // Calspeed, Gauntlet Legends
{ 0xf,0xe,0xd,0xc,0x4,0x5,0x6,0x7,0x9,0x8,0xa,0xb,0x2,0x3,0x1,0x0 }, // Mace
{ 0xc,0xd,0xe,0xf,0x0,0x1,0x2,0x3,0x7,0x8,0x9,0xb,0xa,0x5,0x6,0x4 }, // Gauntlet Dark Legacy
{ 0x7,0x4,0x5,0x6,0x2,0x0,0x1,0x3,0x8,0x9,0xa,0xb,0xd,0xc,0xe,0xf }, // Vapor TRX
{ 0x7,0x4,0x5,0x6,0x2,0x0,0x1,0x3,0x8,0x9,0xa,0xb,0xd,0xc,0xe,0xf }, // San Francisco Rush: The Rock
{ 0x1,0x2,0x3,0x0,0x4,0x5,0x6,0x7,0xa,0xb,0x8,0x9,0xc,0xd,0xe,0xf }, // Hyperdrive
};
ioasic_register_state();
// do we have a DCS2 sound chip connected?
if (m_dcs)
{
m_dcs_cpu = m_dcs->get_cpu();
if (!m_dcs_cpu)
throw device_missing_dependencies();
}
ioasic_register_state();
m_shuffle_map = &shuffle_maps[m_shuffle_type][0];
// initialize the PIC
@ -764,7 +767,6 @@ void midway_ioasic_device::device_start()
m_reg[IOASIC_SOUNDCTL] = 0x0001;
// configure the fifo
if (m_dcs)
{

View file

@ -219,7 +219,7 @@ private:
uint8_t m_shuffle_type;
uint8_t m_shuffle_default;
uint8_t m_shuffle_active;
const uint8_t * m_shuffle_map;
const uint8_t *m_shuffle_map;
uint8_t m_irq_state;
uint16_t m_sound_irq_state;
uint8_t m_auto_ack;

View file

@ -2128,12 +2128,12 @@ void seattle_state::wg3dh(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3839);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x3839);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2154,12 +2154,12 @@ void seattle_state::mace(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3839);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x3839);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2176,6 +2176,7 @@ void seattle_state::mace(machine_config &config)
void seattle_state::sfrush(machine_config &config)
{
flagstaff(config);
// 5 Channel output (4 Channel input connected to Quad Amp PCB)
SPEAKER(config, "flspeaker").front_left();
SPEAKER(config, "frspeaker").front_right();
@ -2208,6 +2209,7 @@ void seattle_state::sfrush(machine_config &config)
void seattle_state::sfrushrk(machine_config &config)
{
flagstaff(config);
// 5 Channel output (4 Channel input connected to Quad Amp PCB)
SPEAKER(config, "flspeaker").front_left();
SPEAKER(config, "frspeaker").front_right();
@ -2250,12 +2252,12 @@ void seattle_state::calspeed(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c0);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x39c0);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2277,12 +2279,12 @@ void seattle_state::vaportrx(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c2);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x39c2);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2303,12 +2305,12 @@ void seattle_state::biofreak(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3835);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x3835);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2329,12 +2331,12 @@ void seattle_state::blitz(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c2);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x39c2);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2356,12 +2358,12 @@ void seattle_state::blitz99(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0afb);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x0afb);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2383,12 +2385,12 @@ void seattle_state::blitz2k(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2411,12 +2413,12 @@ void seattle_state::carnevil(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0af7);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x0af7);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2437,12 +2439,12 @@ void seattle_state::hyprdriv(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0af7);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x0af7);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");

View file

@ -546,7 +546,6 @@ void vegas_state::machine_reset()
m_wheel_force = 0;
m_wheel_offset = 0;
m_wheel_calibrated = false;
}
/*************************************
@ -626,7 +625,6 @@ uint32_t vegas_state::timekeeper_r(offs_t offset, uint32_t mem_mask)
/*************************************
*
* SIO interrupts
@ -1348,7 +1346,6 @@ static INPUT_PORTS_START( vegas_common )
PORT_START("8WAY_P4")
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( vegas_analog )
@ -1360,7 +1357,6 @@ static INPUT_PORTS_START( vegas_analog )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
/*************************************
@ -1470,7 +1466,6 @@ static INPUT_PORTS_START( gauntleg )
PORT_START("49WAYY_P4")
PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( tenthdeg )
@ -1507,7 +1502,6 @@ static INPUT_PORTS_START( tenthdeg )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Fierce")
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Counter")
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED)
INPUT_PORTS_END
@ -1548,7 +1542,6 @@ static INPUT_PORTS_START( warfa )
PORT_MODIFY("AN.1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@ -1580,7 +1573,6 @@ static INPUT_PORTS_START( roadburn )
PORT_MODIFY("AN.2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_NAME("Bank") PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
INPUT_PORTS_END
@ -1674,7 +1666,6 @@ static INPUT_PORTS_START( nbashowt )
PORT_START("49WAYY_P4")
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
INPUT_PORTS_END
@ -1818,7 +1809,6 @@ static INPUT_PORTS_START( cartfury )
PORT_MODIFY("AN.2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_NAME("Brake") PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(1)
INPUT_PORTS_END
/*************************************
@ -1934,7 +1924,6 @@ void vegas_state::hdd_config(device_t *device)
// Allow ultra dma
//uint16_t *identify_device = dynamic_cast<ide_hdd_device *>(device)->identify_device_buffer();
//identify_device[88] = 0x7f;
}
@ -2027,7 +2016,6 @@ void vegas_state::denver(machine_config &config)
ttys02.dsr_handler().set(m_uart2, FUNC(ins8250_uart_device::dsr_w));
ttys02.ri_handler().set(m_uart2, FUNC(ins8250_uart_device::ri_w));
ttys02.cts_handler().set(m_uart2, FUNC(ins8250_uart_device::cts_w));
}
// Per driver configs
@ -2041,12 +2029,12 @@ void vegas_state::gauntleg(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2069,12 +2057,12 @@ void vegas_state::gauntdl(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2096,12 +2084,12 @@ void vegas_state::warfa(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2123,12 +2111,12 @@ void vegas_state::tenthdeg(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0afb);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2115(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0afb);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2150,12 +2138,12 @@ void vegas_state::roadburn(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_dsio_device &dcs(DCS2_AUDIO_DSIO(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0ddd);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_DSIO(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0ddd);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2177,12 +2165,12 @@ void vegas_state::nbashowt(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2206,12 +2194,12 @@ void vegas_state::nbanfl(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2230,6 +2218,7 @@ void vegas_state::nbanfl(machine_config &config)
void vegas_state::nbagold(machine_config &config)
{
vegasban(config);
QED5271LE(config.replace(), m_maincpu, vegas_state::SYSTEM_CLOCK * 2.5);
m_maincpu->set_icache_size(32768);
m_maincpu->set_dcache_size(32768);
@ -2239,12 +2228,12 @@ void vegas_state::nbagold(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2270,15 +2259,15 @@ void vegas_state::sf2049(machine_config &config)
SPEAKER(config, "rrspeaker").headrest_right();
SPEAKER(config, "subwoofer").backrest();
dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
dcs.add_route(0, "flspeaker", 1.0);
dcs.add_route(1, "frspeaker", 1.0);
dcs.add_route(2, "rlspeaker", 1.0);
dcs.add_route(3, "rrspeaker", 1.0);
dcs.add_route(4, "subwoofer", 1.0);
DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(8);
m_dcs->set_polling_offset(0x872);
m_dcs->add_route(0, "flspeaker", 1.0);
m_dcs->add_route(1, "frspeaker", 1.0);
m_dcs->add_route(2, "rlspeaker", 1.0);
m_dcs->add_route(3, "rrspeaker", 1.0);
m_dcs->add_route(4, "subwoofer", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2304,15 +2293,15 @@ void vegas_state::sf2049se(machine_config &config)
SPEAKER(config, "rrspeaker").headrest_right();
SPEAKER(config, "subwoofer").backrest();
dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
dcs.add_route(0, "flspeaker", 1.0);
dcs.add_route(1, "frspeaker", 1.0);
dcs.add_route(2, "rlspeaker", 1.0);
dcs.add_route(3, "rrspeaker", 1.0);
dcs.add_route(4, "subwoofer", 1.0);
DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(8);
m_dcs->set_polling_offset(0x872);
m_dcs->add_route(0, "flspeaker", 1.0);
m_dcs->add_route(1, "frspeaker", 1.0);
m_dcs->add_route(2, "rlspeaker", 1.0);
m_dcs->add_route(3, "rrspeaker", 1.0);
m_dcs->add_route(4, "subwoofer", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2338,15 +2327,15 @@ void vegas_state::sf2049te(machine_config &config)
SPEAKER(config, "rrspeaker").headrest_right();
SPEAKER(config, "subwoofer").backrest();
dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
dcs.add_route(0, "flspeaker", 1.0);
dcs.add_route(1, "frspeaker", 1.0);
dcs.add_route(2, "rlspeaker", 1.0);
dcs.add_route(3, "rrspeaker", 1.0);
dcs.add_route(4, "subwoofer", 1.0);
DCS2_AUDIO_DENVER_5CH(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(8);
m_dcs->set_polling_offset(0x872);
m_dcs->add_route(0, "flspeaker", 1.0);
m_dcs->add_route(1, "frspeaker", 1.0);
m_dcs->add_route(2, "rlspeaker", 1.0);
m_dcs->add_route(3, "rrspeaker", 1.0);
m_dcs->add_route(4, "subwoofer", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");
@ -2365,15 +2354,16 @@ void vegas_state::sf2049te(machine_config &config)
void vegas_state::cartfury(machine_config &config)
{
vegasv3(config);
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, m_dcs, 0));
dcs.set_maincpu_tag(m_maincpu);
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
dcs.add_route(0, "rspeaker", 1.0);
dcs.add_route(1, "lspeaker", 1.0);
DCS2_AUDIO_2104(config, m_dcs, 0);
m_dcs->set_maincpu_tag(m_maincpu);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0x0b5d);
m_dcs->add_route(0, "rspeaker", 1.0);
m_dcs->add_route(1, "lspeaker", 1.0);
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->in_port_cb<0>().set_ioport("DIPS");

View file

@ -846,7 +846,6 @@ void dcs2_audio_device::device_start()
LOG("device_start: audio ram banks: %x size: %x\n", m_sounddata_banks, soundbank_words);
}
// allocate memory for the SRAM
m_sram = std::make_unique<uint16_t[]>(0x8000*4/2);
@ -1460,7 +1459,7 @@ void dcs_audio_device::reset_w(int state)
// going low halts the CPU
if (!state)
{
// LOG("%s: DCS reset = %d\n", machine().describe_context(), state);
//LOG("%s: DCS reset = %d\n", machine().describe_context(), state);
// just run through the init code again
machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::dcs_reset),this));