diff options
author | Robbbert <Robbbert@users.noreply.github.com> | 2018-09-16 02:04:29 +1000 |
---|---|---|
committer | Robbbert <Robbbert@users.noreply.github.com> | 2018-09-16 02:04:29 +1000 |
commit | 546f04f4a385976b2cf7a3628857345ca5a20d24 (patch) | |
tree | ecae22f46b994838411ed58f944b2af4e1776311 | |
parent | 9cc397079aff4d8a9b7fbafc0e109fc6db4e2865 (diff) | |
parent | cbdc9a71c7e0a4466f3406a3bb90f7ea8be5d0fb (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | scripts/src/bus.lua | 2 | ||||
-rw-r--r-- | src/devices/bus/sbus/sbus.cpp | 13 | ||||
-rw-r--r-- | src/devices/bus/sbus/sunpc.cpp | 71 | ||||
-rw-r--r-- | src/devices/bus/sbus/sunpc.h | 45 |
4 files changed, 128 insertions, 3 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index c973b3149c5..bbe03aaf72d 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -3042,6 +3042,8 @@ if (BUSES["SBUS"]~=null) then MAME_DIR .. "src/devices/bus/sbus/bwtwo.h", MAME_DIR .. "src/devices/bus/sbus/cgthree.cpp", MAME_DIR .. "src/devices/bus/sbus/cgthree.h", + MAME_DIR .. "src/devices/bus/sbus/sunpc.cpp", + MAME_DIR .. "src/devices/bus/sbus/sunpc.h", MAME_DIR .. "src/devices/bus/sbus/turbogx.cpp", MAME_DIR .. "src/devices/bus/sbus/turbogx.h", MAME_DIR .. "src/devices/bus/sbus/sbus.cpp", diff --git a/src/devices/bus/sbus/sbus.cpp b/src/devices/bus/sbus/sbus.cpp index ecd3c45b785..5ac9d416685 100644 --- a/src/devices/bus/sbus/sbus.cpp +++ b/src/devices/bus/sbus/sbus.cpp @@ -7,16 +7,23 @@ ***************************************************************************/ #include "emu.h" + +// Display boards #include "bwtwo.h" #include "cgthree.h" #include "turbogx.h" + +// Accelerator boards +#include "sunpc.h" + #include "sbus.h" void sbus_cards(device_slot_interface &device) { - device.option_add("bwtwo", SBUS_BWTWO); /* Sun bwtwo monochrome display board */ - device.option_add("cgthree", SBUS_CGTHREE); /* Sun cgthree color display board */ - device.option_add("turbogx", SBUS_TURBOGX); /* Sun TurboGX 8-bit color display board */ + device.option_add("bwtwo", SBUS_BWTWO); /* Sun bwtwo monochrome display board */ + device.option_add("cgthree", SBUS_CGTHREE); /* Sun cgthree color display board */ + device.option_add("turbogx", SBUS_TURBOGX); /* Sun TurboGX 8-bit color display board */ + device.option_add("sunpc", SBUS_SUNPC); /* Sun SunPC 5x86 Accelerator board */ } DEFINE_DEVICE_TYPE(SBUS_SLOT, sbus_slot_device, "sbus_slot", "Sun SBus Slot") diff --git a/src/devices/bus/sbus/sunpc.cpp b/src/devices/bus/sbus/sunpc.cpp new file mode 100644 index 00000000000..761948581c9 --- /dev/null +++ b/src/devices/bus/sbus/sunpc.cpp @@ -0,0 +1,71 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz +/*************************************************************************** + + Sun SunPC 5x86 Accelerator (501-4230) skeleton + + Notable parts on board: + - 1x AMD AM27C256 PLCC ROM + - 1x Motorola SunPC Accelerator 100-3069-03, mfr/date AANL9732 + - 6x Cypress CY7B185-10VC 64kBit Static RAM + - 1x AMD 5x86 (under heatsink; markings unknown) + +***************************************************************************/ + +#include "emu.h" +#include "sunpc.h" + +DEFINE_DEVICE_TYPE(SBUS_SUNPC, sbus_sunpc_device, "sbus_sunpc", "Sun SunPC accelerator") + +void sbus_sunpc_device::mem_map(address_map &map) +{ + map(0x00000000, 0x01ffffff).rw(FUNC(sbus_sunpc_device::unknown_r), FUNC(sbus_sunpc_device::unknown_w)); + map(0x00000000, 0x00007fff).r(FUNC(sbus_sunpc_device::rom_r)); +} + +ROM_START( sbus_sunpc ) + ROM_REGION32_BE(0x8000, "prom", ROMREGION_ERASEFF) + ROM_LOAD( "sunw,501-1763-01.bin", 0x0000, 0x8000, CRC(171f50f8) SHA1(21c4c02bc5a3a0494301f19c54ba0e207568fb42)) +ROM_END + +const tiny_rom_entry *sbus_sunpc_device::device_rom_region() const +{ + return ROM_NAME( sbus_sunpc ); +} + +void sbus_sunpc_device::device_add_mconfig(machine_config &config) +{ +} + + +sbus_sunpc_device::sbus_sunpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SBUS_SUNPC, tag, owner, clock) + , device_sbus_card_interface(mconfig, *this) + , m_rom(*this, "prom") +{ +} + +void sbus_sunpc_device::device_start() +{ +} + +void sbus_sunpc_device::install_device() +{ + m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_sunpc_device::mem_map); +} + +READ32_MEMBER(sbus_sunpc_device::unknown_r) +{ + logerror("%s: unknown_r: %08x & %08x\n", machine().describe_context(), offset << 2, mem_mask); + return 0; +} + +WRITE32_MEMBER(sbus_sunpc_device::unknown_w) +{ + logerror("%s: unknown_w: %08x = %08x & %08x\n", machine().describe_context(), offset << 2, data, mem_mask); +} + +READ32_MEMBER(sbus_sunpc_device::rom_r) +{ + return ((uint32_t*)m_rom->base())[offset]; +} diff --git a/src/devices/bus/sbus/sunpc.h b/src/devices/bus/sbus/sunpc.h new file mode 100644 index 00000000000..3acc500827d --- /dev/null +++ b/src/devices/bus/sbus/sunpc.h @@ -0,0 +1,45 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz +/*************************************************************************** + + Sun SunPC 5x86 Accelerator (501-4230) skeleton + +***************************************************************************/ + +#ifndef MAME_BUS_SBUS_SUNPC_H +#define MAME_BUS_SBUS_SUNPC_H + +#pragma once + +#include "sbus.h" + + +class sbus_sunpc_device : public device_t, public device_sbus_card_interface +{ +public: + // construction/destruction + sbus_sunpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + // device_t overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + + // device_sbus_slot_interface overrides + virtual void install_device() override; + + DECLARE_READ32_MEMBER(unknown_r); + DECLARE_WRITE32_MEMBER(unknown_w); + DECLARE_READ32_MEMBER(rom_r); + +private: + void mem_map(address_map &map) override; + + required_memory_region m_rom; +}; + +// device type definition +DECLARE_DEVICE_TYPE(SBUS_SUNPC, sbus_sunpc_device) + +#endif // MAME_BUS_SBUS_SUNPC_H |