summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2017-10-15 08:56:26 -0400
committerGravatarGravatar GitHub <noreply@github.com>2017-10-15 08:56:26 -0400
commit68a53889a02c21f9b0c6f58c613faf4eaea8a973 (patch) (github)
treef54044c8731dc393b0cb1bd1af3ec88ec97754ee
parent48f7fe85010e35287857d0b3afdbb353b10499e8 (diff)
parent6eeda5e1d6359a160164a8d2c654f30c67102c46 (diff)
downloadmame-68a53889a02c21f9b0c6f58c613faf4eaea8a973.tar.bz2
mame-68a53889a02c21f9b0c6f58c613faf4eaea8a973.zip
Merge pull request #2719 from rfka01/master
Kaypro: Added the Omni 4 Logic Analyzer
-rw-r--r--src/mame/drivers/kaypro.cpp11
-rw-r--r--src/mame/mame.lst1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index b60881f0c51..693c4452941 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -402,6 +402,16 @@ ROM_START(omni2)
ROM_LOAD("omni2.u43", 0x0000, 0x0800, CRC(049b3381) SHA1(46f1d4f038747ba9048b075dc617361be088f82a) )
ROM_END
+ROM_START(omni4)
+ ROM_REGION(0x4000, "roms",0)
+ ROM_LOAD("omni4.u34", 0x0000, 0x2000, CRC(f24e8521) SHA1(374f2e2b791a807f103744a22c9c8f3af55f1033) )
+
+ ROM_REGION(0x10000, "rambank", ROMREGION_ERASEFF)
+
+ ROM_REGION(0x1000, "chargen", 0)
+ ROM_LOAD("omni4.u9", 0x0000, 0x1000, CRC(579665a6) SHA1(261fcdc5a44821de9484340cbe429110400140b4) )
+ROM_END
+
ROM_START(kaypro2x)
ROM_REGION(0x4000, "roms",0)
ROM_SYSTEM_BIOS( 0, "292", "292")
@@ -460,6 +470,7 @@ COMP( 1982, kayproii, 0, 0, kayproii, kay_kbd, kaypro_state, kaypr
COMP( 1983, kaypro4, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/83" , 0 ) // model 81-004
COMP( 1983, kaypro4p88, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 plus88 - 4/83" , MACHINE_NOT_WORKING ) // model 81-004 with an added 8088 daughterboard and rom
COMP( 198?, omni2, kayproii, 0, omni2, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Omni II Logic Analyzer" , 0 )
+COMP( 198?, omni4, kaypro2x, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Omni Logic Inc.", "Omni 4 Logic Analyzer" , MACHINE_NOT_WORKING )
COMP( 1984, kaypro2x, 0, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 2x" , MACHINE_NOT_WORKING ) // model 81-025
COMP( 1984, kaypro4a, kaypro2x, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/84" , MACHINE_NOT_WORKING ) // model 81-015
// Kaypro 4/84 plus 88 goes here, model 81-015 with an added 8088 daughterboard and rom
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 65c599d1253..4b1a1a3e845 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -17118,6 +17118,7 @@ kaypro4a // Kaypro 4 - 4/84
kaypro4p88 // Kaypro 4 - 4/83 w/plus88 board installed
kayproii // Kaypro II - 2/83
omni2 // Omni II
+omni4 // Omni 4
robie // Kaypro Robie
@source:kc.cpp