Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

tx1: Removed more tag lookups, nw

Browse Source
This commit is contained in:
mooglyguy 2018-05-31 16:57:02 +02:00
parent 1e91539044
commit 47f1777f44
2 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/mame/audio/tx1.cpp
View File

@ -11,7 +11,6 @@
#include "audio/tx1.h"
#include "cpu/z80/z80.h"
#include "includes/tx1.h"
#include "machine/i8255.h"
#include "video/resnet.h"
#include "speaker.h"
@ -68,6 +67,12 @@ tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type ty
device_sound_interface(mconfig, *this),
m_audiocpu(*this, "audio_cpu"),
m_z80_ram(*this, "z80_ram"),
m_ppi(*this, "ppi8255"),
m_dsw(*this, "DSW"),
m_steering(*this, "AN_STEERING"),
m_accelerator(*this, "AN_ACCELERATOR"),
m_brake(*this, "AN_BRAKE"),
m_ppi_portd(*this, "PPI_PORTD"),
m_stream(nullptr),
m_freq_to_step(0),
m_step0(0),
@ -174,24 +179,24 @@ static uint8_t bit_reverse8(uint8_t val)
READ16_MEMBER( tx1_sound_device::dipswitches_r )
{
return (ioport("DSW")->read() & 0xfffe) | m_ts;
return (m_dsw->read() & 0xfffe) | m_ts;
}
// Tazmi TZ2103 custom 4-channel A/D converter @ 7.5 MHz
READ8_MEMBER( buggyboy_sound_device::bb_analog_r )
{
if (offset == 0)
return bit_reverse8(((ioport("AN_ACCELERATOR")->read() & 0xf) << 4) | ioport("AN_STEERING")->read());
return bit_reverse8(((m_accelerator->read() & 0xf) << 4) | m_steering->read());
else
return bit_reverse8((ioport("AN_BRAKE")->read() & 0xf) << 4);
return bit_reverse8((m_brake->read() & 0xf) << 4);
}
READ8_MEMBER( buggyboyjr_sound_device::bbjr_analog_r )
{
if (offset == 0)
return ((ioport("AN_ACCELERATOR")->read() & 0xf) << 4) | ioport("AN_STEERING")->read();
return ((m_accelerator->read() & 0xf) << 4) | m_steering->read();
else
return (ioport("AN_BRAKE")->read() & 0xf) << 4;
return (m_brake->read() & 0xf) << 4;
}
WRITE8_MEMBER( tx1_sound_device::tx1_coin_cnt_w )
@ -210,8 +215,8 @@ WRITE8_MEMBER( buggyboy_sound_device::bb_coin_cnt_w )
WRITE8_MEMBER( tx1_sound_device::tx1_ppi_latch_w )
{
m_ppi_latch_a = ((ioport("AN_BRAKE")->read() & 0xf) << 4) | (ioport("AN_ACCELERATOR")->read() & 0xf);
m_ppi_latch_b = ioport("AN_STEERING")->read();
m_ppi_latch_a = ((m_brake->read() & 0xf) << 4) | (m_accelerator->read() & 0xf);
m_ppi_latch_b = m_steering->read();
}
READ8_MEMBER( tx1_sound_device::tx1_ppi_porta_r )
@ -221,7 +226,7 @@ READ8_MEMBER( tx1_sound_device::tx1_ppi_porta_r )
READ8_MEMBER( tx1_sound_device::tx1_ppi_portb_r )
{
return ioport("PPI_PORTD")->read() | m_ppi_latch_b;
return m_ppi_portd->read() | m_ppi_latch_b;
}
WRITE8_MEMBER( tx1_sound_device::pit8253_w )
@ -296,14 +301,13 @@ WRITE8_MEMBER( tx1_sound_device::ay8910_a_w )
WRITE8_MEMBER( tx1_sound_device::ay8910_b_w )
{
double gain;
m_stream->update();
/* Only B3-0 are inverted */
m_ay_outputb = data ^ 0xf;
/* It'll do until we get quadrophonic speaker support! */
gain = BIT(m_ay_outputb, 4) ? 1.5 : 2.0;
double gain = BIT(m_ay_outputb, 4) ? 1.5 : 2.0;
device_sound_interface *sound;
interface(sound);
sound->set_output_gain(0, gain);
@ -414,7 +418,7 @@ void tx1_sound_device::tx1_sound_prg(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x3000, 0x37ff).ram().mirror(0x800).share("z80_ram");
map(0x4000, 0x4000).w(this, FUNC(tx1_sound_device::z80_intreq_w));
map(0x5000, 0x5003).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x5000, 0x5003).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x6000, 0x6003).rw(this, FUNC(tx1_sound_device::pit8253_r), FUNC(tx1_sound_device::pit8253_w));
map(0x7000, 0x7fff).w(this, FUNC(tx1_sound_device::tx1_ppi_latch_w));
map(0xb000, 0xbfff).rw(this, FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
@ -549,12 +553,12 @@ ioport_constructor tx1j_sound_device::device_input_ports() const
}
MACHINE_CONFIG_START(tx1_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
MCFG_DEVICE_ADD(m_audiocpu, Z80, TX1_PIXEL_CLOCK / 2)
MCFG_DEVICE_PROGRAM_MAP(tx1_sound_prg)
MCFG_DEVICE_IO_MAP(tx1_sound_io)
MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, tx1_sound_device, z80_irq, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_DEVICE_ADD(m_ppi, I8255A, 0)
MCFG_I8255_IN_PORTA_CB(READ8(*this, tx1_sound_device, tx1_ppi_porta_r))
MCFG_I8255_IN_PORTB_CB(READ8(*this, tx1_sound_device, tx1_ppi_portb_r))
MCFG_I8255_IN_PORTC_CB(IOPORT("PPI_PORTC"))
@ -848,7 +852,7 @@ void buggyboy_sound_device::buggyboy_sound_prg(address_map &map)
map(0x0000, 0x3fff).rom();
map(0x4000, 0x47ff).ram().share("z80_ram");
map(0x6000, 0x6001).r(this, FUNC(buggyboy_sound_device::bb_analog_r));
map(0x6800, 0x6803).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x6800, 0x6803).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x7000, 0x7003).rw(this, FUNC(buggyboy_sound_device::pit8253_r), FUNC(buggyboy_sound_device::pit8253_w));
map(0x7800, 0x7800).w(this, FUNC(tx1_sound_device::z80_intreq_w));
map(0xc000, 0xc7ff).rw(this, FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
@ -869,10 +873,10 @@ void buggyboyjr_sound_device::buggybjr_sound_prg(address_map &map)
void buggyboy_sound_device::buggyboy_sound_io(address_map &map)
{
map.global_mask(0xff);
map(0x40, 0x40).r("ym1", FUNC(ay8910_device::data_r));
map(0x40, 0x41).w("ym1", FUNC(ay8910_device::data_address_w));
map(0x80, 0x80).r("ym2", FUNC(ay8910_device::data_r));
map(0x80, 0x81).w("ym2", FUNC(ay8910_device::data_address_w));
map(0x40, 0x40).r(m_ym[0], FUNC(ay8910_device::data_r));
map(0x40, 0x41).w(m_ym[0], FUNC(ay8910_device::data_address_w));
map(0x80, 0x80).r(m_ym[1], FUNC(ay8910_device::data_r));
map(0x80, 0x81).w(m_ym[1], FUNC(ay8910_device::data_address_w));
}
INPUT_PORTS_START( buggyboy_inputs )
@ -1055,12 +1059,12 @@ ioport_constructor buggyboyjr_sound_device::device_input_ports() const
}
MACHINE_CONFIG_START(buggyboy_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
MCFG_DEVICE_ADD(m_audiocpu, Z80, BUGGYBOY_ZCLK / 2)
MCFG_DEVICE_PROGRAM_MAP(buggyboy_sound_prg)
MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, buggyboy_sound_device, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
MCFG_DEVICE_IO_MAP(buggyboy_sound_io)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_DEVICE_ADD(m_ppi, I8255A, 0)
/* Buggy Boy uses an 8255 PPI instead of YM2149 ports for inputs! */
MCFG_I8255_IN_PORTA_CB(IOPORT("PPI_PORTA"))
MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, buggyboy_sound_device, bb_coin_cnt_w))
@ -1071,11 +1075,11 @@ MACHINE_CONFIG_START(buggyboy_sound_device::device_add_mconfig)
// SPEAKER(config, "rearleft", -0.2, 0.0, -0.5); /* Atari TX-1 TM262 manual shows 4 speakers (TX-1 Audio PCB Assembly A042016-01 A) */
// SPEAKER(config, "rearright", 0.2, 0.0, -0.5);
MCFG_DEVICE_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
MCFG_DEVICE_ADD(m_ym[0], YM2149, BUGGYBOY_ZCLK / 4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggyboy_sound_device, ym1_a_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
MCFG_DEVICE_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
MCFG_DEVICE_ADD(m_ym[1], YM2149, BUGGYBOY_ZCLK / 4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggyboy_sound_device, ym2_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggyboy_sound_device, ym2_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
@ -1085,7 +1089,7 @@ MACHINE_CONFIG_START(buggyboy_sound_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(buggyboyjr_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
MCFG_DEVICE_ADD(m_audiocpu, Z80, BUGGYBOY_ZCLK / 2)
MCFG_DEVICE_PROGRAM_MAP(buggybjr_sound_prg)
MCFG_DEVICE_IO_MAP(buggyboy_sound_io)
MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, buggyboy_sound_device, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
@ -1095,12 +1099,12 @@ MACHINE_CONFIG_START(buggyboyjr_sound_device::device_add_mconfig)
// SPEAKER(config, "rearleft", -0.2, 0.0, -0.5);
// SPEAKER(config, "rearright", 0.2, 0.0, -0.5);
MCFG_DEVICE_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC19 */
MCFG_DEVICE_ADD(m_ym[0], YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC19 */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM2149_IC19_A"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("YM2149_IC19_B"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
MCFG_DEVICE_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC24 */
MCFG_DEVICE_ADD(m_ym[1], YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC24 */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggyboy_sound_device, ym2_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggyboy_sound_device, ym2_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)

39
src/mame/audio/tx1.h
View File

@ -11,6 +11,7 @@
#pragma once
#include "machine/i8255.h"
#include "sound/ay8910.h"
class tx1_sound_device : public device_t, public device_sound_interface
@ -19,28 +20,30 @@ public:
tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE16_MEMBER( z80_busreq_w );
DECLARE_WRITE8_MEMBER( z80_intreq_w );
DECLARE_READ16_MEMBER( dipswitches_r );
DECLARE_READ16_MEMBER( z80_shared_r );
DECLARE_WRITE16_MEMBER( z80_shared_w );
READ16_MEMBER( dipswitches_r );
DECLARE_WRITE8_MEMBER( z80_intreq_w );
DECLARE_WRITE8_MEMBER( ts_w );
DECLARE_READ8_MEMBER( ts_r );
DECLARE_READ8_MEMBER( pit8253_r );
DECLARE_WRITE8_MEMBER( pit8253_w );
INTERRUPT_GEN_MEMBER( z80_irq );
protected:
DECLARE_WRITE8_MEMBER( tx1_ppi_latch_w );
DECLARE_WRITE8_MEMBER( tx1_coin_cnt_w );
DECLARE_READ8_MEMBER( tx1_ppi_porta_r );
DECLARE_READ8_MEMBER( tx1_ppi_portb_r );
DECLARE_READ8_MEMBER( pit8253_r );
DECLARE_WRITE8_MEMBER( pit8253_w );
DECLARE_WRITE8_MEMBER( ay8910_a_w );
DECLARE_WRITE8_MEMBER( ay8910_b_w );
INTERRUPT_GEN_MEMBER( z80_irq );
protected:
/*************************************
*
* 8253 Programmable Interval Timer
@ -78,6 +81,13 @@ protected:
// internal state
required_device<cpu_device> m_audiocpu;
required_shared_ptr<uint8_t> m_z80_ram;
optional_device<i8255_device> m_ppi;
required_ioport m_dsw;
required_ioport m_steering;
required_ioport m_accelerator;
required_ioport m_brake;
optional_ioport m_ppi_portd;
sound_stream *m_stream;
uint32_t m_freq_to_step;
@ -132,13 +142,9 @@ class buggyboy_sound_device : public tx1_sound_device
public:
buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE8_MEMBER( ym1_a_w );
DECLARE_WRITE8_MEMBER( ym2_a_w );
DECLARE_WRITE8_MEMBER( ym2_b_w );
DECLARE_READ8_MEMBER( bb_analog_r );
DECLARE_WRITE8_MEMBER( bb_coin_cnt_w );
protected:
buggyboy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@ -151,6 +157,11 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
DECLARE_WRITE8_MEMBER( ym1_a_w );
DECLARE_READ8_MEMBER( bb_analog_r );
DECLARE_WRITE8_MEMBER( bb_coin_cnt_w );
virtual bool has_coin_counters() { return false; }
void buggyboy_sound_io(address_map &map);
@ -164,13 +175,13 @@ class buggyboyjr_sound_device : public buggyboy_sound_device
public:
buggyboyjr_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( bbjr_analog_r );
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
DECLARE_READ8_MEMBER( bbjr_analog_r );
virtual bool has_coin_counters() override { return true; }
void buggybjr_sound_prg(address_map &map);