summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-02-23 10:35:31 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2020-02-23 10:35:31 +1100
commit8b612f788208a0042304de887c228e5e61e8c81f (patch)
treef57f55d305108feacf297dd47c2792077d77b4ec /src/mame
parent5cec84a0cc9d05e078f8c8b8fcf0774936f84c8c (diff)
parent8696c797e71022a7868d65b8471e4657262edac0 (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/ampex210.cpp10
-rw-r--r--src/mame/drivers/roland_d50.cpp4
-rw-r--r--src/mame/mame.lst4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/ampex210.cpp b/src/mame/drivers/ampex210.cpp
index 94232dd28da..aff3b4abeec 100644
--- a/src/mame/drivers/ampex210.cpp
+++ b/src/mame/drivers/ampex210.cpp
@@ -27,7 +27,7 @@ public:
{ }
void ampex210p(machine_config &config);
- void ampex230(machine_config &config);
+ void ampex230p(machine_config &config);
private:
void common_video(machine_config &config);
@@ -185,7 +185,7 @@ void ampex210_state::ampex210p(machine_config &config)
screen.set_screen_update("pvtc", FUNC(scn2672_device::screen_update));
}
-void ampex210_state::ampex230(machine_config &config)
+void ampex210_state::ampex230p(machine_config &config)
{
Z80(config, m_maincpu, 3.6864_MHz_XTAL); // Z80ACPU; clock uncertain
m_maincpu->set_addrmap(AS_PROGRAM, &ampex210_state::ampex230_mem);
@@ -230,7 +230,7 @@ ROM_START(ampex210p) // Z80 (+6551,MC2672,3515260-01, 3 xtals, speaker) // 8k ra
ROM_LOAD("35-526-01.u3", 0x0000, 0x1000, CRC(4659bcd2) SHA1(554574f55ed875baba0a6133648c44df763cc5c4))
ROM_END
-ROM_START(ampex230)
+ROM_START(ampex230p) // EPROMs stickered "© 1989 AMPEX CORP."
ROM_REGION(0x8000, "maincpu", 0)
ROM_LOAD("230_u11.bin", 0x0000, 0x8000, CRC(c8f93719) SHA1(81019b42245ca60c7de3ee5d3194c4d22fd38a8d))
@@ -238,5 +238,5 @@ ROM_START(ampex230)
ROM_LOAD("230_u2.bin", 0x0000, 0x2000, CRC(7143b773) SHA1(616d3c0c1a1f7a00bf16857324043955ab842994))
ROM_END
-COMP(1989, ampex210p, 0, 0, ampex210p, ampex210p, ampex210_state, empty_init, "Ampex", "210+", MACHINE_IS_SKELETON)
-COMP(1989, ampex230, 0, 0, ampex230, ampex210p, ampex210_state, empty_init, "Ampex", "230", MACHINE_IS_SKELETON)
+COMP(1988, ampex210p, 0, 0, ampex210p, ampex210p, ampex210_state, empty_init, "Ampex", "Ampex 210 plus Terminal (v3.0)", MACHINE_IS_SKELETON)
+COMP(1988, ampex230p, 0, 0, ampex230p, ampex210p, ampex210_state, empty_init, "Ampex", "Ampex 230 plus Terminal (v4.0)", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/roland_d50.cpp b/src/mame/drivers/roland_d50.cpp
index 64d4653f9eb..4dd27b9a024 100644
--- a/src/mame/drivers/roland_d50.cpp
+++ b/src/mame/drivers/roland_d50.cpp
@@ -80,7 +80,7 @@ ROM_START(d50) // Newer PCB with silkscreen "Roland || D-50, D-550 || MAIN BOARD
// ic29 is empty on boards with tc534000-sized Mask ROMs
ROM_END
-ROM_START(d50a) // Older PCB with silkscreen "Roland || D-50 MAIN BOARD || ASSY 76180090" and trace layer ID "22925445 00" and a PGA LA32 "R15229851 || MB87136A || 8706 E02" at IC31, though the oldest service manual supposedly claims it could have an "MB87136" with no A as well. This board only supports the split PCM roms unless hand-modified. This board has a factory greenwire fix for a missing trace from the IC8 Chorus ASIC MB87137-001 pin 59 to the IC1 DRAM D41416 pin 17.
+ROM_START(d50o) // Older PCB with silkscreen "Roland || D-50 MAIN BOARD || ASSY 76180090" and trace layer ID "22925445 00" and a PGA LA32 "R15229851 || MB87136A || 8706 E02" at IC31, though the oldest service manual supposedly claims it could have an "MB87136" with no A as well. This board only supports the split PCM roms unless hand-modified. This board has a factory greenwire fix for a missing trace from the IC8 Chorus ASIC MB87137-001 pin 59 to the IC1 DRAM D41416 pin 17.
ROM_REGION(0x10000, "progrom", 0)
ROM_SYSTEM_BIOS(0, "v1.10cfw", "ROM Version 1.10 maybe user patched") // " D-50 Ver 1.10 Thanks to Eric & Adrian. 30G7 C.410/7.4"
ROMX_LOAD("roland__1-11__2-1-96_greg.v1.10.ic22", 0x00000, 0x10000, CRC(7fc199c5) SHA1(3fc889d6c44f8b40de6619a3427d0c89730dd9b3), ROM_BIOS(0)) // this particular dump came from a handwritten label eprom chip labeled "Roland || 1-11 2/1/96 Greg" so it could be original code, but it was a hand-made update chip by some operator in the past. It is possible this code has a user-bugfix applied to it, though, given the 1-11 in the label.
@@ -119,5 +119,5 @@ ROM_START(d550) // Newer PCB with silkscreen "Roland || D-50, D-550 || MAIN BOAR
ROM_END
SYST(1987, d50, 0, 0, d50, d50, roland_d50_state, empty_init, "Roland", "D-50 Linear Synthesizer (Ver. 2.xx)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST(1987, d50a, d50, 0, d50, d50, roland_d50_state, empty_init, "Roland", "D-50 Linear Synthesizer (Ver. 1.xx)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+SYST(1987, d50o, d50, 0, d50, d50, roland_d50_state, empty_init, "Roland", "D-50 Linear Synthesizer (Ver. 1.xx)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
SYST(1987, d550, d50, 0, d50, d50, roland_d50_state, empty_init, "Roland", "D-550 Linear Synthesizer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 0770e7fca07..df9669411ae 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1291,7 +1291,7 @@ dialog80 // Ampex Dialogue 80
@source:ampex210.cpp
ampex210p //
-ampex230 //
+ampex230p //
@source:ampro.cpp
ampro //
@@ -34494,7 +34494,7 @@ cm32p //
@source:roland_d50.cpp
d50 //
-d50a //
+d50o //
d550 //
@source:roland_d110.cpp