summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nigel Barnes <Pernod70@users.noreply.github.com>2020-07-25 11:57:05 +0100
committer Nigel Barnes <Pernod70@users.noreply.github.com>2020-07-25 11:57:56 +0100
commit00906a9089c1b0a281526fe2a2d6511286a3ba20 (patch)
tree77edd89cf20d74128950a71c8718a6ca32e5cc06
parent8674ca9e7cbdb59b0ac9b09dbe636d29edcaa967 (diff)
electron: Replaced OS/BASIC with clean 32K dump. [robcfg]
-rw-r--r--src/mame/drivers/electron.cpp15
-rw-r--r--src/mame/includes/electron.h2
-rw-r--r--src/mame/machine/electron.cpp4
3 files changed, 7 insertions, 14 deletions
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index d3c0636e895..d3737fbeee6 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -342,31 +342,26 @@ void electronsp_state::electronsp(machine_config &config)
ROM_START(electron)
- ROM_REGION( 0x4000, "mos", 0 )
- ROM_LOAD( "b02_acornos-1.rom", 0x0000, 0x4000, CRC(a0c2cf43) SHA1(a27ce645472cc5497690e4bfab43710efbb0792d) )
- ROM_REGION( 0x4000, "basic", 0 )
- ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
+ ROM_REGION( 0x8000, "mos", 0 )
+ ROM_LOAD( "os_basic.ic2", 0x0000, 0x8000, CRC(b997f9cb) SHA1(4a66c83aba07d0a8e76ed8a5545af04e11c19fdc) )
ROM_END
ROM_START(electront)
- ROM_REGION( 0x4000, "mos", 0 )
+ ROM_REGION( 0x8000, "mos", 0 )
/* Serial 06-ALA01-0000087 from Centre for Computing History */
ROM_LOAD( "elk_036.rom", 0x0000, 0x4000, CRC(dd1a99c3) SHA1(87ee1b14895e476909dd002d5ca2346a3a5f3f57) )
- ROM_REGION( 0x4000, "basic", 0 )
ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
ROM_END
ROM_START(electron64)
- ROM_REGION( 0x4000, "mos", 0 )
+ ROM_REGION( 0x8000, "mos", 0 )
ROM_LOAD( "os_300.rom", 0x0000, 0x4000, CRC(f80a0cea) SHA1(165e42ff4164a842e56f08ebd420d5027af99fdd) )
- ROM_REGION( 0x4000, "basic", 0 )
ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
ROM_END
ROM_START(electronsp)
- ROM_REGION( 0x4000, "mos", 0 )
+ ROM_REGION( 0x8000, "mos", 0 )
ROM_LOAD( "os_310.rom", 0x0000, 0x4000, CRC(8b7a9003) SHA1(6d4e2f8ddc1d829b14206d2747749c4c24789568) )
- ROM_REGION( 0x4000, "basic", 0 )
ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
ROM_REGION( 0x8000, "sp64", 0 )
ROM_SYSTEM_BIOS( 0, "101_2", "v1.01 (2x16K)" )
diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h
index 0b136c41f91..9467674e128 100644
--- a/src/mame/includes/electron.h
+++ b/src/mame/includes/electron.h
@@ -45,7 +45,6 @@ public:
, m_screen(*this, "screen")
, m_cassette(*this, "cassette")
, m_beeper(*this, "beeper")
- , m_region_basic(*this, "basic")
, m_region_mos(*this, "mos")
, m_keybd(*this, "LINE.%u", 0)
, m_exp(*this, "exp")
@@ -113,7 +112,6 @@ protected:
required_device<screen_device> m_screen;
required_device<cassette_image_device> m_cassette;
required_device<beep_device> m_beeper;
- required_memory_region m_region_basic;
required_memory_region m_region_mos;
required_ioport_array<14> m_keybd;
required_device<electron_expansion_slot_device> m_exp;
diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp
index 2b6ad342ad7..7846990e877 100644
--- a/src/mame/machine/electron.cpp
+++ b/src/mame/machine/electron.cpp
@@ -232,7 +232,7 @@ uint8_t electron_state::electron_paged_r(offs_t offset)
case 10:
case 11:
/* BASIC */
- data = m_region_basic->base()[offset & 0x3fff];
+ data = m_region_mos->base()[offset & 0x3fff];
break;
default:
@@ -319,7 +319,7 @@ uint8_t electron_state::electron_mos_r(offs_t offset)
/* The processor will run at 2MHz during an access cycle to the ROM */
m_maincpu->set_clock_scale(1.0f);
- return m_region_mos->base()[offset & 0x3fff];
+ return m_region_mos->base()[0x4000 | offset];
}
void electron_state::electron_mos_w(offs_t offset, uint8_t data)