From 3e8cb6894cd0970a3940fc52570bfab3219eab60 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Mon, 12 Dec 2022 20:44:33 +0000 Subject: bus/archimedes/podules: Added Ethernet podules (not working) - Acorn AEH50 Ethernet II - Acorn AEH54 10Base2 Ethernet Podule - ANT Ethernet 10base2 mini-podule --- scripts/src/bus.lua | 6 ++ src/devices/bus/archimedes/podule/ether2.cpp | 134 +++++++++++++++++++++++++++ src/devices/bus/archimedes/podule/ether2.h | 19 ++++ src/devices/bus/archimedes/podule/ether3.cpp | 122 ++++++++++++++++++++++++ src/devices/bus/archimedes/podule/ether3.h | 19 ++++ src/devices/bus/archimedes/podule/ethera.cpp | 123 ++++++++++++++++++++++++ src/devices/bus/archimedes/podule/ethera.h | 19 ++++ src/devices/bus/archimedes/podule/slot.cpp | 12 +-- 8 files changed, 448 insertions(+), 6 deletions(-) create mode 100644 src/devices/bus/archimedes/podule/ether2.cpp create mode 100644 src/devices/bus/archimedes/podule/ether2.h create mode 100644 src/devices/bus/archimedes/podule/ether3.cpp create mode 100644 src/devices/bus/archimedes/podule/ether3.h create mode 100644 src/devices/bus/archimedes/podule/ethera.cpp create mode 100644 src/devices/bus/archimedes/podule/ethera.h diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 9c892278cd7..85906111ee4 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -354,6 +354,12 @@ if (BUSES["ARCHIMEDES_PODULE"]~=null) then MAME_DIR .. "src/devices/bus/archimedes/podule/eaglem2.h", MAME_DIR .. "src/devices/bus/archimedes/podule/ether1.cpp", MAME_DIR .. "src/devices/bus/archimedes/podule/ether1.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether2.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether2.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether3.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether3.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ethera.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ethera.h", MAME_DIR .. "src/devices/bus/archimedes/podule/etherd.cpp", MAME_DIR .. "src/devices/bus/archimedes/podule/etherd.h", MAME_DIR .. "src/devices/bus/archimedes/podule/etherr.cpp", diff --git a/src/devices/bus/archimedes/podule/ether2.cpp b/src/devices/bus/archimedes/podule/ether2.cpp new file mode 100644 index 00000000000..b702b2685db --- /dev/null +++ b/src/devices/bus/archimedes/podule/ether2.cpp @@ -0,0 +1,134 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + Acorn AEH50 Ethernet II + + http://chrisacorns.computinghistory.org.uk/32bit_UpgradesA2G/Acorn_AEH50_Ethernet.html + + TODO: + - everything, this is skeleton with ROM. + +**********************************************************************/ + +#include "emu.h" +#include "ether2.h" +#include "machine/dp8390.h" + + +namespace { + +class arc_ether2_aeh50_device : + public device_t, + public device_archimedes_podule_interface +{ +public: + // construction/destruction + arc_ether2_aeh50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + static constexpr feature_type unemulated_features() { return feature::COMMS; } + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + + // device_archimedes_podule_interface overrides + virtual void ioc_map(address_map &map) override; + virtual void memc_map(address_map &map) override; + +private: + required_memory_region m_podule_rom; + required_device m_dp8390; + + u8 m_rom_page; +}; + + +void arc_ether2_aeh50_device::ioc_map(address_map &map) +{ + map(0x0000, 0x1fff).lr8(NAME([this](offs_t offset) { return m_podule_rom->base()[offset | ((m_rom_page << 11) & 0x3800)]; })).umask32(0x000000ff); + map(0x3000, 0x3000).lw8(NAME([this](u8 data) { m_rom_page = data; })); +} + +void arc_ether2_aeh50_device::memc_map(address_map &map) +{ +} + + +//------------------------------------------------- +// ROM( ether2_aeh50 ) +//------------------------------------------------- + +ROM_START( ether2_aeh50 ) + ROM_REGION(0x4000, "podule_rom", 0) + ROM_LOAD("0273,270.01_enet_id.rom", 0x0000, 0x4000, CRC(87d4fbc6) SHA1(417000f1fa8f61f8092f8f74a0359ffb3ce72768)) +ROM_END + +const tiny_rom_entry *arc_ether2_aeh50_device::device_rom_region() const +{ + return ROM_NAME( ether2_aeh50 ); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void arc_ether2_aeh50_device::device_add_mconfig(machine_config &config) +{ + DP8390D(config, m_dp8390, 20_MHz_XTAL); + m_dp8390->irq_callback().set([this](int state) { set_pirq(state); }); + //m_dp8390->mem_read_callback().set(FUNC(arc_ether2_aeh50_device::mem_read)); + //m_dp8390->mem_write_callback().set(FUNC(arc_ether2_aeh50_device::mem_write)); +} + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// arc_ether2_aeh50_device - constructor +//------------------------------------------------- + +arc_ether2_aeh50_device::arc_ether2_aeh50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, ARC_ETHER2_AEH50, tag, owner, clock) + , device_archimedes_podule_interface(mconfig, *this) + , m_podule_rom(*this, "podule_rom") + , m_dp8390(*this, "dp8390") + , m_rom_page(0) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void arc_ether2_aeh50_device::device_start() +{ + save_item(NAME(m_rom_page)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void arc_ether2_aeh50_device::device_reset() +{ + m_rom_page = 0x00; +} + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(ARC_ETHER2_AEH50, device_archimedes_podule_interface, arc_ether2_aeh50_device, "arc_ether2_aeh50", "Acorn AEH50 Ethernet II") diff --git a/src/devices/bus/archimedes/podule/ether2.h b/src/devices/bus/archimedes/podule/ether2.h new file mode 100644 index 00000000000..81aa4e59875 --- /dev/null +++ b/src/devices/bus/archimedes/podule/ether2.h @@ -0,0 +1,19 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + Acorn AEH50 Ethernet II + +**********************************************************************/ + +#ifndef MAME_BUS_ARCHIMEDES_PODULE_ETHER2_H +#define MAME_BUS_ARCHIMEDES_PODULE_ETHER2_H + +#pragma once + +#include "slot.h" + +// device type definition +DECLARE_DEVICE_TYPE(ARC_ETHER2_AEH50, device_archimedes_podule_interface) + +#endif // MAME_BUS_ARCHIMEDES_PODULE_ETHER2_H diff --git a/src/devices/bus/archimedes/podule/ether3.cpp b/src/devices/bus/archimedes/podule/ether3.cpp new file mode 100644 index 00000000000..7f8a7808e39 --- /dev/null +++ b/src/devices/bus/archimedes/podule/ether3.cpp @@ -0,0 +1,122 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + Acorn AEH54 10Base2 Ethernet Podule + + http://chrisacorns.computinghistory.org.uk/32bit_UpgradesA2G/Acorn_AEH54_Ethernet.html + + TODO: + - everything, this is skeleton with ROM. + +**********************************************************************/ + +#include "emu.h" +#include "ether3.h" + + +namespace { + +class arc_ether3_aeh54_device : + public device_t, + public device_archimedes_podule_interface +{ +public: + // construction/destruction + arc_ether3_aeh54_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + static constexpr feature_type unemulated_features() { return feature::COMMS; } + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + + // device_archimedes_podule_interface overrides + virtual void ioc_map(address_map &map) override; + +private: + required_memory_region m_podule_rom; + + u8 m_rom_page; +}; + + +void arc_ether3_aeh54_device::ioc_map(address_map &map) +{ + map(0x0000, 0x3fff).lr8(NAME([this](offs_t offset) { return m_podule_rom->base()[offset | ((m_rom_page << 12) & 0x1f000)]; })).umask32(0x000000ff); + map(0x0000, 0x0000).lw8(NAME([this](u8 data) { m_rom_page = data; })); +} + + +//------------------------------------------------- +// ROM( ether3_aeh54 ) +//------------------------------------------------- + +ROM_START( ether3_aeh54 ) + ROM_REGION(0x20000, "podule_rom", 0) + ROM_LOAD("aun_client_rom.rom", 0x0000, 0x20000, CRC(8137b9eb) SHA1(103318a527ea5f9a3fe373bfb8f8d0ad3697617f)) +ROM_END + +const tiny_rom_entry *arc_ether3_aeh54_device::device_rom_region() const +{ + return ROM_NAME( ether3_aeh54 ); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void arc_ether3_aeh54_device::device_add_mconfig(machine_config &config) +{ +} + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// arc_ether3_aeh54_device - constructor +//------------------------------------------------- + +arc_ether3_aeh54_device::arc_ether3_aeh54_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, ARC_ETHER3_AEH54, tag, owner, clock) + , device_archimedes_podule_interface(mconfig, *this) + , m_podule_rom(*this, "podule_rom") + , m_rom_page(0) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void arc_ether3_aeh54_device::device_start() +{ + save_item(NAME(m_rom_page)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void arc_ether3_aeh54_device::device_reset() +{ + m_rom_page = 0x00; +} + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(ARC_ETHER3_AEH54, device_archimedes_podule_interface, arc_ether3_aeh54_device, "arc_ether3_aeh54", "Acorn AEH54 10Base2 Ethernet Podule") diff --git a/src/devices/bus/archimedes/podule/ether3.h b/src/devices/bus/archimedes/podule/ether3.h new file mode 100644 index 00000000000..aee4db6a02c --- /dev/null +++ b/src/devices/bus/archimedes/podule/ether3.h @@ -0,0 +1,19 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + Acorn AEH54 10Base2 Ethernet Podule + +**********************************************************************/ + +#ifndef MAME_BUS_ARCHIMEDES_PODULE_ETHER3_H +#define MAME_BUS_ARCHIMEDES_PODULE_ETHER3_H + +#pragma once + +#include "slot.h" + +// device type definition +DECLARE_DEVICE_TYPE(ARC_ETHER3_AEH54, device_archimedes_podule_interface) + +#endif // MAME_BUS_ARCHIMEDES_PODULE_ETHER3_H diff --git a/src/devices/bus/archimedes/podule/ethera.cpp b/src/devices/bus/archimedes/podule/ethera.cpp new file mode 100644 index 00000000000..e1afb2697fd --- /dev/null +++ b/src/devices/bus/archimedes/podule/ethera.cpp @@ -0,0 +1,123 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + ANT Ethernet 10base2 mini-podule + + http://chrisacorns.computinghistory.org.uk/32bit_UpgradesA2G/ANT_Ethernet10base2Mini.html + + TODO: + - everything, this is skeleton with ROM. + +**********************************************************************/ + +#include "emu.h" +#include "ethera.h" + + +namespace { + +class arc_ethera_device : + public device_t, + public device_archimedes_podule_interface +{ +public: + // construction/destruction + arc_ethera_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + static constexpr feature_type unemulated_features() { return feature::COMMS; } + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + + // device_archimedes_podule_interface overrides + virtual void ioc_map(address_map &map) override; + +private: + required_memory_region m_podule_rom; + + u8 m_rom_page; +}; + + +void arc_ethera_device::ioc_map(address_map &map) +{ + map(0x0000, 0x0fff).lr8(NAME([this](offs_t offset) { return m_podule_rom->base()[offset | ((m_rom_page << 10) & 0x3f800)]; })).umask32(0x000000ff); + map(0x0000, 0x0000).lw8(NAME([this](u8 data) { m_rom_page = data; })); +} + + +//------------------------------------------------- +// ROM( ethera ) +//------------------------------------------------- + +ROM_START( ethera ) + ROM_REGION(0x40000, "podule_rom", 0) + ROM_LOAD("ethernet5.rom", 0x0000, 0x40000, CRC(7bb0f699) SHA1(c6c9c9630b6777f4d49824b051fcd16fcb21b8f3)) +ROM_END + +const tiny_rom_entry *arc_ethera_device::device_rom_region() const +{ + return ROM_NAME( ethera ); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void arc_ethera_device::device_add_mconfig(machine_config &config) +{ + //NQ8005(config, "edlc", 20_MHz_XTAL); +} + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// arc_ethera_device - constructor +//------------------------------------------------- + +arc_ethera_device::arc_ethera_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, ARC_ETHERA, tag, owner, clock) + , device_archimedes_podule_interface(mconfig, *this) + , m_podule_rom(*this, "podule_rom") + , m_rom_page(0) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void arc_ethera_device::device_start() +{ + save_item(NAME(m_rom_page)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void arc_ethera_device::device_reset() +{ + m_rom_page = 0x00; +} + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(ARC_ETHERA, device_archimedes_podule_interface, arc_ethera_device, "arc_ethera", "ANT Ethernet 10base2 mini-podule") diff --git a/src/devices/bus/archimedes/podule/ethera.h b/src/devices/bus/archimedes/podule/ethera.h new file mode 100644 index 00000000000..42830b92245 --- /dev/null +++ b/src/devices/bus/archimedes/podule/ethera.h @@ -0,0 +1,19 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + ANT Ethernet 10base2 mini-podule + +**********************************************************************/ + +#ifndef MAME_BUS_ARCHIMEDES_PODULE_ETHERA_H +#define MAME_BUS_ARCHIMEDES_PODULE_ETHERA_H + +#pragma once + +#include "slot.h" + +// device type definition +DECLARE_DEVICE_TYPE(ARC_ETHERA, device_archimedes_podule_interface) + +#endif // MAME_BUS_ARCHIMEDES_PODULE_ETHERA_H diff --git a/src/devices/bus/archimedes/podule/slot.cpp b/src/devices/bus/archimedes/podule/slot.cpp index c40a5e8c3b6..725eae79ea5 100644 --- a/src/devices/bus/archimedes/podule/slot.cpp +++ b/src/devices/bus/archimedes/podule/slot.cpp @@ -248,10 +248,10 @@ void device_archimedes_podule_interface::interface_post_start() //#include "colourcard.h" #include "eaglem2.h" #include "ether1.h" -//#include "ether2.h" -//#include "ether3.h" +#include "ether2.h" +#include "ether3.h" //#include "ether5.h" -//#include "ethera.h" +#include "ethera.h" #include "etherd.h" #include "etherr.h" #include "faxpack.h" @@ -316,8 +316,8 @@ void archimedes_exp_devices(device_slot_interface &device) //device.option_add("ccgold", ARC_CCGOLD); // Wild Vision/Computer Concepts Colour Card Gold device.option_add("eaglem2", ARC_EAGLEM2); // Wild Vision/Computer Concepts Eagle M2 device.option_add("ether1", ARC_ETHER1_AKA25); // Acorn AKA25 Ethernet - //device.option_add("ether2", ARC_ETHER2_AEH50); // Acorn AEH50 Ethernet II - //device.option_add("ether3_aeh54", ARC_ETHER3_AEH54); // Acorn AEH54 10Base2 Ethernet Podule + device.option_add("ether2", ARC_ETHER2_AEH50); // Acorn AEH50 Ethernet II + device.option_add("ether3_aeh54", ARC_ETHER3_AEH54); // Acorn AEH54 10Base2 Ethernet Podule //device.option_add("ether5", ARC_ETHER5); // Atomwide Ethernet V Podule device.option_add("etherr", ARC_ETHERR); // RISC Developments Ethernet Card device.option_add("faxpack", ARC_FAXPACK); // Computer Concepts Fax-Pack @@ -378,7 +378,7 @@ void archimedes_mini_exp_devices(device_slot_interface &device) device.option_add("bbcio_aga30", ARC_BBCIO_AGA30); // Acorn AGA30 BBC I/O Podule device.option_add("bbcio_we", ARC_BBCIO_WE); // Watford BBC User I/O Card //device.option_add("disc_a3k6", ARC_DISC_A3K6); // PRES A3K6 Disc Buffer - //device.option_add("ethera", ARC_ETHERA); // ANT Ethernet 10base2 mini-podule + device.option_add("ethera", ARC_ETHERA); // ANT Ethernet 10base2 mini-podule device.option_add("etherd", ARC_ETHERD); // Digital Services Ethernet Podule //device.option_add("ide_a3k_hccs", ARC_IDE_A3K_HCCS); // HCCS IDE A3000 Interface //device.option_add("ide_castle", ARC_IDE_CASTLE); // Castle Technology A3000 IDE Expansion Card -- cgit v1.2.3