-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
- Loading branch information
Showing
38 changed files
with
3,451 additions
and
413 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd"> | ||
| <!-- | ||
| license:CC0-1.0 | ||
| --> | ||
|
|
||
| <softwarelist name="lnux4004" description="Linux/4004 SD Card images"> | ||
|
|
||
| <software name="linux"> | ||
| <description>Debian GNU/Linux 7 (Linux uMIPS 4.4.292+)</description> | ||
| <year>2024</year> | ||
| <publisher>Dmitry Grinberg</publisher> | ||
| <part name="linux4004" interface="sdcard"> | ||
| <diskarea name="harddriv"> | ||
| <disk name="linux4004" sha1="6458018636d21845c95e1076b81c615e16a97975" writeable="yes" /> | ||
| </diskarea> | ||
| </part> | ||
| </software> | ||
|
|
||
| </softwarelist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| // license:BSD-3-Clause | ||
| // copyright-holders:Andrei I. Holub | ||
| /* | ||
| * The Music Machine - MIDI and sampling expansion | ||
| * by Ram Electronics Ltd | ||
| */ | ||
|
|
||
| #include "emu.h" | ||
| #include "musicmachine.h" | ||
|
|
||
| #include "bus/midi/midi.h" | ||
| #include "machine/6850acia.h" | ||
| #include "machine/clock.h" | ||
| #include "sound/dac.h" | ||
|
|
||
| #include "speaker.h" | ||
|
|
||
|
|
||
| namespace { | ||
|
|
||
| class spectrum_musicmachine_device : public device_t, public device_spectrum_expansion_interface | ||
| { | ||
| public: | ||
| // construction/destruction | ||
| spectrum_musicmachine_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); | ||
|
|
||
| void write_acia_clock(u8 data); | ||
|
|
||
| protected: | ||
| // device_t implementation | ||
| virtual void device_start() override ATTR_COLD; | ||
| virtual void device_reset() override ATTR_COLD; | ||
| virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; | ||
|
|
||
| // device_spectrum_expansion_interface implementation | ||
| virtual u8 iorq_r(offs_t offset) override; | ||
| virtual void iorq_w(offs_t offset, u8 data) override; | ||
|
|
||
| private: | ||
| required_device<acia6850_device> m_acia; | ||
| required_device<dac_byte_interface> m_dac; | ||
|
|
||
| bool m_irq_select; | ||
| }; | ||
|
|
||
|
|
||
| void spectrum_musicmachine_device::device_add_mconfig(machine_config &config) | ||
| { | ||
| ACIA6850(config, m_acia).txd_handler().set("mdout", FUNC(midi_port_device::write_txd)); | ||
| m_acia->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w)); | ||
| MIDI_PORT(config, "mdin", midiin_slot, "midiin").rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd)); | ||
| MIDI_PORT(config, "mdout", midiout_slot, "midiout"); | ||
| clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); | ||
| acia_clock.signal_handler().set(FUNC(spectrum_musicmachine_device::write_acia_clock)); | ||
|
|
||
| SPEAKER(config, "speaker").front_center(); | ||
| ZN429E(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.2); | ||
| } | ||
|
|
||
|
|
||
| //************************************************************************** | ||
| // LIVE DEVICE | ||
| //************************************************************************** | ||
|
|
||
| spectrum_musicmachine_device::spectrum_musicmachine_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : | ||
| device_t(mconfig, SPECTRUM_MUSICMACHINE, tag, owner, clock) | ||
| , device_spectrum_expansion_interface(mconfig, *this) | ||
| , m_acia(*this,"acia") | ||
| , m_dac(*this,"dac") | ||
| { | ||
| } | ||
|
|
||
| //------------------------------------------------- | ||
| // device_start - device-specific startup | ||
| //------------------------------------------------- | ||
|
|
||
| void spectrum_musicmachine_device::device_start() | ||
| { | ||
| save_item(NAME(m_irq_select)); | ||
| } | ||
|
|
||
| //------------------------------------------------- | ||
| // device_reset - device-specific reset | ||
| //------------------------------------------------- | ||
|
|
||
| void spectrum_musicmachine_device::device_reset() | ||
| { | ||
| m_irq_select = false; | ||
| } | ||
|
|
||
| void spectrum_musicmachine_device::write_acia_clock(u8 data) | ||
| { | ||
| m_acia->write_txc(data); | ||
| m_acia->write_rxc(data); | ||
| } | ||
|
|
||
| u8 spectrum_musicmachine_device::iorq_r(offs_t offset) | ||
| { | ||
| u8 data = (offset & 1) ? m_slot->fb_r() : 0xff; | ||
|
|
||
| switch (offset & 0xff) | ||
| { | ||
| case 0x7f: | ||
| if ((offset & 0x3ff) == 0x27f) | ||
| data = m_acia->status_r(); | ||
| else if ((offset & 0x3ff) == 0x37f) | ||
| data = m_acia->data_r(); | ||
| break; | ||
| case 0xbf: | ||
| // TODO ADC_READ | ||
| break; | ||
| case 0xdf: | ||
| // TODO Strobe: ADC_START | ||
| break; | ||
| } | ||
|
|
||
| return data; | ||
| } | ||
|
|
||
| void spectrum_musicmachine_device::iorq_w(offs_t offset, u8 data) | ||
| { | ||
| switch (offset & 0xff) | ||
| { | ||
| case 0x5f: | ||
| m_irq_select = data & 1; | ||
| break; | ||
| case 0x7f: | ||
| if ((offset & 0x3ff) == 0x07f) | ||
| m_acia->control_w(data); | ||
| else if ((offset & 0x3ff) == 0x17f) | ||
| m_acia->data_w(data); | ||
| break; | ||
| case 0x9f: | ||
| m_dac->write(data); | ||
| break; | ||
| case 0xdf: | ||
| // TODO Strobe: ADC_START | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| } // anonymous namespace | ||
|
|
||
|
|
||
| //************************************************************************** | ||
| // DEVICE DEFINITIONS | ||
| //************************************************************************** | ||
|
|
||
| DEFINE_DEVICE_TYPE_PRIVATE(SPECTRUM_MUSICMACHINE, device_spectrum_expansion_interface, spectrum_musicmachine_device, "spectrummusic", "The Music Machine (ZX)") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // license:BSD-3-Clause | ||
| // copyright-holders:Barry Rodewald | ||
| /* | ||
| * The Music Machine - MIDI and sampling expansion | ||
| * by Ram Electronics | ||
| * | ||
| * Contains a 6850 AICA, Ferranti ZN429E8 DAC and ZN449 ADC | ||
| */ | ||
|
|
||
| #ifndef MAME_BUS_SPECTRUM_MUSICMACHINE_H | ||
| #define MAME_BUS_SPECTRUM_MUSICMACHINE_H | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "exp.h" | ||
|
|
||
|
|
||
| DECLARE_DEVICE_TYPE(SPECTRUM_MUSICMACHINE, device_spectrum_expansion_interface) | ||
|
|
||
| #endif // MAME_BUS_SPECTRUM_MUSICMACHINE_H |
Oops, something went wrong.