diff options
-rw-r--r-- | src/devices/bus/archimedes/podule/rom.cpp | 68 | ||||
-rw-r--r-- | src/devices/bus/archimedes/podule/rom.h | 1 | ||||
-rw-r--r-- | src/devices/bus/archimedes/podule/slot.cpp | 1 |
3 files changed, 56 insertions, 14 deletions
diff --git a/src/devices/bus/archimedes/podule/rom.cpp b/src/devices/bus/archimedes/podule/rom.cpp index be073229e5e..265cdddcced 100644 --- a/src/devices/bus/archimedes/podule/rom.cpp +++ b/src/devices/bus/archimedes/podule/rom.cpp @@ -30,7 +30,9 @@ public: static constexpr feature_type unemulated_features() { return feature::ROM; } protected: - // device-level overrides + arc_rom_aka05_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + + // device_t overrides virtual void device_start() override; virtual void device_reset() override; @@ -43,7 +45,7 @@ protected: private: required_memory_region m_podule_rom; - required_device_array<generic_slot_device, 7> m_rom; + required_device_array<generic_slot_device, 8> m_rom; u8 rom_r(offs_t offset); void rom_w(offs_t offset, u8 data); @@ -52,6 +54,19 @@ private: u8 m_rom_page; }; +// ======================> arc_rom_r225_device + +class arc_rom_r225_device : public arc_rom_aka05_device +{ +public: + // construction/destruction + arc_rom_r225_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + +protected: + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; +}; + void arc_rom_aka05_device::ioc_map(address_map &map) { @@ -72,11 +87,22 @@ ROM_START( rom_aka05 ) ROMX_LOAD("0276,221-02_manager.bin", 0x0000, 0x4000, CRC(23ec4ddb) SHA1(e699157895433010b1ea110c78fbc80a4bc58f09), ROM_BIOS(0)) ROM_END +ROM_START( rom_r225 ) + ROM_REGION(0x40000, "podule_rom", ROMREGION_ERASEFF) + ROM_LOAD("0270,751-01_r225_boot_rom1.bin", 0x00000, 0x20000, CRC(69117329) SHA1(3ce1a3630bc5d3475216cc403df348f55cad681a)) + ROM_LOAD("0270,752-01_r225_boot_rom2.bin", 0x20000, 0x20000, CRC(2756ee10) SHA1(bb0825670bde59c80a73895141b2d8ad6ea87a2f)) +ROM_END + const tiny_rom_entry *arc_rom_aka05_device::device_rom_region() const { return ROM_NAME( rom_aka05 ); } +const tiny_rom_entry *arc_rom_r225_device::device_rom_region() const +{ + return ROM_NAME( rom_r225 ); +} + void arc_ram_devices(device_slot_interface &device) { @@ -89,16 +115,17 @@ void arc_ram_devices(device_slot_interface &device) void arc_rom_aka05_device::device_add_mconfig(machine_config &config) { - // rom sockets 5 x 128K + // rom sockets 6 x 128K GENERIC_SOCKET(config, m_rom[0], generic_plain_slot, "bbc_rom", "bin,rom"); GENERIC_SOCKET(config, m_rom[1], generic_plain_slot, "bbc_rom", "bin,rom"); GENERIC_SOCKET(config, m_rom[2], generic_plain_slot, "bbc_rom", "bin,rom"); GENERIC_SOCKET(config, m_rom[3], generic_plain_slot, "bbc_rom", "bin,rom"); GENERIC_SOCKET(config, m_rom[4], generic_plain_slot, "bbc_rom", "bin,rom"); + GENERIC_SOCKET(config, m_rom[5], generic_plain_slot, "bbc_rom", "bin,rom"); // ram sockets 2 x 32K - GENERIC_SOCKET(config, m_rom[5], arc_ram_devices, "bbc_rom", "bin,rom").set_user_loadable(false); GENERIC_SOCKET(config, m_rom[6], arc_ram_devices, "bbc_rom", "bin,rom").set_user_loadable(false); + GENERIC_SOCKET(config, m_rom[7], arc_ram_devices, "bbc_rom", "bin,rom").set_user_loadable(false); SOFTWARE_LIST(config, "rom_ls").set_original("bbc_rom").set_filter("B"); } @@ -112,8 +139,8 @@ void arc_rom_aka05_device::device_add_mconfig(machine_config &config) // arc_rom_aka05_device - constructor //------------------------------------------------- -arc_rom_aka05_device::arc_rom_aka05_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, ARC_ROM_AKA05, tag, owner, clock) +arc_rom_aka05_device::arc_rom_aka05_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, type, tag, owner, clock) , device_archimedes_podule_interface(mconfig, *this) , m_podule_rom(*this, "podule_rom") , m_rom(*this, "rom%u", 1U) @@ -122,6 +149,16 @@ arc_rom_aka05_device::arc_rom_aka05_device(const machine_config &mconfig, const { } +arc_rom_aka05_device::arc_rom_aka05_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : arc_rom_aka05_device(mconfig, ARC_ROM_AKA05, tag, owner, clock) +{ +} + +arc_rom_r225_device::arc_rom_r225_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : arc_rom_aka05_device(mconfig, ARC_ROM_R225, tag, owner, clock) +{ +} + //------------------------------------------------- // device_start - device-specific startup @@ -152,19 +189,19 @@ void arc_rom_aka05_device::device_reset() u8 arc_rom_aka05_device::rom_r(offs_t offset) { u8 data = 0xff; + u32 const addr = offset | (m_rom_page << 11); switch (m_rom_select) { - case 0: - data = m_podule_rom->base()[offset | (m_rom_page << 11)]; - break; - - case 1: case 2: case 3: case 4: case 5: - data = m_rom[m_rom_select - 1]->read_rom(offset | (m_rom_page << 11)); + case 0: case 1: case 2: case 3: case 4: case 5: + if ((m_rom_select * 0x20000) < m_podule_rom->bytes()) + data = m_podule_rom->base()[(m_rom_select * 0x20000) | addr]; + else + data = m_rom[m_rom_select]->read_rom(addr); break; case 6: case 7: - data = m_rom[m_rom_select - 1]->read_ram(offset | (m_rom_page << 11)); + data = m_rom[m_rom_select]->read_ram(addr); break; } @@ -173,10 +210,12 @@ u8 arc_rom_aka05_device::rom_r(offs_t offset) void arc_rom_aka05_device::rom_w(offs_t offset, u8 data) { + u32 const addr = offset | (m_rom_page << 11); + switch (m_rom_select) { case 6: case 7: - m_rom[m_rom_select - 1]->write_ram(offset | (m_rom_page << 11), data); + m_rom[m_rom_select]->write_ram(addr, data); break; } } @@ -189,3 +228,4 @@ void arc_rom_aka05_device::rom_w(offs_t offset, u8 data) //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(ARC_ROM_AKA05, device_archimedes_podule_interface, arc_rom_aka05_device, "arc_rom_aka05", "Acorn AKA05 ROM Podule") +DEFINE_DEVICE_TYPE_PRIVATE(ARC_ROM_R225, device_archimedes_podule_interface, arc_rom_r225_device, "arc_rom_r225", "Acorn AKA05 ROM (with DiscLess Bootstrap support)") diff --git a/src/devices/bus/archimedes/podule/rom.h b/src/devices/bus/archimedes/podule/rom.h index 6a583839a90..980e66eb9be 100644 --- a/src/devices/bus/archimedes/podule/rom.h +++ b/src/devices/bus/archimedes/podule/rom.h @@ -15,5 +15,6 @@ // device type definition DECLARE_DEVICE_TYPE(ARC_ROM_AKA05, device_archimedes_podule_interface) +DECLARE_DEVICE_TYPE(ARC_ROM_R225, device_archimedes_podule_interface) #endif // MAME_BUS_ARCHIMEDES_PODULE_ROM_H diff --git a/src/devices/bus/archimedes/podule/slot.cpp b/src/devices/bus/archimedes/podule/slot.cpp index 2c5ecd61212..92544eb3433 100644 --- a/src/devices/bus/archimedes/podule/slot.cpp +++ b/src/devices/bus/archimedes/podule/slot.cpp @@ -339,6 +339,7 @@ void archimedes_exp_devices(device_slot_interface &device) //device.option_add("prisma3", ARC_PRISMA3); // Millipede PRISMA-3 Podule //device.option_add("prisma3p", ARC_PRISMA3P); // Millipede PRISMA-3 Plus Podule device.option_add("rom_aka05", ARC_ROM_AKA05); // Acorn AKA05 ROM Podule + device.option_add("rom_r225boot", ARC_ROM_R225); // Acorn AKA05 ROM (with DiscLess Bootstrap support) //device.option_add("rom_cc", ARC_ROM_CC); // Computer Concepts ROM/RAM Podule device.option_add("rs423", ARC_RS423); // Intelligent Interfaces Dual RS423 Serial Interface device.option_add("scan256", ARC_SCAN256); // Watford Electronics 256 Grey-Scale Scanner |