From 4942d4ab0b856d9b6b77104482ec00c0c2ae441f Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Tue, 30 Apr 2019 13:44:23 +0200 Subject: cgenie: Fix color RAM accesses, major update to hash file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hash file sorted into categories, removed offset, moved missing items to the top, standardized tape format. Software list items promoted to working: ---------------------------------------- Invasion aus dem Weltraum New NOT_WORKING software list additions: ---------------------------------------- Exterminator II: The Mad Menagerie Super Star Treck New working software list additions: ------------------------------------ Adressdatei II Basic-Packer 2.13 (alternate) Benchmark Test Genie I II / TRS 80 Cassettenlader Charset Dez-Hex EBASIC (32k version) Editor fuer definierbare Zeichen Extended Copy Extra-Basic Nato Morsing Standard Code NODOS 80 Primzahlsuche Real-Compiler Screen Editor (incl. Adventure screen) Shift Transformation Sprite-Editor Tape-Edit Die Physik des Transistors Utilities Package Ver. 2.0 Der Flohwalzer Peng Abenteuerland Africa Ballon Botschaft Brücke Bumm Bumm Cave Man Chess Machine CIA-Agent Crazy Chaser Deathstar Deathtrap Defender Disastrous Villa Die Juwelen des Grafen Dracula Empire ExReversic Fast Food Gorilla Schiff des Grauens House of Death Hektik (alternate) Horror Castle Joker Poker King Kniffel Länder-Quiz Las Vergas Spiel-Automat Madtree Mord im Zeppelin Mysterious Tavern Santa Paravia und Fuimaccio Schnick Schnack Schnuck Trash-Man Wurm --- hash/cgenie_cass.xml | 1600 ++++++++++++++++++++++++++++++++----------- src/mame/drivers/cgenie.cpp | 4 +- 2 files changed, 1183 insertions(+), 421 deletions(-) diff --git a/hash/cgenie_cass.xml b/hash/cgenie_cass.xml index e43c79600e4..4b1ccfc268e 100644 --- a/hash/cgenie_cass.xml +++ b/hash/cgenie_cass.xml @@ -3,105 +3,614 @@ - - Andromeda (32k) + + + + Adressdatei II + 198? + <unknown> + + + + + + + + + + Basicode + 1983 + TCS + + + + + + + + + + + Basic +5 + 1983 + TCS + + + + + + + + + + Basic-Packer 2.13 + 1983 + TCS + + + + + + + + + + + Basic-Packer 2.13 (alternate) + 1983 + TCS + + + + + + + + + + Benchmark Test + 198? + <unknown> + + + + + + + + + + + Genie I II / TRS 80 Cassettenlader + 1984 + <unknown> + + + + + + + + + + + Charset + 198? + <unknown> + + + + + + + + + + + Colour Basic Compiler 3.05 1982 - TCG + TCS + + + + + + + + + + Colour Design 3.0 + 19?? + <unknown> + + + + + + + + + + Colour-Forth 2.0 (with cassette support) + 1983 + TCS + + + + + + + + + + Colour-Forth 2.0 + 1983 + TCS + + + + + + + + + + Colour-Monitor 2.0 + 198? + <unknown> + + + + + + + + + + Colour-Monitor 3.0 + 1983 + TCS + + + + + + + + + + Colour-PASCAL 2.0 + 198? + <unknown> + + + + + + + + + + Colour-ROT + 1983 + TCS + + + + + + + + + + + Colour-Zap Ver 1.0 (TCS) + 1983 + TCS + + + + + + + + + + Dez-Hex + 198? + <unknown> + + + + + + + + + + EBASIC (32k version) + 1985 + <unknown> + + + + + + + + + + + Editor fuer definierbare Zeichen + 198? + <unknown> + + + + + + + + + + + + + + + Extended Copy + 198? + TTS + + + + + + + + + + Extra-Basic + 198? + <unknown> + + + + + + + + + + + Grafik-Editor + 1983 + TCS + + + + + + + + + + + + Nato Morsing Standard Code + 1983 + <unknown> + + + + + + + + + + + + NODOS 80 + 198? + <unknown> + + + + + + + + + + Primzahlsuche + 198? + <unknown> + + + + + + + + + + + Real-Compiler + 198? + MM-Software + + + + + + + + + + RS-232 Treiberprogramm + 198? + <unknown> + + + + + + + + + + Screen Editor (incl. Adventure screen) + 198? + <unknown> + + + + + + + + + + Shift Transformation + 198? + <unknown> + + + + + + + + + + + Software-Schutz + 1983 + Harald Bögeholz + + + + + + + + + + Sprite-Editor + 1983 + <unknown> + + + + + + + + + + + Super-Basic + 198? + Heinz Hübben Software Verlag + + + + + + + + + + Super-Grafik + 1984 + The Colour Connection + + + + + + + + + + + Synthesizer (TCS) + 1983 + TCS + + + + + + + + + + + System Copy + 198? + <unknown> + + + + + + + + + + + Tape-Disk Converter 1.11 + 198? + <unknown> + + + + + + + + + + Tape-Edit + 1983 + TCS - + - - + + - - Andromeda (16k) - 1982 - TCG + + Tracemon + 1983 + Juergen Buchmueller - + - - + + - - Astronaut - 1984 - N. A. Taylor - + + Die Physik des Transistors + 198? + <unknown> + - - + + - + + Unknown multi-program tape + 198? + <unknown> + + + + + + + - - Basicode + + Utilities Package Ver. 2.0 1983 - TCS - - + Algray Software + + - - + + - - Basic +5 + + Zeicheneditor + (incl. SCREEN-Editor) 1983 TCS - + - - + + - - Basic-Packer 2.13 + + Zeicheneditor + 1983 TCS - + - - + + - - - - - Colour Basic Compiler 3.05 - 1982 + + Zeichensätze (incl. Screen-Printer) + 1983 TCS - + + - - + + + + Colour Genie Demonstration Kassette 198? @@ -109,234 +618,296 @@ distributor of the Colour Genie EG2000 computers. - - + + - - Colour Design 3.0 - 19?? + + Der Flohwalzer + 198? <unknown> - + - - + + - - Colour-Forth 2.0 (with cassette support) + + Musik 1983 TCS - + - - + + - - Colour-Forth 2.0 - 1983 + + + Peng + 198? TCS - + - - + + - - Colour Frog - 1983 - TCS - - + + + + Abenteuerland + 198? + <unknown> + - - + + - - Colour Kong (32k) - 1983 - TCS - - + + Africa + 198? + <unknown> + + - - + + - - Colour Kong (16k) - 1983 - TCS - - + + Andromeda (32k) + 1982 + TCG + + - - + + - - Colour Kong (16k, no autostart) - 1983 - TCS - - + + Andromeda (16k) + 1982 + TCG + + - - + + - + + Astronaut + 1984 + N. A. Taylor + + + + + + + - - Colour-Monitor 2.0 + + Ballon 198? <unknown> - + - - + + - - Colour-Monitor 3.0 - 1983 - TCS - + + Botschaft + 1985 + Scholz Baeumner Schaffarzik (SBS) + + - - + + - - Colour-PASCAL 2.0 - 198? + + Brücke + 1984 <unknown> - + + - - + + - - Colour-ROT - 1983 + + + Bumm Bumm + 198? TCS - - + + + + - - + + - - Colour Schach - 1983 + + Cave Man + 198? <unknown> - - + + - - + + - - Colour Schach (TCS) - 1983 - TCS - - + + Chess Machine + 1984 + Heinz Hübben Software Verlag + - - + + - - - Synthesizer (TCS) + + Chopper (1983) 1983 + Jürgen Buchmüller + + + + + + + + + + + Chopper (TCS) + 198? TCS - + - - + + - + + CIA-Agent + 1985 + Scholz Baeumner Schaffarzik (SBS) + + + + + + + + - - Colour-Zap Ver 1.0 (TCS) + + Colour Kong (32k) 1983 TCS - + + - - + + - + + Colour Kong (16k) + 1983 + TCS + + + + + + + + - - Chopper (TCS) - 198? + + Colour Kong (16k, no autostart) + 1983 TCS - - + + - - + + - - Chopper (1983) + + Colour Schach 1983 - Jürgen Buchmüller - - + <unknown> + + - - + + - + + Colour Schach (TCS) + 1983 + TCS + + + + + + + + Cosmic Attack @@ -345,8 +916,20 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Crazy Chaser + 198? + <unknown> + + + + @@ -358,40 +941,77 @@ distributor of the Colour Genie EG2000 computers. - - + + - + Crazy Paint (The Colour Connection) 1984 The Colour Connection - - + + - + Crazy Paint (The Colour Connection, alternate) 1984 The Colour Connection - - + + + + + + + + Deathstar + 1983 + Algray Software + + + + + + + + + + + Deathtrap + 198? + <unknown> + + + + + + + + + + + Defender + 198? + Andreas Goldau Softwareproduction + + + + + - - DIG-BOY (TCS) 1983 @@ -399,13 +1019,42 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Disastrous Villa + 1985 + Scholz Baeumner Schaffarzik (SBS) + + + + + - + + Die Juwelen des Grafen Dracula + 198? + Cooperated Software + + + + + + + + + + + + + Eagle @@ -414,8 +1063,8 @@ distributor of the Colour Genie EG2000 computers. - - + + @@ -427,8 +1076,8 @@ distributor of the Colour Genie EG2000 computers. - - + + @@ -440,8 +1089,8 @@ distributor of the Colour Genie EG2000 computers. - - + + @@ -453,25 +1102,59 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Empire + 198? + <unknown> + + + + - - - + + ExReversic + 1983 + TCS + + + + + + + + + + + Fast Food + 1983 + cc Computer Studio + + + + + + + + Firebird 1983 - Heinz Hübben Software + Heinz Hübben Software Verlag - - + + @@ -482,49 +1165,90 @@ distributor of the Colour Genie EG2000 computers. TCS - - + + - + Im Reich der Fraggels 19?? - <unknown> - + Scholz Baeumner Schaffarzik (SBS) + + + - - + + - + + Colour Frog + 1983 + TCS + + + + + + + + Glückspilz 1983 <unknown> - + + - - + + - - Grafik-Editor + + Gorilla 1983 - TCS - - + Heinz Hübben Software Verlag + + - - - + + + + + + + + Schiff des Grauens + 198? + Scholz Baeumner Schaffarzik (SBS) + + + + + + + + + + + + House of Death + 1985 + Scholz Baeumner Schaffarzik (SBS) + + + + + + @@ -536,8 +1260,21 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Hektik (alternate) + 1983 + TCS + + + + + @@ -545,25 +1282,38 @@ distributor of the Colour Genie EG2000 computers. Helikopter 1983 - Heinz Hübben Software + Heinz Hübben Software Verlag - - + + + + + + + + Horror Castle + 198? + Scholz Baeumner Schaffarzik (SBS) + + + + + - + Invasion aus dem Weltraum 1982 TCS - - + + @@ -575,19 +1325,30 @@ distributor of the Colour Genie EG2000 computers. - - + + - + - + - + + Joker Poker + 1983 + TCS + + + + + + + + Marienkäfer @@ -596,23 +1357,34 @@ distributor of the Colour Genie EG2000 computers. - - + + - - - - Life + + King 1983 TCS - + + + + + + + + + + Kniffel + 1985 + TTS + + - - + + @@ -625,17 +1397,54 @@ distributor of the Colour Genie EG2000 computers. - + - + + + + + + + Länder-Quiz + 1984 + TCS + + + + + + + + + + + Las Vergas Spiel-Automat + 198? + <unknown> + + + + + - + + Life + 1983 + TCS + + + + + + + + Lunar Lander @@ -644,15 +1453,36 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Exterminator II: The Mad Menagerie + 1984 + Algray Software + + + + - - - + + Madtree + 1983 + TCS + + + + + + + + Mampf Man II @@ -661,16 +1491,12 @@ distributor of the Colour Genie EG2000 computers. - - + + - - - - Meteor 1983 @@ -678,8 +1504,8 @@ distributor of the Colour Genie EG2000 computers. - - + + @@ -690,8 +1516,21 @@ distributor of the Colour Genie EG2000 computers. <unknown> - - + + + + + + + + Mord im Zeppelin + 198? + Scholz Baeumner Schaffarzik (SBS) + + + + + @@ -703,26 +1542,25 @@ distributor of the Colour Genie EG2000 computers. - - + + - - Musik - 1983 - TCS - + + Mysterious Tavern + 198? + Scholz Baeumner Schaffarzik (SBS) + + - - + + - - Netzo 1983 @@ -730,43 +1568,33 @@ distributor of the Colour Genie EG2000 computers. - - + + - - - - Pac Boy 1984 - Heinz Hübben Software + Heinz Hübben Software Verlag - - + + - - - - - - - - RS-232 Treiberprogramm + + Santa Paravia und Fuimaccio 198? <unknown> - + - - + + @@ -778,8 +1606,21 @@ distributor of the Colour Genie EG2000 computers. - - + + + + + + + + Schnick Schnack Schnuck + 1986 + <unknown> + + + + + @@ -791,14 +1632,12 @@ distributor of the Colour Genie EG2000 computers. - - + + - - Skramble 1983 @@ -806,23 +1645,9 @@ distributor of the Colour Genie EG2000 computers. - + - - - - - - - - - Software-Schutz - 1983 - Harald Bögeholz - - - - + @@ -834,8 +1659,8 @@ distributor of the Colour Genie EG2000 computers. - - + + @@ -847,35 +1672,21 @@ distributor of the Colour Genie EG2000 computers. - - + + - - - - Super-Basic + + + Super Star Treck 198? - Heinz Hübben Software - - - - - - - - - - Super-Grafik - 1984 - The Colour Connection - - + <unknown> + - - + + @@ -884,35 +1695,11 @@ distributor of the Colour Genie EG2000 computers. Superhirn 198? TTS + - - - - - - - - System Copy - 198? - <unknown> - - - - - - - - - - - Tape-Disk Converter 1.11 - 198? - <unknown> - - - - + + @@ -923,8 +1710,8 @@ distributor of the Colour Genie EG2000 computers. TCS - - + + @@ -933,24 +1720,25 @@ distributor of the Colour Genie EG2000 computers. Toad Mania 1983 Gumboot Software - + + - - + + - - Tracemon + + Trash-Man 1983 - Juergen Buchmueller - - + Schmidtke Electronic + + - - + + @@ -959,11 +1747,12 @@ distributor of the Colour Genie EG2000 computers. Triton Battle 19?? Schmidtke Electronic - + + - - + + @@ -974,59 +1763,32 @@ distributor of the Colour Genie EG2000 computers. <unknown> - - + + - - Unknown multi-program tape - 198? + + Wurm + 1982 <unknown> - - - - - - - - - - - - Zeicheneditor + - 1983 - TCS - - - - - - - - - - Zeicheneditor + (incl. SCREEN-Editor) - 1983 - TCS - + - - + + - - Zeichensätze (incl. Screen-Printer) - 1983 - TCS - - + + Zalaga + 198? + <unknown> + - - + + diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index 81f3fb84297..ed21baaf88f 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -112,7 +112,7 @@ void cgenie_state::cgenie_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x3fff).rom(); -// AM_RANGE(0x4000, 0xbfff) AM_RAM // set up in machine_start +// map(0x4000, 0xbfff).ram(); // set up in machine_start() map(0xc000, 0xefff).noprw(); // cartridge space map(0xf000, 0xf3ff).rw(FUNC(cgenie_state::colorram_r), FUNC(cgenie_state::colorram_w)).share("colorram"); map(0xf400, 0xf7ff).ram().share("fontram"); @@ -337,7 +337,7 @@ MC6845_UPDATE_ROW( cgenie_state::crtc_update_row ) for (int column = 0; column < x_count; column++) { uint8_t code = m_ram->pointer()[ma + column]; - uint8_t color = m_color_ram[(ma & 0xbff) + column]; + uint8_t color = m_color_ram[(ma + column) & 0x3ff]; // gfx mode? if (BIT(m_control, 5)) -- cgit v1.2.3