Skip to content

xavix progress - mostly sound #14290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 10, 2025
+883 −399
Merged

xavix progress - mostly sound #14290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea51d6e
xavix progress - mostly sound
Oct 8, 2025
6620931
handle MAME idiosyncrasy
Oct 8, 2025
4a1be4a
I think this shouldn't have been changed
Oct 8, 2025
2f0ece6
fix a few more seeprom hookups
Oct 10, 2025
602022a
fix xavix2 hookup while we're here
Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/mame/tvgames/xavix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,19 @@ void xavix_state::xavix_lowbus_map(address_map &map)
map(0x7400, 0x757f).ram();

// Sound Control
map(0x75f0, 0x75f1).rw(FUNC(xavix_state::sound_startstop_r), FUNC(xavix_state::sound_startstop_w)); // r/w tested read/written 8 times in a row
map(0x75f2, 0x75f3).rw(FUNC(xavix_state::sound_updateenv_r), FUNC(xavix_state::sound_updateenv_w));
map(0x75f4, 0x75f5).r(FUNC(xavix_state::sound_sta16_r)); // related to 75f0 / 75f1 (read after writing there - rad_mtrk)
map(0x75f6, 0x75f6).rw(FUNC(xavix_state::sound_volume_r), FUNC(xavix_state::sound_volume_w)); // r/w tested
map(0x75f7, 0x75f7).w(FUNC(xavix_state::sound_regbase_w));
map(0x75f8, 0x75f8).rw(FUNC(xavix_state::sound_75f8_r), FUNC(xavix_state::sound_75f8_w)); // r/w tested
map(0x75f9, 0x75f9).rw(FUNC(xavix_state::sound_75f9_r), FUNC(xavix_state::sound_75f9_w));
map(0x75fa, 0x75fa).rw(FUNC(xavix_state::sound_timer0_r), FUNC(xavix_state::sound_timer0_w)); // r/w tested
map(0x75fb, 0x75fb).rw(FUNC(xavix_state::sound_timer1_r), FUNC(xavix_state::sound_timer1_w)); // r/w tested
map(0x75fc, 0x75fc).rw(FUNC(xavix_state::sound_timer2_r), FUNC(xavix_state::sound_timer2_w)); // r/w tested
map(0x75fd, 0x75fd).rw(FUNC(xavix_state::sound_timer3_r), FUNC(xavix_state::sound_timer3_w)); // r/w tested
map(0x75fe, 0x75fe).rw(FUNC(xavix_state::sound_irqstatus_r), FUNC(xavix_state::sound_irqstatus_w));
map(0x75ff, 0x75ff).w(FUNC(xavix_state::sound_75ff_w));
map(0x75f0, 0x75f1).rw(FUNC(xavix_state::sound_voice_startstop_r), FUNC(xavix_state::sound_voice_startstop_w));
map(0x75f2, 0x75f3).rw(FUNC(xavix_state::sound_voice_updateenv_r), FUNC(xavix_state::sound_voice_updateenv_w));
map(0x75f4, 0x75f5).r(FUNC(xavix_state::sound_voice_status_r));
map(0x75f6, 0x75f6).rw(FUNC(xavix_state::sound_volume_r), FUNC(xavix_state::sound_volume_w));
map(0x75f7, 0x75f7).rw(FUNC(xavix_state::sound_regbase_r), FUNC(xavix_state::sound_regbase_w));
map(0x75f8, 0x75f8).rw(FUNC(xavix_state::sound_cyclerate_r), FUNC(xavix_state::sound_cyclerate_w));
map(0x75f9, 0x75f9).rw(FUNC(xavix_state::sound_mixer_r), FUNC(xavix_state::sound_mixer_w));
map(0x75fa, 0x75fa).rw(FUNC(xavix_state::sound_tp0_r), FUNC(xavix_state::sound_tp0_w));
map(0x75fb, 0x75fb).rw(FUNC(xavix_state::sound_tp1_r), FUNC(xavix_state::sound_tp1_w));
map(0x75fc, 0x75fc).rw(FUNC(xavix_state::sound_tp2_r), FUNC(xavix_state::sound_tp2_w));
map(0x75fd, 0x75fd).rw(FUNC(xavix_state::sound_tp3_r), FUNC(xavix_state::sound_tp3_w));
map(0x75fe, 0x75fe).rw(FUNC(xavix_state::sound_irq_status_r), FUNC(xavix_state::sound_irq_status_w));
map(0x75ff, 0x75ff).rw(FUNC(xavix_state::sound_dac_control_r), FUNC(xavix_state::sound_dac_control_w));

// Slot Registers
map(0x7810, 0x7810).w(FUNC(xavix_state::slotreg_7810_w)); // startup
Expand Down Expand Up @@ -1624,6 +1624,7 @@ void xavix_state::xavix(machine_config &config)
XAVIX_SOUND(config, m_sound, MAIN_CLOCK);
m_sound->read_regs_callback().set(FUNC(xavix_state::sound_regram_read_cb));
m_sound->read_samples_callback().set(FUNC(xavix_state::sample_read));
m_sound->write_regs_callback().set(FUNC(xavix_state::sound_regram_write_cb));
//m_sound->add_route(ALL_OUTPUTS, "mono", 1.0);
m_sound->add_route(0, "speaker", 1.0, 0);
m_sound->add_route(1, "speaker", 1.0, 1);
Expand Down
156 changes: 120 additions & 36 deletions src/mame/tvgames/xavix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,119 @@ class xavix_sound_device : public device_t, public device_sound_interface
xavix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

auto read_regs_callback() { return m_readregs_cb.bind(); }
auto write_regs_callback() { return m_writeregs_cb.bind(); } // <-- for vm1 LA/RA mirroring
auto read_samples_callback() { return m_readsamples_cb.bind(); }

// control API
void enable_voice(int voice, bool update_only);
void disable_voice(int voice);
bool is_voice_enabled(int voice);

// rate handling
void set_tempo(int index, uint8_t value);
void set_cyclerate(uint8_t value);

// register handlers (from the CPU map)
uint8_t sound_volume_r();
void sound_volume_w(uint8_t data);
uint8_t sound_mixer_r();
void sound_mixer_w(uint8_t data);
uint8_t dac_control_r();
void dac_control_w(uint8_t data);

// helpers
void set_dac_gain(uint8_t amp_data);
void set_output_mode(bool mono);
void set_mastervol(uint8_t data);

protected:
// device-level overrides
virtual void device_start() override ATTR_COLD;
virtual void device_reset() override ATTR_COLD;

// sound stream update overrides
// sound stream update
virtual void sound_stream_update(sound_stream &stream) override;

private:
sound_stream *m_stream = nullptr;
// stream
sound_stream* m_stream = nullptr;

// global timing
uint8_t m_tp_dev[4] = { 0, 0, 0, 0 };
uint8_t m_cyclerate_dev = 1;

// callbacks
devcb_read8 m_readregs_cb;
devcb_write8 m_writeregs_cb; // used to mirror vm1 phase to LA/RA
devcb_read8 m_readsamples_cb;

// voice state
struct xavix_voice {
bool enabled[2]{};
uint32_t position[2]{};
uint32_t startposition[2]{};
uint8_t bank = 0; // no samples appear to cross a bank boundary, so likely wraps
int type = 0;
int rate = 0;
int vol = 0;
uint8_t enabled = 0;
uint32_t position = 0;
uint32_t loopposition = 0;
uint32_t loopendposition = 0;
uint32_t startposition = 0;

uint32_t envpositionleft = 0;
uint32_t envpositionright = 0;
uint8_t envbank = 0;
uint8_t envmode = 0;

uint8_t bank = 0;
uint32_t rate = 0;
uint8_t type = 0;
uint8_t vol = 0;

uint16_t env_rom_base_left = 0;
uint16_t env_rom_base_right = 0;

uint8_t env_vol_left = 0xff;
uint8_t env_vol_right = 0xff;

uint32_t env_period_samples = 0;
uint32_t env_countdown = 0;
uint8_t env_active_left = 1;
uint8_t env_active_right = 1;

// misc (vm1/vm2 helpers, tickers)
uint8_t env_phase = 0;

uint8_t la_byte = 0; // shadow of LA (low address byte)
uint8_t ra_byte = 0; // shadow of RA (low address byte)
};

devcb_read8 m_readregs_cb;
// mixer state
struct xavix_mixer
{
uint8_t monoural = 0;
uint8_t capacity = 0;
uint8_t amp = 2;

uint8_t dac = 0;
uint8_t gap = 0;
uint8_t lead = 0;
uint8_t lag = 0;

devcb_read8 m_readsamples_cb;
uint8_t mastervol = 0xff;
int32_t gain = 2;
};

xavix_mixer m_mix;
xavix_voice m_voice[16];

uint32_t m_pitch_countdown[16];

// helpers
uint32_t tempo_to_period_samples(uint8_t tp) const;
uint8_t decay(uint8_t x);
void step_envelope(int voice);
uint8_t fetch_env_byte(int voice, int channel, uint32_t idx);
uint8_t fetch_env_byte_direct(int voice, int channel, uint16_t addr);
void step_pitch(int voice);
void step_side1(int channel, int voice, const uint8_t la, const uint8_t ra);
void step_side_env_vm1(int channel, xavix_voice v, int voice);
void step_side_env_vm2(int channel, xavix_voice v, int voice);
};

DECLARE_DEVICE_TYPE(XAVIX_SOUND, xavix_sound_device)
Expand Down Expand Up @@ -385,36 +466,39 @@ class xavix_state : public driver_device
uint8_t dispctrl_6ff8_r();
void dispctrl_6ff8_w(uint8_t data);

uint8_t sound_startstop_r(offs_t offset);
void sound_startstop_w(offs_t offset, uint8_t data);
uint8_t sound_updateenv_r(offs_t offset);
void sound_updateenv_w(offs_t offset, uint8_t data);
uint8_t sound_voice_startstop_r(offs_t offset);
void sound_voice_startstop_w(offs_t offset, uint8_t data);
uint8_t sound_voice_updateenv_r(offs_t offset);
void sound_voice_updateenv_w(offs_t offset, uint8_t data);

uint8_t sound_voice_status_r(offs_t offset);

uint8_t sound_sta16_r(offs_t offset);
uint8_t sound_75f5_r();
uint8_t sound_volume_r();
void sound_volume_w(uint8_t data);

uint8_t sound_regbase_r();
void sound_regbase_w(uint8_t data);

uint8_t sound_75f8_r();
void sound_75f8_w(uint8_t data);
uint8_t sound_cyclerate_r();
void sound_cyclerate_w(uint8_t data);

uint8_t sound_mixer_r();
void sound_mixer_w(uint8_t data);

uint8_t sound_75f9_r();
void sound_75f9_w(uint8_t data);
uint8_t sound_tp0_r();
void sound_tp0_w(uint8_t data);
uint8_t sound_tp1_r();
void sound_tp1_w(uint8_t data);
uint8_t sound_tp2_r();
void sound_tp2_w(uint8_t data);
uint8_t sound_tp3_r();
void sound_tp3_w(uint8_t data);

uint8_t sound_timer0_r();
void sound_timer0_w(uint8_t data);
uint8_t sound_timer1_r();
void sound_timer1_w(uint8_t data);
uint8_t sound_timer2_r();
void sound_timer2_w(uint8_t data);
uint8_t sound_timer3_r();
void sound_timer3_w(uint8_t data);
uint8_t sound_irq_status_r();
void sound_irq_status_w(uint8_t data);
void sound_dac_control_w(uint8_t data);
uint8_t sound_dac_control_r();

uint8_t sound_irqstatus_r();
void sound_irqstatus_w(uint8_t data);
void sound_75ff_w(uint8_t data);
uint8_t m_sound_irqstatus = 0;
uint8_t m_soundreg16_0[2]{};
uint8_t m_soundreg16_1[2]{};
Expand Down Expand Up @@ -534,11 +618,10 @@ class xavix_state : public driver_device
uint8_t m_6ff0 = 0;
uint8_t m_video_ctrl = 0;

uint8_t m_mastervol = 0;
uint8_t m_unk_snd75f8 = 0;
uint8_t m_unk_snd75f9 = 0;
uint8_t m_cyclerate = 0;
uint8_t m_mixer = 0;
uint8_t m_unk_snd75ff = 0;
uint8_t m_sndtimer[4]{};
uint8_t m_tp[4]{};

uint8_t m_timer_baseval = 0;

Expand Down Expand Up @@ -614,6 +697,7 @@ class xavix_state : public driver_device
int get_current_address_byte();

uint8_t sound_regram_read_cb(offs_t offset);
void sound_regram_write_cb(offs_t offset, uint8_t data);

uint8_t m_extbusctrl[3]{};

Expand Down
12 changes: 4 additions & 8 deletions src/mame/tvgames/xavix2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,18 +499,14 @@ void xavix2_state::pio_update()

void naruto_state::pio_update()
{
if (BIT(m_pio_mask_out, 21))
m_i2cmem->write_sda(BIT(m_pio_dataw, 21));
if (BIT(m_pio_mask_out, 20))
m_i2cmem->write_scl(BIT(m_pio_dataw, 20));
m_i2cmem->write_sda(BIT(m_pio_mask_out, 21) ? BIT(m_pio_dataw, 21) : 1);
m_i2cmem->write_scl(BIT(m_pio_mask_out, 20) ? BIT(m_pio_dataw, 20) : 0);
}

void domyos_state::pio_update()
{
if (BIT(m_pio_mask_out, 16))
m_i2cmem->write_sda(BIT(m_pio_dataw, 16));
if (BIT(m_pio_mask_out, 17))
m_i2cmem->write_scl(BIT(m_pio_dataw, 17));
m_i2cmem->write_sda(BIT(m_pio_mask_out, 16) ? BIT(m_pio_dataw, 16) : 1);
m_i2cmem->write_scl(BIT(m_pio_mask_out, 17) ? BIT(m_pio_dataw, 17) : 0);
}

void xavix2_state::pio_w(offs_t offset, u32 data, u32 mem_mask)
Expand Down
8 changes: 2 additions & 6 deletions src/mame/tvgames/xavix_2002.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,12 +419,8 @@ void superxavix_i2c_jmat_state::write_extended_io1(offs_t offset, uint8_t data,
{
LOG("%s: io1_data_w %02x\n", machine().describe_context(), data);

if (mem_mask & 0x08)
m_i2cmem->write_sda((data & 0x08) >> 3);

if (mem_mask & 0x10)
m_i2cmem->write_scl((data & 0x10) >> 4);

m_i2cmem->write_sda(BIT(mem_mask, 3) ? BIT(data, 3) : 1);
m_i2cmem->write_scl(BIT(mem_mask, 4) ? BIT(data, 4) : 0);
}

void superxavix_i2c_jmat_state::write_extended_io2(offs_t offset, uint8_t data, uint8_t mem_mask)
Expand Down
Loading
Loading