diff --git a/hash/amigaocs_flop.xml b/hash/amigaocs_flop.xml
index a2d4c7048fd..daebf09d756 100644
--- a/hash/amigaocs_flop.xml
+++ b/hash/amigaocs_flop.xml
@@ -1436,6 +1436,7 @@ license:CC0
+
Alien Breed (Euro)
@@ -1759,6 +1760,7 @@ license:CC0
+
Altered Beast (Euro)
@@ -1825,6 +1827,7 @@ license:CC0
+
The Amazing Spider-Man (Euro)
@@ -1832,6 +1835,7 @@ license:CC0
1990
Empire
+
@@ -2287,6 +2291,7 @@ license:CC0
+
Apidya (Euro)
@@ -2503,6 +2508,7 @@ license:CC0
+
Archipelagos (Euro)
@@ -2806,6 +2812,7 @@ license:CC0
+
Arnie (Euro)
@@ -2820,6 +2827,7 @@ license:CC0
+
Arnie 2 (Euro)
@@ -2924,7 +2932,8 @@ license:CC0
-
+
+
Aspar Master Grand Prix (Euro, Les Fous du Volant)
@@ -3928,6 +3937,7 @@ license:CC0
+
Barbarian (Euro, v16.3.88, Palace)
@@ -3984,6 +3994,7 @@ license:CC0
+
Barbarian II (Euro, Palace, v4.8.89)
@@ -4525,6 +4536,7 @@ license:CC0
+
Battle Squadron (Euro)
@@ -4708,6 +4720,7 @@ license:CC0
+
Beach Volley (Euro)
@@ -5248,6 +5261,7 @@ license:CC0
+
Beverly Hills Cop (Euro)
@@ -6306,6 +6320,7 @@ license:CC0
+
Bomber Bob (Euro)
@@ -7002,13 +7017,15 @@ license:CC0
-
+
+
Budokan - The Martial Spirit (Euro)
1990
Electronic Arts
+
@@ -7331,6 +7348,7 @@ license:CC0
+
Cadaver (Euro, v0.01)
@@ -7373,6 +7391,7 @@ license:CC0
+
Cadaver - The Pay Off (Euro)
@@ -7562,6 +7581,7 @@ license:CC0
+
Cannon Fodder (Euro)
@@ -7842,6 +7862,7 @@ license:CC0
+
Captive (Euro, v1.2)
@@ -8307,6 +8328,7 @@ license:CC0
+
Centurion - Defender of Rome (USA)
@@ -8314,6 +8336,7 @@ license:CC0
1991
Electronic Arts
+
@@ -10085,6 +10108,7 @@ license:CC0
+
Cosmic Bouncer (Euro)
@@ -11647,6 +11671,7 @@ license:CC0
+
The Deep (Euro)
@@ -11703,6 +11728,7 @@ license:CC0
+
Defender of the Crown (Euro)
@@ -11941,6 +11967,7 @@ license:CC0
+
Desert Strike - Return to the Gulf (Euro)
@@ -12328,6 +12355,7 @@ license:CC0
+
Dogs Of War
@@ -12479,6 +12507,7 @@ license:CC0
+
Double Dragon (Euro, v2.16)
@@ -12507,6 +12536,7 @@ license:CC0
+
Double Dragon II (Euro, v4.01ECS)
@@ -12552,6 +12582,7 @@ license:CC0
+
Double Dragon 3 - The Rosetta Stone (Euro)
@@ -12847,13 +12878,15 @@ license:CC0
-
+
+
Dragon's Lair: Escape from Singe's Castle (Euro)
1990
Visionary
+
@@ -12925,6 +12958,7 @@ license:CC0
+
Dragon's Lair (Euro)
@@ -12970,6 +13004,7 @@ license:CC0
+
Dragon's Lair II - Time Warp (Euro)
@@ -13015,6 +13050,7 @@ license:CC0
+
Dragon's Lair III: The Curse of Mordread (Euro)
@@ -13439,6 +13475,7 @@ license:CC0
+
Duck Tales - "The Quest for Gold" (Euro, v1.0)
@@ -13446,6 +13483,7 @@ license:CC0
1990
Titus
+
@@ -13643,7 +13681,8 @@ license:CC0
-
+
+
Dungeon Master (Euro, v3.6)
@@ -13765,13 +13804,15 @@ license:CC0
-
+
+
Dylan Dog - Ritorno al Crepuscolo (Ita)
1993
Simulmondo
+
@@ -14207,7 +14248,8 @@ license:CC0
-
+
+
Elvira - Mistress of the Dark (Euro)
@@ -14558,6 +14600,7 @@ license:CC0
+
Emlyn Hughes International Soccer (Euro)
@@ -14759,7 +14802,8 @@ license:CC0
-
+
+
Escape from Colditz (Euro)
@@ -15031,6 +15075,7 @@ license:CC0
+
Exile (Euro)
@@ -15469,7 +15514,8 @@ license:CC0
-
+
+
F1 GP Circuits (Euro)
@@ -16214,6 +16260,7 @@ license:CC0
+
Final Fight (Euro, Super Fighter)
@@ -17171,7 +17218,8 @@ license:CC0
-
+
+
Fred (Euro)
@@ -18191,6 +18239,7 @@ license:CC0
+
Ghostbusters II (Euro)
@@ -18289,6 +18338,8 @@ license:CC0
+
+
Ghouls 'n' Ghosts & Venus the Flytrap (Euro, Chart Attack)
@@ -18660,6 +18711,7 @@ license:CC0
1991
U.S. Gold
+
@@ -18698,6 +18750,7 @@ license:CC0
+
Gods (Euro, v1.00)
@@ -18852,7 +18905,8 @@ license:CC0
-
+
+
Graffiti Man (Euro, 5th Anniversary)
@@ -19041,13 +19095,15 @@ license:CC0
-
+
+
Great Courts 2 (Euro)
1991
Ubi Soft
+
@@ -19069,6 +19125,7 @@ license:CC0
+
The Great Giana Sisters (Euro)
@@ -19154,6 +19211,7 @@ license:CC0
+
Grid Start (Euro, Sextett)
@@ -19340,6 +19398,7 @@ license:CC0
+
Guy Spy (Euro)
@@ -20088,6 +20147,7 @@ license:CC0
+
HeroQuest (Euro)
@@ -20395,6 +20455,7 @@ license:CC0
+
Hoi (Euro)
@@ -21191,6 +21252,7 @@ license:CC0
+
Hybris (USA, v0.95)
@@ -21705,6 +21767,7 @@ license:CC0
+
Indiana Jones and the Last Crusade (Euro, TAG)
@@ -22494,6 +22557,7 @@ license:CC0
+
It Came from the Desert (Euro)
@@ -22543,6 +22607,7 @@ license:CC0
+
Ivanhoe (Euro)
@@ -23098,6 +23163,7 @@ license:CC0
+
John Madden Football (Euro)
@@ -23105,18 +23171,19 @@ license:CC0
1992
Electronic Arts
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -23202,7 +23269,8 @@ license:CC0
-
+
+
Journey to the Center of the Earth (Euro)
@@ -23444,6 +23512,7 @@ license:CC0
+
Katakis (Euro, v1.1)
@@ -23596,6 +23665,7 @@ license:CC0
1992
Virgin
+
@@ -23688,6 +23758,7 @@ license:CC0
+
Kick Off (Euro, v1.1)
@@ -24135,6 +24206,7 @@ license:CC0
+
Killing Machine (Euro)
@@ -24411,6 +24483,7 @@ license:CC0
+
The King of Chicago (Euro)
@@ -24503,7 +24576,8 @@ license:CC0
-
+
+
Knight Force (Euro)
@@ -24552,6 +24626,7 @@ license:CC0
+
Knights of the Crystallion (Euro)
@@ -24870,6 +24945,7 @@ license:CC0
+
Last Battle (Euro)
@@ -24898,6 +24974,7 @@ license:CC0
+
Last Ninja 2 - Back With A Vengeance (Euro)
@@ -24912,6 +24989,7 @@ license:CC0
+
Last Ninja 2 - Back With A Vengeance (Euro, Superheroes)
@@ -25726,6 +25804,7 @@ license:CC0
+
Lemmings (Euro)
@@ -25845,6 +25924,7 @@ license:CC0
+
Lemmings 2 - The Tribes (Euro)
@@ -25934,6 +26014,7 @@ license:CC0
+
Lethal Weapon (Euro)
@@ -26017,6 +26098,7 @@ license:CC0
+
Life and Death (Euro)
@@ -26135,6 +26217,7 @@ license:CC0
+
Lionheart (Euro)
@@ -26168,7 +26251,8 @@ license:CC0
-
+
+
Little Computer People (Euro)
@@ -26298,6 +26382,7 @@ license:CC0
+
Lombard RAC Rally (Euro)
@@ -26306,17 +26391,17 @@ license:CC0
1988
Mandarin
-
-
-
-
-
-
+
+
+
+
+
+
@@ -26347,13 +26432,15 @@ license:CC0
-
+
+
Loom (Euro, v1.2 19900510)
1990
Lucasfilm
+
@@ -26537,6 +26624,7 @@ license:CC0
+
Lords of the Rising Sun (Euro)
@@ -26579,6 +26667,7 @@ license:CC0
+
Lost Patrol (Euro)
@@ -26600,6 +26689,7 @@ license:CC0
+
Lost Patrol (USA)
@@ -26729,6 +26819,7 @@ license:CC0
+
Lotus Esprit Turbo Challenge (Euro)
@@ -26771,6 +26862,7 @@ license:CC0
+
Lotus III - The Ultimate Challenge (Euro)
@@ -26792,6 +26884,7 @@ license:CC0
+
Lotus Turbo Challenge 2 (Euro)
@@ -27206,7 +27299,8 @@ license:CC0
-
+
+
Major Motion (Euro)
@@ -27687,6 +27781,7 @@ license:CC0
+
Mayday Squad Heroes (Euro)
@@ -28213,6 +28308,7 @@ license:CC0
+
Micro Machines (Euro)
@@ -28241,6 +28337,7 @@ license:CC0
+
MicroProse Formula One Grand Prix (Euro)
@@ -28274,6 +28371,7 @@ license:CC0
+
MicroProse Soccer (Euro, Soccer Stars)
@@ -28288,6 +28386,7 @@ license:CC0
+
Midnight Resistance (Euro)
@@ -28697,7 +28796,8 @@ license:CC0
-
+
+
Moebius - The Orb of Celestial Harmony (USA)
@@ -28711,6 +28811,7 @@ license:CC0
+
Monkey Island 2 - LeChuck's Revenge (Euro, v1.0 19920408)
@@ -29222,6 +29323,7 @@ license:CC0
+
Motörhead (Euro)
@@ -29503,6 +29605,7 @@ license:CC0
+
'Nam 1965-1975 (Euro)
@@ -29567,6 +29670,7 @@ license:CC0
+
Nathan Never (Euro)
@@ -29636,6 +29740,7 @@ license:CC0
+
Navy Seals (Euro)
@@ -29937,6 +30042,7 @@ license:CC0
+
Night Hunter (Euro, 10 Great Games)
@@ -30111,6 +30217,7 @@ license:CC0
+
Ninja Remix (Euro)
@@ -30152,6 +30259,7 @@ license:CC0
+
The Ninja Warriors (Euro)
@@ -30261,6 +30369,7 @@ license:CC0
+
No Exit (Euro)
@@ -30268,6 +30377,7 @@ license:CC0
1990
Tomahawk
+
@@ -30344,7 +30454,8 @@ license:CC0
-
+
+
North & South (Euro)
@@ -30470,6 +30581,7 @@ license:CC0
+
Odyssey (Euro, aud304312c 19970206)
@@ -30491,6 +30603,7 @@ license:CC0
+
Odyssey (Euro, aud304312b 19960201)
@@ -30512,6 +30625,7 @@ license:CC0
+
Odyssey (Euro, aud304312a 19950523)
@@ -30725,7 +30839,8 @@ license:CC0
-
+
+
Omega (Euro)
@@ -30802,6 +30917,7 @@ license:CC0
+
Onslaught (Euro)
@@ -31304,6 +31420,7 @@ license:CC0
+
Out Run (Euro)
@@ -31346,6 +31463,7 @@ license:CC0
+
Out Run Europa (Euro)
@@ -31443,7 +31561,8 @@ license:CC0
-
+
+
Over the Net (USA)
@@ -31611,6 +31730,7 @@ license:CC0
+
Pang (Euro)
@@ -31625,6 +31745,7 @@ license:CC0
+
Panza Kick Boxing (Euro)
@@ -32578,6 +32699,7 @@ license:CC0
+
Platoon (USA)
@@ -32613,6 +32735,7 @@ license:CC0
+
Player Manager (Euro)
@@ -32641,6 +32764,7 @@ license:CC0
+
Player Manager (Ita)
@@ -32957,7 +33081,8 @@ license:CC0
-
+
+
Ports of Call (Euro, v1.1, A600 Smart Start)
@@ -33154,6 +33279,7 @@ license:CC0
+
Predator 2 (Euro)
@@ -35074,7 +35200,8 @@ license:CC0
-
+
+
Retee! (Ita)
@@ -35165,6 +35292,7 @@ license:CC0
+
Rick Dangerous (Euro, MicroStyle re-release)
@@ -35179,6 +35307,7 @@ license:CC0
+
Rick Dangerous (Euro)
@@ -35193,6 +35322,7 @@ license:CC0
+
Rick Dangerous (Euro, Alt, Unlimited Lives?)
@@ -35207,6 +35337,7 @@ license:CC0
+
Rick Dangerous 2 (Euro)
@@ -35221,6 +35352,7 @@ license:CC0
+
Rick Dangerous 2 (Euro, Budget)
@@ -35730,6 +35862,7 @@ license:CC0
+
Rocket Ranger (Euro)
@@ -35814,6 +35947,7 @@ license:CC0
+
Rock 'n Roll (Euro)
@@ -36365,6 +36499,7 @@ license:CC0
+
The Saddam Hussein Game (USA)
@@ -36435,6 +36570,7 @@ license:CC0
+
SAS Combat Simulator (Euro)
@@ -36477,6 +36613,7 @@ license:CC0
+
Savage (Euro)
@@ -36658,7 +36795,8 @@ license:CC0
-
+
+
Seconds Out (Euro, Budget)
@@ -36672,6 +36810,7 @@ license:CC0
+
The Secret of Monkey Island (Euro, v1.2)
@@ -36679,6 +36818,7 @@ license:CC0
1991
U.S. Gold
+
@@ -36858,6 +36998,7 @@ license:CC0
+
Sensible Soccer (Euro, v1.0)
@@ -36880,9 +37021,10 @@ license:CC0
-
+
+
Sensible Soccer v1.1 (Euro)
@@ -37089,6 +37231,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Sensible World of Soccer 96-97 (Euro)
@@ -37266,6 +37409,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Shadow of the Beast (Euro)
@@ -37322,6 +37466,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Shadow of the Beast II (Euro)
@@ -37364,6 +37509,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Shadow of the Beast III (Euro)
@@ -37439,7 +37585,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Shadow Warriors (Euro)
@@ -37495,6 +37642,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Shadowlands (Euro)
@@ -38028,13 +38176,15 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Sim City (Euro, v1.2)
1989
Infogrames
+
@@ -38670,7 +38820,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Skrull the Barbarian (Euro)
@@ -38955,6 +39106,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Slip Stream (Euro)
@@ -39004,6 +39156,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Snoopy - The Cool Computer Game (Euro)
@@ -39018,6 +39171,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Snoopy - The Cool Computer Game (Euro, Alt)
@@ -39093,6 +39247,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Soccer Pinball (Euro)
@@ -39303,6 +39458,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Space Ace (Euro)
@@ -39336,6 +39492,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Space Ace II - Borf's Revenge (Euro)
@@ -39501,6 +39658,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Space Hulk (Euro)
@@ -41031,6 +41189,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Stormlord (Euro)
@@ -41169,6 +41328,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Strider (Euro)
@@ -41183,7 +41343,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Strider II (Euro)
@@ -41536,6 +41697,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Supaplex (Euro)
@@ -41550,6 +41712,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Super Cars (Euro)
@@ -41585,6 +41748,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Super Cars II (Euro)
@@ -41662,6 +41826,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Super Monaco GP (Euro)
@@ -41747,6 +41912,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Super Skidmarks (Euro, v2.2)
@@ -41755,23 +41921,23 @@ Because according to available sources v1.1 was always boxed as 'European Champi
1995
Acid
+
+
+
+
+
+
-
+
-
-
-
-
-
-
@@ -42005,6 +42171,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Superfrog (Euro)
@@ -42193,6 +42360,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
SWIV (Euro, 19910228)
@@ -42235,13 +42403,15 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Sword of Honour (Euro)
1992
Prestige
+
@@ -42256,6 +42426,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Sword of Sodan (Euro)
@@ -42283,6 +42454,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Swords of Twilight (Euro)
@@ -42291,17 +42463,17 @@ Because according to available sources v1.1 was always boxed as 'European Champi
1989
Electronic Arts
-
-
-
-
-
-
+
+
+
+
+
+
@@ -42564,6 +42736,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Targhan (Euro)
@@ -42677,6 +42850,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Teenage Mutant Ninja Turtles (Euro, Ultra Games)
@@ -42684,6 +42858,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
1990
Ultra Games
+
@@ -42880,7 +43055,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Terramex (Euro)
@@ -43228,7 +43404,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Thexder (Euro)
@@ -43613,6 +43790,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Time Runners 1 - Gateways in Time (Euro)
@@ -43627,6 +43805,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Time Runners 2 - The Space Stone (Euro)
@@ -44005,6 +44184,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Time Runners 30 - The Final Duel (Euro)
@@ -44543,6 +44723,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Tournament Golf (Euro)
@@ -44662,6 +44843,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Transarctica (Euro)
@@ -44948,6 +45130,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Turrican (Euro)
@@ -44976,6 +45159,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Turrican II (Euro)
@@ -45006,6 +45190,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Turrican 3 (Euro)
@@ -45656,9 +45841,9 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
The Untouchables (Euro)
@@ -45901,6 +46086,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Vengeance of Excalibur (Euro)
@@ -46104,6 +46290,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Vixen (Euro)
@@ -46297,6 +46484,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Vyrus (Euro)
@@ -47127,6 +47315,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Wild Streets (Euro)
@@ -47293,6 +47482,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
1990
Mirrorsoft
+
@@ -47328,6 +47518,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Wings of Fury (Euro)
@@ -47650,6 +47841,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Wolfchild (Euro)
@@ -47706,7 +47898,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Wonderland (Euro, v1.27i 19910422)
@@ -47893,6 +48086,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Worms (Euro)
@@ -47900,6 +48094,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
1995
Ocean
+
@@ -48148,7 +48343,8 @@ Because according to available sources v1.1 was always boxed as 'European Champi
-
+
+
Xenon (Euro)
@@ -48177,6 +48373,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Xenon 2 - Megablast (Euro)
@@ -48445,6 +48642,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Zak McKracken and the Alien Mindbenders (Euro)
@@ -48466,6 +48664,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Zak McKracken and the Alien Mindbenders (Fra)
@@ -48487,6 +48686,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Zak McKracken and the Alien Mindbenders (Ger)
@@ -48508,6 +48708,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Zany Golf (USA)
@@ -48550,6 +48751,7 @@ Because according to available sources v1.1 was always boxed as 'European Champi
+
Zeewolf (Euro, v1.02)
diff --git a/hash/compis.xml b/hash/compis.xml
index 8f71e7e6157..6ceebfc0601 100644
--- a/hash/compis.xml
+++ b/hash/compis.xml
@@ -330,4 +330,96 @@ Systemskiva för hårdskiveenhet [version 7242]
+
+
+ MätEtt (enanvändare)
+ 1987
+ Esselte Studium
+
+
+
+
+
+
+
+
+
+
+
+ Millikans försök (enanvändare)
+ 1987
+ Esselte Studium
+
+
+
+
+
+
+
+
+
+
+ RitEtt (enanvändare)
+ 1986
+ Esselte Studium
+
+
+
+
+
+
+
+
+
+
+ Datorn i matematik (nät/skollicens)
+ 1986
+ Esselte Studium
+
+
+
+
+
+
+
+
+
+
+ Mät energi (enanvändare)
+ 1986
+ Esselte Studium
+
+
+
+
+
+
+
+
+
+
+ Internationella ord från latinet (nät/skollicens)
+ 1988
+ Almqvist & Wiksell
+
+
+
+
+
+
+
+
+
+
+ Internationella ord från grekiskan (nät/skollicens)
+ 1988
+ Almqvist & Wiksell
+
+
+
+
+
+
+
+
diff --git a/hash/jaguar.xml b/hash/jaguar.xml
index da65900767f..6d5a11e2b06 100644
--- a/hash/jaguar.xml
+++ b/hash/jaguar.xml
@@ -168,7 +168,7 @@ Unreleased (possibly no prototypes exist):
-
+
Atari Karts
1995
@@ -181,8 +181,8 @@ Unreleased (possibly no prototypes exist):
-
-
+
+
Attack of the Mutant Penguins
1996
Atari
@@ -592,7 +592,8 @@ Unreleased (possibly no prototypes exist):
-
+
+
NBA Jam T.E. - Tournament Edition
1996
@@ -966,7 +967,7 @@ Unreleased (possibly no prototypes exist):
-
+
Troy Aikman NFL Football
1995
Williams Entertainment
diff --git a/hash/sgi_mips.xml b/hash/sgi_mips.xml
index cd44e794a22..826c506d7ee 100644
--- a/hash/sgi_mips.xml
+++ b/hash/sgi_mips.xml
@@ -7,6 +7,18 @@ license:CC0
+
+ Alias|Wavefront Advanced Visualizer 4.2
+ 199?
+ Alias|Wavefront
+
+
+
+
+
+
+
+
Barco Creator 7.2
1999
@@ -169,6 +181,18 @@ license:CC0
+
+ Discreet Effect 6.1.3
+ 2000
+ Discreet
+
+
+
+
+
+
+
+
ENlightenDSM 1.1 for UNIX and NT
1998
@@ -222,6 +246,31 @@ license:CC0
+
+ Discreet Flame 4.0.2
+ 1996
+ Discreet Logic
+
+
+
+
+
+
+
+
+
+
+ Discreet Flame 7.6
+ 2002
+ Discreet Logic
+
+
+
+
+
+
+
+
Freeware 2.0 - Unsupported Software compatible with IRIX 6.2 and later
1996
@@ -392,6 +441,18 @@ license:CC0
+
+ Alias|Wavefront Maya Composer 5.5
+ 1999
+ Alias|Wavefront
+
+
+
+
+
+
+
+
MineSet 2.0.1 for IRIX 6.2 and later
1998
@@ -592,7 +653,7 @@ license:CC0
O2 Out of Box Experience 2.4 for IRIX 6.5 and later
2000
- Silicon Graphics
+ SGI
@@ -757,6 +818,48 @@ license:CC0
+
+ Alias|Wavefront PowerAnimator 7.51
+ 1996
+ Alias|Wavefront
+
+
+
+
+
+
+
+
+
+ Alias|Wavefront PowerAnimator 8.2
+ 1997
+ Alias|Wavefront
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PRISMS 6.4
+ 1997
+ Side Effects Software
+
+
+
+
+
+
+
+
Samba 2.0.0 for IRIX for IRIX 6.5 and later
1998
@@ -773,7 +876,7 @@ license:CC0
Silicon Graphics General and Platform Demos 6.5.12
2001
- Silicon Graphics
+ SGI
@@ -848,7 +951,7 @@ license:CC0
Silicon Graphics MultiLink Adapter Documentation
2000
- Silicon Graphics
+ SGI
@@ -1398,7 +1501,7 @@ license:CC0
-
+
@@ -1411,7 +1514,7 @@ license:CC0
-
+
@@ -1681,19 +1784,6 @@ license:CC0
-
- IRIX 6.5 Applications August 2001
- 2001
- Silicon Graphics
-
-
-
-
-
-
-
-
-
@@ -2074,6 +2164,7 @@ license:CC0
1995
Silicon Graphics
+
@@ -2108,19 +2199,6 @@ license:CC0
-
- IRIX 5.3 for Indy R4000, R4400, R4600 (100-200 MHz)
- 1995
- Silicon Graphics
-
-
-
-
-
-
-
-
-
IRIX 6.0.1
1994
@@ -2605,7 +2683,7 @@ license:CC0
IRIX 6.5.7
2000
- Silicon Graphics
+ SGI
@@ -2659,7 +2737,7 @@ license:CC0
IRIX 6.5.8
2000
- Silicon Graphics
+ SGI
@@ -2713,7 +2791,7 @@ license:CC0
IRIX 6.5.9
2000
- Silicon Graphics
+ SGI
@@ -2775,7 +2853,7 @@ license:CC0
IRIX 6.5.10
2000
- Silicon Graphics
+ SGI
@@ -2805,7 +2883,7 @@ license:CC0
IRIX 6.5.11
2001
- Silicon Graphics
+ SGI
@@ -2835,7 +2913,7 @@ license:CC0
IRIX 6.5.12
2001
- Silicon Graphics
+ SGI
@@ -2873,7 +2951,7 @@ license:CC0
IRIX 6.5.13
2001
- Silicon Graphics
+ SGI
@@ -2911,7 +2989,7 @@ license:CC0
IRIX 6.5.14
2001
- Silicon Graphics
+ SGI
@@ -2941,7 +3019,7 @@ license:CC0
IRIX 6.5.15
2002
- Silicon Graphics
+ SGI
@@ -2987,7 +3065,7 @@ license:CC0
IRIX 6.5.16
2002
- Silicon Graphics
+ SGI
@@ -3025,7 +3103,7 @@ license:CC0
IRIX 6.5.17
2002
- Silicon Graphics
+ SGI
@@ -3063,7 +3141,7 @@ license:CC0
IRIX 6.5.18
2002
- Silicon Graphics
+ SGI
@@ -3114,10 +3192,88 @@ license:CC0
+
+ IRIX 6.5.19
+ 2003
+ SGI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
IRIX 6.5.21
2003
- Silicon Graphics
+ SGI
@@ -3155,7 +3311,7 @@ license:CC0
IRIX 6.5.22
2003
- Silicon Graphics
+ SGI
@@ -3193,7 +3349,7 @@ license:CC0
IRIX 6.5.23
2004
- Silicon Graphics
+ SGI
@@ -3223,7 +3379,7 @@ license:CC0
IRIX 6.5.26
2004
- Silicon Graphics
+ SGI
@@ -3269,7 +3425,7 @@ license:CC0
IRIX 6.5.27
2005
- Silicon Graphics
+ SGI
@@ -3299,7 +3455,7 @@ license:CC0
IRIX 6.5.28
2005
- Silicon Graphics
+ SGI
@@ -3329,7 +3485,7 @@ license:CC0
IRIX 6.5.29
2006
- Silicon Graphics
+ SGI
@@ -3383,7 +3539,7 @@ license:CC0
IRIX 6.5.30
2006
- Silicon Graphics
+ SGI
diff --git a/hash/st_flop.xml b/hash/st_flop.xml
index c6a255b04f6..ae2ca3cd7be 100644
--- a/hash/st_flop.xml
+++ b/hash/st_flop.xml
@@ -4294,6 +4294,41 @@ license:CC0
+
+ Street Fighter II: The World Warrior (Euro)
+ 1992
+ U.S. Gold
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Strider (Euro, Les Chevaliers)
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 20420d87a6c..905a081cd4a 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -158,6 +158,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_74107.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74123.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74123.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74125.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74125.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74153.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74153.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74161.cpp",
@@ -178,6 +180,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_74193.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74194.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74194.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74377.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74377.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74393.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74393.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74365.cpp",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index fd0a950e205..6051f733403 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1219,6 +1219,8 @@ files {
MAME_DIR .. "src/mame/drivers/jaguar.cpp",
MAME_DIR .. "src/mame/includes/jaguar.h",
MAME_DIR .. "src/mame/audio/jaguar.cpp",
+ MAME_DIR .. "src/mame/video/jag_blitter.cpp",
+ MAME_DIR .. "src/mame/video/jag_blitter.h",
MAME_DIR .. "src/mame/video/jaguar.cpp",
MAME_DIR .. "src/mame/video/jagblit.h",
MAME_DIR .. "src/mame/video/jagblit.hxx",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 6141c773412..1211b8eb7a2 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1666,7 +1666,8 @@ files {
MAME_DIR .. "src/mame/includes/pc1512.h",
MAME_DIR .. "src/mame/machine/pc1512kb.cpp",
MAME_DIR .. "src/mame/machine/pc1512kb.h",
- MAME_DIR .. "src/mame/video/pc1512.cpp",
+ MAME_DIR .. "src/mame/video/ams40041.cpp",
+ MAME_DIR .. "src/mame/video/ams40041.h",
MAME_DIR .. "src/mame/drivers/pcw.cpp",
MAME_DIR .. "src/mame/includes/pcw.h",
MAME_DIR .. "src/mame/video/pcw.cpp",
@@ -2673,6 +2674,7 @@ createMESSProjects(_target, _subtarget, "korg")
files {
MAME_DIR .. "src/mame/drivers/korgds8.cpp",
MAME_DIR .. "src/mame/drivers/korgdss1.cpp",
+ MAME_DIR .. "src/mame/drivers/korgdvp1.cpp",
MAME_DIR .. "src/mame/drivers/korgdw8k.cpp",
MAME_DIR .. "src/mame/drivers/korgm1.cpp",
MAME_DIR .. "src/mame/drivers/korgz3.cpp",
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index 8c68e818531..ff1668a8eb9 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -97,7 +97,7 @@ READ8_MEMBER(a1bus_cffa_device::cffa_r)
break;
case 0x8:
- m_lastdata = m_ata->read_cs0((offset & 0xf) - 8, 0xff);
+ m_lastdata = m_ata->cs0_r((offset & 0xf) - 8, 0xff);
return m_lastdata & 0x00ff;
case 0x9:
@@ -107,7 +107,7 @@ READ8_MEMBER(a1bus_cffa_device::cffa_r)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0((offset & 0xf) - 8, 0xff);
+ return m_ata->cs0_r((offset & 0xf) - 8, 0xff);
}
return 0xff;
@@ -132,7 +132,7 @@ WRITE8_MEMBER(a1bus_cffa_device::cffa_w)
case 0x8:
- m_ata->write_cs0((offset & 0xf) - 8, data, 0xff);
+ m_ata->cs0_w((offset & 0xf) - 8, data, 0xff);
break;
case 0x9:
@@ -142,7 +142,7 @@ WRITE8_MEMBER(a1bus_cffa_device::cffa_w)
case 0xd:
case 0xe:
case 0xf:
- m_ata->write_cs0((offset & 0xf) - 8, data, 0xff);
+ m_ata->cs0_w((offset & 0xf) - 8, data, 0xff);
break;
}
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 42a55c6b81c..7f6104310be 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -145,7 +145,7 @@ uint8_t a2bus_cffa2000_device::read_c0nx(uint8_t offset)
// Apple /// driver uses sta $c080,x when writing, which causes spurious reads of c088
if (!m_inwritecycle)
{
- m_lastreaddata = m_ata->read_cs0(offset - 8);
+ m_lastreaddata = m_ata->cs0_r(offset - 8);
}
return m_lastreaddata & 0xff;
@@ -156,7 +156,7 @@ uint8_t a2bus_cffa2000_device::read_c0nx(uint8_t offset)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0(offset-8, 0xff);
+ return m_ata->cs0_r(offset-8, 0xff);
}
return 0xff;
@@ -192,7 +192,7 @@ void a2bus_cffa2000_device::write_c0nx(uint8_t offset, uint8_t data)
m_lastdata &= 0xff00;
m_lastdata |= data;
// printf("%02x to 8, m_lastdata = %x\n", data, m_lastdata);
- m_ata->write_cs0(offset-8, m_lastdata);
+ m_ata->cs0_w(offset-8, m_lastdata);
break;
case 9:
@@ -202,7 +202,7 @@ void a2bus_cffa2000_device::write_c0nx(uint8_t offset, uint8_t data)
case 0xd:
case 0xe:
case 0xf:
- m_ata->write_cs0(offset-8, data, 0xff);
+ m_ata->cs0_w(offset-8, data, 0xff);
break;
}
}
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 6bb4beaaf0a..dcc8e454a73 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -191,7 +191,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
switch (offset)
{
case 0:
- m_lastdata = m_ata->read_cs0(offset);
+ m_lastdata = m_ata->cs0_r(offset);
// printf("IDE: read %04x\n", m_lastdata);
m_last_read_was_0 = true;
return m_lastdata&0xff;
@@ -204,7 +204,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
}
else
{
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
}
case 2:
@@ -213,7 +213,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
case 5:
case 6:
case 7:
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
default:
logerror("a2vulcan: unknown read @ C0n%x\n", offset);
@@ -245,11 +245,11 @@ void a2bus_vulcanbase_device::write_c0nx(uint8_t offset, uint8_t data)
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
// printf("IDE: write %04x\n", m_lastdata);
- m_ata->write_cs0(0, m_lastdata);
+ m_ata->cs0_w(0, m_lastdata);
}
else
{
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
}
break;
@@ -260,7 +260,7 @@ void a2bus_vulcanbase_device::write_c0nx(uint8_t offset, uint8_t data)
case 6:
case 7:
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
break;
case 9: // ROM bank
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 6f76de550b0..fc06cb2a737 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -175,10 +175,10 @@ uint8_t a2bus_zipdrivebase_device::read_c0nx(uint8_t offset)
case 5:
case 6:
case 7:
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
case 8: // data port
- m_lastdata = m_ata->read_cs0(0, 0xffff);
+ m_lastdata = m_ata->cs0_r(0, 0xffff);
// printf("%04x @ IDE data\n", m_lastdata);
return m_lastdata&0xff;
@@ -205,10 +205,10 @@ uint8_t a2bus_focusdrive_device::read_c0nx(uint8_t offset)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0(offset&7, 0xff);
+ return m_ata->cs0_r(offset&7, 0xff);
case 0: // data port
- m_lastdata = m_ata->read_cs0(0, 0xffff);
+ m_lastdata = m_ata->cs0_r(0, 0xffff);
//printf("%04x @ IDE data\n", m_lastdata);
return m_lastdata&0xff;
@@ -240,7 +240,7 @@ void a2bus_zipdrivebase_device::write_c0nx(uint8_t offset, uint8_t data)
case 6:
case 7:
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
break;
case 8:
@@ -252,7 +252,7 @@ void a2bus_zipdrivebase_device::write_c0nx(uint8_t offset, uint8_t data)
// printf("%02x to IDE data hi\n", data);
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
- m_ata->write_cs0(0, m_lastdata, 0xffff);
+ m_ata->cs0_w(0, m_lastdata, 0xffff);
break;
default:
@@ -275,14 +275,14 @@ void a2bus_focusdrive_device::write_c0nx(uint8_t offset, uint8_t data)
case 0xf:
// due to a bug in the 6502 firmware, eat data if DRQ is set
#if 0
- while (m_ata->read_cs0(7, 0xff) & 0x08)
+ while (m_ata->cs0_r(7, 0xff) & 0x08)
{
- m_ata->read_cs0(0, 0xffff);
+ m_ata->cs0_r(0, 0xffff);
printf("eating 2 bytes to clear DRQ\n");
}
#endif
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset & 7, data, 0xff);
+ m_ata->cs0_w(offset & 7, data, 0xff);
break;
case 0:
@@ -294,7 +294,7 @@ void a2bus_focusdrive_device::write_c0nx(uint8_t offset, uint8_t data)
// printf("%02x to IDE data hi\n", data);
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
- m_ata->write_cs0(0, m_lastdata, 0xffff);
+ m_ata->cs0_w(0, m_lastdata, 0xffff);
break;
default:
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index 98078003f4b..114e9eeb2e6 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -116,7 +116,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
case 0x05:
case 0x06:
case 0x07:
- data = m_ata->read_cs0(offset & 0x07, 0xff);
+ data = m_ata->cs0_r(offset & 0x07, 0xff);
break;
case 0x40: // Printer status
@@ -137,7 +137,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
break;
case 0x58:
- m_ata_data = m_ata->read_cs0(0);
+ m_ata_data = m_ata->cs0_r(0);
data = m_ata_data & 0xff;
break;
@@ -147,7 +147,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
break;
case 0x5a:
- data = m_ata->read_cs1(6, 0xff);
+ data = m_ata->cs1_r(6, 0xff);
break;
case 0x5b: // Digital Input Register
@@ -176,7 +176,7 @@ void powermate_ide_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int
case 0x05:
case 0x06:
case 0x07:
- m_ata->write_cs0(offset & 0x07, data, 0xff);
+ m_ata->cs0_w(offset & 0x07, data, 0xff);
break;
case 0x40:
@@ -188,7 +188,7 @@ void powermate_ide_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int
case 0x58:
m_ata_data |= data;
- m_ata->write_cs0(0, m_ata_data);
+ m_ata->cs0_w(0, m_ata_data);
break;
case 0x59:
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 3cc14d9d1d0..57a251eb67c 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -248,7 +248,7 @@ WRITE16_MEMBER( buddha_device::ide_interrupt_enable_w )
READ16_MEMBER( buddha_device::ide_0_cs0_r )
{
- uint16_t data = m_ata_0->read_cs0((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_0->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_0_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -263,12 +263,12 @@ WRITE16_MEMBER( buddha_device::ide_0_cs0_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_0->write_cs0((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_0->cs0_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_0_cs1_r )
{
- uint16_t data = m_ata_0->read_cs1((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_0->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_0_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -283,12 +283,12 @@ WRITE16_MEMBER( buddha_device::ide_0_cs1_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_0->write_cs1((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_0->cs1_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_1_cs0_r )
{
- uint16_t data = m_ata_1->read_cs0((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_1->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_1_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -303,12 +303,12 @@ WRITE16_MEMBER( buddha_device::ide_1_cs0_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_1->write_cs0((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_1->cs0_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_1_cs1_r )
{
- uint16_t data = m_ata_1->read_cs1((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_1->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_1_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -323,7 +323,7 @@ WRITE16_MEMBER( buddha_device::ide_1_cs1_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_1->write_cs1((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_1->cs1_w((offset >> 1) & 0x07, data, mem_mask);
}
} } } // namespace bus::amiga::zorro
diff --git a/src/devices/bus/ata/ataintf.h b/src/devices/bus/ata/ataintf.h
index ce2e501886a..423a8165d35 100644
--- a/src/devices/bus/ata/ataintf.h
+++ b/src/devices/bus/ata/ataintf.h
@@ -133,15 +133,10 @@ public:
return *this;
}
- uint16_t read_cs0(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
- uint16_t read_cs1(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
- void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
- void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
-
- DECLARE_READ16_MEMBER(cs0_r) { return read_cs0(offset, mem_mask); }
- DECLARE_READ16_MEMBER(cs1_r) { return read_cs1(offset, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs0_w) { write_cs0(offset, data, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs1_w) { write_cs1(offset, data, mem_mask); }
+ uint16_t cs0_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
+ uint16_t cs1_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
+ void cs0_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
+ void cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
};
DECLARE_DEVICE_TYPE(ATA_INTERFACE, ata_interface_device)
diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.cpp b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
index 71ea5c50767..05ba11a3bab 100644
--- a/src/devices/bus/bbc/1mhzbus/datacentre.cpp
+++ b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
@@ -149,18 +149,18 @@ uint8_t bbc_datacentre_device::fred_r(offs_t offset)
case 0x40:
if (offset & 0x07)
{
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
}
else
{
- m_ide_data = m_ide->read_cs0(offset & 0x07);
+ m_ide_data = m_ide->cs0_r(offset & 0x07);
data = m_ide_data & 0xff;
}
break;
case 0x48:
if (offset & 0x04)
{
- data = m_ide->read_cs1(offset & 0x07, 0xff);
+ data = m_ide->cs1_r(offset & 0x07, 0xff);
}
else
{
@@ -206,18 +206,18 @@ void bbc_datacentre_device::fred_w(offs_t offset, uint8_t data)
case 0x40:
if (offset & 0x07)
{
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
}
else
{
m_ide_data = (m_ide_data & 0xff00) | data;
- m_ide->write_cs0(offset & 0x07, m_ide_data);
+ m_ide->cs0_w(offset & 0x07, m_ide_data);
}
break;
case 0x48:
if (offset & 0x04)
{
- m_ide->write_cs1(offset & 0x07, data, 0xff);
+ m_ide->cs1_w(offset & 0x07, data, 0xff);
}
else
{
diff --git a/src/devices/bus/bbc/1mhzbus/ide.cpp b/src/devices/bus/bbc/1mhzbus/ide.cpp
index 0fa7d3ad069..d5fdafb000d 100644
--- a/src/devices/bus/bbc/1mhzbus/ide.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ide.cpp
@@ -117,7 +117,7 @@ uint8_t bbc_ide8_device::fred_r(offs_t offset)
switch (offset & 0xf8)
{
case 0x40:
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
break;
}
@@ -129,7 +129,7 @@ void bbc_ide8_device::fred_w(offs_t offset, uint8_t data)
switch (offset & 0xf8)
{
case 0x40:
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
break;
}
}
@@ -146,18 +146,18 @@ uint8_t bbc_beebide_device::fred_r(offs_t offset)
case 0x40:
if (offset & 0x07)
{
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
}
else
{
- m_ide_data = m_ide->read_cs0(offset & 0x07);
+ m_ide_data = m_ide->cs0_r(offset & 0x07);
data = m_ide_data & 0xff;
}
break;
case 0x48:
if (offset & 0x04)
{
- data = m_ide->read_cs1(offset & 0x07, 0xff);
+ data = m_ide->cs1_r(offset & 0x07, 0xff);
}
else
{
@@ -181,18 +181,18 @@ void bbc_beebide_device::fred_w(offs_t offset, uint8_t data)
case 0x40:
if (offset & 0x07)
{
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
}
else
{
m_ide_data = (m_ide_data & 0xff00) | data;
- m_ide->write_cs0(offset & 0x07, m_ide_data);
+ m_ide->cs0_w(offset & 0x07, m_ide_data);
}
break;
case 0x48:
if (offset & 0x04)
{
- m_ide->write_cs1(offset & 0x07, data, 0xff);
+ m_ide->cs1_w(offset & 0x07, data, 0xff);
}
else
{
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 1942ce466b5..73e14ea6b99 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -173,13 +173,13 @@ uint8_t c64_ide64_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, int sp
if (io1_offset >= 0x20 && io1_offset < 0x28)
{
- m_ata_data = m_ata->read_cs0(offset & 0x07);
+ m_ata_data = m_ata->cs0_r(offset & 0x07);
data = m_ata_data & 0xff;
}
else if (io1_offset >= 0x28 && io1_offset < 0x30)
{
- m_ata_data = m_ata->read_cs1(offset & 0x07);
+ m_ata_data = m_ata->cs1_r(offset & 0x07);
data = m_ata_data & 0xff;
}
@@ -276,13 +276,13 @@ void c64_ide64_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2
{
m_ata_data = (m_ata_data & 0xff00) | data;
- m_ata->write_cs0(offset & 0x07, m_ata_data);
+ m_ata->cs0_w(offset & 0x07, m_ata_data);
}
else if (io1_offset >= 0x28 && io1_offset < 0x30)
{
m_ata_data = (m_ata_data & 0xff00) | data;
- m_ata->write_cs1(offset & 0x07, m_ata_data);
+ m_ata->cs1_w(offset & 0x07, m_ata_data);
}
else if (io1_offset == 0x31)
{
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index 27a5bba5a3a..2d08f27a1e5 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -56,7 +56,7 @@ void cg_parallel_slot_device::device_start()
// I/O PORTS
//**************************************************************************
-READ8_MEMBER( cg_parallel_slot_device::pa_r )
+uint8_t cg_parallel_slot_device::pa_r()
{
if (m_cart)
return m_cart->pa_r();
@@ -64,13 +64,13 @@ READ8_MEMBER( cg_parallel_slot_device::pa_r )
return 0xff;
}
-WRITE8_MEMBER( cg_parallel_slot_device::pa_w )
+void cg_parallel_slot_device::pa_w(uint8_t data)
{
if (m_cart)
m_cart->pa_w(data);
}
-READ8_MEMBER( cg_parallel_slot_device::pb_r )
+uint8_t cg_parallel_slot_device::pb_r()
{
if (m_cart)
return m_cart->pb_r();
@@ -78,7 +78,7 @@ READ8_MEMBER( cg_parallel_slot_device::pb_r )
return 0xff;
}
-WRITE8_MEMBER( cg_parallel_slot_device::pb_w )
+void cg_parallel_slot_device::pb_w(uint8_t data)
{
if (m_cart)
m_cart->pb_w(data);
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
index cf96a4faaef..74fb8b7a50b 100644
--- a/src/devices/bus/cgenie/parallel/parallel.h
+++ b/src/devices/bus/cgenie/parallel/parallel.h
@@ -49,12 +49,12 @@ public:
virtual ~cg_parallel_slot_device();
// IOA
- DECLARE_READ8_MEMBER(pa_r);
- DECLARE_WRITE8_MEMBER(pa_w);
+ uint8_t pa_r();
+ void pa_w(uint8_t data);
// IOB
- DECLARE_READ8_MEMBER(pb_r);
- DECLARE_WRITE8_MEMBER(pb_w);
+ uint8_t pb_r();
+ void pb_w(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index 6931eecfda0..9c5095e5fd1 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -157,7 +157,7 @@ READ_LINE_MEMBER(comx_expansion_slot_device::ef4_r)
// sc_w - state code/N0-N2 write
//-------------------------------------------------
-WRITE8_MEMBER(comx_expansion_slot_device::sc_w)
+void comx_expansion_slot_device::sc_w(offs_t offset, uint8_t data)
{
if (m_card != nullptr)
m_card->comx_sc_w(offset, data);
diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
index 75ff26f77ce..8f99edae4fd 100644
--- a/src/devices/bus/comx35/exp.h
+++ b/src/devices/bus/comx35/exp.h
@@ -73,7 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(irq_w) { m_write_irq(state); }
- DECLARE_WRITE8_MEMBER(sc_w);
+ void sc_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(tpb_w);
protected:
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index 8710717de6c..13edcad0aa6 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -133,27 +133,27 @@ READ8_MEMBER(cpc_symbiface2_device::ide_cs0_r)
else
{
m_iohigh = true;
- m_ide_data = m_ide->read_cs0(offset);
+ m_ide_data = m_ide->cs0_r(offset);
return m_ide_data & 0xff;
}
}
else
- return m_ide->read_cs0(offset);
+ return m_ide->cs0_r(offset);
}
WRITE8_MEMBER(cpc_symbiface2_device::ide_cs0_w)
{
- m_ide->write_cs0(offset, data);
+ m_ide->cs0_w(offset, data);
}
READ8_MEMBER(cpc_symbiface2_device::ide_cs1_r)
{
- return m_ide->read_cs1(offset);
+ return m_ide->cs1_r(offset);
}
WRITE8_MEMBER(cpc_symbiface2_device::ide_cs1_w)
{
- m_ide->write_cs1(offset, data);
+ m_ide->cs1_w(offset, data);
}
// RTC (Dallas DS1287A)
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index c9a699cf539..dbd5eaecf58 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -158,7 +158,7 @@ READ8_MEMBER(hp82937_io_card_device::dio_r)
if (m_dio_out) {
return 0xff;
} else {
- return m_ieee488->read_dio();
+ return m_ieee488->dio_r();
}
}
@@ -252,7 +252,7 @@ void hp82937_io_card_device::device_reset()
void hp82937_io_card_device::update_data_out()
{
- m_ieee488->write_dio(m_dio_out ? m_cpu->p2_r() : 0xff);
+ m_ieee488->host_dio_w(m_dio_out ? m_cpu->p2_r() : 0xff);
}
void hp82937_io_card_device::update_signals()
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index bec3e84d3c0..92e98efd38f 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -245,7 +245,7 @@ READ8_MEMBER(hp98034_io_card_device::hpib_ctrl_r)
READ8_MEMBER(hp98034_io_card_device::hpib_data_r)
{
- return ~m_ieee488->read_dio();
+ return ~m_ieee488->dio_r();
}
READ8_MEMBER(hp98034_io_card_device::idr_r)
@@ -331,7 +331,7 @@ void hp98034_io_card_device::update_data_out()
if (m_clr_hpib) {
m_data_out = 0;
}
- m_ieee488->write_dio(~m_data_out);
+ m_ieee488->host_dio_w(~m_data_out);
}
void hp98034_io_card_device::update_ctrl_out()
diff --git a/src/devices/bus/hp_dio/human_interface.cpp b/src/devices/bus/hp_dio/human_interface.cpp
index 0eddcde7f48..10ecb19e549 100644
--- a/src/devices/bus/hp_dio/human_interface.cpp
+++ b/src/devices/bus/hp_dio/human_interface.cpp
@@ -217,7 +217,7 @@ WRITE8_MEMBER(human_interface_device::gpib_w)
if (m_ppoll_sc & PPOLL_IE) {
LOG("%s: start parallel poll\n", __func__);
- ieee488_dio_w(space, 0, m_ieee488->dio_r(space, 0));
+ ieee488_dio_w(space, 0, m_ieee488->dio_r());
}
break;
case 4:
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 20abb161352..98c8c237af8 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -94,7 +94,7 @@ READ8_MEMBER( c2031_device::via0_pa_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c2031_device::via0_pa_w )
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 53a2f9f95e8..3684664325b 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -222,7 +222,7 @@ READ8_MEMBER( c2040_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c2040_device::dio_w )
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 9594b26cf7e..81f64c271f0 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -274,7 +274,7 @@ READ8_MEMBER( c8050_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c8050_device::dio_w )
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 63b5cbe2506..75e0d054874 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -127,7 +127,7 @@ READ8_MEMBER( c8280_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c8280_device::dio_w )
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 58a34acae64..9bf524d9f64 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -153,7 +153,7 @@ READ8_MEMBER( d9060_device_base::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
diff --git a/src/devices/bus/ieee488/grid2102.cpp b/src/devices/bus/ieee488/grid2102.cpp
index a903ef1dc3e..5505d6533ba 100644
--- a/src/devices/bus/ieee488/grid2102.cpp
+++ b/src/devices/bus/ieee488/grid2102.cpp
@@ -91,9 +91,9 @@ void grid210x_device::device_start() {
void grid210x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) {
if (m_floppy_loop_state == GRID210X_STATE_READING_DATA) {
- uint8_t data[io_size];
+ std::unique_ptr data(new uint8_t[io_size]);
fseek(floppy_sector_number * 512, SEEK_SET);
- fread(data, io_size);
+ fread(data.get(), io_size);
for (int i = 0; i < io_size; i++) {
m_output_data_buffer.push(data[i]);
}
@@ -160,7 +160,7 @@ void grid210x_device::ieee488_dav(int state) {
// read data and wait for transfer end
int atn = m_bus->atn_r() ^ 1;
m_bus->nrfd_w(this, 0);
- uint8_t data = m_bus->read_dio() ^ 0xFF;
+ uint8_t data = m_bus->dio_r() ^ 0xFF;
int eoi = m_bus->eoi_r() ^ 1;
LOG_BYTES("grid210x_device byte recv %02x atn %d eoi %d\n", data, atn, eoi);
m_last_recv_byte = data;
@@ -235,7 +235,7 @@ void grid210x_device::ieee488_dav(int state) {
void grid210x_device::ieee488_nrfd(int state) {
if (state == 1 && m_gpib_loop_state == GRID210X_GPIB_STATE_SEND_DATA_START) {
// set dio and assert dav
- m_bus->write_dio(m_byte_to_send ^ 0xFF);
+ m_bus->host_dio_w(m_byte_to_send ^ 0xFF);
m_bus->eoi_w(this, m_send_eoi ^ 1);
m_bus->dav_w(this, 0);
m_bus->ndac_w(this, 1);
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index be648c1fa50..ed140734e13 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -131,7 +131,7 @@ void hardbox_device::hardbox_io(address_map &map)
READ8_MEMBER( hardbox_device::ppi0_pa_r )
{
- return m_bus->read_dio() ^ 0xff;
+ return m_bus->dio_r() ^ 0xff;
}
WRITE8_MEMBER( hardbox_device::ppi0_pb_w )
diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp
index 9217d9eda76..bef1fdd8ecb 100644
--- a/src/devices/bus/ieee488/hp9122c.cpp
+++ b/src/devices/bus/ieee488/hp9122c.cpp
@@ -257,7 +257,7 @@ void hp9122c_device::update_intsel()
READ8_MEMBER(hp9122c_device::i8291a_dio_r)
{
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER(hp9122c_device::i8291a_dio_w)
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 89f64b75884..a1546668d3f 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -473,7 +473,7 @@ WRITE_LINE_MEMBER(hp9895_device::phi_ren_w)
READ8_MEMBER(hp9895_device::phi_dio_r)
{
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER(hp9895_device::phi_dio_w)
diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
index 67c5ca6be07..5a83d0fe927 100644
--- a/src/devices/bus/ieee488/ieee488.h
+++ b/src/devices/bus/ieee488/ieee488.h
@@ -61,8 +61,7 @@ public:
void add_device(ieee488_slot_device *slot, device_t *target);
// reads for both host and peripherals
- uint8_t read_dio() { return get_data(); }
- DECLARE_READ8_MEMBER( dio_r ) { return get_data(); }
+ uint8_t dio_r() { return get_data(); }
DECLARE_READ_LINE_MEMBER( eoi_r ) { return get_signal(EOI); }
DECLARE_READ_LINE_MEMBER( dav_r ) { return get_signal(DAV); }
DECLARE_READ_LINE_MEMBER( nrfd_r ) { return get_signal(NRFD); }
@@ -73,8 +72,7 @@ public:
DECLARE_READ_LINE_MEMBER( ren_r ) { return get_signal(REN); }
// writes for host (driver_device)
- void write_dio(uint8_t data) { set_data(this, data); }
- DECLARE_WRITE8_MEMBER( host_dio_w ) { set_data(this, data); }
+ void host_dio_w(uint8_t data) { set_data(this, data); }
DECLARE_WRITE_LINE_MEMBER( host_eoi_w ) { set_signal(this, EOI, state); }
DECLARE_WRITE_LINE_MEMBER( host_dav_w ) { set_signal(this, DAV, state); }
DECLARE_WRITE_LINE_MEMBER( host_nrfd_w ) { set_signal(this, NRFD, state); }
diff --git a/src/devices/bus/ieee488/remote488.cpp b/src/devices/bus/ieee488/remote488.cpp
index b5eb0041632..233b5e9b758 100644
--- a/src/devices/bus/ieee488/remote488.cpp
+++ b/src/devices/bus/ieee488/remote488.cpp
@@ -707,7 +707,7 @@ void remote488_device::update_ah_fsm()
if (m_bus->dav_r()) {
m_ah_state = REM_AH_ACRS;
} else if (!m_waiting_cp) {
- uint8_t dio = ~m_bus->read_dio();
+ uint8_t dio = ~m_bus->dio_r();
if (!m_bus->eoi_r()) {
send_update(MSG_END_BYTE , dio);
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 8076a0d5432..ac2630c39cc 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -100,7 +100,7 @@ void softbox_device::softbox_io(address_map &map)
READ8_MEMBER( softbox_device::ppi0_pa_r )
{
- return m_bus->read_dio() ^ 0xff;
+ return m_bus->dio_r() ^ 0xff;
}
WRITE8_MEMBER( softbox_device::ppi0_pb_w )
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index e11b8588d60..d7c046e77de 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -135,13 +135,13 @@ READ8_MEMBER( side116_device::read )
if (offset == 0)
{
- uint16_t ide_data = m_ata->read_cs0(0);
+ uint16_t ide_data = m_ata->cs0_r(0);
data = ide_data & 0xff;
m_latch = ide_data >> 8;
}
else if (offset < 8)
{
- data = m_ata->read_cs0(offset & 7, 0xff);
+ data = m_ata->cs0_r(offset & 7, 0xff);
}
else if (offset == 8)
{
@@ -149,7 +149,7 @@ READ8_MEMBER( side116_device::read )
}
else
{
- data = m_ata->read_cs1(offset & 7, 0xff);
+ data = m_ata->cs1_r(offset & 7, 0xff);
}
return data;
@@ -160,11 +160,11 @@ WRITE8_MEMBER( side116_device::write )
if (offset == 0)
{
uint16_t ide_data = (m_latch << 8) | data;
- m_ata->write_cs0(0, ide_data);
+ m_ata->cs0_w(0, ide_data);
}
else if (offset < 8)
{
- m_ata->write_cs0(offset & 7, data, 0xff);
+ m_ata->cs0_w(offset & 7, data, 0xff);
}
else if (offset == 8)
{
@@ -172,7 +172,7 @@ WRITE8_MEMBER( side116_device::write )
}
else
{
- m_ata->write_cs1(offset & 7, data, 0xff);
+ m_ata->cs1_w(offset & 7, data, 0xff);
}
}
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index 2a7898fc903..61e67104299 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -63,13 +63,13 @@ READ8_MEMBER( xtide_device::read )
if (offset == 0)
{
- uint16_t data16 = m_ata->read_cs0(offset & 7);
+ uint16_t data16 = m_ata->cs0_r(offset & 7);
result = data16 & 0xff;
m_d8_d15_latch = data16 >> 8;
}
else if (offset < 8)
{
- result = m_ata->read_cs0(offset & 7, 0xff);
+ result = m_ata->cs0_r(offset & 7, 0xff);
}
else if (offset == 8)
{
@@ -77,7 +77,7 @@ READ8_MEMBER( xtide_device::read )
}
else
{
- result = m_ata->read_cs1(offset & 7, 0xff);
+ result = m_ata->cs1_r(offset & 7, 0xff);
}
// logerror("%s xtide_device::read: offset=%d, result=%2X\n",device->machine().describe_context(),offset,result);
@@ -93,11 +93,11 @@ WRITE8_MEMBER( xtide_device::write )
{
// Data register transfer low byte and latched high
uint16_t data16 = (m_d8_d15_latch << 8) | data;
- m_ata->write_cs0(offset & 7, data16);
+ m_ata->cs0_w(offset & 7, data16);
}
else if (offset < 8)
{
- m_ata->write_cs0(offset & 7, data, 0xff);
+ m_ata->cs0_w(offset & 7, data, 0xff);
}
else if (offset == 8)
{
@@ -105,7 +105,7 @@ WRITE8_MEMBER( xtide_device::write )
}
else
{
- m_ata->write_cs1(offset & 7, data, 0xff);
+ m_ata->cs1_w(offset & 7, data, 0xff);
}
}
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index f07b6de1695..8f162bc3006 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -440,11 +440,11 @@ READ8_MEMBER(kc_d004_gide_device::gide_r)
{
if (ide_cs == 0 )
{
- m_ata_data = m_ata->read_cs0(io_addr & 0x07);
+ m_ata_data = m_ata->cs0_r(io_addr & 0x07);
}
else
{
- m_ata_data = m_ata->read_cs1(io_addr & 0x07);
+ m_ata_data = m_ata->cs1_r(io_addr & 0x07);
}
}
@@ -489,11 +489,11 @@ WRITE8_MEMBER(kc_d004_gide_device::gide_w)
{
if (ide_cs == 0)
{
- m_ata->write_cs0(io_addr & 0x07, m_ata_data);
+ m_ata->cs0_w(io_addr & 0x07, m_ata_data);
}
else
{
- m_ata->write_cs1(io_addr & 0x07, m_ata_data);
+ m_ata->cs1_w(io_addr & 0x07, m_ata_data);
}
}
}
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index 10583d28023..7ed66ef8886 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -211,15 +211,15 @@ uint8_t qubide_device::read(offs_t offset, uint8_t data)
switch (offset & 0x0f)
{
case 0:
- data = m_ata->read_cs1(0x07, 0xff);
+ data = m_ata->cs1_r(0x07, 0xff);
break;
default:
- data = m_ata->read_cs0(offset & 0x07, 0xff);
+ data = m_ata->cs0_r(offset & 0x07, 0xff);
break;
case 0x08: case 0x0a: case 0x0c:
- m_ata_data = m_ata->read_cs0(0);
+ m_ata_data = m_ata->cs0_r(0);
data = m_ata_data >> 8;
break;
@@ -229,7 +229,7 @@ uint8_t qubide_device::read(offs_t offset, uint8_t data)
break;
case 0x0e: case 0x0f:
- data = m_ata->read_cs1(0x05, 0xff);
+ data = m_ata->cs1_r(0x05, 0xff);
break;
}
}
@@ -256,7 +256,7 @@ void qubide_device::write(offs_t offset, uint8_t data)
switch (offset & 0x0f)
{
case 0: case 0x0e: case 0x0f:
- m_ata->write_cs1(0x05, data, 0xff);
+ m_ata->cs1_w(0x05, data, 0xff);
break;
case 0x08: case 0x0a: case 0x0c:
@@ -266,11 +266,11 @@ void qubide_device::write(offs_t offset, uint8_t data)
case 0x09: case 0x0b: case 0x0d:
m_ata_data = (m_ata_data & 0xff00) | data;
- m_ata->write_cs0(0, m_ata_data);
+ m_ata->cs0_w(0, m_ata_data);
break;
default:
- m_ata->write_cs0(offset & 0x07, data, 0xff);
+ m_ata->cs0_w(offset & 0x07, data, 0xff);
break;
}
}
diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp
index be0dc7aea2c..027d94d9075 100644
--- a/src/devices/bus/scv/rom.cpp
+++ b/src/devices/bus/scv/rom.cpp
@@ -154,7 +154,7 @@ WRITE8_MEMBER(scv_rom32ram8_device::write_cart)
m_ram[offset & 0x1fff] = data;
}
-WRITE8_MEMBER(scv_rom32ram8_device::write_bank)
+void scv_rom32ram8_device::write_bank(uint8_t data)
{
m_ram_enabled = BIT(data, 5);
}
@@ -165,7 +165,7 @@ READ8_MEMBER(scv_rom64_device::read_cart)
return m_rom[offset + (m_bank_base * 0x8000)];
}
-WRITE8_MEMBER(scv_rom64_device::write_bank)
+void scv_rom64_device::write_bank(uint8_t data)
{
m_bank_base = BIT(data, 5);
}
@@ -176,7 +176,7 @@ READ8_MEMBER(scv_rom128_device::read_cart)
return m_rom[offset + (m_bank_base * 0x8000)];
}
-WRITE8_MEMBER(scv_rom128_device::write_bank)
+void scv_rom128_device::write_bank(uint8_t data)
{
m_bank_base = (data >> 5) & 0x03;
}
@@ -196,7 +196,7 @@ WRITE8_MEMBER(scv_rom128ram4_device::write_cart)
m_ram[offset & 0xfff] = data;
}
-WRITE8_MEMBER(scv_rom128ram4_device::write_bank)
+void scv_rom128ram4_device::write_bank(uint8_t data)
{
m_bank_base = (data >> 5) & 0x03;
m_ram_enabled = BIT(data, 6);
diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h
index 4a6b90b39a1..16799084ddf 100644
--- a/src/devices/bus/scv/rom.h
+++ b/src/devices/bus/scv/rom.h
@@ -65,7 +65,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual void write_bank(uint8_t data) override;
protected:
// device-level overrides
@@ -91,7 +91,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual void write_bank(uint8_t data) override;
private:
uint8_t m_bank_base;
@@ -108,7 +108,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual void write_bank(uint8_t data) override;
protected:
// device-level overrides
@@ -131,7 +131,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual void write_bank(uint8_t data) override;
protected:
// device-level overrides
diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp
index 3144fe30089..412c9c5818f 100644
--- a/src/devices/bus/scv/slot.cpp
+++ b/src/devices/bus/scv/slot.cpp
@@ -284,8 +284,8 @@ WRITE8_MEMBER(scv_cart_slot_device::write_cart)
write_bank
-------------------------------------------------*/
-WRITE8_MEMBER(scv_cart_slot_device::write_bank)
+void scv_cart_slot_device::write_bank(uint8_t data)
{
if (m_cart)
- m_cart->write_bank(space, offset, data);
+ m_cart->write_bank(data);
}
diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h
index 97c49af8be4..7394cd401e3 100644
--- a/src/devices/bus/scv/slot.h
+++ b/src/devices/bus/scv/slot.h
@@ -37,7 +37,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_cart) { }
- virtual DECLARE_WRITE8_MEMBER(write_bank) { }
+ virtual void write_bank(uint8_t data) { }
void rom_alloc(uint32_t size, const char *tag);
void ram_alloc(uint32_t size);
@@ -103,7 +103,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
- virtual DECLARE_WRITE8_MEMBER(write_bank);
+ virtual void write_bank(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp
index d729dd3a398..3482e38d57e 100644
--- a/src/devices/bus/ti99/peb/tn_ide.cpp
+++ b/src/devices/bus/ti99/peb/tn_ide.cpp
@@ -252,9 +252,9 @@ READ8Z_MEMBER(nouspikel_ide_card_device::readz)
if (first && ((offset & 0x0010)==0))
{
if (cs1fx)
- atavalue = m_ata->read_cs0(reg);
+ atavalue = m_ata->cs0_r(reg);
else
- atavalue = m_ata->read_cs1(reg);
+ atavalue = m_ata->cs1_r(reg);
LOGMASKED(LOG_ATA, "%s %02x -> %04x\n", cs1fx? "cs1" : "cs3", reg, atavalue);
}
@@ -420,9 +420,9 @@ void nouspikel_ide_card_device::write(offs_t offset, uint8_t data)
LOGMASKED(LOG_ATA, "%s %02x <- %04x\n", cs1fx? "cs1" : "cs3", reg, atavalue);
if (cs1fx)
- m_ata->write_cs0(reg, atavalue);
+ m_ata->cs0_w(reg, atavalue);
else
- m_ata->write_cs1(reg, atavalue);
+ m_ata->cs1_w(reg, atavalue);
}
}
}
diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp
index a18fcd2fc92..6b2704b5150 100644
--- a/src/devices/cpu/clipper/clipper.cpp
+++ b/src/devices/cpu/clipper/clipper.cpp
@@ -333,7 +333,7 @@ bool clipper_device::memory_translate(int spacenum, int intention, offs_t &addre
return ((intention & TRANSLATE_TYPE_MASK) == TRANSLATE_FETCH ? get_icammu() : get_dcammu()).memory_translate(m_ssw, spacenum, intention, address);
}
-WRITE16_MEMBER(clipper_device::set_exception)
+void clipper_device::set_exception(u16 data)
{
LOGMASKED(LOG_EXCEPTION, "external exception 0x%04x triggered\n", data);
diff --git a/src/devices/cpu/clipper/clipper.h b/src/devices/cpu/clipper/clipper.h
index 47d035ec3b0..3e78a5fdfff 100644
--- a/src/devices/cpu/clipper/clipper.h
+++ b/src/devices/cpu/clipper/clipper.h
@@ -18,8 +18,8 @@
class clipper_device : public cpu_device
{
public:
- DECLARE_WRITE8_MEMBER(set_ivec) { m_ivec = data; }
- DECLARE_WRITE16_MEMBER(set_exception);
+ void set_ivec(u8 data) { m_ivec = data; }
+ void set_exception(u16 data);
// branch conditions (first description for comparison, second for move/logical)
enum branch_conditions : u8
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index aae072b6cb7..ab4c439871b 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -878,7 +878,6 @@ void i8085a_cpu_device::execute_run()
check_for_interrupts();
m_in_acknowledge = false;
- logerror("PC=%04X\n", m_PC.d);
debugger_instruction_hook(m_PC.d);
/* here we go... */
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 468283588e7..67b23280d86 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -677,6 +677,7 @@ void i80186_cpu_device::device_start()
memset(&m_intr, 0, sizeof(intr_state));
memset(&m_mem, 0, sizeof(mem_state));
m_reloc = 0;
+ m_last_dma = 0;
m_timer[0].int_timer = timer_alloc(TIMER_INT0);
m_timer[1].int_timer = timer_alloc(TIMER_INT1);
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index 17272b39e8c..875efb90b45 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -10,7 +10,9 @@
- Implement pipeline, actually instruction cycles;
Currently implementation is similar to single stepping
with single cycle
- - Implement and acknowlodge remain registers
+ - Implement and acknowlodge remain registers;
+ - Improve delay slot display in debugger (highlight current instruction
+ doesn't work but instruction hook does);
***************************************************************************/
@@ -53,13 +55,13 @@ enum : u32
CINT5FLAG = 0x20000 // DSP only
};
-inline void jaguar_cpu_device::CLR_Z() { m_ctrl[G_FLAGS] &= ~ZFLAG; }
-inline void jaguar_cpu_device::CLR_ZN() { m_ctrl[G_FLAGS] &= ~(ZFLAG | NFLAG); }
-inline void jaguar_cpu_device::CLR_ZNC() { m_ctrl[G_FLAGS] &= ~(CFLAG | ZFLAG | NFLAG); }
-inline void jaguar_cpu_device::SET_Z(u32 r) { m_ctrl[G_FLAGS] |= (r == 0); }
-inline void jaguar_cpu_device::SET_C_ADD(u32 a, u32 b) { m_ctrl[G_FLAGS] |= (b > (~a)) << 1; }
-inline void jaguar_cpu_device::SET_C_SUB(u32 a, u32 b) { m_ctrl[G_FLAGS] |= (b > a) << 1; }
-inline void jaguar_cpu_device::SET_N(u32 r) { m_ctrl[G_FLAGS] |= ((r >> 29) & 4); }
+inline void jaguar_cpu_device::CLR_Z() { m_flags &= ~ZFLAG; }
+inline void jaguar_cpu_device::CLR_ZN() { m_flags &= ~(ZFLAG | NFLAG); }
+inline void jaguar_cpu_device::CLR_ZNC() { m_flags &= ~(CFLAG | ZFLAG | NFLAG); }
+inline void jaguar_cpu_device::SET_Z(u32 r) { m_flags |= (r == 0); }
+inline void jaguar_cpu_device::SET_C_ADD(u32 a, u32 b) { m_flags |= (b > (~a)) << 1; }
+inline void jaguar_cpu_device::SET_C_SUB(u32 a, u32 b) { m_flags |= (b > a) << 1; }
+inline void jaguar_cpu_device::SET_N(u32 r) { m_flags |= ((r >> 29) & 4); }
inline void jaguar_cpu_device::SET_ZN(u32 r) { SET_N(r); SET_Z(r); }
inline void jaguar_cpu_device::SET_ZNC_ADD(u32 a, u32 b, u32 r) { SET_N(r); SET_Z(r); SET_C_ADD(a, b); }
inline void jaguar_cpu_device::SET_ZNC_SUB(u32 a, u32 b, u32 r) { SET_N(r); SET_Z(r); SET_C_SUB(a, b); }
@@ -69,12 +71,9 @@ inline void jaguar_cpu_device::SET_ZNC_SUB(u32 a, u32 b, u32 r) { SET_N(r); SET_
MACROS
***************************************************************************/
-#define PC m_ctrl[G_PC]
-#define FLAGS m_ctrl[G_FLAGS]
-
inline u8 jaguar_cpu_device::CONDITION(u8 x)
{
- return condition_table[x + ((m_ctrl[G_FLAGS] & 7) << 5)];
+ return condition_table[x + ((m_flags & 7) << 5)];
}
inline u8 jaguar_cpu_device::READBYTE(offs_t a) { return m_program->read_byte(a); }
@@ -151,15 +150,33 @@ DEFINE_DEVICE_TYPE(JAGUARGPU, jaguargpu_cpu_device, "jaguargpu", "Motorola Atari
DEFINE_DEVICE_TYPE(JAGUARDSP, jaguardsp_cpu_device, "jaguardsp", "Motorola Atari Jaguar DSP \"Jerry\"")
-jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 version, bool isdsp)
+jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 version, bool isdsp, address_map_constructor io_map)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_BIG, 32, 24, 0)
+ , m_io_config("io", ENDIANNESS_BIG, 32, 8, 0, io_map)
, m_version(version) // 1 : Jaguar prototype, 2 : Jaguar first release, 3 : Midsummer prototype, Other : unknown/reserved
, m_isdsp(isdsp)
, m_cpu_interrupt(*this)
, m_tables_referenced(false)
, table_refcount(0)
, m_table(isdsp ? dsp_op_table : gpu_op_table)
+ , m_io_end(0x00070007)
+ , m_io_pc(0)
+ , m_io_status(0)
+ , m_pc(0)
+ , m_flags(0)
+ , m_imask(false)
+ , m_maddw(0)
+ , m_mwidth(0)
+ , m_mtxaddr(0)
+ , m_go(false)
+ , m_int_latch(0)
+ , m_int_mask(0)
+ , m_bus_hog(false)
+ , m_div_remainder(0)
+ , m_div_offset(false)
+ , m_hidata(0)
+ , m_modulo(0xffffffff)
{
if (isdsp)
{
@@ -175,20 +192,21 @@ jaguar_cpu_device::jaguar_cpu_device(const machine_config &mconfig, device_type
jaguargpu_cpu_device::jaguargpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : jaguar_cpu_device(mconfig, JAGUARGPU, tag, owner, clock, 2, false)
+ : jaguar_cpu_device(mconfig, JAGUARGPU, tag, owner, clock, 2, false, address_map_constructor(FUNC(jaguargpu_cpu_device::io_map), this))
{
}
jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : jaguar_cpu_device(mconfig, JAGUARDSP, tag, owner, clock, 2, true)
+ : jaguar_cpu_device(mconfig, JAGUARDSP, tag, owner, clock, 2, true, address_map_constructor(FUNC(jaguardsp_cpu_device::io_map), this))
{
}
device_memory_interface::space_config_vector jaguar_cpu_device::memory_space_config() const
{
return space_config_vector {
- std::make_pair(AS_PROGRAM, &m_program_config)
+ std::make_pair(AS_PROGRAM, &m_program_config),
+ std::make_pair(AS_IO, &m_io_config)
};
}
@@ -196,8 +214,8 @@ device_memory_interface::space_config_vector jaguar_cpu_device::memory_space_con
void jaguar_cpu_device::update_register_banks()
{
/* pick the bank */
- u32 bank = FLAGS & RPAGEFLAG;
- if (FLAGS & IFLAG) bank = 0;
+ u32 bank = m_flags & RPAGEFLAG;
+ if (m_imask == true) bank = 0;
/* do we need to swap? */
if ((bank == 0 && m_b0 != m_r) || (bank != 0 && m_b1 != m_r))
@@ -237,51 +255,43 @@ void jaguar_cpu_device::check_irqs()
int which = 0;
/* if the IMASK is set, bail */
- if (FLAGS & IFLAG)
+ if (m_imask == true)
return;
- /* get the active interrupt bits */
- u8 bits = (m_ctrl[G_CTRL] >> 6) & 0x1f;
- bits |= (m_ctrl[G_CTRL] >> 10) & 0x20;
-
- /* get the interrupt mask */
- u8 mask = (FLAGS >> 4) & 0x1f;
- mask |= (FLAGS >> 11) & 0x20;
+ u8 latch = m_int_latch;
+ u8 mask = m_int_mask;
/* bail if nothing is available */
- bits &= mask;
- if (bits == 0)
+ latch &= mask;
+ if (latch == 0)
return;
-
+
/* determine which interrupt */
- if (bits & 0x01) which = 0;
- if (bits & 0x02) which = 1;
- if (bits & 0x04) which = 2;
- if (bits & 0x08) which = 3;
- if (bits & 0x10) which = 4;
- if (bits & 0x20) which = 5;
+ for (int i = 0; i < 6; i++)
+ if (latch & (1 << i))
+ which = i;
/* set the interrupt flag */
- FLAGS |= IFLAG;
+ m_imask = true;
update_register_banks();
- /* push the PC-2 on the stack */
+ /* push the m_pc-2 on the stack */
m_r[31] -= 4;
- WRITELONG(m_r[31], PC - 2);
+ WRITELONG(m_r[31], m_pc - 2);
/* dispatch */
- PC = (m_isdsp) ? 0xf1b000 : 0xf03000;
- PC += which * 0x10;
+ m_pc = m_internal_ram_start;
+ m_pc += which * 0x10;
}
void jaguar_cpu_device::execute_set_input(int irqline, int state)
{
- const u32 mask = (irqline < 5) ? (0x40 << irqline) : 0x10000;
- m_ctrl[G_CTRL] &= ~mask;
+ const u32 mask = (1 << irqline);
+ m_int_latch &= ~mask;
if (state != CLEAR_LINE)
{
- m_ctrl[G_CTRL] |= mask;
+ m_int_latch |= mask;
check_irqs();
}
}
@@ -346,14 +356,29 @@ void jaguar_cpu_device::device_start()
init_tables();
m_program = &space(AS_PROGRAM);
+ m_io = &space(AS_IO);
m_cache = m_program->cache<2, 0, ENDIANNESS_BIG>();
m_cpu_interrupt.resolve_safe();
save_item(NAME(m_r));
save_item(NAME(m_a));
- save_item(NAME(m_ctrl));
save_item(NAME(m_ppc));
+ save_item(NAME(m_go));
+ save_item(NAME(m_int_latch));
+ save_item(NAME(m_int_mask));
+ save_item(NAME(m_bus_hog));
+ save_item(NAME(m_flags));
+ save_item(NAME(m_imask));
+ save_item(NAME(m_div_remainder));
+ save_item(NAME(m_div_offset));
+
+ save_item(NAME(m_io_end));
+ save_item(NAME(m_io_pc));
+ save_item(NAME(m_io_status));
+ save_item(NAME(m_io_mtxc));
+ save_item(NAME(m_io_mtxa));
+ // TODO: data map
if (m_isdsp)
{
m_internal_ram_start = 0xf1b000;
@@ -367,13 +392,12 @@ void jaguar_cpu_device::device_start()
std::fill(std::begin(m_r), std::end(m_r), 0);
std::fill(std::begin(m_a), std::end(m_a), 0);
- std::fill(std::begin(m_ctrl), std::end(m_ctrl), 0);
m_ppc = 0;
m_accum = 0;
m_bankswitch_icount = 0;
- state_add( JAGUAR_PC, "PC", PC).formatstr("%08X");
- state_add( JAGUAR_FLAGS, "FLAGS", FLAGS).formatstr("%08X");
+ state_add( JAGUAR_PC, "PC", m_pc).formatstr("%08X");
+ state_add( JAGUAR_FLAGS, "FLAGS", m_flags).formatstr("%08X");
state_add( JAGUAR_R0, "R0", m_r[0]).formatstr("%08X");
state_add( JAGUAR_R1, "R1", m_r[1]).formatstr("%08X");
state_add( JAGUAR_R2, "R2", m_r[2]).formatstr("%08X");
@@ -407,9 +431,9 @@ void jaguar_cpu_device::device_start()
state_add( JAGUAR_R30, "R30", m_r[30]).formatstr("%08X");
state_add( JAGUAR_R31, "R31", m_r[31]).formatstr("%08X");
- state_add( STATE_GENPC, "GENPC", PC).noshow();
+ state_add( STATE_GENPC, "GENPC", m_pc).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_ppc).noshow();
- state_add( STATE_GENFLAGS, "GENFLAGS", FLAGS).formatstr("%11s").noshow();
+ state_add( STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%11s").noshow();
set_icountptr(m_icount);
}
@@ -421,17 +445,17 @@ void jaguar_cpu_device::state_string_export(const device_state_entry &entry, std
{
case STATE_GENFLAGS:
str = string_format("%c%c%c%c%c%c%c%c%c%c%c",
- FLAGS & 0x8000 ? 'D':'.',
- FLAGS & 0x4000 ? 'A':'.',
- FLAGS & 0x0100 ? '4':'.',
- FLAGS & 0x0080 ? '3':'.',
- FLAGS & 0x0040 ? '2':'.',
- FLAGS & 0x0020 ? '1':'.',
- FLAGS & 0x0010 ? '0':'.',
- FLAGS & 0x0008 ? 'I':'.',
- FLAGS & 0x0004 ? 'N':'.',
- FLAGS & 0x0002 ? 'C':'.',
- FLAGS & 0x0001 ? 'Z':'.');
+ m_flags & 0x8000 ? 'D':'.',
+ m_flags & 0x4000 ? 'A':'.',
+ m_flags & 0x0100 ? '4':'.',
+ m_flags & 0x0080 ? '3':'.',
+ m_flags & 0x0040 ? '2':'.',
+ m_flags & 0x0020 ? '1':'.',
+ m_flags & 0x0010 ? '0':'.',
+ m_imask == true ? 'I':'.',
+ m_flags & 0x0004 ? 'N':'.',
+ m_flags & 0x0002 ? 'C':'.',
+ m_flags & 0x0001 ? 'Z':'.');
break;
}
}
@@ -441,6 +465,7 @@ void jaguar_cpu_device::device_reset()
{
m_b0 = m_r;
m_b1 = m_a;
+ m_modulo = 0xffffffff;
}
@@ -464,7 +489,7 @@ jaguar_cpu_device::~jaguar_cpu_device()
void jaguargpu_cpu_device::execute_run()
{
/* if we're halted, we shouldn't be here */
- if (!(m_ctrl[G_CTRL] & 1))
+ if (m_go == false)
{
//device->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
m_icount = 0;
@@ -481,13 +506,13 @@ void jaguargpu_cpu_device::execute_run()
do
{
/* debugging */
- //if ((m_version < 3) && (PC < 0xf03000 || PC > 0xf04000)) { fatalerror("GPU: PC = %06X (ppc = %06X)\n", PC, m_ppc); }
- m_ppc = PC;
- debugger_instruction_hook(PC);
+ //if ((m_version < 3) && (m_pc < 0xf03000 || m_pc > 0xf04000)) { fatalerror("GPU: m_pc = %06X (ppc = %06X)\n", m_pc, m_ppc); }
+ m_ppc = m_pc;
+ debugger_instruction_hook(m_pc);
/* instruction fetch */
- const u16 op = ROPCODE(PC);
- PC += 2;
+ const u16 op = ROPCODE(m_pc);
+ m_pc += 2;
/* parse the instruction */
(this->*gpu_op_table[op >> 10])(op);
@@ -499,7 +524,7 @@ void jaguargpu_cpu_device::execute_run()
void jaguardsp_cpu_device::execute_run()
{
/* if we're halted, we shouldn't be here */
- if (!(m_ctrl[G_CTRL] & 1))
+ if (m_go == false)
{
//device->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
m_icount = 0;
@@ -516,13 +541,13 @@ void jaguardsp_cpu_device::execute_run()
do
{
/* debugging */
- //if (PC < 0xf1b000 || PC > 0xf1d000) { fatalerror(stderr, "DSP: PC = %06X\n", PC); }
- m_ppc = PC;
- debugger_instruction_hook(PC);
+ //if (m_pc < 0xf1b000 || m_pc > 0xf1d000) { fatalerror(stderr, "DSP: m_pc = %06X\n", m_pc); }
+ m_ppc = m_pc;
+ debugger_instruction_hook(m_pc);
/* instruction fetch */
- const u16 op = ROPCODE(PC);
- PC += 2;
+ const u16 op = ROPCODE(m_pc);
+ m_pc += 2;
/* parse the instruction */
(this->*dsp_op_table[op >> 10])(op);
@@ -544,7 +569,7 @@ void jaguar_cpu_device::abs_rn(u16 op)
if (res & 0x80000000)
{
m_r[dreg] = res = -res;
- FLAGS |= CFLAG;
+ m_flags |= CFLAG;
}
SET_Z(res);
}
@@ -564,7 +589,7 @@ void jaguar_cpu_device::addc_rn_rn(u16 op)
const u8 dreg = op & 31;
const u32 r1 = m_r[(op >> 5) & 31];
const u32 r2 = m_r[dreg];
- u32 c = ((FLAGS >> 1) & 1);
+ u32 c = ((m_flags >> 1) & 1);
const u32 res = r2 + r1 + c;
m_r[dreg] = res;
CLR_ZNC(); SET_ZNC_ADD(r2, r1 + c, res);
@@ -586,7 +611,7 @@ void jaguar_cpu_device::addqmod_n_rn(u16 op) /* DSP only */
const u32 r1 = convert_zero[(op >> 5) & 31];
const u32 r2 = m_r[dreg];
u32 res = r2 + r1;
- res = (res & ~m_ctrl[D_MOD]) | (r2 & ~m_ctrl[D_MOD]);
+ res = (res & ~m_modulo) | (r2 & m_modulo);
m_r[dreg] = res;
CLR_ZNC(); SET_ZNC_ADD(r2, r1, res);
}
@@ -634,7 +659,7 @@ void jaguar_cpu_device::btst_n_rn(u16 op)
{
const u32 r1 = (op >> 5) & 31;
const u32 r2 = m_r[op & 31];
- CLR_Z(); FLAGS |= (~r2 >> r1) & 1;
+ CLR_Z(); m_flags |= (~r2 >> r1) & 1;
}
void jaguar_cpu_device::cmp_rn_rn(u16 op)
@@ -660,19 +685,23 @@ void jaguar_cpu_device::div_rn_rn(u16 op)
const u32 r2 = m_r[dreg];
if (r1)
{
- if (m_ctrl[D_DIVCTRL] & 1)
+ if (m_div_offset & 1)
{
m_r[dreg] = ((u64)r2 << 16) / r1;
- m_ctrl[D_REMAINDER] = ((u64)r2 << 16) % r1;
+ m_div_remainder = ((u64)r2 << 16) % r1;
}
else
{
m_r[dreg] = r2 / r1;
- m_ctrl[D_REMAINDER] = r2 % r1;
+ m_div_remainder = r2 % r1;
}
}
else
+ {
+ // TODO: exact values for divide by zero
m_r[dreg] = 0xffffffff;
+ m_div_remainder = 0xffffffff;
+ }
}
void jaguar_cpu_device::illegal(u16 op)
@@ -684,6 +713,7 @@ void jaguar_cpu_device::imacn_rn_rn(u16 op)
const u32 r1 = m_r[(op >> 5) & 31];
const u32 r2 = m_r[op & 31];
m_accum += (s64)((int16_t)r1 * (int16_t)r2);
+ // TODO: what's really "unexpected"?
logerror("Unexpected IMACN instruction!\n");
}
@@ -706,18 +736,18 @@ void jaguar_cpu_device::imultn_rn_rn(u16 op)
m_accum = (s32)res;
CLR_ZN(); SET_ZN(res);
- op = ROPCODE(PC);
+ op = ROPCODE(m_pc);
while ((op >> 10) == 20)
{
r1 = m_r[(op >> 5) & 31];
r2 = m_r[op & 31];
m_accum += (s64)((int16_t)r1 * (int16_t)r2);
- PC += 2;
- op = ROPCODE(PC);
+ m_pc += 2;
+ op = ROPCODE(m_pc);
}
if ((op >> 10) == 19)
{
- PC += 2;
+ m_pc += 2;
m_r[op & 31] = (u32)m_accum;
}
}
@@ -727,10 +757,10 @@ void jaguar_cpu_device::jr_cc_n(u16 op)
if (CONDITION(op & 31))
{
const s32 r1 = (s8)((op >> 2) & 0xf8) >> 2;
- const u32 newpc = PC + r1;
- debugger_instruction_hook(PC);
- op = ROPCODE(PC);
- PC = newpc;
+ const u32 newpc = m_pc + r1;
+ debugger_instruction_hook(m_pc);
+ op = ROPCODE(m_pc);
+ m_pc = newpc;
(this->*m_table[op >> 10])(op);
m_icount -= 3; /* 3 wait states guaranteed */
@@ -745,9 +775,9 @@ void jaguar_cpu_device::jump_cc_rn(u16 op)
/* special kludge for risky code in the cojag DSP interrupt handlers */
const u32 newpc = (m_icount == m_bankswitch_icount) ? m_a[reg] : m_r[reg];
- debugger_instruction_hook(PC);
- op = ROPCODE(PC);
- PC = newpc;
+ debugger_instruction_hook(m_pc);
+ op = ROPCODE(m_pc);
+ m_pc = newpc;
(this->*m_table[op >> 10])(op);
m_icount -= 3; /* 3 wait states guaranteed */
@@ -819,7 +849,7 @@ void jaguar_cpu_device::loadp_rn_rn(u16 op) /* GPU only */
}
else
{
- m_ctrl[G_HIDATA] = READLONG(r1);
+ m_hidata = READLONG(r1);
m_r[op & 31] = READLONG(r1+4);
}
}
@@ -835,13 +865,13 @@ void jaguar_cpu_device::mirror_rn(u16 op) /* DSP only */
void jaguar_cpu_device::mmult_rn_rn(u16 op)
{
- const u8 count = m_ctrl[G_MTXC] & 15;
+ const u8 count = m_mwidth;
const u8 sreg = (op >> 5) & 31;
const u8 dreg = op & 31;
- u32 addr = m_ctrl[G_MTXA];
+ u32 addr = m_mtxaddr;
s64 accum = 0;
- if (!(m_ctrl[G_MTXC] & 0x10))
+ if (m_maddw == false)
{
for (int i = 0; i < count; i++)
{
@@ -879,8 +909,8 @@ void jaguar_cpu_device::movefa_rn_rn(u16 op)
void jaguar_cpu_device::movei_n_rn(u16 op)
{
- const u32 res = ROPCODE(PC) | (ROPCODE(PC + 2) << 16);
- PC += 4;
+ const u32 res = ROPCODE(m_pc) | (ROPCODE(m_pc + 2) << 16);
+ m_pc += 4;
m_r[op & 31] = res;
}
@@ -987,7 +1017,7 @@ void jaguar_cpu_device::ror_rn_rn(u16 op)
const u32 r2 = m_r[dreg];
const u32 res = (r2 >> r1) | (r2 << (32 - r1));
m_r[dreg] = res;
- CLR_ZNC(); SET_ZN(res); FLAGS |= (r2 >> 30) & 2;
+ CLR_ZNC(); SET_ZN(res); m_flags |= (r2 >> 30) & 2;
}
void jaguar_cpu_device::rorq_n_rn(u16 op)
@@ -997,7 +1027,7 @@ void jaguar_cpu_device::rorq_n_rn(u16 op)
const u32 r2 = m_r[dreg];
const u32 res = (r2 >> r1) | (r2 << (32 - r1));
m_r[dreg] = res;
- CLR_ZNC(); SET_ZN(res); FLAGS |= (r2 >> 30) & 2;
+ CLR_ZNC(); SET_ZN(res); m_flags |= (r2 >> 30) & 2;
}
void jaguar_cpu_device::sat8_rn(u16 op) /* GPU only */
@@ -1057,12 +1087,12 @@ void jaguar_cpu_device::sh_rn_rn(u16 op)
if (r1 < 0)
{
res = (r1 <= -32) ? 0 : (r2 << -r1);
- FLAGS |= (r2 >> 30) & 2;
+ m_flags |= (r2 >> 30) & 2;
}
else
{
res = (r1 >= 32) ? 0 : (r2 >> r1);
- FLAGS |= (r2 << 1) & 2;
+ m_flags |= (r2 << 1) & 2;
}
m_r[dreg] = res;
SET_ZN(res);
@@ -1079,12 +1109,12 @@ void jaguar_cpu_device::sha_rn_rn(u16 op)
if (r1 < 0)
{
res = (r1 <= -32) ? 0 : (r2 << -r1);
- FLAGS |= (r2 >> 30) & 2;
+ m_flags |= (r2 >> 30) & 2;
}
else
{
res = (r1 >= 32) ? ((s32)r2 >> 31) : ((s32)r2 >> r1);
- FLAGS |= (r2 << 1) & 2;
+ m_flags |= (r2 << 1) & 2;
}
m_r[dreg] = res;
SET_ZN(res);
@@ -1097,7 +1127,7 @@ void jaguar_cpu_device::sharq_n_rn(u16 op)
const u32 r2 = m_r[dreg];
const u32 res = (s32)r2 >> r1;
m_r[dreg] = res;
- CLR_ZNC(); SET_ZN(res); FLAGS |= (r2 << 1) & 2;
+ CLR_ZNC(); SET_ZN(res); m_flags |= (r2 << 1) & 2;
}
void jaguar_cpu_device::shlq_n_rn(u16 op)
@@ -1107,7 +1137,7 @@ void jaguar_cpu_device::shlq_n_rn(u16 op)
const u32 r2 = m_r[dreg];
const u32 res = r2 << (32 - r1);
m_r[dreg] = res;
- CLR_ZNC(); SET_ZN(res); FLAGS |= (r2 >> 30) & 2;
+ CLR_ZNC(); SET_ZN(res); m_flags |= (r2 >> 30) & 2;
}
void jaguar_cpu_device::shrq_n_rn(u16 op)
@@ -1117,7 +1147,7 @@ void jaguar_cpu_device::shrq_n_rn(u16 op)
const u32 r2 = m_r[dreg];
const u32 res = r2 >> r1;
m_r[dreg] = res;
- CLR_ZNC(); SET_ZN(res); FLAGS |= (r2 << 1) & 2;
+ CLR_ZNC(); SET_ZN(res); m_flags |= (r2 << 1) & 2;
}
void jaguar_cpu_device::store_rn_rn(u16 op)
@@ -1185,7 +1215,7 @@ void jaguar_cpu_device::storep_rn_rn(u16 op) /* GPU only */
}
else
{
- WRITELONG(r1, m_ctrl[G_HIDATA]);
+ WRITELONG(r1, m_hidata);
WRITELONG(r1+4, m_r[op & 31]);
}
}
@@ -1205,7 +1235,7 @@ void jaguar_cpu_device::subc_rn_rn(u16 op)
const u8 dreg = op & 31;
const u32 r1 = m_r[(op >> 5) & 31];
const u32 r2 = m_r[dreg];
- u32 c = ((FLAGS >> 1) & 1);
+ u32 c = ((m_flags >> 1) & 1);
const u32 res = r2 - r1 - c;
m_r[dreg] = res;
CLR_ZNC(); SET_ZNC_SUB(r2, r1 + c, res);
@@ -1227,7 +1257,7 @@ void jaguar_cpu_device::subqmod_n_rn(u16 op) /* DSP only */
const u32 r1 = convert_zero[(op >> 5) & 31];
const u32 r2 = m_r[dreg];
u32 res = r2 - r1;
- res = (res & ~m_ctrl[D_MOD]) | (r2 & ~m_ctrl[D_MOD]);
+ res = (res & ~m_modulo) | (r2 & m_modulo);
m_r[dreg] = res;
CLR_ZNC(); SET_ZNC_SUB(r2, r1, res);
}
@@ -1257,191 +1287,212 @@ void jaguar_cpu_device::xor_rn_rn(u16 op)
I/O HANDLING
***************************************************************************/
-u32 jaguargpu_cpu_device::ctrl_r(offs_t offset)
+void jaguar_cpu_device::io_common_map(address_map &map)
{
- if (LOG_GPU_IO) logerror("GPU read register @ F021%02X\n", offset * 4);
-
- u32 res = m_ctrl[offset];
- if (offset == G_CTRL)
- res |= (m_version & 0xf) << 12;
-
- return res;
+ map(0x00, 0x03).rw(FUNC(jaguar_cpu_device::flags_r), FUNC(jaguar_cpu_device::flags_w));
+ map(0x04, 0x07).w(FUNC(jaguar_cpu_device::matrix_control_w));
+ map(0x08, 0x0b).w(FUNC(jaguar_cpu_device::matrix_address_w));
+// map(0x0c, 0x0f) endian
+ map(0x10, 0x13).w(FUNC(jaguar_cpu_device::pc_w));
+ map(0x14, 0x17).rw(FUNC(jaguar_cpu_device::status_r), FUNC(jaguar_cpu_device::control_w));
+// map(0x18, 0x1b) implementation specific
+ map(0x1c, 0x1f).rw(FUNC(jaguar_cpu_device::div_remainder_r), FUNC(jaguar_cpu_device::div_control_w));
}
-
-void jaguargpu_cpu_device::ctrl_w(offs_t offset, u32 data, u32 mem_mask)
+// $f02100
+void jaguargpu_cpu_device::io_map(address_map &map)
{
- if (LOG_GPU_IO && offset != G_HIDATA)
- logerror("GPU write register @ F021%02X = %08X\n", offset * 4, data);
+ jaguar_cpu_device::io_common_map(map);
+ map(0x0c, 0x0f).w(FUNC(jaguargpu_cpu_device::end_w));
+ map(0x18, 0x1b).rw(FUNC(jaguargpu_cpu_device::hidata_r), FUNC(jaguargpu_cpu_device::hidata_w));
+}
- /* remember the old and set the new */
- const u32 oldval = m_ctrl[offset];
- u32 newval = oldval;
- COMBINE_DATA(&newval);
+// $f0a100
+void jaguardsp_cpu_device::io_map(address_map &map)
+{
+ jaguar_cpu_device::io_common_map(map);
+ map(0x0c, 0x0f).w(FUNC(jaguardsp_cpu_device::dsp_end_w));
+ map(0x18, 0x1b).w(FUNC(jaguardsp_cpu_device::modulo_w));
+ map(0x20, 0x23).r(FUNC(jaguardsp_cpu_device::high_accum_r));
+}
- /* handle the various registers */
- switch (offset)
+READ32_MEMBER(jaguar_cpu_device::flags_r)
+{
+ return (m_flags & 0x1c1f7) | (m_imask << 3);
+}
+
+WRITE32_MEMBER(jaguar_cpu_device::flags_w)
+{
+ COMBINE_DATA(&m_flags);
+ // clear imask only on bit 3 clear (1 has no effect)
+ if ((m_flags & 0x08) == 0)
+ m_imask = false;
+
+ // update int latch & mask
+ m_int_mask = (m_flags >> 4) & 0x1f;
+ m_int_latch &= ~((m_flags >> 9) & 0x1f);
+
+ // TODO: move to specific handler
+ if (m_isdsp)
{
- case G_FLAGS:
-
- /* combine the data properly */
- m_ctrl[offset] = newval & (ZFLAG | CFLAG | NFLAG | EINT04FLAGS | RPAGEFLAG);
- if (newval & IFLAG)
- m_ctrl[offset] |= oldval & IFLAG;
-
- /* clear interrupts */
- m_ctrl[G_CTRL] &= ~((newval & CINT04FLAGS) >> 3);
-
- /* determine which register bank should be active */
- update_register_banks();
-
- /* update IRQs */
- check_irqs();
- break;
-
- case G_MTXC:
- case G_MTXA:
- m_ctrl[offset] = newval;
- break;
-
- case G_END:
- m_ctrl[offset] = newval;
- if ((newval & 7) != 7)
- logerror("GPU to set to little-endian!\n");
- break;
-
- case G_PC:
- PC = newval & 0xffffff;
- break;
-
- case G_CTRL:
- m_ctrl[offset] = newval;
- if ((oldval ^ newval) & 0x01)
- {
- set_input_line(INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE);
- yield();
- }
- if (newval & 0x02)
- {
- m_cpu_interrupt(ASSERT_LINE);
- m_ctrl[offset] &= ~0x02;
- }
- if (newval & 0x04)
- {
- m_ctrl[G_CTRL] |= 1 << 6;
- m_ctrl[offset] &= ~0x04;
- check_irqs();
- }
- if (newval & 0x18)
- {
- logerror("GPU single stepping was enabled!\n");
- }
- break;
-
- case G_HIDATA:
- case G_DIVCTRL:
- m_ctrl[offset] = newval;
- break;
+ m_int_mask |= (BIT(m_flags, 16) << 5);
+ m_int_latch &= ~(BIT(m_flags, 17) << 5);
}
+
+ // TODO: DMAEN (bit 15)
+
+ update_register_banks();
+ check_irqs();
}
+WRITE32_MEMBER(jaguar_cpu_device::matrix_control_w)
+{
+ COMBINE_DATA(&m_io_mtxc);
+ m_mwidth = m_io_mtxc & 0xf;
+ m_maddw = BIT(m_io_mtxc, 4);
+}
+WRITE32_MEMBER(jaguar_cpu_device::matrix_address_w)
+{
+ COMBINE_DATA(&m_io_mtxa);
+ // matrix can be long word address only, and only read from internal RAM
+ m_mtxaddr = m_internal_ram_start | (m_io_mtxa & 0xffc);
+}
+
+WRITE32_MEMBER(jaguar_cpu_device::pc_w)
+{
+ COMBINE_DATA(&m_io_pc);
+ if (m_go == false)
+ m_pc = m_io_pc & 0xffffff;
+ else
+ throw emu_fatalerror("%s: inflight PC write %08x", this->tag(), m_pc);
+}
+
+/*
+ * Data Organization Register
+ * Note: The canonical way to set this up from 68k is $00070007,
+ * so that Power-On endianness doesn't matter. 1=Big Endian
+ * ---- -x-- Instruction endianness
+ * ---- --x- Pixel endianness (GPU only)
+ * ---- ---x I/O endianness
+ */
+// TODO: just log if anything farts for now, change to bit struct once we have something to test out
+WRITE32_MEMBER(jaguar_cpu_device::end_w)
+{
+ COMBINE_DATA(&m_io_end);
+ // sburnout sets bit 1 == 0
+ if ((m_io_end & 0x7) != 0x7)
+ throw emu_fatalerror("%s: fatal endian setup %08x", this->tag(), m_io_end);
+}
+
+WRITE32_MEMBER(jaguardsp_cpu_device::dsp_end_w)
+{
+ COMBINE_DATA(&m_io_end);
+ // wolfn3d writes a '0' to bit 1 (which is a NOP for DSP)
+ if ((m_io_end & 0x5) != 0x5)
+ throw emu_fatalerror("%s: fatal endian setup %08x", this->tag(), m_io_end);
+}
+
+/*
+ * Control/Status Register
+ * - xxxx ---- ---- ---- chip version number
+ * - ---- x--- ---- ---- bus hog (increase self chip priority on bus)
+ * y ---- -xxx xx-- ---- interrupt latch (y is DSP specific) (r/o)
+ * - ---- ---- --0- ----
+ * - ---- ---- ---x x--- single step regs
+ * - ---- ---- ---- -x-- GPUINT0 or DSPINT0
+ * - ---- ---- ---- --x- Host interrupt (w/o)
+ * - ---- ---- ---- ---x GPUGO or DSPGO flag
+ *
+ */
+READ32_MEMBER(jaguar_cpu_device::status_r)
+{
+ u32 result = ((m_version & 0xf)<<12) | (m_bus_hog<<11) | m_go;
+ result|= (m_int_latch & 0x1f) << 6;
+ // TODO: make it DSP specific
+ if (m_isdsp == true)
+ result|= (m_int_latch & 0x20) << 11;
+ return result;
+}
+
+WRITE_LINE_MEMBER(jaguar_cpu_device::go_w)
+{
+ m_go = state;
+ set_input_line(INPUT_LINE_HALT, (m_go == true) ? CLEAR_LINE : ASSERT_LINE);
+ yield();
+}
+
+WRITE32_MEMBER(jaguar_cpu_device::control_w)
+{
+ COMBINE_DATA(&m_io_status);
+ bool new_go = BIT(m_io_status, 0);
+ if (new_go != m_go)
+ go_w(new_go);
+
+ if (BIT(m_io_status, 1))
+ m_cpu_interrupt(ASSERT_LINE);
+
+ // TODO: following does nothing if set by itself, or acts as a trap?
+ if (BIT(m_io_status, 2))
+ {
+ m_int_latch |= 1;
+ check_irqs();
+ }
+
+ // TODO: single step handling
+
+ m_bus_hog = BIT(m_io_status, 11);
+ // TODO: protect/protectse uses this, why?
+ if (m_bus_hog == true)
+ logerror("%s: bus hog enabled\n", this->tag());
+}
+
+READ32_MEMBER(jaguargpu_cpu_device::hidata_r)
+{
+ return m_hidata;
+}
+
+WRITE32_MEMBER(jaguargpu_cpu_device::hidata_w)
+{
+ COMBINE_DATA(&m_hidata);
+}
+
+READ32_MEMBER(jaguar_cpu_device::div_remainder_r)
+{
+ // TODO: truly 32-bit?
+ return m_div_remainder;
+}
+
+WRITE32_MEMBER(jaguar_cpu_device::div_control_w)
+{
+ m_div_offset = BIT(data, 0);
+}
+
+WRITE32_MEMBER(jaguardsp_cpu_device::modulo_w)
+{
+ COMBINE_DATA(&m_modulo);
+}
+
+READ32_MEMBER(jaguardsp_cpu_device::high_accum_r)
+{
+ printf("%s: high 16-bit accumulator read\n", this->tag());
+ return (m_accum >> 32) & 0xff;
+}
+
+u32 jaguar_cpu_device::iobus_r(offs_t offset, u32 mem_mask)
+{
+ return m_io->read_dword(offset*4, mem_mask);
+}
+
+void jaguar_cpu_device::iobus_w(offs_t offset, u32 data, u32 mem_mask)
+{
+ m_io->write_dword(offset*4, data, mem_mask);
+}
/***************************************************************************
- I/O HANDLING
+ DASM
***************************************************************************/
-u32 jaguardsp_cpu_device::ctrl_r(offs_t offset)
-{
- if (LOG_DSP_IO && offset != D_FLAGS)
- logerror("DSP read register @ F1A1%02X\n", offset * 4);
-
- /* switch to the target context */
- u32 res = m_ctrl[offset];
- if (offset == D_CTRL)
- res |= (m_version & 0xf) << 12;
-
- return res;
-}
-
-
-void jaguardsp_cpu_device::ctrl_w(offs_t offset, u32 data, u32 mem_mask)
-{
- if (LOG_DSP_IO && offset != D_FLAGS)
- logerror("DSP write register @ F1A1%02X = %08X\n", offset * 4, data);
-
- /* remember the old and set the new */
- const u32 oldval = m_ctrl[offset];
- u32 newval = oldval;
- COMBINE_DATA(&newval);
-
- /* handle the various registers */
- switch (offset)
- {
- case D_FLAGS:
-
- /* combine the data properly */
- m_ctrl[offset] = newval & (ZFLAG | CFLAG | NFLAG | EINT04FLAGS | EINT5FLAG | RPAGEFLAG);
- if (newval & IFLAG)
- m_ctrl[offset] |= oldval & IFLAG;
-
- /* clear interrupts */
- m_ctrl[D_CTRL] &= ~((newval & CINT04FLAGS) >> 3);
- m_ctrl[D_CTRL] &= ~((newval & CINT5FLAG) >> 1);
-
- /* determine which register bank should be active */
- update_register_banks();
-
- /* update IRQs */
- check_irqs();
- break;
-
- case D_MTXC:
- case D_MTXA:
- m_ctrl[offset] = newval;
- break;
-
- case D_END:
- m_ctrl[offset] = newval;
- if ((newval & 7) != 7)
- logerror("DSP to set to little-endian!\n");
- break;
-
- case D_PC:
- PC = newval & 0xffffff;
- break;
-
- case D_CTRL:
- m_ctrl[offset] = newval;
- if ((oldval ^ newval) & 0x01)
- {
- set_input_line(INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE);
- yield();
- }
- if (newval & 0x02)
- {
- m_cpu_interrupt(ASSERT_LINE);
- m_ctrl[offset] &= ~0x02;
- }
- if (newval & 0x04)
- {
- m_ctrl[D_CTRL] |= 1 << 6;
- m_ctrl[offset] &= ~0x04;
- check_irqs();
- }
- if (newval & 0x18)
- {
- logerror("DSP single stepping was enabled!\n");
- }
- break;
-
- case D_MOD:
- case D_DIVCTRL:
- m_ctrl[offset] = newval;
- break;
- }
-}
-
std::unique_ptr jaguargpu_cpu_device::create_disassembler()
{
return std::make_unique(jaguar_disassembler::variant::GPU);
diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h
index 3324ca3facd..499a3233f7e 100644
--- a/src/devices/cpu/jaguar/jaguar.h
+++ b/src/devices/cpu/jaguar/jaguar.h
@@ -28,38 +28,6 @@ enum
JAGUAR_R24,JAGUAR_R25,JAGUAR_R26,JAGUAR_R27,JAGUAR_R28,JAGUAR_R29,JAGUAR_R30,JAGUAR_R31
};
-enum
-{
- G_FLAGS = 0,
- G_MTXC,
- G_MTXA,
- G_END,
- G_PC,
- G_CTRL,
- G_HIDATA,
- G_DIVCTRL,
- G_DUMMY,
- G_REMAINDER,
- G_CTRLMAX
-};
-
-enum
-{
- D_FLAGS = 0,
- D_MTXC,
- D_MTXA,
- D_END,
- D_PC,
- D_CTRL,
- D_MOD,
- D_DIVCTRL,
- D_MACHI,
- D_REMAINDER,
- D_CTRLMAX
-};
-
-
-
/***************************************************************************
INTERRUPT CONSTANTS
***************************************************************************/
@@ -81,7 +49,7 @@ DECLARE_DEVICE_TYPE(JAGUARGPU, jaguargpu_cpu_device)
DECLARE_DEVICE_TYPE(JAGUARDSP, jaguardsp_cpu_device)
-class jaguar_cpu_device : public cpu_device
+class jaguar_cpu_device : public cpu_device
{
public:
// construction/destruction
@@ -90,11 +58,13 @@ public:
// configuration helpers
auto irq() { return m_cpu_interrupt.bind(); }
- virtual void ctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0) = 0;
- virtual u32 ctrl_r(offs_t offset) = 0;
+ // TODO: add which device triggered the I/O
+ void iobus_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 iobus_r(offs_t offset, u32 mem_mask = ~0);
+ DECLARE_WRITE_LINE_MEMBER(go_w);
protected:
- jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 version, bool isdsp);
+ jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 version, bool isdsp, address_map_constructor io_map);
// device-level overrides
virtual void device_start() override;
@@ -112,6 +82,18 @@ protected:
// device_state_interface overrides
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
+
+ // I/Os (common)
+ DECLARE_READ32_MEMBER(flags_r);
+ DECLARE_WRITE32_MEMBER(flags_w);
+ DECLARE_WRITE32_MEMBER(matrix_control_w);
+ DECLARE_WRITE32_MEMBER(matrix_address_w);
+ DECLARE_WRITE32_MEMBER(end_w);
+ DECLARE_WRITE32_MEMBER(pc_w);
+ DECLARE_READ32_MEMBER(status_r);
+ DECLARE_WRITE32_MEMBER(control_w);
+ DECLARE_READ32_MEMBER(div_remainder_r);
+ DECLARE_WRITE32_MEMBER(div_control_w);
// defines
inline void CLR_Z();
@@ -138,6 +120,7 @@ protected:
inline u16 ROPCODE(offs_t pc);
address_space_config m_program_config;
+ address_space_config m_io_config;
/* core registers */
u32 m_r[32];
@@ -146,7 +129,6 @@ protected:
u32 * m_b1;
/* control registers */
- u32 m_ctrl[G_CTRLMAX];
u32 m_ppc;
u64 m_accum;
@@ -157,6 +139,7 @@ protected:
int m_bankswitch_icount;
devcb_write_line m_cpu_interrupt;
address_space *m_program;
+ address_space *m_io;
memory_access_cache<2, 0, ENDIANNESS_BIG> *m_cache;
u32 m_internal_ram_start;
@@ -164,8 +147,6 @@ protected:
typedef void (jaguar_cpu_device::*op_func)(u16 op);
- static const op_func gpu_op_table[64];
- static const op_func dsp_op_table[64];
static const u32 convert_zero[32];
bool m_tables_referenced;
@@ -179,7 +160,6 @@ protected:
void add_rn_rn(u16 op);
void addc_rn_rn(u16 op);
void addq_n_rn(u16 op);
- void addqmod_n_rn(u16 op); /* DSP only */
void addqt_n_rn(u16 op);
void and_rn_rn(u16 op);
void bclr_n_rn(u16 op);
@@ -201,8 +181,6 @@ protected:
void load_r15rn_rn(u16 op);
void loadb_rn_rn(u16 op);
void loadw_rn_rn(u16 op);
- void loadp_rn_rn(u16 op); /* GPU only */
- void mirror_rn(u16 op); /* DSP only */
void mmult_rn_rn(u16 op);
void move_rn_rn(u16 op);
void move_pc_rn(u16 op);
@@ -217,15 +195,10 @@ protected:
void normi_rn_rn(u16 op);
void not_rn(u16 op);
void or_rn_rn(u16 op);
- void pack_rn(u16 op); /* GPU only */
void resmac_rn(u16 op);
void ror_rn_rn(u16 op);
void rorq_n_rn(u16 op);
- void sat8_rn(u16 op); /* GPU only */
- void sat16_rn(u16 op); /* GPU only */
- void sat16s_rn(u16 op); /* DSP only */
- void sat24_rn(u16 op); /* GPU only */
- void sat32s_rn(u16 op); /* DSP only */
+
void sh_rn_rn(u16 op);
void sha_rn_rn(u16 op);
void sharq_n_rn(u16 op);
@@ -238,16 +211,58 @@ protected:
void store_rn_r15rn(u16 op);
void storeb_rn_rn(u16 op);
void storew_rn_rn(u16 op);
- void storep_rn_rn(u16 op); /* GPU only */
void sub_rn_rn(u16 op);
void subc_rn_rn(u16 op);
void subq_n_rn(u16 op);
- void subqmod_n_rn(u16 op); /* DSP only */
void subqt_n_rn(u16 op);
void xor_rn_rn(u16 op);
+ // GPU only opcodes
+ void loadp_rn_rn(u16 op);
+ void pack_rn(u16 op);
+ void sat8_rn(u16 op);
+ void sat16_rn(u16 op);
+ void sat24_rn(u16 op);
+ void storep_rn_rn(u16 op);
+ // DSP only opcodes
+ void addqmod_n_rn(u16 op);
+ void mirror_rn(u16 op);
+ void sat16s_rn(u16 op);
+ void sat32s_rn(u16 op);
+ void subqmod_n_rn(u16 op);
+
void update_register_banks();
void check_irqs();
void init_tables();
+
+ // I/O internal regs
+ void io_common_map(address_map &map);
+ // TODO: the m_io* stubs are conventionally given for allowing a correct register setup from vanilla 68k.
+ // This is yet another reason about needing a bus device dispatcher for this system.
+ u32 m_io_end;
+ u32 m_io_pc;
+ u32 m_io_status;
+ u32 m_io_mtxc;
+ u32 m_io_mtxa;
+
+ u32 m_pc;
+ u32 m_flags;
+ bool m_imask;
+ bool m_maddw;
+ u8 m_mwidth;
+ u32 m_mtxaddr;
+ bool m_go;
+ u8 m_int_latch;
+ u8 m_int_mask;
+ bool m_bus_hog;
+ u32 m_div_remainder;
+ bool m_div_offset;
+
+ // GPU specific
+ u32 m_hidata;
+ static const op_func gpu_op_table[64];
+ // DSP specific
+ u32 m_modulo;
+ static const op_func dsp_op_table[64];
};
@@ -257,12 +272,14 @@ public:
// construction/destruction
jaguargpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- void ctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0) override;
- u32 ctrl_r(offs_t offset) override;
+ void io_map(address_map &map);
protected:
virtual void execute_run() override;
virtual std::unique_ptr create_disassembler() override;
+
+ DECLARE_WRITE32_MEMBER(hidata_w);
+ DECLARE_READ32_MEMBER(hidata_r);
};
@@ -272,14 +289,16 @@ public:
// construction/destruction
jaguardsp_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- void ctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0) override;
- u32 ctrl_r(offs_t offset) override;
+ void io_map(address_map &map);
protected:
virtual u32 execute_input_lines() const noexcept override { return 6; }
virtual void execute_run() override;
virtual std::unique_ptr create_disassembler() override;
+ DECLARE_WRITE32_MEMBER(modulo_w);
+ DECLARE_WRITE32_MEMBER(dsp_end_w);
+ DECLARE_READ32_MEMBER(high_accum_r);
};
diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp
index fba67830b1b..5b199497ddd 100644
--- a/src/devices/cpu/m37710/m37710.cpp
+++ b/src/devices/cpu/m37710/m37710.cpp
@@ -644,14 +644,14 @@ uint16_t m37710_cpu_device::ad_result_r(offs_t offset)
{
uint16_t result = m_ad_result[offset];
- LOGMASKED(LOG_AD, "ad_result_r from %02x: A/D %d = %x (PC=%x)\n", (int)(offset * 2) + 0x20, offset, result, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_AD, "ad_result_r from %02x: A/D %d = %x (PC=%x)\n", (int)(offset * 2) + 0x20, offset, result, REG_PG | REG_PC);
return result;
}
uint8_t m37710_cpu_device::uart0_mode_r()
{
- LOGMASKED(LOG_UART, "uart0_mode_r: UART0 transmit/recv mode = %x (PC=%x)\n", m_uart_mode[0], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart0_mode_r: UART0 transmit/recv mode = %x (PC=%x)\n", m_uart_mode[0], REG_PG | REG_PC);
return m_uart_mode[0];
}
@@ -665,7 +665,7 @@ void m37710_cpu_device::uart0_mode_w(uint8_t data)
uint8_t m37710_cpu_device::uart1_mode_r()
{
- LOGMASKED(LOG_UART, "uart1_mode_r: UART1 transmit/recv mode = %x (PC=%x)\n", m_uart_mode[1], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart1_mode_r: UART1 transmit/recv mode = %x (PC=%x)\n", m_uart_mode[1], REG_PG | REG_PC);
return m_uart_mode[1];
}
@@ -703,7 +703,7 @@ void m37710_cpu_device::uart1_tbuf_w(uint16_t data)
uint8_t m37710_cpu_device::uart0_ctrl_reg0_r()
{
- LOGMASKED(LOG_UART, "uart0_ctrl_reg0_r: UART0 transmit/recv ctrl 0 = %x (PC=%x)\n", m_uart_ctrl_reg0[0], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart0_ctrl_reg0_r: UART0 transmit/recv ctrl 0 = %x (PC=%x)\n", m_uart_ctrl_reg0[0], REG_PG | REG_PC);
return m_uart_ctrl_reg0[0];
}
@@ -718,7 +718,7 @@ void m37710_cpu_device::uart0_ctrl_reg0_w(uint8_t data)
uint8_t m37710_cpu_device::uart1_ctrl_reg0_r()
{
- LOGMASKED(LOG_UART, "uart1_ctrl_reg0_r: UART1 transmit/recv ctrl 0 = %x (PC=%x)\n", m_uart_ctrl_reg0[1], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart1_ctrl_reg0_r: UART1 transmit/recv ctrl 0 = %x (PC=%x)\n", m_uart_ctrl_reg0[1], REG_PG | REG_PC);
return m_uart_ctrl_reg0[1];
}
@@ -733,7 +733,7 @@ void m37710_cpu_device::uart1_ctrl_reg0_w(uint8_t data)
uint8_t m37710_cpu_device::uart0_ctrl_reg1_r()
{
- LOGMASKED(LOG_UART, "uart0_ctrl_reg1_r: UART0 transmit/recv ctrl 1 = %x (PC=%x)\n", m_uart_ctrl_reg1[0], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart0_ctrl_reg1_r: UART0 transmit/recv ctrl 1 = %x (PC=%x)\n", m_uart_ctrl_reg1[0], REG_PG | REG_PC);
return m_uart_ctrl_reg1[0];
}
@@ -747,7 +747,7 @@ void m37710_cpu_device::uart0_ctrl_reg1_w(uint8_t data)
uint8_t m37710_cpu_device::uart1_ctrl_reg1_r()
{
- LOGMASKED(LOG_UART, "uart1_ctrl_reg1_r: UART1 transmit/recv ctrl 1 = %x (PC=%x)\n", m_uart_ctrl_reg1[1], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart1_ctrl_reg1_r: UART1 transmit/recv ctrl 1 = %x (PC=%x)\n", m_uart_ctrl_reg1[1], REG_PG | REG_PC);
return m_uart_ctrl_reg1[1];
}
@@ -761,21 +761,21 @@ void m37710_cpu_device::uart1_ctrl_reg1_w(uint8_t data)
uint16_t m37710_cpu_device::uart0_rbuf_r()
{
- LOGMASKED(LOG_UART, "uart0_rbuf_r: UART0 recv buf (PC=%x)\n", REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart0_rbuf_r: UART0 recv buf (PC=%x)\n", REG_PG | REG_PC);
return 0;
}
uint16_t m37710_cpu_device::uart1_rbuf_r()
{
- LOGMASKED(LOG_UART, "uart1_rbuf_r: UART1 recv buf (PC=%x)\n", REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_UART, "uart1_rbuf_r: UART1 recv buf (PC=%x)\n", REG_PG | REG_PC);
return 0;
}
uint8_t m37710_cpu_device::count_start_r()
{
- LOGMASKED(LOG_TIMER, "count_start_r: Count start = %x (PC=%x)\n", m_count_start, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_TIMER, "count_start_r: Count start = %x (PC=%x)\n", m_count_start, REG_PG | REG_PC);
return m_count_start;
}
@@ -801,7 +801,7 @@ void m37710_cpu_device::one_shot_start_w(uint8_t data)
uint8_t m37710_cpu_device::up_down_r()
{
- LOGMASKED(LOG_TIMER, "up_down_r: Up-down register = %x (PC=%x)\n", m_up_down_reg, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_TIMER, "up_down_r: Up-down register = %x (PC=%x)\n", m_up_down_reg, REG_PG | REG_PC);
// bits 7-5 read back as 0
return m_up_down_reg & 0x1f;
@@ -828,7 +828,7 @@ void m37710_cpu_device::timer_reg_w(offs_t offset, uint16_t data, uint16_t mem_m
uint8_t m37710_cpu_device::timer_mode_r(offs_t offset)
{
- LOGMASKED(LOG_TIMER, "timer_mode_r from %02x: Timer %s mode = %x (PC=%x)\n", (int)offset + 0x56, m37710_tnames[offset], m_timer_mode[offset], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_TIMER, "timer_mode_r from %02x: Timer %s mode = %x (PC=%x)\n", (int)offset + 0x56, m37710_tnames[offset], m_timer_mode[offset], REG_PG | REG_PC);
return m_timer_mode[offset];
}
@@ -842,7 +842,7 @@ void m37710_cpu_device::timer_mode_w(offs_t offset, uint8_t data)
uint8_t m37710_cpu_device::proc_mode_r(offs_t offset)
{
- LOGMASKED(LOG_GENERAL, "proc_mode_r: Processor mode = %x (PC=%x)\n", m_proc_mode, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_GENERAL, "proc_mode_r: Processor mode = %x (PC=%x)\n", m_proc_mode, REG_PG | REG_PC);
return m_proc_mode & 0xf7;
}
@@ -873,7 +873,7 @@ void m37710_cpu_device::watchdog_freq_w(uint8_t data)
uint8_t m37710_cpu_device::waveform_mode_r()
{
- LOGMASKED(LOG_GENERAL, "waveform_mode_r: Waveform output mode (PC=%x)\n", REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_GENERAL, "waveform_mode_r: Waveform output mode (PC=%x)\n", REG_PG | REG_PC);
return 0;
}
@@ -885,7 +885,7 @@ void m37710_cpu_device::waveform_mode_w(uint8_t data)
uint8_t m37710_cpu_device::rto_control_r()
{
- LOGMASKED(LOG_GENERAL, "rto_control_r: Real-time output control = %x (PC=%x)\n", m_rto_control, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_GENERAL, "rto_control_r: Real-time output control = %x (PC=%x)\n", m_rto_control, REG_PG | REG_PC);
return m_rto_control;
}
@@ -899,7 +899,7 @@ void m37710_cpu_device::rto_control_w(uint8_t data)
uint8_t m37710_cpu_device::dram_control_r()
{
- LOGMASKED(LOG_GENERAL, "dram_control_r: DRAM control = %x (PC=%x)\n", m_dram_control, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_GENERAL, "dram_control_r: DRAM control = %x (PC=%x)\n", m_dram_control, REG_PG | REG_PC);
return m_dram_control;
}
@@ -932,7 +932,7 @@ uint8_t m37710_cpu_device::get_int_control(int level)
{
assert(level < M37710_MASKABLE_INTERRUPTS);
- //LOGMASKED(LOG_INT, "int_control_r: %s IRQ ctrl = %x (PC=%x)\n", m37710_intnames[level], m_int_control[level], REG_PB<<16 | REG_PC);
+ //LOGMASKED(LOG_INT, "int_control_r: %s IRQ ctrl = %x (PC=%x)\n", m37710_intnames[level], m_int_control[level], REG_PG | REG_PC);
uint8_t result = m_int_control[level];
@@ -1025,7 +1025,7 @@ void m37710_cpu_device::m37710i_update_irqs()
if (!FLAG_I && thispri > curpri && thispri > m_ipl)
{
// mark us as the best candidate
- LOGMASKED(LOG_INT, "%s interrupt active with priority %d (PC=%x)\n", m37710_intnames[curirq], thispri, REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_INT, "%s interrupt active with priority %d (PC=%x)\n", m37710_intnames[curirq], thispri, REG_PG | REG_PC);
wantedIRQ = curirq;
curpri = thispri;
}
@@ -1033,7 +1033,7 @@ void m37710_cpu_device::m37710i_update_irqs()
else
{
// non-maskable
- LOGMASKED(LOG_INT, "%s interrupt active (PC=%x)\n", m37710_intnames[curirq], REG_PB<<16 | REG_PC);
+ LOGMASKED(LOG_INT, "%s interrupt active (PC=%x)\n", m37710_intnames[curirq], REG_PG | REG_PC);
wantedIRQ = curirq;
curpri = 7;
break; // no more processing, NMIs always win
@@ -1054,16 +1054,16 @@ void m37710_cpu_device::m37710i_update_irqs()
// let's do it...
// push PB, then PC, then status
CLK(13);
- m37710i_push_8(REG_PB>>16);
+ m37710i_push_8(REG_PG>>16);
m37710i_push_16(REG_PC);
m37710i_push_8(m_ipl);
- m37710i_push_8(m37710i_get_reg_p());
+ m37710i_push_8(m37710i_get_reg_ps());
// set I to 1, set IPL to the interrupt we're taking
FLAG_I = IFLAG_SET;
m_ipl = curpri;
- // then PB=0, PC=(vector)
- REG_PB = 0;
+ // then PG=0, PC=(vector)
+ REG_PG = 0;
REG_PC = m37710_read_16(m37710_irq_vectors[wantedIRQ]);
}
}
@@ -1131,9 +1131,9 @@ void m37710_cpu_device::device_reset()
IRQ_DELAY = 0;
/* 37710 boots in full native mode */
- REG_D = 0;
- REG_PB = 0;
- REG_DB = 0;
+ REG_DPR = 0;
+ REG_PG = 0;
+ REG_DT = 0;
REG_S = (REG_S & 0xff) | 0x100;
REG_XH = REG_X & 0xff00; REG_X &= 0xff;
REG_YH = REG_Y & 0xff00; REG_Y &= 0xff;
@@ -1268,9 +1268,9 @@ void m37710_cpu_device::device_start()
m_s = 0;
m_pc = 0;
m_ppc = 0;
- m_pb = 0;
- m_db = 0;
- m_d = 0;
+ m_pg = 0;
+ m_dt = 0;
+ m_dpr = 0;
m_flag_e = 0;
m_flag_m = 0;
m_flag_x = 0;
@@ -1339,9 +1339,9 @@ void m37710_cpu_device::device_start()
save_item(NAME(m_s));
save_item(NAME(m_pc));
save_item(NAME(m_ppc));
- save_item(NAME(m_pb));
- save_item(NAME(m_db));
- save_item(NAME(m_d));
+ save_item(NAME(m_pg));
+ save_item(NAME(m_dt));
+ save_item(NAME(m_dpr));
save_item(NAME(m_flag_e));
save_item(NAME(m_flag_m));
save_item(NAME(m_flag_x));
@@ -1390,11 +1390,11 @@ void m37710_cpu_device::device_start()
machine().save().register_postload(save_prepost_delegate(save_prepost_delegate(FUNC(m37710_cpu_device::m37710_restore_state), this)));
state_add( M37710_PC, "PC", m_pc).formatstr("%04X");
- state_add( M37710_PB, "PB", m_debugger_pb).callimport().callexport().formatstr("%02X");
- state_add( M37710_DB, "DB", m_debugger_db).callimport().callexport().formatstr("%02X");
- state_add( M37710_D, "D", m_d).formatstr("%04X");
+ state_add( M37710_PG, "PG", m_debugger_pg).callimport().callexport().formatstr("%02X");
+ state_add( M37710_DT, "DT", m_debugger_dt).callimport().callexport().formatstr("%02X");
+ state_add( M37710_DPR, "DPR", m_dpr).formatstr("%04X");
state_add( M37710_S, "S", m_s).formatstr("%04X");
- state_add( M37710_P, "P", m_debugger_p).callimport().callexport().formatstr("%04X");
+ state_add( M37710_PS, "PS", m_debugger_ps).callimport().callexport().formatstr("%04X");
state_add( M37710_E, "E", m_flag_e).formatstr("%01X");
state_add( M37710_A, "A", m_debugger_a).callimport().callexport().formatstr("%04X");
state_add( M37710_B, "B", m_debugger_b).callimport().callexport().formatstr("%04X");
@@ -1404,7 +1404,7 @@ void m37710_cpu_device::device_start()
state_add( STATE_GENPC, "GENPC", m_debugger_pc ).callimport().callexport().noshow();
state_add( STATE_GENPCBASE, "CURPC", m_debugger_pc ).callimport().callexport().noshow();
- state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_p ).formatstr("%8s").noshow();
+ state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_ps ).formatstr("%8s").noshow();
set_icountptr(m_ICount);
}
@@ -1414,17 +1414,17 @@ void m37710_cpu_device::state_import(const device_state_entry &entry)
{
switch (entry.index())
{
- case M37710_PB:
- m37710_set_reg(M37710_PB, m_debugger_pb);
+ case M37710_PG:
+ m37710_set_reg(M37710_PG, m_debugger_pg);
break;
- case M37710_DB:
- m37710_set_reg(M37710_DB, m_debugger_db);
+ case M37710_DT:
+ m37710_set_reg(M37710_DT, m_debugger_dt);
break;
- case M37710_P:
- m37710_set_reg(M37710_P, m_debugger_p&0xff);
- m_ipl = (m_debugger_p>>8)&0xff;
+ case M37710_PS:
+ m37710_set_reg(M37710_PS, m_debugger_ps&0xff);
+ m_ipl = (m_debugger_ps>>8)&0xff;
break;
case M37710_A:
@@ -1437,7 +1437,7 @@ void m37710_cpu_device::state_import(const device_state_entry &entry)
case STATE_GENPC:
case STATE_GENPCBASE:
- REG_PB = m_debugger_pc & 0xff0000;
+ REG_PG = m_debugger_pc & 0xff0000;
m37710_set_pc(m_debugger_pc & 0xffff);
break;
}
@@ -1448,16 +1448,16 @@ void m37710_cpu_device::state_export(const device_state_entry &entry)
{
switch (entry.index())
{
- case M37710_PB:
- m_debugger_pb = m_pb >> 16;
+ case M37710_PG:
+ m_debugger_pg = m_pg >> 16;
break;
- case M37710_DB:
- m_debugger_db = m_db >> 16;
+ case M37710_DT:
+ m_debugger_dt = m_dt >> 16;
break;
- case M37710_P:
- m_debugger_p = (m_flag_n&0x80) | ((m_flag_v>>1)&0x40) | m_flag_m | m_flag_x | m_flag_d | m_flag_i | ((!m_flag_z)<<1) | ((m_flag_c>>8)&1) | (m_ipl<<8);
+ case M37710_PS:
+ m_debugger_ps = (m_flag_n&0x80) | ((m_flag_v>>1)&0x40) | m_flag_m | m_flag_x | m_flag_d | m_flag_i | ((!m_flag_z)<<1) | ((m_flag_c>>8)&1) | (m_ipl<<8);
break;
case M37710_A:
@@ -1470,7 +1470,7 @@ void m37710_cpu_device::state_export(const device_state_entry &entry)
case STATE_GENPC:
case STATE_GENPCBASE:
- m_debugger_pc = (REG_PB | REG_PC);
+ m_debugger_pc = (REG_PG | REG_PC);
break;
}
}
@@ -1549,12 +1549,12 @@ void m37710_cpu_device::m37710i_set_execution_mode(uint32_t mode)
void m37710_cpu_device::m37710i_interrupt_software(uint32_t vector)
{
CLK(13);
- m37710i_push_8(REG_PB>>16);
+ m37710i_push_8(REG_PG>>16);
m37710i_push_16(REG_PC);
m37710i_push_8(m_ipl);
- m37710i_push_8(m37710i_get_reg_p());
+ m37710i_push_8(m37710i_get_reg_ps());
FLAG_I = IFLAG_SET;
- REG_PB = 0;
+ REG_PG = 0;
REG_PC = m37710_read_16(vector);
}
diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h
index e409b3a2247..5ddac905305 100644
--- a/src/devices/cpu/m37710/m37710.h
+++ b/src/devices/cpu/m37710/m37710.h
@@ -83,8 +83,8 @@ enum
/* Registers - used by m37710_set_reg() and m37710_get_reg() */
enum
{
- M37710_PC=1, M37710_S, M37710_P, M37710_A, M37710_B, M37710_X, M37710_Y,
- M37710_PB, M37710_DB, M37710_D, M37710_E,
+ M37710_PC=1, M37710_S, M37710_PS, M37710_A, M37710_B, M37710_X, M37710_Y,
+ M37710_PG, M37710_DT, M37710_DPR, M37710_E,
M37710_NMI_STATE, M37710_IRQ_STATE
};
@@ -247,9 +247,9 @@ private:
uint32_t m_s; /* Stack Pointer */
uint32_t m_pc; /* Program Counter */
uint32_t m_ppc; /* Previous Program Counter */
- uint32_t m_pb; /* Program Bank (shifted left 16) */
- uint32_t m_db; /* Data Bank (shifted left 16) */
- uint32_t m_d; /* Direct Register */
+ uint32_t m_pg; /* Program Bank (shifted left 16) */
+ uint32_t m_dt; /* Data Bank (shifted left 16) */
+ uint32_t m_dpr; /* Direct Page Register */
uint32_t m_flag_e; /* Emulation Mode Flag */
uint32_t m_flag_m; /* Memory/Accumulator Select Flag */
uint32_t m_flag_x; /* Index Select Flag */
@@ -308,19 +308,16 @@ private:
uint16_t m_dmac_control;
// DMA
- uint32_t m_dma0_src, m_dma0_dst, m_dma0_cnt, m_dma0_mode;
- uint32_t m_dma1_src, m_dma1_dst, m_dma1_cnt, m_dma1_mode;
- uint32_t m_dma2_src, m_dma2_dst, m_dma2_cnt, m_dma2_mode;
- uint32_t m_dma3_src, m_dma3_dst, m_dma3_cnt, m_dma3_mode;
+ uint32_t m_dma_src[4], m_dma_dst[4], m_dma_cnt[4], m_dma_mode[4];
// interrupt controller
uint8_t m_int_control[M37710_MASKABLE_INTERRUPTS];
// for debugger
uint32_t m_debugger_pc;
- uint32_t m_debugger_pb;
- uint32_t m_debugger_db;
- uint32_t m_debugger_p;
+ uint32_t m_debugger_pg;
+ uint32_t m_debugger_dt;
+ uint32_t m_debugger_ps;
uint32_t m_debugger_a;
uint32_t m_debugger_b;
@@ -407,17 +404,17 @@ private:
void m37710i_jump_24(uint32_t address);
void m37710i_branch_8(uint32_t offset);
void m37710i_branch_16(uint32_t offset);
- uint32_t m37710i_get_reg_p();
+ uint32_t m37710i_get_reg_ps();
void m37710i_set_reg_ipl(uint32_t value);
void m37710i_interrupt_software(uint32_t vector);
void m37710i_set_flag_m0x0(uint32_t value);
void m37710i_set_flag_m0x1(uint32_t value);
void m37710i_set_flag_m1x0(uint32_t value);
void m37710i_set_flag_m1x1(uint32_t value);
- void m37710i_set_reg_p_m0x0(uint32_t value);
- void m37710i_set_reg_p_m0x1(uint32_t value);
- void m37710i_set_reg_p_m1x0(uint32_t value);
- void m37710i_set_reg_p_m1x1(uint32_t value);
+ void m37710i_set_reg_ps_m0x0(uint32_t value);
+ void m37710i_set_reg_ps_m0x1(uint32_t value);
+ void m37710i_set_reg_ps_m1x0(uint32_t value);
+ void m37710i_set_reg_ps_m1x1(uint32_t value);
uint32_t EA_IMM8();
uint32_t EA_IMM16();
uint32_t EA_IMM24();
diff --git a/src/devices/cpu/m37710/m37710cm.h b/src/devices/cpu/m37710/m37710cm.h
index 8f5bd029d14..1fa3c45f14f 100644
--- a/src/devices/cpu/m37710/m37710cm.h
+++ b/src/devices/cpu/m37710/m37710cm.h
@@ -73,9 +73,9 @@ static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
#define REG_S m_s /* Stack Pointer */
#define REG_PC m_pc /* Program Counter */
#define REG_PPC m_ppc /* Previous Program Counter */
-#define REG_PB m_pb /* Program Bank */
-#define REG_DB m_db /* Data Bank */
-#define REG_D m_d /* Direct Register */
+#define REG_PG m_pg /* Program Bank */
+#define REG_DT m_dt /* Data Bank */
+#define REG_DPR m_dpr /* Direct Page Register */
#define FLAG_M m_flag_m /* Memory/Accumulator Select Flag */
#define FLAG_X m_flag_x /* Index Select Flag */
#define FLAG_N m_flag_n /* Negative Flag */
diff --git a/src/devices/cpu/m37710/m37710il.h b/src/devices/cpu/m37710/m37710il.h
index 92e3fc6765f..52d418a2739 100644
--- a/src/devices/cpu/m37710/m37710il.h
+++ b/src/devices/cpu/m37710/m37710il.h
@@ -142,7 +142,7 @@ inline void m37710_cpu_device::m37710i_jump_16(uint32_t address)
inline void m37710_cpu_device::m37710i_jump_24(uint32_t address)
{
- REG_PB = address&0xff0000;
+ REG_PG = address&0xff0000;
REG_PC = MAKE_UINT_16(address);
}
@@ -161,7 +161,7 @@ inline void m37710_cpu_device::m37710i_branch_16(uint32_t offset)
/* ============================ STATUS REGISTER =========================== */
/* ======================================================================== */
-inline uint32_t m37710_cpu_device::m37710i_get_reg_p()
+inline uint32_t m37710_cpu_device::m37710i_get_reg_ps()
{
return (FLAG_N&0x80) |
((FLAG_V>>1)&0x40) |
@@ -183,26 +183,26 @@ inline void m37710_cpu_device::m37710i_set_reg_ipl(uint32_t value)
/* ============================= ADDRESS MODES ============================ */
/* ======================================================================== */
-inline uint32_t m37710_cpu_device::EA_IMM8() {REG_PC += 1; return REG_PB | MAKE_UINT_16(REG_PC-1);}
-inline uint32_t m37710_cpu_device::EA_IMM16() {REG_PC += 2; return REG_PB | MAKE_UINT_16(REG_PC-2);}
-inline uint32_t m37710_cpu_device::EA_IMM24() {REG_PC += 3; return REG_PB | MAKE_UINT_16(REG_PC-3);}
-inline uint32_t m37710_cpu_device::EA_D() {if(MAKE_UINT_8(REG_D)) CLK(1); return MAKE_UINT_16(REG_D + OPER_8_IMM());}
-inline uint32_t m37710_cpu_device::EA_A() {return REG_DB | OPER_16_IMM();}
+inline uint32_t m37710_cpu_device::EA_IMM8() {REG_PC += 1; return REG_PG | MAKE_UINT_16(REG_PC-1);}
+inline uint32_t m37710_cpu_device::EA_IMM16() {REG_PC += 2; return REG_PG | MAKE_UINT_16(REG_PC-2);}
+inline uint32_t m37710_cpu_device::EA_IMM24() {REG_PC += 3; return REG_PG | MAKE_UINT_16(REG_PC-3);}
+inline uint32_t m37710_cpu_device::EA_D() {if(MAKE_UINT_8(REG_DPR)) CLK(1); return MAKE_UINT_16(REG_DPR + OPER_8_IMM());}
+inline uint32_t m37710_cpu_device::EA_A() {return REG_DT | OPER_16_IMM();}
inline uint32_t m37710_cpu_device::EA_AL() {return OPER_24_IMM();}
-inline uint32_t m37710_cpu_device::EA_DX() {return MAKE_UINT_16(REG_D + OPER_8_IMM() + REG_X);}
-inline uint32_t m37710_cpu_device::EA_DY() {return MAKE_UINT_16(REG_D + OPER_8_IMM() + REG_Y);}
+inline uint32_t m37710_cpu_device::EA_DX() {return MAKE_UINT_16(REG_DPR + OPER_8_IMM() + REG_X);}
+inline uint32_t m37710_cpu_device::EA_DY() {return MAKE_UINT_16(REG_DPR + OPER_8_IMM() + REG_Y);}
inline uint32_t m37710_cpu_device::EA_AX() {uint32_t tmp = EA_A(); if((tmp^(tmp+REG_X))&0xff00) CLK(1); return tmp + REG_X;}
inline uint32_t m37710_cpu_device::EA_ALX() {return EA_AL() + REG_X;}
inline uint32_t m37710_cpu_device::EA_AY() {uint32_t tmp = EA_A(); if((tmp^(tmp+REG_X))&0xff00) CLK(1); return tmp + REG_Y;}
-inline uint32_t m37710_cpu_device::EA_DI() {return REG_DB | OPER_16_D();}
+inline uint32_t m37710_cpu_device::EA_DI() {return REG_DT | OPER_16_D();}
inline uint32_t m37710_cpu_device::EA_DLI() {return OPER_24_D();}
inline uint32_t m37710_cpu_device::EA_AI() {return read_16_A(OPER_16_IMM());}
inline uint32_t m37710_cpu_device::EA_ALI() {return OPER_24_A();}
-inline uint32_t m37710_cpu_device::EA_DXI() {return REG_DB | OPER_16_DX();}
-inline uint32_t m37710_cpu_device::EA_DIY() {uint32_t tmp = REG_DB | OPER_16_D(); if((tmp^(tmp+REG_X))&0xff00) CLK(1); return tmp + REG_Y;}
+inline uint32_t m37710_cpu_device::EA_DXI() {return REG_DT | OPER_16_DX();}
+inline uint32_t m37710_cpu_device::EA_DIY() {uint32_t tmp = REG_DT | OPER_16_D(); if((tmp^(tmp+REG_X))&0xff00) CLK(1); return tmp + REG_Y;}
inline uint32_t m37710_cpu_device::EA_DLIY() {return OPER_24_D() + REG_Y;}
inline uint32_t m37710_cpu_device::EA_AXI() {return read_16_AXI(MAKE_UINT_16(OPER_16_IMM() + REG_X));}
inline uint32_t m37710_cpu_device::EA_S() {return MAKE_UINT_16(REG_S + OPER_8_IMM());}
-inline uint32_t m37710_cpu_device::EA_SIY() {return MAKE_UINT_16(read_16_SIY(REG_S + OPER_8_IMM()) + REG_Y) | REG_DB;}
+inline uint32_t m37710_cpu_device::EA_SIY() {return MAKE_UINT_16(read_16_SIY(REG_S + OPER_8_IMM()) + REG_Y) | REG_DT;}
#endif /* __M37710IL_H__ */
diff --git a/src/devices/cpu/m37710/m37710op.h b/src/devices/cpu/m37710/m37710op.h
index a05c0a2a758..f6f493f31dc 100644
--- a/src/devices/cpu/m37710/m37710op.h
+++ b/src/devices/cpu/m37710/m37710op.h
@@ -7,28 +7,28 @@
#undef FLAG_SET_M
#undef FLAG_SET_X
#undef m37710i_set_flag_mx
-#undef m37710i_set_reg_p
+#undef m37710i_set_reg_ps
#if EXECUTION_MODE == EXECUTION_MODE_M0X0
#define FLAG_SET_M 0
#define FLAG_SET_X 0
#define m37710i_set_flag_mx m37710i_set_flag_m0x0
-#define m37710i_set_reg_p m37710i_set_reg_p_m0x0
+#define m37710i_set_reg_ps m37710i_set_reg_ps_m0x0
#elif EXECUTION_MODE == EXECUTION_MODE_M0X1
#define FLAG_SET_M 0
#define FLAG_SET_X 1
#define m37710i_set_flag_mx m37710i_set_flag_m0x1
-#define m37710i_set_reg_p m37710i_set_reg_p_m0x1
+#define m37710i_set_reg_ps m37710i_set_reg_ps_m0x1
#elif EXECUTION_MODE == EXECUTION_MODE_M1X0
#define FLAG_SET_M 1
#define FLAG_SET_X 0
#define m37710i_set_flag_mx m37710i_set_flag_m1x0
-#define m37710i_set_reg_p m37710i_set_reg_p_m1x0
+#define m37710i_set_reg_ps m37710i_set_reg_ps_m1x0
#elif EXECUTION_MODE == EXECUTION_MODE_M1X1
#define FLAG_SET_M 1
#define FLAG_SET_X 1
#define m37710i_set_flag_mx m37710i_set_flag_m1x1
-#define m37710i_set_reg_p m37710i_set_reg_p_m1x1
+#define m37710i_set_reg_ps m37710i_set_reg_ps_m1x1
#endif
/* ======================================================================== */
@@ -82,7 +82,7 @@ void m37710_cpu_device::m37710i_set_flag_mx(uint32_t value)
}
-void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
+void m37710_cpu_device::m37710i_set_reg_ps(uint32_t value)
{
FLAG_N = value;
FLAG_V = value << 1;
@@ -115,13 +115,13 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
if (SRC&0x8) \
{ m37710i_push_8(REG_Y); CLK(2); } \
if (SRC&0x10) \
- { m37710i_push_16(REG_D); CLK(2); } \
+ { m37710i_push_16(REG_DPR); CLK(2); } \
if (SRC&0x20) \
- { m37710i_push_8(REG_DB>>16); CLK(1); } \
+ { m37710i_push_8(REG_DT>>16); CLK(1); } \
if (SRC&0x40) \
- { m37710i_push_8(REG_PB>>16); CLK(1); } \
+ { m37710i_push_8(REG_PG>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_p()); CLK(2); }
+ { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_ps()); CLK(2); }
#else // FLAG_SET_X
#define OP_PSH(MODE) \
SRC = OPER_8_##MODE(); \
@@ -135,13 +135,13 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
if (SRC&0x8) \
{ m37710i_push_16(REG_Y); CLK(2); } \
if (SRC&0x10) \
- { m37710i_push_16(REG_D); CLK(2); } \
+ { m37710i_push_16(REG_DPR); CLK(2); } \
if (SRC&0x20) \
- { m37710i_push_8(REG_DB>>16); CLK(1); } \
+ { m37710i_push_8(REG_DT>>16); CLK(1); } \
if (SRC&0x40) \
- { m37710i_push_8(REG_PB>>16); CLK(1); } \
+ { m37710i_push_8(REG_PG>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_p()); CLK(2); }
+ { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_ps()); CLK(2); }
#endif // FLAG_SET_X
#else // FLAG_SET_M
#if FLAG_SET_X
@@ -157,13 +157,13 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
if (SRC&0x8) \
{ m37710i_push_8(REG_Y); CLK(2); } \
if (SRC&0x10) \
- { m37710i_push_16(REG_D); CLK(2); } \
+ { m37710i_push_16(REG_DPR); CLK(2); } \
if (SRC&0x20) \
- { m37710i_push_8(REG_DB>>16); CLK(1); } \
+ { m37710i_push_8(REG_DT>>16); CLK(1); } \
if (SRC&0x40) \
- { m37710i_push_8(REG_PB>>16); CLK(1); } \
+ { m37710i_push_8(REG_PG>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_p()); CLK(2); }
+ { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_ps()); CLK(2); }
#else // FLAG_SET_X
#define OP_PSH(MODE) \
SRC = OPER_8_##MODE(); \
@@ -177,13 +177,13 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
if (SRC&0x8) \
{ m37710i_push_16(REG_Y); CLK(2); } \
if (SRC&0x10) \
- { m37710i_push_16(REG_D); CLK(2); } \
+ { m37710i_push_16(REG_DPR); CLK(2); } \
if (SRC&0x20) \
- { m37710i_push_8(REG_DB>>16); CLK(1); } \
+ { m37710i_push_8(REG_DT>>16); CLK(1); } \
if (SRC&0x40) \
- { m37710i_push_8(REG_PB>>16); CLK(1); } \
+ { m37710i_push_8(REG_PG>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_p()); CLK(2); }
+ { m37710i_push_8(m_ipl); m37710i_push_8(m37710i_get_reg_ps()); CLK(2); }
#endif // FLAG_SET_X
#endif // FLAG_SET_M
@@ -194,12 +194,12 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
SRC = OPER_8_##MODE(); \
CLK(14); \
if (SRC&0x80) \
- { m37710i_set_reg_p(m37710i_pull_8()); m37710i_set_reg_ipl(m37710i_pull_8()); CLK(3); } \
+ { m37710i_set_reg_ps(m37710i_pull_8()); m37710i_set_reg_ipl(m37710i_pull_8()); CLK(3); } \
if (SRC&0x20) \
- { REG_DB = m37710i_pull_8() << 16; CLK(3); } \
+ { REG_DT = m37710i_pull_8() << 16; CLK(3); } \
if (SRC&0x10) \
- { REG_D = m37710i_pull_16(); CLK(4); } \
- if (m37710i_get_reg_p() & XFLAG_SET) \
+ { REG_DPR = m37710i_pull_16(); CLK(4); } \
+ if (m37710i_get_reg_ps() & XFLAG_SET) \
{ \
if (SRC&0x8) \
{ REG_Y = m37710i_pull_8(); CLK(3); } \
@@ -213,7 +213,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
if (SRC&0x4) \
{ REG_X = m37710i_pull_16(); CLK(3); } \
} \
- if (m37710i_get_reg_p() & MFLAG_SET) \
+ if (m37710i_get_reg_ps() & MFLAG_SET) \
{ \
if (SRC&0x2) \
{ REG_BA = m37710i_pull_8(); CLK(3); } \
@@ -462,7 +462,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_BRK
#define OP_BRK() \
REG_PC++; CLK(CLK_OP + CLK_R8 + CLK_IMM); \
- logerror("error M37710: BRK at PC=%06x\n", REG_PB|REG_PC); \
+ logerror("error M37710: BRK at PC=%06x\n", REG_PG|REG_PC); \
m37710i_interrupt_software(0xfffa)
/* M37710 Branch Always */
@@ -704,7 +704,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_JMPAXI
#define OP_JMPAXI() \
CLK(CLK_OP + CLK_AXI); \
- m37710i_jump_16(read_16_AXI(REG_PB | (MAKE_UINT_16(OPER_16_IMM() + REG_X))))
+ m37710i_jump_16(read_16_AXI(REG_PG | (MAKE_UINT_16(OPER_16_IMM() + REG_X))))
/* M37710 Jump absolute long */
#undef OP_JMPAL
@@ -717,7 +717,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_JSL(MODE) \
CLK(CLK_OP + CLK_W24 + CLK_##MODE + 1); \
DST = EA_##MODE(); \
- m37710i_push_8(REG_PB>>16); \
+ m37710i_push_8(REG_PG>>16); \
m37710i_push_16(REG_PC); \
m37710i_jump_24(DST)
@@ -733,7 +733,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_JSRAXI
#define OP_JSRAXI() \
CLK(CLK_OP + CLK_W16 + CLK_AXI); \
- DST = read_16_AXI(REG_PB | (MAKE_UINT_16(OPER_16_IMM() + REG_X))); \
+ DST = read_16_AXI(REG_PG | (MAKE_UINT_16(OPER_16_IMM() + REG_X))); \
m37710i_push_16(REG_PC); \
m37710i_jump_16(DST)
@@ -769,14 +769,14 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_LDM(MODE) \
CLK(CLK_OP + CLK_R8 + CLK_##MODE); \
REG_IM2 = EA_##MODE(); \
- REG_IM = read_8_IMM(REG_PB | REG_PC); \
+ REG_IM = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
write_8_##MODE(REG_IM2, REG_IM)
#else
#define OP_LDM(MODE) \
CLK(CLK_OP + CLK_R16 + CLK_##MODE); \
REG_IM2 = EA_##MODE(); \
- REG_IM = read_16_IMM(REG_PB | REG_PC); \
+ REG_IM = read_16_IMM(REG_PG | REG_PC); \
REG_PC+=2; \
write_16_##MODE(REG_IM2, REG_IM)
#endif
@@ -787,7 +787,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_BBS(MODE) \
CLK(CLK_OP + CLK_R8 + CLK_##MODE); \
REG_IM2 = read_8_NORM(EA_##MODE()); \
- REG_IM = read_8_IMM(REG_PB | REG_PC); \
+ REG_IM = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
DST = OPER_8_IMM(); \
if ((REG_IM2 & REG_IM) == REG_IM) \
@@ -800,7 +800,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_BBS(MODE) \
CLK(CLK_OP + CLK_R16 + CLK_##MODE); \
REG_IM2 = read_16_NORM(EA_##MODE()); \
- REG_IM = read_16_IMM(REG_PB | REG_PC); \
+ REG_IM = read_16_IMM(REG_PG | REG_PC); \
REG_PC++; \
REG_PC++; \
DST = OPER_8_IMM(); \
@@ -818,7 +818,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_BBC(MODE) \
CLK(CLK_OP + CLK_R8 + CLK_##MODE); \
REG_IM2 = read_8_NORM(EA_##MODE()); \
- REG_IM = read_8_IMM(REG_PB | REG_PC); \
+ REG_IM = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
DST = OPER_8_IMM(); \
if ((REG_IM2 & REG_IM) == 0) \
@@ -831,7 +831,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_BBC(MODE) \
CLK(CLK_OP + CLK_R16 + CLK_##MODE); \
REG_IM2 = read_16_NORM(EA_##MODE()); \
- REG_IM = read_16_IMM(REG_PB | REG_PC); \
+ REG_IM = read_16_IMM(REG_PG | REG_PC); \
REG_PC++; \
REG_PC++; \
DST = OPER_8_IMM(); \
@@ -933,7 +933,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_MVN() \
DST = OPER_8_IMM()<<16; \
SRC = OPER_8_IMM()<<16; \
- REG_DB = DST; \
+ REG_DT = DST; \
REG_A |= REG_B; \
CLK(7); \
if (REG_A > 0) \
@@ -963,7 +963,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_MVN() \
DST = OPER_8_IMM()<<16; \
SRC = OPER_8_IMM()<<16; \
- REG_DB = DST; \
+ REG_DT = DST; \
REG_A |= REG_B; \
CLK(7); \
if (REG_A > 0) \
@@ -997,7 +997,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_MVP() \
DST = OPER_8_IMM()<<16; \
SRC = OPER_8_IMM()<<16; \
- REG_DB = DST; \
+ REG_DT = DST; \
REG_A |= REG_B; \
CLK(7); \
if (REG_A > 0) \
@@ -1027,7 +1027,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_MVP() \
DST = OPER_8_IMM()<<16; \
SRC = OPER_8_IMM()<<16; \
- REG_DB = DST; \
+ REG_DT = DST; \
REG_A |= REG_B; \
CLK(7); \
if (REG_A > 0) \
@@ -1145,26 +1145,26 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_PHT
#define OP_PHT() \
CLK(CLK_OP + CLK_W8 + 1); \
- m37710i_push_8(REG_DB>>16)
+ m37710i_push_8(REG_DT>>16)
-/* M37710 Push direct register */
+/* M37710 Push direct page register */
#undef OP_PHD
#define OP_PHD() \
CLK(CLK_OP + CLK_W16 + 1); \
- m37710i_push_16(REG_D)
+ m37710i_push_16(REG_DPR)
/* M37710 Push program bank register */
#undef OP_PHK
#define OP_PHK() \
CLK(CLK_OP + CLK_W8 + 1); \
- m37710i_push_8(REG_PB>>16)
+ m37710i_push_8(REG_PG>>16)
/* M37710 Push the Processor Status Register to the stack */
#undef OP_PHP
#define OP_PHP() \
CLK(CLK_OP + CLK_W8 + 1); \
m37710i_push_8(m_ipl); \
- m37710i_push_8(m37710i_get_reg_p())
+ m37710i_push_8(m37710i_get_reg_ps())
/* M37710 Pull accumulator from the stack */
#undef OP_PLA
@@ -1210,19 +1210,19 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#define OP_PLT() \
CLK(CLK_OP + CLK_R8 + 2); \
FLAG_N = FLAG_Z = m37710i_pull_8(); \
- REG_DB = FLAG_Z << 16
+ REG_DT = FLAG_Z << 16
-/* M37710 Pull direct register */
+/* M37710 Pull direct page register */
#undef OP_PLD
#define OP_PLD() \
CLK(CLK_OP + CLK_R16 + 2); \
- REG_D = m37710i_pull_16()
+ REG_DPR = m37710i_pull_16()
/* M37710 Pull the Processor Status Register from the stack */
#undef OP_PLP
#define OP_PLP() \
CLK(CLK_OP + CLK_R8 + 2); \
- m37710i_set_reg_p(m37710i_pull_8()); \
+ m37710i_set_reg_ps(m37710i_pull_8()); \
m37710i_set_reg_ipl(m37710i_pull_8()); \
m37710i_update_irqs()
@@ -1230,14 +1230,14 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_REP
#define OP_REP() \
CLK(CLK_OP + CLK_R8 + 1); \
- m37710i_set_reg_p(m37710i_get_reg_p() & ~OPER_8_IMM()); \
+ m37710i_set_reg_ps(m37710i_get_reg_ps() & ~OPER_8_IMM()); \
m37710i_update_irqs()
/* M37710 Clear "M" status bit */
#undef OP_CLM
#define OP_CLM() \
CLK(CLK_OP + CLK_R8 + 1); \
- m37710i_set_reg_p(m37710i_get_reg_p() & ~FLAGPOS_M)
+ m37710i_set_reg_ps(m37710i_get_reg_ps() & ~FLAGPOS_M)
/* M37710 Rotate Left the accumulator */
#undef OP_ROL
@@ -1360,10 +1360,10 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_RTI
#define OP_RTI() \
CLK(8); \
- m37710i_set_reg_p(m37710i_pull_8()); \
+ m37710i_set_reg_ps(m37710i_pull_8()); \
m37710i_set_reg_ipl(m37710i_pull_8()); \
m37710i_jump_16(m37710i_pull_16()); \
- REG_PB = m37710i_pull_8() << 16; \
+ REG_PG = m37710i_pull_8() << 16; \
m37710i_update_irqs()
/* M37710 Return from Subroutine Long */
@@ -1513,13 +1513,13 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_SEP
#define OP_SEP() \
CLK(CLK_OP + CLK_R8 + 1); \
- m37710i_set_reg_p(m37710i_get_reg_p() | OPER_8_IMM())
+ m37710i_set_reg_ps(m37710i_get_reg_ps() | OPER_8_IMM())
/* M37710 Set "M" status bit */
#undef OP_SEM
#define OP_SEM() \
CLK(CLK_OP + CLK_R8 + 1); \
- m37710i_set_reg_p(m37710i_get_reg_p() | FLAGPOS_M)
+ m37710i_set_reg_ps(m37710i_get_reg_ps() | FLAGPOS_M)
/* M37710 Store accumulator to memory */
#undef OP_STA
@@ -1648,59 +1648,59 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
FLAG_N = NFLAG_16(FLAG_Z)
#endif
-/* M37710 Transfer accumulator to direct register */
+/* M37710 Transfer accumulator to direct page register */
#undef OP_TAD
#if FLAG_SET_M
#define OP_TAD() \
CLK(CLK_OP + CLK_IMPLIED); \
- REG_D = REG_A | REG_B
+ REG_DPR = REG_A | REG_B
#else
#define OP_TAD() \
CLK(CLK_OP + CLK_IMPLIED); \
- REG_D = REG_A
+ REG_DPR = REG_A
#endif
-/* M37710 Transfer accumulator B to direct register */
+/* M37710 Transfer accumulator B to direct page register */
#undef OP_TBD
#if FLAG_SET_M
#define OP_TBD() \
CLK(CLK_OP + CLK_IMPLIED); \
- REG_D = REG_BA | REG_BB
+ REG_DPR = REG_BA | REG_BB
#else
#define OP_TBD() \
CLK(CLK_OP + CLK_IMPLIED); \
- REG_D = REG_BA
+ REG_DPR = REG_BA
#endif
-/* M37710 Transfer direct register to accumulator */
+/* M37710 Transfer direct page register to accumulator */
#undef OP_TDA
#if FLAG_SET_M
#define OP_TDA() \
CLK(CLK_OP + CLK_IMPLIED); \
- FLAG_Z = REG_D; \
+ FLAG_Z = REG_DPR; \
FLAG_N = NFLAG_16(FLAG_Z); \
- REG_A = MAKE_UINT_8(REG_D); \
- REG_B = REG_D & 0xff00
+ REG_A = MAKE_UINT_8(REG_DPR); \
+ REG_B = REG_DPR & 0xff00
#else
#define OP_TDA() \
CLK(CLK_OP + CLK_IMPLIED); \
- FLAG_Z = REG_A = REG_D; \
+ FLAG_Z = REG_A = REG_DPR; \
FLAG_N = NFLAG_16(FLAG_Z)
#endif
-/* M37710 Transfer direct register to accumulator B */
+/* M37710 Transfer direct page register to accumulator B */
#undef OP_TDB
#if FLAG_SET_M
#define OP_TDB() \
CLK(CLK_OP + CLK_IMPLIED); \
- FLAG_Z = REG_D; \
+ FLAG_Z = REG_DPR; \
FLAG_N = NFLAG_16(FLAG_Z); \
- REG_BA = MAKE_UINT_8(REG_D); \
- REG_BB = REG_D & 0xff00
+ REG_BA = MAKE_UINT_8(REG_DPR); \
+ REG_BB = REG_DPR & 0xff00
#else
#define OP_TDB() \
CLK(CLK_OP + CLK_IMPLIED); \
- FLAG_Z = REG_BA = REG_D; \
+ FLAG_Z = REG_BA = REG_DPR; \
FLAG_N = NFLAG_16(FLAG_Z)
#endif
@@ -1821,7 +1821,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
CLK(CLK_OP + CLK_RMW8 + CLK_W_##MODE); \
DST = EA_##MODE(); \
REG_IM = read_8_##MODE(DST); \
- REG_IM2 = read_8_IMM(REG_PB | REG_PC); \
+ REG_IM2 = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
write_8_##MODE(DST, REG_IM & ~REG_IM2);
#else
@@ -1829,7 +1829,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
CLK(CLK_OP + CLK_RMW16 + CLK_W_##MODE); \
DST = EA_##MODE(); \
REG_IM = read_16_##MODE(DST); \
- REG_IM2 = read_16_IMM(REG_PB | REG_PC); \
+ REG_IM2 = read_16_IMM(REG_PG | REG_PC); \
REG_PC+=2; \
write_16_##MODE(DST, REG_IM & ~REG_IM2);
#endif
@@ -1841,7 +1841,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
CLK(CLK_OP + CLK_RMW8 + CLK_W_##MODE); \
DST = EA_##MODE(); \
REG_IM = read_8_##MODE(DST); \
- REG_IM2 = read_8_IMM(REG_PB | REG_PC); \
+ REG_IM2 = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
write_8_##MODE(DST, REG_IM | REG_IM2);
#else
@@ -1849,7 +1849,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
CLK(CLK_OP + CLK_RMW16 + CLK_W_##MODE); \
DST = EA_##MODE(); \
REG_IM = read_16_##MODE(DST); \
- REG_IM2 = read_16_IMM(REG_PB | REG_PC); \
+ REG_IM2 = read_16_IMM(REG_PG | REG_PC); \
REG_PC+=2; \
write_16_##MODE(DST, REG_IM | REG_IM2);
#endif
@@ -1864,7 +1864,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_LDT
#define OP_LDT(MODE) \
CLK(CLK_OP + CLK_R8 + CLK_##MODE); \
- REG_DB = OPER_8_##MODE()<<16;
+ REG_DT = OPER_8_##MODE()<<16;
/* M37710 prefix for B accumulator (0x42) */
@@ -1872,7 +1872,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
#undef OP_PFB
#define OP_PFB() \
CLK(2); \
- REG_IR = read_8_IMM(REG_PB | REG_PC); \
+ REG_IR = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
(this->*m_opcodes42[REG_IR])();
@@ -1880,7 +1880,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
/* M37710 prefix for multiply / divide instructions (0x89) */
#undef OP_PFXM
#define OP_PFXM() \
- REG_IR = read_8_IMM(REG_PB | REG_PC); \
+ REG_IR = read_8_IMM(REG_PG | REG_PC); \
REG_PC++; \
(this->*m_opcodes89[REG_IR])();
@@ -1888,7 +1888,7 @@ void m37710_cpu_device::m37710i_set_reg_p(uint32_t value)
/* M37710 unimplemented opcode */
#undef OP_UNIMP
#define OP_UNIMP() \
- logerror("error M37710: UNIMPLEMENTED OPCODE! K=%x PC=%x\n", REG_PB, REG_PPC);
+ logerror("error M37710: UNIMPLEMENTED OPCODE! K=%x PC=%x\n", REG_PG, REG_PPC);
/* ======================================================================== */
/* ======================== OPCODE & FUNCTION TABLES ====================== */
@@ -2497,10 +2497,10 @@ TABLE_FUNCTION(uint32_t, get_reg, (int regnum))
case M37710_Y: return REG_Y;
case M37710_S: return REG_S;
case M37710_PC: return REG_PC;
- case M37710_PB: return REG_PB >> 16;
- case M37710_DB: return REG_DB >> 16;
- case M37710_D: return REG_D;
- case M37710_P: return m37710i_get_reg_p();
+ case M37710_PG: return REG_PG >> 16;
+ case M37710_DT: return REG_DT >> 16;
+ case M37710_DPR: return REG_DPR;
+ case M37710_PS: return m37710i_get_reg_ps();
case M37710_IRQ_STATE: return LINE_IRQ;
case STATE_GENPCBASE: return REG_PPC;
}
@@ -2513,7 +2513,7 @@ TABLE_FUNCTION(void, set_reg, (int regnum, uint32_t val))
{
case M37710_PC: REG_PC = MAKE_UINT_16(val); break;
case M37710_S: REG_S = MAKE_UINT_16(val); break;
- case M37710_P: m37710i_set_reg_p(val); break;
+ case M37710_PS: m37710i_set_reg_ps(val); break;
#if FLAG_SET_M
case M37710_A: REG_A = MAKE_UINT_8(val); REG_B = val&0xff00; break;
case M37710_B: REG_BA = MAKE_UINT_8(val); REG_BB = val&0xff00; break;
@@ -2540,9 +2540,9 @@ TABLE_FUNCTION(int, execute, (int clocks))
do
{
REG_PPC = REG_PC;
- M37710_CALL_DEBUGGER(REG_PB | REG_PC);
+ M37710_CALL_DEBUGGER(REG_PG | REG_PC);
REG_PC++;
- REG_IR = read_8_IMM(REG_PB | REG_PPC);
+ REG_IR = read_8_IMM(REG_PG | REG_PPC);
(this->*m_opcodes[REG_IR])();
} while(CLOCKS > 0);
return clocks - CLOCKS;
diff --git a/src/devices/cpu/m37710/m7700ds.cpp b/src/devices/cpu/m37710/m7700ds.cpp
index bf8f791935b..12478d32903 100644
--- a/src/devices/cpu/m37710/m7700ds.cpp
+++ b/src/devices/cpu/m37710/m7700ds.cpp
@@ -319,9 +319,9 @@ offs_t m7700_disassembler::disassemble(std::ostream &stream, offs_t pc, const da
uint32_t flags = 0;
offs_t address = pc;
- u32 pb = pc & 0xffff0000;
+ u32 pg = pc & 0xff0000;
pc &= 0xffff;
- address = pc | pb;
+ address = pc | pg;
instruction = opcodes.r8(address);
@@ -370,13 +370,13 @@ offs_t m7700_disassembler::disassemble(std::ostream &stream, offs_t pc, const da
case RELB:
varS = opcodes.r8(address + 1);
length++;
- util::stream_format(stream, " %06x (%s)", pb | ((pc + length + varS)&0xffff), int_8_str(varS));
+ util::stream_format(stream, " %06x (%s)", pg | ((pc + length + varS)&0xffff), int_8_str(varS));
break;
case RELW:
case PER :
var = opcodes.r16(address + 1);
length += 2;
- util::stream_format(stream, " %06x (%s)", pb | ((pc + length + var)&0xffff), int_16_str(var));
+ util::stream_format(stream, " %06x (%s)", pg | ((pc + length + var)&0xffff), int_16_str(var));
break;
case IMM :
if((opcode->flag == M && !m_flag) || (opcode->flag == X && !x_flag))
@@ -395,13 +395,13 @@ offs_t m7700_disassembler::disassemble(std::ostream &stream, offs_t pc, const da
{
varS = opcodes.r8(address + 4);
length += 4;
- util::stream_format(stream, " #$%04x, $%02x, %06x (%s)", opcodes.r16(address + 2), opcodes.r8(address + 1), pb | ((pc + length + varS)&0xffff), int_8_str(varS));
+ util::stream_format(stream, " #$%04x, $%02x, %06x (%s)", opcodes.r16(address + 2), opcodes.r8(address + 1), pg | ((pc + length + varS)&0xffff), int_8_str(varS));
}
else
{
varS = opcodes.r8(address + 3);
length += 3;
- util::stream_format(stream, " #$%02x, $%02x, %06x (%s)", opcodes.r8(address + 2), opcodes.r8(address + 1), pb | ((pc + length + varS)&0xffff), int_8_str(varS));
+ util::stream_format(stream, " #$%02x, $%02x, %06x (%s)", opcodes.r8(address + 2), opcodes.r8(address + 1), pg | ((pc + length + varS)&0xffff), int_8_str(varS));
}
break;
case BBCA:
@@ -409,13 +409,13 @@ offs_t m7700_disassembler::disassemble(std::ostream &stream, offs_t pc, const da
{
length += 5;
varS = opcodes.r8(address + 5);
- util::stream_format(stream, " #$%04x, $%04x, %06x (%s)", opcodes.r16(address + 3), opcodes.r16(address + 1), pb | ((pc + length + varS)&0xffff), int_8_str(varS));
+ util::stream_format(stream, " #$%04x, $%04x, %06x (%s)", opcodes.r16(address + 3), opcodes.r16(address + 1), pg | ((pc + length + varS)&0xffff), int_8_str(varS));
}
else
{
length += 4;
varS = opcodes.r8(address + 4);
- util::stream_format(stream, " #$%02x, $%04x, %06x (%s)", opcodes.r8(address + 3), opcodes.r16(address + 1), pb | ((pc + length + varS)&0xffff), int_8_str(varS));
+ util::stream_format(stream, " #$%02x, $%04x, %06x (%s)", opcodes.r8(address + 3), opcodes.r16(address + 1), pg | ((pc + length + varS)&0xffff), int_8_str(varS));
}
break;
case LDM4:
diff --git a/src/devices/machine/am79c30.cpp b/src/devices/machine/am79c30.cpp
index 77b87733044..ed31a517398 100644
--- a/src/devices/machine/am79c30.cpp
+++ b/src/devices/machine/am79c30.cpp
@@ -386,7 +386,7 @@ void am79c30a_device::set_lmr1(u8 data)
if (BIT(data, 6) != BIT(m_lmr1, 6))
LOG("%s: LIU receiver/transmitter %sabled\n", machine().describe_context(), BIT(data, 6) ? "en" : "dis");
if (BIT(data, 7))
- logerror("%s: LMR1 reserved bit 7 set\n");
+ logerror("%s: LMR1 reserved bit 7 set\n", machine().describe_context());
m_lmr1 = data;
}
@@ -414,7 +414,7 @@ void am79c30a_device::set_lmr2(u8 data)
if (BIT(data, 6) != BIT(m_lmr2, 6))
LOG("%s: F7 change of state interrupt %sabled\n", machine().describe_context(), BIT(data, 6) ? "en" : "dis");
if (BIT(data, 7))
- logerror("%s: LMR2 reserved bit 7 set\n");
+ logerror("%s: LMR2 reserved bit 7 set\n", machine().describe_context());
m_lmr2 = data;
}
@@ -492,9 +492,9 @@ void am79c30a_device::set_mcr(unsigned n, u8 data)
if (data == 0)
LOG("%s: No connect (MCR%d)\n", machine().describe_context(), n + 1);
else if ((data & 0xf0) >> 4 == (data & 0x0f))
- LOG("%s: %s loopback (MCR%d)\n", machine().describe_context(), data & 0x0f, n + 1);
+ LOG("%s: %s loopback (MCR%d)\n", machine().describe_context(), s_mcr_channels[data & 0x0f], n + 1);
else
- LOG("%s: %s <-> %s (MCR%d)\n", machine().describe_context(), (data & 0xf0) >> 4, data & 0x0f, n + 1);
+ LOG("%s: %s <-> %s (MCR%d)\n", machine().describe_context(), s_mcr_channels[(data & 0xf0) >> 4], s_mcr_channels[data & 0x0f], n + 1);
}
m_mcr[n] = data;
@@ -753,7 +753,9 @@ void am79c30a_device::set_stra(u8 data)
else
{
u8 a = 15 - ((data & 0xf0) >> 4);
- LOG("%s: Secondary tone ringer %.2f V peak-to-peak, %d dB relative\n", BIT(a, 0) ? 3.53553390593274 : 5.0 / (1 << (a / 2)), a * -3);
+ LOG("%s: Secondary tone ringer %.2f V peak-to-peak, %d dB relative\n", machine().describe_context(),
+ BIT(a, 0) ? 3.53553390593274 : 5.0 / (1 << (a / 2)),
+ a * -3);
}
}
diff --git a/src/devices/machine/i8087.cpp b/src/devices/machine/i8087.cpp
index 82fd0348514..9d2327bd3af 100644
--- a/src/devices/machine/i8087.cpp
+++ b/src/devices/machine/i8087.cpp
@@ -259,13 +259,13 @@ void i8087_device::execute()
m_timer->adjust(attotime::from_hz((m_icount ? m_icount : 1) * clock()));
}
-WRITE32_MEMBER(i8087_device::insn_w)
+void i8087_device::insn_w(uint32_t data)
{
m_ppc = m_pc;
m_pc = data;
}
-WRITE32_MEMBER(i8087_device::addr_w)
+void i8087_device::addr_w(uint32_t data)
{
m_ea = data;
execute();
diff --git a/src/devices/machine/i8087.h b/src/devices/machine/i8087.h
index aab97cd3305..4ee28a095bf 100644
--- a/src/devices/machine/i8087.h
+++ b/src/devices/machine/i8087.h
@@ -19,8 +19,8 @@ public:
auto irq() { return m_int_handler.bind(); }
auto busy() { return m_busy_handler.bind(); }
- DECLARE_WRITE32_MEMBER(insn_w); // the real 8087 sniffs the bus watching for esc, can't do that here so provide a poke spot
- DECLARE_WRITE32_MEMBER(addr_w);
+ void insn_w(uint32_t data); // the real 8087 sniffs the bus watching for esc, can't do that here so provide a poke spot
+ void addr_w(uint32_t data);
protected:
i8087_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index 4703fed8990..996faed2f42 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -245,10 +245,10 @@ inline uint8_t i8155_device::read_port(int port)
inline void i8155_device::write_port(int port, uint8_t data)
{
+ m_output[port] = data;
switch (get_port_mode(port))
{
case PORT_MODE_OUTPUT:
- m_output[port] = data;
if (port == PORT_A)
m_out_pa_cb((offs_t)0, m_output[port]);
else if (port == PORT_B)
diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp
index f49b320b41a..6cd55c3157d 100644
--- a/src/devices/machine/mm74c922.cpp
+++ b/src/devices/machine/mm74c922.cpp
@@ -18,7 +18,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-DEFINE_DEVICE_TYPE(MM74C922, mm74c922_device, "mm74c922", "MM74C923 16-Key Encoder")
+DEFINE_DEVICE_TYPE(MM74C922, mm74c922_device, "mm74c922", "MM74C922 16-Key Encoder")
DEFINE_DEVICE_TYPE(MM74C923, mm74c923_device, "mm74c923", "MM74C923 20-Key Encoder")
@@ -72,7 +72,7 @@ void mm74c922_device::device_start()
// allocate timers
m_scan_timer = timer_alloc();
- m_scan_timer->adjust(attotime::zero, 0, attotime::from_hz(50));
+ m_scan_timer->adjust(attotime::zero, 0, attotime::from_hz(500)); // approximate rate from a 100n capacitor
// register for state saving
save_item(NAME(m_inhibit));
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 1c903b7b928..d39bb899d67 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -639,9 +639,9 @@ netlist::setup_t &netlist_mame_device::setup()
return m_netlist->setup();
}
-void netlist_mame_device::register_memregion_source(netlist::nlparse_t &setup, device_t &dev, const char *name)
+void netlist_mame_device::register_memregion_source(netlist::nlparse_t &parser, device_t &dev, const char *name)
{
- setup.register_source(dev, pstring(name));
+ parser.register_source(dev, pstring(name));
}
void netlist_mame_analog_input_device::write(const double val)
@@ -781,16 +781,14 @@ void netlist_mame_analog_output_device::custom_netlist_additions(netlist::netlis
{
const pstring pin(m_in);
pstring dname = pstring("OUT_") + pin;
- pstring dfqn = nlstate.parser().build_fqn(dname);
/* ignore if no running machine -> called within device_validity_check context */
if (owner()->has_running_machine())
m_delegate.resolve();
- auto dev = nlstate.make_object(nlstate, dfqn);
- //static_cast(dev.get())->register_callback(std::move(m_delegate));
+ auto dev = nlstate.make_object(nlstate, dname);
dev->register_callback(std::move(m_delegate));
- nlstate.register_device(dfqn, std::move(dev));
+ nlstate.register_device(dname, std::move(dev));
nlstate.parser().register_link(dname + ".IN", pin);
}
@@ -816,15 +814,14 @@ void netlist_mame_logic_output_device::custom_netlist_additions(netlist::netlist
{
pstring pin(m_in);
pstring dname = "OUT_" + pin;
- pstring dfqn = nlstate.parser().build_fqn(dname);
/* ignore if no running machine -> called within device_validity_check context */
if (owner()->has_running_machine())
m_delegate.resolve();
- auto dev = nlstate.make_object(nlstate, dfqn);
+ auto dev = nlstate.make_object(nlstate, dname);
dev->register_callback(std::move(m_delegate));
- nlstate.register_device(dfqn, std::move(dev));
+ nlstate.register_device(dname, std::move(dev));
nlstate.parser().register_link(dname + ".IN", pin);
}
@@ -1086,14 +1083,14 @@ void netlist_mame_device::common_dev_start(netlist::netlist_state_t *lnetlist) c
bool err=false;
bool v = plib::pstonum_ne(p, err);
if (err)
- lsetup.parser().log().warning("NL_STATS: invalid value {1}", p);
+ lsetup.log().warning("NL_STATS: invalid value {1}", p);
else
lnetlist->exec().enable_stats(v);
}
// register additional devices
- nl_register_devices(lsetup);
+ nl_register_devices(lsetup.parser());
/* let sub-devices add sources and do stuff prior to parsing */
for (device_t &d : subdevices())
@@ -1102,7 +1099,7 @@ void netlist_mame_device::common_dev_start(netlist::netlist_state_t *lnetlist) c
if( sdev != nullptr )
{
LOGDEVCALLS("Preparse subdevice %s/%s\n", d.name(), d.shortname());
- sdev->pre_parse_action(*lnetlist);
+ sdev->pre_parse_action(lsetup.parser());
}
}
@@ -1112,7 +1109,6 @@ void netlist_mame_device::common_dev_start(netlist::netlist_state_t *lnetlist) c
m_setup_func(lsetup.parser());
-#if 1
/* let sub-devices tweak the netlist */
for (device_t &d : subdevices())
{
@@ -1123,8 +1119,6 @@ void netlist_mame_device::common_dev_start(netlist::netlist_state_t *lnetlist) c
sdev->custom_netlist_additions(*lnetlist);
}
}
- lsetup.prepare_to_run();
-#endif
}
plib::unique_ptr netlist_mame_device::base_validity_check(validity_checker &valid) const
@@ -1135,6 +1129,7 @@ plib::unique_ptr netlist_mame_device::base_validity_ch
// enable validation mode
lnetlist->set_extended_validation(true);
common_dev_start(lnetlist.get());
+ lnetlist->setup().prepare_to_run();
for (device_t &d : subdevices())
{
@@ -1184,6 +1179,7 @@ void netlist_mame_device::device_start()
}
common_dev_start(m_netlist.get());
+ m_netlist->setup().prepare_to_run();
m_netlist->save(*this, m_rem, pstring(this->name()), "m_rem");
m_netlist->save(*this, m_div, pstring(this->name()), "m_div");
@@ -1334,9 +1330,9 @@ void netlist_mame_cpu_device::device_start()
}
-void netlist_mame_cpu_device::nl_register_devices(netlist::setup_t &lsetup) const
+void netlist_mame_cpu_device::nl_register_devices(netlist::nlparse_t &parser) const
{
- lsetup.parser().factory().add( "NETDEV_CALLBACK", "-", __FILE__);
+ parser.factory().add( "NETDEV_CALLBACK", "-", __FILE__);
}
uint64_t netlist_mame_cpu_device::execute_clocks_to_cycles(uint64_t clocks) const noexcept
@@ -1487,10 +1483,10 @@ void netlist_mame_sound_device::device_start()
}
-void netlist_mame_sound_device::nl_register_devices(netlist::setup_t &lsetup) const
+void netlist_mame_sound_device::nl_register_devices(netlist::nlparse_t &parser) const
{
- lsetup.parser().factory().add("NETDEV_SOUND_OUT", "+CHAN", __FILE__);
- lsetup.parser().factory().add("NETDEV_SOUND_IN", "-", __FILE__);
+ parser.factory().add("NETDEV_SOUND_OUT", "+CHAN", __FILE__);
+ parser.factory().add("NETDEV_SOUND_IN", "-", __FILE__);
}
void netlist_mame_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 9b11b1b5549..c447174353d 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -78,7 +78,7 @@ public:
void update_icount(netlist::netlist_time_ext time) noexcept;
void check_mame_abort_slice() noexcept;
- static void register_memregion_source(netlist::nlparse_t &setup, device_t &dev, const char *name);
+ static void register_memregion_source(netlist::nlparse_t &parser, device_t &dev, const char *name);
int m_icount;
@@ -99,7 +99,7 @@ protected:
netlist_mame_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// Custom to netlist ...
- virtual void nl_register_devices(netlist::setup_t &lsetup) const { }
+ virtual void nl_register_devices(netlist::nlparse_t &parser) const { }
// device_t overrides
virtual void device_config_complete() override;
@@ -178,7 +178,7 @@ public:
protected:
// netlist_mame_device
- virtual void nl_register_devices(netlist::setup_t &lsetup) const override;
+ virtual void nl_register_devices(netlist::nlparse_t &parser) const override;
// device_t overrides
virtual void device_start() override;
@@ -238,7 +238,7 @@ public:
protected:
// netlist_mame_device
- virtual void nl_register_devices(netlist::setup_t &lsetup) const override;
+ virtual void nl_register_devices(netlist::nlparse_t &parser) const override;
// device_t overrides
virtual void device_start() override;
@@ -269,7 +269,7 @@ public:
}
virtual void custom_netlist_additions(netlist::netlist_state_t &nlstate) { }
- virtual void pre_parse_action(netlist::netlist_state_t &nlstate) { }
+ virtual void pre_parse_action(netlist::nlparse_t &parser) { }
virtual void validity_helper(validity_checker &valid,
netlist::netlist_state_t &nlstate) const { }
diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp
index 4e1e4ea8c6b..5c1028c01c1 100644
--- a/src/devices/machine/phi.cpp
+++ b/src/devices/machine/phi.cpp
@@ -243,7 +243,7 @@ WRITE_LINE_MEMBER(phi_device::ren_w)
set_ext_signal(PHI_488_REN , state);
}
-WRITE8_MEMBER(phi_device::bus_dio_w)
+void phi_device::bus_dio_w(uint8_t data)
{
update_pp();
}
diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h
index 33def593315..dc3d0d76fd2 100644
--- a/src/devices/machine/phi.h
+++ b/src/devices/machine/phi.h
@@ -60,7 +60,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(atn_w);
DECLARE_WRITE_LINE_MEMBER(ren_w);
- DECLARE_WRITE8_MEMBER(bus_dio_w);
+ void bus_dio_w(uint8_t data);
void set_ext_signal(phi_488_signal_t signal , int state);
diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h
index 613886a5c0e..ba0c5bc5915 100644
--- a/src/devices/sound/dac.h
+++ b/src/devices/sound/dac.h
@@ -27,21 +27,21 @@ class dac_bit_interface
{
public:
virtual DECLARE_WRITE_LINE_MEMBER(write) = 0;
- virtual DECLARE_WRITE8_MEMBER(data_w) = 0;
+ virtual void data_w(uint8_t data) = 0;
};
class dac_byte_interface
{
public:
virtual void write(unsigned char data) = 0;
- virtual DECLARE_WRITE8_MEMBER(data_w) = 0;
+ virtual void data_w(uint8_t data) = 0;
};
class dac_word_interface
{
public:
virtual void write(unsigned short data) = 0;
- virtual DECLARE_WRITE16_MEMBER(data_w) = 0;
+ virtual void data_w(uint16_t data) = 0;
};
template
@@ -213,7 +213,7 @@ public:
}
virtual WRITE_LINE_MEMBER(write) override { this->setCode(state); }
- virtual WRITE8_MEMBER(data_w) override { this->setCode(data); }
+ virtual void data_w(uint8_t data) override { this->setCode(data); }
};
template
@@ -228,7 +228,7 @@ public:
}
virtual void write(unsigned char data) override { this->setCode(data); }
- virtual DECLARE_WRITE8_MEMBER(data_w) override { this->setCode(data); }
+ virtual void data_w(uint8_t data) override { this->setCode(data); }
};
template
@@ -243,7 +243,7 @@ public:
}
virtual void write(unsigned short data) override { this->setCode(data); }
- virtual DECLARE_WRITE16_MEMBER(data_w) override { this->setCode(data); }
+ virtual void data_w(uint16_t data) override { this->setCode(data); }
};
constexpr double dac_gain_r2r = 1.0;
diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h
index e8d5fa415e5..98a1d52a39f 100644
--- a/src/devices/sound/l7a1045_l6028_dsp_a.h
+++ b/src/devices/sound/l7a1045_l6028_dsp_a.h
@@ -24,8 +24,8 @@ public:
DECLARE_READ8_MEMBER(dma_r_cb);
DECLARE_WRITE8_MEMBER(dma_w_cb);
- DECLARE_READ16_MEMBER(dma_r16_cb) { m_voice[0].pos++; return 0; }
- DECLARE_WRITE16_MEMBER(dma_w16_cb) { m_voice[0].pos++; }
+ uint16_t dma_r16_cb() { m_voice[0].pos++; return 0; }
+ void dma_w16_cb(uint16_t data) { m_voice[0].pos++; }
DECLARE_WRITE_LINE_MEMBER(dma_hreq_cb);
protected:
diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp
index 2c3f6cbd26d..09f0a310b45 100644
--- a/src/devices/sound/mos7360.cpp
+++ b/src/devices/sound/mos7360.cpp
@@ -818,7 +818,7 @@ void mos7360_device::soundport_w(int offset, int data)
// read - register read
//-------------------------------------------------
-uint8_t mos7360_device::read(address_space &space, offs_t offset, int &cs0, int &cs1)
+uint8_t mos7360_device::read(offs_t offset, int &cs0, int &cs1)
{
uint8_t val = m_last_data;
@@ -902,7 +902,7 @@ uint8_t mos7360_device::read(address_space &space, offs_t offset, int &cs0, int
// write - register write
//-------------------------------------------------
-void mos7360_device::write(address_space &space, offs_t offset, uint8_t data, int &cs0, int &cs1)
+void mos7360_device::write(offs_t offset, uint8_t data, int &cs0, int &cs1)
{
int old;
diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h
index d73f711cd76..93ec30b2277 100644
--- a/src/devices/sound/mos7360.h
+++ b/src/devices/sound/mos7360.h
@@ -83,8 +83,8 @@ public:
virtual space_config_vector memory_space_config() const override;
- uint8_t read(address_space &space, offs_t offset, int &cs0, int &cs1);
- void write(address_space &space, offs_t offset, uint8_t data, int &cs0, int &cs1);
+ uint8_t read(offs_t offset, int &cs0, int &cs1);
+ void write(offs_t offset, uint8_t data, int &cs0, int &cs1);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp
index 46291961f7b..7abf8e0a979 100644
--- a/src/devices/video/hd44780.cpp
+++ b/src/devices/video/hd44780.cpp
@@ -23,6 +23,7 @@
//**************************************************************************
DEFINE_DEVICE_TYPE(HD44780, hd44780_device, "hd44780_a00", "Hitachi HD44780 A00 LCD Controller")
+DEFINE_DEVICE_TYPE(SED1278_0B, sed1278_0b_device, "sed1278_0b", "Epson SED1278-0B LCD Controller") // packaged as either SED1278F0B or SED1278D0B
DEFINE_DEVICE_TYPE(KS0066_F05, ks0066_f05_device, "ks0066_f05", "Samsung KS0066 F05 LCD Controller")
@@ -35,6 +36,11 @@ ROM_START( hd44780_a00 )
ROM_LOAD( "hd44780_a00.bin", 0x0000, 0x1000, BAD_DUMP CRC(01d108e2) SHA1(bc0cdf0c9ba895f22e183c7bd35a3f655f2ca96f)) // from page 17 of the HD44780 datasheet
ROM_END
+ROM_START( sed1278_0b )
+ ROM_REGION( 0x1000, "cgrom", 0 )
+ ROM_LOAD( "sed1278_0b.bin", 0x0000, 0x1000, BAD_DUMP CRC(eef342fa) SHA1(d6ac58a48e428e7cff26fb9c8ea9b4eeaa853038)) // from page 9-33 of the SED1278 datasheet
+ROM_END
+
ROM_START( ks0066_f05 )
ROM_REGION( 0x1000, "cgrom", 0 )
ROM_LOAD( "ks0066_f05.bin", 0x0000, 0x1000, BAD_DUMP CRC(af9e7bd6) SHA1(0196e871584ee5d370856e7307c0f9d1466e3e51)) // from page 51 of the KS0066 datasheet
@@ -67,6 +73,12 @@ hd44780_device::hd44780_device(const machine_config &mconfig, device_type type,
{
}
+sed1278_0b_device::sed1278_0b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ hd44780_device(mconfig, SED1278_0B, tag, owner, clock)
+{
+ set_charset_type(CHARSET_SED1278_0B);
+}
+
ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
hd44780_device(mconfig, KS0066_F05, tag, owner, clock)
{
@@ -83,6 +95,7 @@ const tiny_rom_entry *hd44780_device::device_rom_region() const
switch (m_charset_type)
{
case CHARSET_HD44780_A00: return ROM_NAME( hd44780_a00 );
+ case CHARSET_SED1278_0B: return ROM_NAME( sed1278_0b );
case CHARSET_KS0066_F05: return ROM_NAME( ks0066_f05 );
}
@@ -479,6 +492,7 @@ void hd44780_device::control_write(u8 data)
logerror("HD44780: function set cannot be executed after other instructions unless the interface data length is changed\n");
return;
}
+ m_first_cmd = true;
m_char_size = BIT(m_ir, 2) ? 10 : 8;
m_data_len = BIT(m_ir, 4) ? 8 : 4;
diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h
index 71b88f6f6b4..b8d79236955 100644
--- a/src/devices/video/hd44780.h
+++ b/src/devices/video/hd44780.h
@@ -66,6 +66,7 @@ protected:
enum
{
CHARSET_HD44780_A00,
+ CHARSET_SED1278_0B,
CHARSET_KS0066_F05 /*,
CHARSET_HD44780_A01,
CHARSET_HD44780_A02,
@@ -138,6 +139,15 @@ private:
enum { DDRAM, CGRAM };
};
+// ======================> sed1278_0b_device
+
+class sed1278_0b_device : public hd44780_device
+{
+public:
+ // construction/destruction
+ sed1278_0b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
+
// ======================> ks0066_f05_device
class ks0066_f05_device : public hd44780_device
@@ -149,6 +159,7 @@ public:
// device type definition
DECLARE_DEVICE_TYPE(HD44780, hd44780_device)
+DECLARE_DEVICE_TYPE(SED1278_0B, sed1278_0b_device)
DECLARE_DEVICE_TYPE(KS0066_F05, ks0066_f05_device)
#endif // MAME_VIDEO_HD44780_H
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index ba0334d8859..a1c371d1623 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -66,7 +66,6 @@ DEFINE_DEVICE_TYPE(HD6845S, hd6845s_device, "hd6845s", "Hitachi HD6845S CRTC"
DEFINE_DEVICE_TYPE(SY6545_1, sy6545_1_device, "sy6545_1", "Synertek SY6545-1 CRTC")
DEFINE_DEVICE_TYPE(SY6845E, sy6845e_device, "sy6845e", "Synertek SY6845E CRTC")
DEFINE_DEVICE_TYPE(HD6345, hd6345_device, "hd6345", "Hitachi HD6345 CRTC")
-DEFINE_DEVICE_TYPE(AMS40041, ams40041_device, "ams40041", "AMS40041 CRTC")
DEFINE_DEVICE_TYPE(AMS40489, ams40489_device, "ams40489", "AMS40489 ASIC (CRTC)")
DEFINE_DEVICE_TYPE(MOS8563, mos8563_device, "mos8563", "MOS 8563 VDC")
DEFINE_DEVICE_TYPE(MOS8568, mos8568_device, "mos8568", "MOS 8568 VDC")
@@ -1348,28 +1347,6 @@ void hd6345_device::device_start()
}
-void ams40041_device::device_start()
-{
- mc6845_device::device_start();
-
- m_horiz_char_total = 113;
- m_horiz_disp = 80;
- m_horiz_sync_pos = 90;
- m_sync_width = 10;
- m_vert_char_total = 127;
- m_vert_total_adj = 6;
- m_vert_disp = 100;
- m_vert_sync_pos = 112;
- m_mode_control = 2;
-
- m_supports_disp_start_addr_r = false;
- m_supports_vert_sync_width = false;
- m_supports_status_reg_d5 = false;
- m_supports_status_reg_d6 = false;
- m_supports_status_reg_d7 = false;
- m_supports_transparent = false;
-}
-
void ams40489_device::device_start()
{
mc6845_device::device_start();
@@ -1505,7 +1482,6 @@ void c6545_1_device::device_reset() { mc6845_device::device_reset(); }
void sy6545_1_device::device_reset() { mc6845_device::device_reset(); }
void sy6845e_device::device_reset() { mc6845_device::device_reset(); }
void hd6345_device::device_reset() { mc6845_device::device_reset(); }
-void ams40041_device::device_reset() { mc6845_device::device_reset(); }
void ams40489_device::device_reset() { mc6845_device::device_reset(); }
void mos8563_device::device_reset()
@@ -1586,11 +1562,6 @@ hd6345_device::hd6345_device(const machine_config &mconfig, const char *tag, dev
}
-ams40041_device::ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : mc6845_device(mconfig, AMS40041, tag, owner, clock)
-{
-}
-
ams40489_device::ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mc6845_device(mconfig, AMS40489, tag, owner, clock)
{
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index 1cfd768cdeb..93cb4a41334 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -373,16 +373,6 @@ protected:
virtual void device_reset() override;
};
-class ams40041_device : public mc6845_device
-{
-public:
- ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
- virtual void device_start() override;
- virtual void device_reset() override;
-};
-
class ams40489_device : public mc6845_device
{
public:
@@ -481,7 +471,6 @@ DECLARE_DEVICE_TYPE(HD6845S, hd6845s_device)
DECLARE_DEVICE_TYPE(SY6545_1, sy6545_1_device)
DECLARE_DEVICE_TYPE(SY6845E, sy6845e_device)
DECLARE_DEVICE_TYPE(HD6345, hd6345_device)
-DECLARE_DEVICE_TYPE(AMS40041, ams40041_device)
DECLARE_DEVICE_TYPE(AMS40489, ams40489_device)
DECLARE_DEVICE_TYPE(MOS8563, mos8563_device)
DECLARE_DEVICE_TYPE(MOS8568, mos8568_device)
diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp
index 47985c7a2d4..0a8936d0885 100644
--- a/src/lib/netlist/analog/nld_bjt.cpp
+++ b/src/lib/netlist/analog/nld_bjt.cpp
@@ -47,6 +47,11 @@ namespace analog
// nld_Q - Base classes
// -----------------------------------------------------------------------------
+ enum class bjt_type {
+ BJT_NPN,
+ BJT_PNP
+ };
+
/// \brief Class representing the bjt model parameters.
///
/// This is the model representation of the bjt model. Typically, SPICE uses
@@ -101,7 +106,8 @@ namespace analog
{
public:
bjt_model_t(param_model_t &model)
- : m_IS (model, "IS")
+ : m_type((model.type() == "NPN") ? bjt_type::BJT_NPN : bjt_type::BJT_PNP)
+ , m_IS (model, "IS")
, m_BF (model, "BF")
, m_NF (model, "NF")
, m_BR (model, "BR")
@@ -110,6 +116,7 @@ namespace analog
, m_CJC(model, "CJC")
{}
+ bjt_type m_type;
param_model_t::value_t m_IS; //!< transport saturation current
param_model_t::value_t m_BF; //!< ideal maximum forward beta
param_model_t::value_t m_NF; //!< forward current emission coefficient
@@ -125,14 +132,10 @@ namespace analog
NETLIB_BASE_OBJECT(QBJT)
{
public:
- enum q_type {
- BJT_NPN,
- BJT_PNP
- };
NETLIB_CONSTRUCTOR_EX(QBJT, const pstring &model = "NPN")
, m_model(*this, "MODEL", model)
- , m_qtype(BJT_NPN)
+ , m_qtype(bjt_type::BJT_NPN)
{
}
@@ -141,14 +144,14 @@ namespace analog
//NETLIB_RESETI();
NETLIB_UPDATEI();
- q_type qtype() const noexcept { return m_qtype; }
- bool is_qtype(q_type atype) const noexcept { return m_qtype == atype; }
- void set_qtype(q_type atype) noexcept { m_qtype = atype; }
+ bjt_type qtype() const noexcept { return m_qtype; }
+ bool is_qtype(bjt_type atype) const noexcept { return m_qtype == atype; }
+ void set_qtype(bjt_type atype) noexcept { m_qtype = atype; }
protected:
param_model_t m_model;
private:
- q_type m_qtype;
+ bjt_type m_qtype;
};
// -----------------------------------------------------------------------------
@@ -172,13 +175,14 @@ namespace analog
NETLIB_OBJECT_DERIVED(QBJT_switch, QBJT)
{
NETLIB_CONSTRUCTOR(QBJT_switch)
- , m_RB(*this, "m_RB", true)
- , m_RC(*this, "m_RC", true)
- , m_BC(*this, "m_BC", true)
- , m_gB(nlconst::cgmin())
- , m_gC(nlconst::cgmin())
- , m_V(nlconst::zero())
- , m_state_on(*this, "m_state_on", 0U)
+ , m_modacc(m_model)
+ , m_RB(*this, "m_RB", true)
+ , m_RC(*this, "m_RC", true)
+ , m_BC(*this, "m_BC", true)
+ , m_gB(nlconst::cgmin())
+ , m_gC(nlconst::cgmin())
+ , m_V(nlconst::zero())
+ , m_state_on(*this, "m_state_on", 0U)
{
register_subalias("B", m_RB.P());
register_subalias("E", m_RB.N());
@@ -195,6 +199,7 @@ namespace analog
NETLIB_UPDATE_TERMINALSI();
private:
+ bjt_model_t m_modacc;
nld_twoterm m_RB;
nld_twoterm m_RC;
nld_twoterm m_BC;
@@ -314,15 +319,13 @@ namespace analog
NETLIB_UPDATE_PARAM(QBJT_switch)
{
- bjt_model_t model(m_model);
-
- nl_fptype IS = model.m_IS;
- nl_fptype BF = model.m_BF;
- nl_fptype NF = model.m_NF;
- //nl_fptype VJE = model.dValue("VJE", 0.75);
+ nl_fptype IS = m_modacc.m_IS;
+ nl_fptype BF = m_modacc.m_BF;
+ nl_fptype NF = m_modacc.m_NF;
+ //nl_fptype VJE = m_modacc.dValue("VJE", 0.75);
// FIXME: check for PNP as well and bail out
- set_qtype((m_model.type() == "NPN") ? BJT_NPN : BJT_PNP);
+ set_qtype(m_modacc.m_type);
nl_fptype alpha = BF / (nlconst::one() + BF);
@@ -347,7 +350,7 @@ namespace analog
NETLIB_UPDATE_TERMINALS(QBJT_switch)
{
- const nl_fptype m = (is_qtype( BJT_NPN) ? 1 : -1);
+ const nl_fptype m = (is_qtype( bjt_type::BJT_NPN) ? 1 : -1);
const unsigned new_state = (m_RB.deltaV() * m > m_V ) ? 1 : 0;
if (m_state_on ^ new_state)
@@ -398,7 +401,7 @@ namespace analog
NETLIB_UPDATE_TERMINALS(QBJT_EB)
{
- const nl_fptype polarity(qtype() == BJT_NPN ? nlconst::one() : -nlconst::one());
+ const nl_fptype polarity(qtype() == bjt_type::BJT_NPN ? nlconst::one() : -nlconst::one());
m_gD_BE.update_diode(-m_D_EB.deltaV() * polarity);
m_gD_BC.update_diode(-m_D_CB.deltaV() * polarity);
@@ -430,10 +433,10 @@ namespace analog
nl_fptype NF = m_modacc.m_NF;
nl_fptype BR = m_modacc.m_BR;
nl_fptype NR = m_modacc.m_NR;
- //nl_fptype VJE = m_model.dValue("VJE", 0.75);
+ //nl_fptype VJE = m_m_modacc.dValue("VJE", 0.75);
// FIXME: check for PNP as well and bail out
- set_qtype((m_model.type() == "NPN") ? BJT_NPN : BJT_PNP);
+ set_qtype(m_modacc.m_type);
m_alpha_f = BF / (nlconst::one() + BF);
m_alpha_r = BR / (nlconst::one() + BR);
diff --git a/src/lib/netlist/analog/nlid_twoterm.cpp b/src/lib/netlist/analog/nlid_twoterm.cpp
index 1981b1c6e12..a449e19b078 100644
--- a/src/lib/netlist/analog/nlid_twoterm.cpp
+++ b/src/lib/netlist/analog/nlid_twoterm.cpp
@@ -145,9 +145,8 @@ namespace analog
NETLIB_RESET(D)
{
- diode_model_t modacc(m_model);
- nl_fptype Is = modacc.m_IS;
- nl_fptype n = modacc.m_N;
+ nl_fptype Is = m_modacc.m_IS;
+ nl_fptype n = m_modacc.m_N;
m_D.set_param(Is, n, exec().gmin(), nlconst::T0());
set_G_V_I(m_D.G(), nlconst::zero(), m_D.Ieq());
@@ -155,9 +154,8 @@ namespace analog
NETLIB_UPDATE_PARAM(D)
{
- diode_model_t modacc(m_model);
- nl_fptype Is = modacc.m_IS;
- nl_fptype n = modacc.m_N;
+ nl_fptype Is = m_modacc.m_IS;
+ nl_fptype n = m_modacc.m_N;
m_D.set_param(Is, n, exec().gmin(), nlconst::T0());
}
@@ -178,21 +176,19 @@ namespace analog
NETLIB_RESET(Z)
{
- zdiode_model_t modacc(m_model);
- nl_fptype IsBV = modacc.m_IBV / (plib::exp(modacc.m_BV / nlconst::np_VT(modacc.m_NBV)) - nlconst::one());
+ nl_fptype IsBV = m_modacc.m_IBV / (plib::exp(m_modacc.m_BV / nlconst::np_VT(m_modacc.m_NBV)) - nlconst::one());
- m_D.set_param(modacc.m_IS, modacc.m_N, exec().gmin(), nlconst::T0());
- m_R.set_param(IsBV, modacc.m_NBV, exec().gmin(), nlconst::T0());
+ m_D.set_param(m_modacc.m_IS, m_modacc.m_N, exec().gmin(), nlconst::T0());
+ m_R.set_param(IsBV, m_modacc.m_NBV, exec().gmin(), nlconst::T0());
set_G_V_I(m_D.G(), nlconst::zero(), m_D.Ieq());
}
NETLIB_UPDATE_PARAM(Z)
{
- zdiode_model_t modacc(m_model);
- nl_fptype IsBV = modacc.m_IBV / (plib::exp(modacc.m_BV / nlconst::np_VT(modacc.m_NBV)) - nlconst::one());
+ nl_fptype IsBV = m_modacc.m_IBV / (plib::exp(m_modacc.m_BV / nlconst::np_VT(m_modacc.m_NBV)) - nlconst::one());
- m_D.set_param(modacc.m_IS, modacc.m_N, exec().gmin(), nlconst::T0());
- m_R.set_param(IsBV, modacc.m_NBV, exec().gmin(), nlconst::T0());
+ m_D.set_param(m_modacc.m_IS, m_modacc.m_N, exec().gmin(), nlconst::T0());
+ m_R.set_param(IsBV, m_modacc.m_NBV, exec().gmin(), nlconst::T0());
set_G_V_I(m_D.G(), nlconst::zero(), m_D.Ieq());
}
diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h
index 14fad2cf051..87411ee8109 100644
--- a/src/lib/netlist/analog/nlid_twoterm.h
+++ b/src/lib/netlist/analog/nlid_twoterm.h
@@ -488,6 +488,7 @@ namespace analog
public:
NETLIB_CONSTRUCTOR_EX(D, const pstring &model = "D")
, m_model(*this, "MODEL", model)
+ , m_modacc(m_model)
, m_D(*this, "m_D")
{
register_subalias("A", P());
@@ -504,6 +505,7 @@ namespace analog
private:
param_model_t m_model;
+ diode_model_t m_modacc;
generic_diode m_D;
};
@@ -516,6 +518,7 @@ namespace analog
public:
NETLIB_CONSTRUCTOR_EX(Z, const pstring &model = "D")
, m_model(*this, "MODEL", model)
+ , m_modacc(m_model)
, m_D(*this, "m_D")
, m_R(*this, "m_R")
{
@@ -533,6 +536,7 @@ namespace analog
private:
param_model_t m_model;
+ zdiode_model_t m_modacc;
generic_diode m_D;
// REVERSE diode
generic_diode m_R;
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index 7ca0c8de42e..d18a65605aa 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -73,7 +73,7 @@ TIDY_DB = $(OBJ)/compile_commands.json
# LTO = -flto=4 -fuse-linker-plugin -flto-partition=balanced -Wodr
-CCOREFLAGS = -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../..
+CCOREFLAGS = -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../..
CFLAGS = $(LTO) $(CCOREFLAGS) $(CEXTRAFLAGS)
@@ -145,6 +145,7 @@ NLOBJS := \
$(NLOBJ)/devices/nld_2716.o \
$(NLOBJ)/devices/nld_tms4800.o \
$(NLOBJ)/devices/nld_4006.o \
+ $(NLOBJ)/devices/nld_4013.o \
$(NLOBJ)/devices/nld_4020.o \
$(NLOBJ)/devices/nld_4066.o \
$(NLOBJ)/devices/nld_4316.o \
@@ -162,6 +163,7 @@ NLOBJS := \
$(NLOBJ)/devices/nld_7497.o \
$(NLOBJ)/devices/nld_74107.o \
$(NLOBJ)/devices/nld_74123.o \
+ $(NLOBJ)/devices/nld_74125.o \
$(NLOBJ)/devices/nld_74153.o \
$(NLOBJ)/devices/nld_74161.o \
$(NLOBJ)/devices/nld_74164.o \
@@ -173,6 +175,7 @@ NLOBJS := \
$(NLOBJ)/devices/nld_74193.o \
$(NLOBJ)/devices/nld_74194.o \
$(NLOBJ)/devices/nld_74365.o \
+ $(NLOBJ)/devices/nld_74377.o \
$(NLOBJ)/devices/nld_74393.o \
$(NLOBJ)/devices/nld_74ls629.o \
$(NLOBJ)/devices/nld_82S16.o \
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj b/src/lib/netlist/buildVS/netlistlib.vcxproj
index 231ced66701..726b81546b4 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj
@@ -123,6 +123,7 @@
+
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
index 4416e3295b2..2188b989e7e 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
@@ -105,6 +105,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -473,6 +476,9 @@
Header Files
+
+ Header Files
+
Header Files
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 0741c598517..ae380e6804b 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -109,6 +109,8 @@ namespace devices
LIB_ENTRY(74107A) // FIXME: implement missing DIP
LIB_ENTRY(74123)
LIB_ENTRY(74123_dip)
+ LIB_ENTRY(74125)
+ LIB_ENTRY(74126)
LIB_ENTRY(74153)
LIB_ENTRY(74153_dip)
LIB_ENTRY(74161)
@@ -127,6 +129,7 @@ namespace devices
LIB_ENTRY(74193)
LIB_ENTRY(74194)
LIB_ENTRY(74365)
+ LIB_ENTRY(74377_GATE)
LIB_ENTRY(74393)
LIB_ENTRY(74393_dip)
//ENTRY(74279, TTL_74279, "") // only dip available
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index 1eccd867cb6..12f55858111 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -48,6 +48,7 @@
#include "nld_2102A.h"
#include "nld_2716.h"
#include "nld_4006.h"
+#include "nld_4013.h"
#include "nld_4020.h"
#include "nld_4066.h"
#include "nld_4316.h"
@@ -64,6 +65,7 @@
#include "nld_74193.h"
#include "nld_74194.h"
#include "nld_74365.h"
+#include "nld_74377.h"
#include "nld_74393.h"
#include "nld_7448.h"
#include "nld_7450.h"
diff --git a/src/lib/netlist/devices/nld_4013.cpp b/src/lib/netlist/devices/nld_4013.cpp
new file mode 100644
index 00000000000..18aba4687e0
--- /dev/null
+++ b/src/lib/netlist/devices/nld_4013.cpp
@@ -0,0 +1,143 @@
+
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_4013.c
+ *
+ */
+
+#include "nld_4013.h"
+#include "netlist/nl_base.h"
+#include "nlid_system.h"
+
+#include
+
+namespace netlist
+{
+ namespace devices
+ {
+
+ NETLIB_OBJECT(4013)
+ {
+ NETLIB_CONSTRUCTOR(4013)
+ , m_D(*this, "DATA")
+ , m_RESET(*this, "RESET")
+ , m_SET(*this, "SET")
+ , m_CLK(*this, "CLOCK", NETLIB_DELEGATE(4013, clk))
+ , m_Q(*this, "Q")
+ , m_QQ(*this, "QQ")
+ , m_nextD(*this, "m_nextD", 0)
+ , m_power_pins(*this)
+ {
+ }
+
+ private:
+ NETLIB_RESETI();
+ NETLIB_UPDATEI();
+ NETLIB_HANDLERI(clk);
+
+ logic_input_t m_D;
+ logic_input_t m_RESET;
+ logic_input_t m_SET;
+ logic_input_t m_CLK;
+ logic_output_t m_Q;
+ logic_output_t m_QQ;
+
+ state_var m_nextD;
+
+ nld_power_pins m_power_pins;
+
+ void newstate_clk(const netlist_sig_t stateQ)
+ {
+ static constexpr delay = NLTIME_FROM_NS(150);
+ m_Q.push(stateQ, delay);
+ m_QQ.push(!stateQ, delay);
+ }
+
+ void newstate_setreset(const netlist_sig_t stateQ, const netlist_sig_t stateQQ)
+ {
+ // Q: 150 ns, QQ: 200 ns
+ static constexpr const std::array delay = { NLTIME_FROM_NS(150), NLTIME_FROM_NS(200) };
+ m_Q.push(stateQ, delay[0]);
+ m_QQ.push(stateQQ, delay[1]);
+ }
+ };
+
+ NETLIB_OBJECT(4013_dip)
+ {
+ NETLIB_CONSTRUCTOR(4013_dip)
+ NETLIB_FAMILY("CD4XXX")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
+ {
+ register_subalias("1", "A.Q");
+ register_subalias("2", "A.QQ");
+ register_subalias("3", "A.CLOCK");
+ register_subalias("4", "A.RESET");
+ register_subalias("5", "A.DATA");
+ register_subalias("6", "A.SET");
+ register_subalias("7", "A.VSS");
+
+ register_subalias("8", "B.SET");
+ register_subalias("9", "B.DATA");
+ register_subalias("10", "B.RESET");
+ register_subalias("11", "B.CLOCK");
+ register_subalias("12", "B.QQ");
+ register_subalias("13", "B.Q");
+ register_subalias("14", "A.VDD");
+
+ connect("A.VSS", "B.VSS");
+ connect("A.VDD", "B.VDD");
+ }
+ NETLIB_UPDATEI();
+ NETLIB_RESETI();
+
+ private:
+ NETLIB_SUB(4013) m_A;
+ NETLIB_SUB(4013) m_B;
+ };
+
+ NETLIB_HANDLER(4013, clk)
+ {
+ newstate_clk(m_nextD);
+ m_CLK.inactivate();
+ }
+
+ NETLIB_UPDATE(4013)
+ {
+ const auto set(m_SET());
+ const auto reset(m_RESET());
+ if ((set ^ 1) & (reset ^ 1))
+ {
+ m_D.activate();
+ m_nextD = m_D();
+ m_CLK.activate_lh();
+ }
+ else
+ {
+ newstate_setreset(set, reset);
+ m_CLK.inactivate();
+ m_D.inactivate();
+ }
+ }
+
+ NETLIB_RESET(4013)
+ {
+ m_CLK.set_state(logic_t::STATE_INP_LH);
+ m_D.set_state(logic_t::STATE_INP_ACTIVE);
+ m_nextD = 0;
+ }
+
+ NETLIB_RESET(4013_dip)
+ {
+ }
+
+ NETLIB_UPDATE(4013_dip)
+ {
+ }
+
+ NETLIB_DEVICE_IMPL(CD4013, "CD4013", "+CLOCK,+DATA,+RESET,+SET,@VDD,@VSS")
+ NETLIB_DEVICE_IMPL(CD4013_DIP, "CD4013_DIP", "")
+
+ } //namespace devices
+} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_4013.h b/src/lib/netlist/devices/nld_4013.h
new file mode 100644
index 00000000000..053a43f0ed5
--- /dev/null
+++ b/src/lib/netlist/devices/nld_4013.h
@@ -0,0 +1,59 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_4013.h
+ *
+ * CD4013: Dual Positive-Edge-Triggered D Flip-Flops
+ * with Set, Reset and Complementary Outputs
+ *
+ * +--------------+
+ * Q1 |1 ++ 14| VDD
+ * Q1Q |2 13| Q2
+ * CLOCK1 |3 12| Q2Q
+ * RESET1 |4 4013 11| CLOCK2
+ * DATA1 |5 10| RESET2
+ * SET1 |6 9| DATA2
+ * VSS |7 8| SET2
+ * +--------------+
+ *
+ * +-----+-----+-----+---++---+-----+
+ * | SET | RES | CLK | D || Q | QQ |
+ * +=====+=====+=====+===++===+=====+
+ * | 1 | 0 | X | X || 1 | 0 |
+ * | 0 | 1 | X | X || 0 | 1 |
+ * | 1 | 1 | X | X || 1 | 1 | (*)
+ * | 0 | 0 | R | 1 || 1 | 0 |
+ * | 0 | 0 | R | 0 || 0 | 1 |
+ * | 0 | 0 | 0 | X || Q0| Q0Q |
+ * +-----+-----+-----+---++---+-----+
+ *
+ * (*) This configuration is not stable, i.e. it will not persist
+ * when either the preset and or clear inputs return to their inactive (high) level
+ *
+ * Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ * R: 0 -. 1
+ *
+ * Naming conventions follow National Semiconductor datasheet
+ *
+ * FIXME: Check that (*) is emulated properly
+ */
+
+#ifndef NLD_4013_H_
+#define NLD_4013_H_
+
+#include "netlist/nl_setup.h"
+
+#define CD4013(name, cCLOCK, cDATA, cRESET, cSET) \
+ NET_REGISTER_DEV(CD4013, name) \
+ NET_CONNECT(name, VSS, VSS) \
+ NET_CONNECT(name, VDD, VDD) \
+ NET_CONNECT(name, CLK, cCLK) \
+ NET_CONNECT(name, DATA, cDATA) \
+ NET_CONNECT(name, SET, cSET) \
+ NET_CONNECT(name, RESET, cRESET)
+
+#define CD4013_DIP(name) \
+ NET_REGISTER_DEV(CD4013_DIP, name)
+
+#endif /* NLD_4013_H_ */
diff --git a/src/lib/netlist/devices/nld_74125.cpp b/src/lib/netlist/devices/nld_74125.cpp
new file mode 100644
index 00000000000..bac94c18d22
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74125.cpp
@@ -0,0 +1,122 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74125.c
+ *
+ */
+
+#include "nld_74125.h"
+#include "nl_base.h"
+
+namespace netlist
+{
+ template
+ struct uptr : public unique_pool_ptr
+ {
+ uptr() = default;
+
+ using base_type = unique_pool_ptr;
+
+ template::value>::type>
+ uptr(O &owner, const pstring &name, Args&&... args)
+ : unique_pool_ptr(static_cast(owner).state().make_object(owner, name, std::forward(args)...))
+ { }
+
+ template
+ uptr(typename std::enable_if<
+ std::is_base_of::value, O>::type &owner, const pstring &name, Args&&... args)
+ : unique_pool_ptr(static_cast(owner).make_object(owner, name, std::forward(args)...))
+ { }
+
+ C14CONSTEXPR auto operator ()() noexcept -> decltype((*unique_pool_ptr::get())()) { return (*this->get())(); }
+ constexpr auto operator ()() const noexcept -> const decltype((*unique_pool_ptr::get())()) { return (*this->get())(); }
+ };
+
+ namespace devices
+ {
+
+ template
+ NETLIB_OBJECT(74125_base)
+ {
+ NETLIB_CONSTRUCTOR(74125_base)
+ , m_A(*this, "A", NETLIB_DELEGATE(74125_base, A))
+ , m_G(*this, "G", NETLIB_DELEGATE(74125_base, G))
+ , m_Y(*this, "Y", NLTIME_FROM_NS(11), NLTIME_FROM_NS(13))
+ , m_power_pins(*this)
+ {
+ }
+
+ private:
+ NETLIB_RESETI()
+ {
+ }
+
+ NETLIB_UPDATEI()
+ {
+ // this one is only called during startup. Ensure all outputs
+ // are in a consistent state.
+ m_Y.set_tristate(m_G() ^ INVERT_G);
+ m_Y.push(m_A(), m_A() ? NLTIME_FROM_NS(8) : NLTIME_FROM_NS(12));
+ }
+
+ NETLIB_HANDLERI(A)
+ {
+ m_Y.push(m_A(), m_A() ? NLTIME_FROM_NS(8) : NLTIME_FROM_NS(12));
+ }
+
+ NETLIB_HANDLERI(G)
+ {
+ m_Y.set_tristate(m_G() ^ INVERT_G);
+ }
+
+ logic_input_t m_A;
+ uptr m_G;
+ tristate_output_t m_Y;
+ nld_power_pins m_power_pins;
+ };
+
+#if 0
+ template
+ NETLIB_OBJECT(74125_dip_base)
+ {
+ NETLIB_CONSTRUCTOR(74125_dip_base)
+ , A(*this, "A")
+ {
+ this->register_subalias("1", "A.CLRQ");
+ this->register_subalias("2", "A.CLK");
+ this->register_subalias("3", "A.A");
+ this->register_subalias("4", "A.B");
+ this->register_subalias("5", "A.C");
+ this->register_subalias("6", "A.D");
+ this->register_subalias("7", "A.ENP");
+ this->register_subalias("8", "A.GND");
+
+ this->register_subalias("9", "A.LOADQ");
+ this->register_subalias("10", "A.ENT");
+ this->register_subalias("11", "A.QD");
+ this->register_subalias("12", "A.QC");
+ this->register_subalias("13", "A.QB");
+ this->register_subalias("14", "A.QA");
+ this->register_subalias("15", "A.RC");
+ this->register_subalias("16", "A.VCC");
+ }
+ private:
+ NETLIB_SUB(74125_base) A;
+ };
+ using NETLIB_NAME(74163) = NETLIB_NAME(74125_base);
+ using NETLIB_NAME(74125_dip) = NETLIB_NAME(74125_dip_base);
+ using NETLIB_NAME(74163_dip) = NETLIB_NAME(74125_dip_base);
+ NETLIB_DEVICE_IMPL(74125_dip, "TTL_74125_DIP", "")
+
+ NETLIB_DEVICE_IMPL(74163, "TTL_74163", "+CLK,+ENP,+ENT,+CLRQ,+LOADQ,+A,+B,+C,+D,@VCC,@GND")
+ NETLIB_DEVICE_IMPL(74163_dip, "TTL_74163_DIP", "")
+#endif
+ using NETLIB_NAME(74125) = NETLIB_NAME(74125_base)<1>;
+ using NETLIB_NAME(74126) = NETLIB_NAME(74125_base)<0>;
+
+ NETLIB_DEVICE_IMPL(74125, "TTL_74125", "")
+ NETLIB_DEVICE_IMPL(74126, "TTL_74126", "")
+
+ } //namespace devices
+} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_74125.h b/src/lib/netlist/devices/nld_74125.h
new file mode 100644
index 00000000000..38f9f245a9a
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74125.h
@@ -0,0 +1,92 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74125.h
+ *
+ * DM74125: Synchronous 4-Bit Counters
+ *
+ * +--------------+
+ * /CLEAR |1 ++ 16| VCC
+ * CLOCK |2 15| RC (Ripple Carry)
+ * A |3 14| QA
+ * B |4 74125 13| QB
+ * C |5 12| QC
+ * D |6 11| QD
+ * Enable P |7 10| Enable T
+ * GND |8 9| /LOAD
+ * +--------------+
+ *
+ * Counter Sequence
+ *
+ * +-------++----+----+----+----+----+
+ * | COUNT || QD | QC | QB | QA | RC |
+ * +=======++====+====+====+====+====+
+ * | 0 || 0 | 0 | 0 | 0 | 0 |
+ * | 1 || 0 | 0 | 0 | 1 | 0 |
+ * | 2 || 0 | 0 | 1 | 0 | 0 |
+ * | 3 || 0 | 0 | 1 | 1 | 0 |
+ * | 4 || 0 | 1 | 0 | 0 | 0 |
+ * | 5 || 0 | 1 | 0 | 1 | 0 |
+ * | 6 || 0 | 1 | 1 | 0 | 0 |
+ * | 7 || 0 | 1 | 1 | 1 | 0 |
+ * | 8 || 1 | 0 | 0 | 0 | 0 |
+ * | 9 || 1 | 0 | 0 | 1 | 0 |
+ * | 10 || 1 | 0 | 1 | 0 | 0 |
+ * | 11 || 1 | 0 | 1 | 1 | 0 |
+ * | 12 || 1 | 1 | 0 | 0 | 0 |
+ * | 13 || 1 | 1 | 0 | 1 | 0 |
+ * | 14 || 1 | 1 | 1 | 0 | 0 |
+ * | 15 || 1 | 1 | 1 | 1 | 1 |
+ * +-------++----+----+----+----+----+
+ *
+ * Reset count function: Please refer to
+ * National Semiconductor datasheet (timing diagram)
+ *
+ * Naming conventions follow National Semiconductor datasheet
+ *
+ * TODO: DM74161 is compatible to DM74125 (both asynchronous clear)
+ * DM74163 has asynchronous clear (on L to H transition of clock)
+ */
+
+#ifndef NLD_74125_H_
+#define NLD_74125_H_
+
+#include "netlist/nl_setup.h"
+
+#if 0
+#define TTL_74125(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \
+ NET_REGISTER_DEV(TTL_74125, name) \
+ NET_CONNECT(name, GND, GND) \
+ NET_CONNECT(name, VCC, VCC) \
+ NET_CONNECT(name, CLK, cCLK) \
+ NET_CONNECT(name, ENP, cENP) \
+ NET_CONNECT(name, ENT, cENT) \
+ NET_CONNECT(name, CLRQ, cCLRQ) \
+ NET_CONNECT(name, LOADQ, cLOADQ) \
+ NET_CONNECT(name, A, cA) \
+ NET_CONNECT(name, B, cB) \
+ NET_CONNECT(name, C, cC) \
+ NET_CONNECT(name, D, cD)
+
+#define TTL_74163(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \
+ NET_REGISTER_DEV(TTL_74163, name) \
+ NET_CONNECT(name, GND, GND) \
+ NET_CONNECT(name, VCC, VCC) \
+ NET_CONNECT(name, CLK, cCLK) \
+ NET_CONNECT(name, ENP, cENP) \
+ NET_CONNECT(name, ENT, cENT) \
+ NET_CONNECT(name, CLRQ, cCLRQ) \
+ NET_CONNECT(name, LOADQ, cLOADQ) \
+ NET_CONNECT(name, A, cA) \
+ NET_CONNECT(name, B, cB) \
+ NET_CONNECT(name, C, cC) \
+ NET_CONNECT(name, D, cD)
+
+#define TTL_74125_DIP(name) \
+ NET_REGISTER_DEV(TTL_74125_DIP, name)
+
+#define TTL_74163_DIP(name) \
+ NET_REGISTER_DEV(TTL_74163_DIP, name)
+#endif
+
+#endif /* NLD_74125_H_ */
diff --git a/src/lib/netlist/devices/nld_74377.cpp b/src/lib/netlist/devices/nld_74377.cpp
new file mode 100644
index 00000000000..127803acb42
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74377.cpp
@@ -0,0 +1,62 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74377.c
+ *
+ */
+
+#include "nld_74377.h"
+#include "netlist/nl_base.h"
+
+namespace netlist
+{
+ namespace devices
+ {
+
+ constexpr const std::array delay = { NLTIME_FROM_NS(25), NLTIME_FROM_NS(25) };
+
+ NETLIB_OBJECT(74377_GATE)
+ {
+ NETLIB_CONSTRUCTOR(74377_GATE)
+ , m_E(*this, "E")
+ , m_D(*this, "D")
+ , m_CP(*this, "CP")
+ , m_Q(*this, "Q")
+ , m_QQ(*this, "QQ")
+ , m_cp(*this, "m_cp", 0)
+ , m_power_pins(*this)
+ {
+ }
+
+ NETLIB_RESETI()
+ {
+ }
+ NETLIB_UPDATEI()
+ {
+ netlist_sig_t last_cp = m_cp;
+
+ m_cp = m_CP();
+
+ if (!m_E() && !last_cp && m_cp)
+ {
+ netlist_sig_t d = m_D();
+ m_Q.push(d, delay[d]);
+ m_QQ.push(d ^ 1, delay[d ^ 1]);
+ }
+ }
+
+ private:
+ logic_input_t m_E;
+ logic_input_t m_D;
+ logic_input_t m_CP;
+ logic_output_t m_Q;
+ logic_output_t m_QQ;
+
+ state_var_sig m_cp;
+ nld_power_pins m_power_pins;
+ };
+
+ NETLIB_DEVICE_IMPL(74377_GATE, "TTL_74377_GATE", "")
+
+ } //namespace devices
+} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_74377.h b/src/lib/netlist/devices/nld_74377.h
new file mode 100644
index 00000000000..6f5a3aed14e
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74377.h
@@ -0,0 +1,61 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud,Aaron Giles
+/*
+ * nld_74377.h
+ *
+ * DM74377: Octal D Flip-Flop With Enable
+ *
+ * +--------------+
+ * /E |1 ++ 20| VCC
+ * Q0 |2 19| Q7
+ * D0 |3 18| D7
+ * D1 |4 74377 17| D6
+ * Q1 |5 16| Q6
+ * Q2 |6 15| Q5
+ * D2 |7 14| D5
+ * D3 |8 13| D4
+ * Q3 |9 12| Q4
+ * GND |10 11| CP
+ * +--------------+
+ *
+ * DM74378: Hex D Flip-Flop With Enable
+ *
+ * +--------------+
+ * /E |1 ++ 16| VCC
+ * Q0 |2 15| Q5
+ * D0 |3 14| D5
+ * D1 |4 74378 13| D4
+ * Q1 |5 12| Q4
+ * D2 |6 11| D3
+ * Q2 |7 10| Q3
+ * GND |8 9| CP
+ * +--------------+
+ *
+ * DM74379: 4-bit D Flip-Flop With Enable
+ *
+ * +--------------+
+ * /E |1 ++ 16| VCC
+ * Q0 |2 15| Q3
+ * /Q0 |3 14| /Q3
+ * D0 |4 74379 13| D3
+ * D1 |5 12| D2
+ * /Q1 |6 11| /Q2
+ * Q1 |7 10| Q2
+ * GND |8 9| CP
+ * +--------------+
+ *
+ * Naming conventions follow Motorola datasheet
+ *
+ */
+
+#ifndef NLD_74377_H_
+#define NLD_74377_H_
+
+#include "netlist/nl_setup.h"
+
+
+#define TTL_74377_GATE(name) \
+ NET_REGISTER_DEV(TTL_74377_GATE, name)
+
+
+#endif /* NLD_74377_H_ */
diff --git a/src/lib/netlist/devices/nld_devinc.h b/src/lib/netlist/devices/nld_devinc.h
index bd453dad8f3..aff6c92d630 100644
--- a/src/lib/netlist/devices/nld_devinc.h
+++ b/src/lib/netlist/devices/nld_devinc.h
@@ -426,6 +426,12 @@
#define TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6) \
NET_REGISTER_DEVEXT(TTL_74365, name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6)
+// ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_74377.cpp
+// ---------------------------------------------------------------------
+#define TTL_74377_GATE(name) \
+ NET_REGISTER_DEVEXT(TTL_74377_GATE, name)
+
// ---------------------------------------------------------------------
// Source: src/lib/netlist/devices/nld_74393.cpp
// ---------------------------------------------------------------------
@@ -879,6 +885,15 @@
#define TTL_74279_DIP(name) \
NET_REGISTER_DEVEXT(TTL_74279_DIP, name)
+#define TTL_74377_DIP(name) \
+ NET_REGISTER_DEVEXT(TTL_74377_DIP, name)
+
+#define TTL_74378_DIP(name) \
+ NET_REGISTER_DEVEXT(TTL_74378_DIP, name)
+
+#define TTL_74379_DIP(name) \
+ NET_REGISTER_DEVEXT(TTL_74379_DIP, name)
+
#define DM9312_DIP(name) \
NET_REGISTER_DEVEXT(DM9312_DIP, name)
@@ -891,6 +906,9 @@
#define CD4070_GATE(name) \
NET_REGISTER_DEVEXT(CD4070_GATE, name)
+#define CD4069_GATE(name) \
+ NET_REGISTER_DEVEXT(CD4069_GATE, name)
+
#define CD4001_DIP(name) \
NET_REGISTER_DEVEXT(CD4001_DIP, name)
diff --git a/src/lib/netlist/devices/nlid_proxy.cpp b/src/lib/netlist/devices/nlid_proxy.cpp
index bebc1c66a47..fb0ba84c5a8 100644
--- a/src/lib/netlist/devices/nlid_proxy.cpp
+++ b/src/lib/netlist/devices/nlid_proxy.cpp
@@ -120,7 +120,7 @@ namespace netlist
, m_I(*this, "I")
, m_RP(*this, "RP")
, m_RN(*this, "RN")
- , m_last_state(*this, "m_last_var", -1)
+ , m_last_state(*this, "m_last_var", terminal_t::OUT_TRISTATE())
{
register_subalias("Q", m_RN.P());
@@ -144,7 +144,7 @@ namespace netlist
void nld_d_to_a_proxy::reset()
{
//m_Q.initial(0.0);
- m_last_state = -1;
+ m_last_state = terminal_t::OUT_TRISTATE();
m_RN.reset();
m_RP.reset();
m_RN.set_G_V_I(plib::reciprocal(logic_family()->R_low()),
@@ -156,27 +156,38 @@ namespace netlist
NETLIB_UPDATE(d_to_a_proxy)
{
- const auto state = static_cast(m_I());
+ const auto state = m_I();
if (state != m_last_state)
{
// RN, RP are connected ...
m_RN.change_state([this, &state]()
{
- if (state)
+ switch (state)
{
- m_RN.set_G_V_I(G_OFF,
- nlconst::zero(),
- nlconst::zero());
- m_RP.set_G_V_I(plib::reciprocal(logic_family()->R_high()),
- logic_family()->high_offset_V(), nlconst::zero());
- }
- else
- {
- m_RN.set_G_V_I(plib::reciprocal(logic_family()->R_low()),
- logic_family()->low_offset_V(), nlconst::zero());
- m_RP.set_G_V_I(G_OFF,
- nlconst::zero(),
- nlconst::zero());
+ case 0:
+ m_RN.set_G_V_I(plib::reciprocal(logic_family()->R_low()),
+ logic_family()->low_offset_V(), nlconst::zero());
+ m_RP.set_G_V_I(G_OFF,
+ nlconst::zero(),
+ nlconst::zero());
+ break;
+ case 1:
+ m_RN.set_G_V_I(G_OFF,
+ nlconst::zero(),
+ nlconst::zero());
+ m_RP.set_G_V_I(plib::reciprocal(logic_family()->R_high()),
+ logic_family()->high_offset_V(), nlconst::zero());
+ break;
+ case terminal_t::OUT_TRISTATE():
+ m_RN.set_G_V_I(G_OFF,
+ nlconst::zero(),
+ nlconst::zero());
+ m_RP.set_G_V_I(G_OFF,
+ nlconst::zero(),
+ nlconst::zero());
+ break;
+ default:
+ printf("this should never happen!");
}
});
m_last_state = state;
diff --git a/src/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h
index 1425e61bfdf..161bd56970d 100644
--- a/src/lib/netlist/devices/nlid_proxy.h
+++ b/src/lib/netlist/devices/nlid_proxy.h
@@ -118,7 +118,7 @@ namespace devices
logic_input_t m_I;
analog::NETLIB_NAME(twoterm) m_RP;
analog::NETLIB_NAME(twoterm) m_RN;
- state_var m_last_state;
+ state_var m_last_state;
};
} // namespace devices
diff --git a/src/lib/netlist/examples/74125.cpp b/src/lib/netlist/examples/74125.cpp
new file mode 100644
index 00000000000..807d8bf27c8
--- /dev/null
+++ b/src/lib/netlist/examples/74125.cpp
@@ -0,0 +1,40 @@
+// license:CC0
+// copyright-holders:Couriersud
+
+/*
+ * 74125.cpp
+ *
+ */
+
+//! [74125_example]
+#include "netlist/devices/net_lib.h"
+
+// ./nltool -c run -l RL.1 src/lib/netlist/examples/74125.cpp
+// RL.1 : Output
+
+NETLIST_START(main)
+
+ SOLVER(Solver, 48000) // could be 1 in this example
+
+ ANALOG_INPUT(VCC, 5.0)
+
+ TTL_74125(X1)
+ TTL_74126(X2)
+
+ CLOCK(C1, 100)
+ CLOCK(C2, 300)
+ CLOCK(C3, 5)
+
+ RES(RL, 1000)
+
+ NET_C(C1.Q, X1.A)
+ NET_C(C2.Q, X2.A)
+ NET_C(C3.Q, X1.G, X2.G)
+
+ NET_C(X1.Y, X2.Y, RL.1)
+
+ NET_C(GND, RL.2, C1.GND, C2.GND, C3.GND, X1.GND, X2.GND)
+ NET_C(VCC, C1.VCC, C2.VCC, C3.VCC, X1.VCC, X2.VCC)
+
+NETLIST_END()
+//! [74125_example]
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.cpp b/src/lib/netlist/macro/nlm_cd4xxx.cpp
index 52adb40430d..2411f837b29 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx.cpp
+++ b/src/lib/netlist/macro/nlm_cd4xxx.cpp
@@ -7,13 +7,13 @@
* CD4001BC: Quad 2-Input NOR Buffered B Series Gate
*
* +--------------+
- * A1 |1 ++ 14| VCC
+ * A1 |1 ++ 14| VDD
* B1 |2 13| A6
* A2 |3 12| Y6
* Y2 |4 4001 11| A5
* A3 |5 10| Y5
* Y3 |6 9| A4
- * GND |7 8| Y4
+ * VSS |7 8| Y4
* +--------------+
*
*/
@@ -24,16 +24,16 @@ static NETLIST_START(CD4001_DIP)
CD4001_GATE(s3)
CD4001_GATE(s4)
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
+ NET_C(s1.VDD, s2.VDD, s3.VDD, s4.VDD)
+ NET_C(s1.VSS, s2.VSS, s3.VSS, s4.VSS)
DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VDD */ s1.VCC,
+ s1.A, /* A1 |1 ++ 14| VDD */ s1.VDD,
s1.B, /* B1 |2 13| A6 */ s4.B,
s1.Q, /* A2 |3 12| Y6 */ s4.A,
s2.Q, /* Y2 |4 4001 11| A5 */ s4.Q,
s2.A, /* A3 |5 10| Y5 */ s3.Q,
s2.B, /* Y3 |6 9| A4 */ s3.B,
- s1.GND, /* VSS |7 8| Y4 */ s3.A
+ s1.VSS, /* VSS |7 8| Y4 */ s3.A
/* +--------------+ */
)
@@ -149,7 +149,45 @@ static NETLIST_START(CD4016_DIP)
NETLIST_END()
/*
- * DM7486: Quad 2-Input Exclusive-OR Gates
+ * CD4069: Hex Inverter
+ * _
+ * Y = A
+ * +---++---+
+ * | A || Y |
+ * +===++===+
+ * | 0 || 1 |
+ * | 1 || 0 |
+ * +---++---+
+ *
+ * Naming conventions follow National Semiconductor datasheet
+ *
+ */
+
+static NETLIST_START(CD4069_DIP)
+ CD4069_GATE(A)
+ CD4069_GATE(B)
+ CD4069_GATE(C)
+ CD4069_GATE(D)
+ CD4069_GATE(E)
+ CD4069_GATE(F)
+
+ NET_C(A.VDD, B.VDD, C.VDD, D.VDD, E.VDD, E.VDD)
+ NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VDD */ A.VDD,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 4069 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.VSS,/* VSS |7 8| Y4 */ D.Q
+ /* +--------------+ */
+ )
+NETLIST_END()
+
+/*
+ * CD4070: Quad 2-Input Exclusive-OR Gates
*
* Y = A+B
* +---+---++---+
@@ -161,8 +199,6 @@ NETLIST_END()
* | 1 | 1 || 0 |
* +---+---++---+
*
- * Naming conventions follow National Semiconductor datasheet
- *
*/
static NETLIST_START(CD4070_DIP)
@@ -171,17 +207,17 @@ static NETLIST_START(CD4070_DIP)
CD4070_GATE(C)
CD4070_GATE(D)
- NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
- NET_C(A.GND, B.GND, C.GND, D.GND)
+ NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+ NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
DIPPINS( /* +--------------+ */
- A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.A, /* A1 |1 ++ 14| VDD */ A.VDD,
A.B, /* B1 |2 13| B4 */ D.B,
A.Q, /* Y1 |3 12| A4 */ D.A,
- B.Q, /* Y2 |4 7486 11| Y4 */ D.Q,
+ B.Q, /* Y2 |4 4070 11| Y4 */ D.Q,
B.A, /* A2 |5 10| Y3 */ C.Q,
B.B, /* B2 |6 9| B3 */ C.B,
- A.GND,/* GND |7 8| A3 */ C.A
+ A.VSS,/* VSS |7 8| A3 */ C.A
/* +--------------+ */
)
NETLIST_END()
@@ -220,12 +256,19 @@ NETLIST_START(CD4XXX_lib)
TRUTHTABLE_START(CD4001_GATE, 2, 1, "")
TT_HEAD("A , B | Q ")
- TT_LINE("0,0|1|85")
+ TT_LINE("0,0|1|110")
TT_LINE("X,1|0|120")
TT_LINE("1,X|0|120")
TT_FAMILY("CD4XXX")
TRUTHTABLE_END()
+ TRUTHTABLE_START(CD4069_GATE, 1, 1, "")
+ TT_HEAD("A|Q ")
+ TT_LINE("0|1|55")
+ TT_LINE("1|0|55")
+ TT_FAMILY("CD4XXX")
+ TRUTHTABLE_END()
+
TRUTHTABLE_START(CD4070_GATE, 2, 1, "")
TT_HEAD("A,B|Q ")
TT_LINE("0,0|0|15")
@@ -236,6 +279,7 @@ NETLIST_START(CD4XXX_lib)
TRUTHTABLE_END()
LOCAL_LIB_ENTRY(CD4001_DIP)
+ LOCAL_LIB_ENTRY(CD4069_DIP)
LOCAL_LIB_ENTRY(CD4070_DIP)
/* DIP ONLY */
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.h b/src/lib/netlist/macro/nlm_cd4xxx.h
index e71fd7fb387..0de0c763718 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx.h
+++ b/src/lib/netlist/macro/nlm_cd4xxx.h
@@ -33,6 +33,12 @@
#define CD4001_DIP(name) \
NET_REGISTER_DEV(CD4001_DIP, name)
+#define CD4069_GATE(name) \
+ NET_REGISTER_DEV(CD4069_GATE, name)
+
+#define CD4069_DIP(name) \
+ NET_REGISTER_DEV(CD4069_DIP, name)
+
#define CD4070_GATE(name) \
NET_REGISTER_DEV(CD4070_GATE, name)
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index 33c516f9766..8485ce86c86 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -296,7 +296,7 @@ static NETLIST_START(TTL_7414_DIP)
NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
DIPPINS( /* +--------------+ */
- A.A, /* A1 |1 ++ 14| VCC */ VCC.I,
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
A.Q, /* Y1 |2 13| A6 */ F.A,
B.A, /* A2 |3 12| Y6 */ F.Q,
B.Q, /* Y2 |4 7414 11| A5 */ E.A,
@@ -319,7 +319,7 @@ static NETLIST_START(TTL_74LS14_DIP)
NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
DIPPINS( /* +--------------+ */
- A.A, /* A1 |1 ++ 14| VCC */ VCC.I,
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
A.Q, /* Y1 |2 13| A6 */ F.A,
B.A, /* A2 |3 12| Y6 */ F.Q,
B.Q, /* Y2 |4 74LS14 11| A5 */ E.A,
@@ -828,6 +828,93 @@ static NETLIST_START(TTL_74279_DIP)
)
NETLIST_END()
+/*
+ * DM74377: Octal D Flip-Flop With Enable
+ * DM74378: Hex D Flip-Flop With Enable
+ * DM74379: 4-bit D Flip-Flop With Enable
+ *
+ */
+
+static NETLIST_START(TTL_74377_DIP)
+ TTL_74377_GATE(A)
+ TTL_74377_GATE(B)
+ TTL_74377_GATE(C)
+ TTL_74377_GATE(D)
+ TTL_74377_GATE(E)
+ TTL_74377_GATE(F)
+ TTL_74377_GATE(G)
+ TTL_74377_GATE(H)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC, G.VCC, H.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND, G.GND, H.GND)
+ NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP, G.CP, H.CP)
+ NET_C(A.E, B.E, C.E, D.E, E.E, F.E, G.E, H.E)
+
+ DIPPINS( /* +--------------+ */
+ A.E, /* /E |1 ++ 20| VCC */ A.VCC,
+ A.Q, /* Q0 |2 19| Q7 */ H.Q,
+ A.D, /* D0 |3 18| D7 */ H.D,
+ B.D, /* D1 |4 74377 17| D6 */ G.D,
+ B.Q, /* Q1 |5 16| Q6 */ G.Q,
+ C.Q, /* Q2 |6 15| Q5 */ F.Q,
+ C.D, /* D2 |7 14| D5 */ F.D,
+ D.D, /* D3 |8 13| D4 */ E.D,
+ D.Q, /* Q3 |9 12| Q4 */ E.D,
+ A.GND,/* GND |10 11| CP */ A.CP
+ /* +--------------+ */
+ )
+NETLIST_END()
+
+static NETLIST_START(TTL_74378_DIP)
+ TTL_74377_GATE(A)
+ TTL_74377_GATE(B)
+ TTL_74377_GATE(C)
+ TTL_74377_GATE(D)
+ TTL_74377_GATE(E)
+ TTL_74377_GATE(F)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+ NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP)
+ NET_C(A.E, B.E, C.E, D.E, E.E, F.E)
+
+ DIPPINS( /* +--------------+ */
+ A.E, /* /E |1 ++ 16| VCC */ A.VCC,
+ A.Q, /* Q0 |2 15| Q5 */ F.Q,
+ A.D, /* D0 |3 14| D5 */ F.D,
+ B.D, /* D1 |4 74378 13| D4 */ E.D,
+ B.Q, /* Q1 |5 12| Q4 */ E.Q,
+ C.D, /* D2 |6 11| D3 */ D.D,
+ C.Q, /* Q2 |7 10| Q3 */ D.Q,
+ A.GND,/* GND |8 9| CP */ A.CP
+ /* +--------------+ */
+ )
+NETLIST_END()
+
+static NETLIST_START(TTL_74379_DIP)
+ TTL_74377_GATE(A)
+ TTL_74377_GATE(B)
+ TTL_74377_GATE(C)
+ TTL_74377_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+ NET_C(A.CP, B.CP, C.CP, D.CP)
+ NET_C(A.E, B.E, C.E, D.E)
+
+ DIPPINS( /* +--------------+ */
+ A.E, /* /E |1 ++ 16| VCC */ A.VCC,
+ A.Q, /* Q0 |2 15| Q3 */ D.Q,
+ A.QQ, /* /Q0 |3 14| /Q3 */ D.QQ,
+ A.D, /* D0 |4 74379 13| D3 */ D.D,
+ B.D, /* D1 |5 12| D2 */ C.D,
+ B.QQ, /* /Q1 |6 11| /Q2 */ C.QQ,
+ B.Q, /* Q1 |7 10| Q2 */ C.Q,
+ A.GND,/* GND |8 9| CP */ A.CP
+ /* +--------------+ */
+ )
+NETLIST_END()
+
/*
* DM9312: One of Eight Line Data Selectors/Multiplexers
*
@@ -1434,5 +1521,8 @@ NETLIST_START(TTL74XX_lib)
LOCAL_LIB_ENTRY(TTL_74156_DIP)
LOCAL_LIB_ENTRY(TTL_74260_DIP)
LOCAL_LIB_ENTRY(TTL_74279_DIP)
+ LOCAL_LIB_ENTRY(TTL_74377_DIP)
+ LOCAL_LIB_ENTRY(TTL_74378_DIP)
+ LOCAL_LIB_ENTRY(TTL_74379_DIP)
LOCAL_LIB_ENTRY(DM9312_DIP)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h
index 17fd32f885a..c2eb075d938 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.h
+++ b/src/lib/netlist/macro/nlm_ttl74xx.h
@@ -293,6 +293,15 @@
#define TTL_74279_DIP(name) \
NET_REGISTER_DEV(TTL_74279_DIP, name)
+#define TTL_74377_DIP(name) \
+ NET_REGISTER_DEV(TTL_74377_DIP, name)
+
+#define TTL_74378_DIP(name) \
+ NET_REGISTER_DEV(TTL_74378_DIP, name)
+
+#define TTL_74379_DIP(name) \
+ NET_REGISTER_DEV(TTL_74379_DIP, name)
+
#define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7) \
NET_REGISTER_DEV(DM9312, name) \
NET_CONNECT(name, VCC, VCC) \
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 6a12a40355d..3da7fa70ba9 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -194,7 +194,10 @@ namespace netlist
void netlist_state_t::compile_defines(std::vector> &defs)
{
- #define ENTRY(x) if (pstring(#x) != PSTRINGIFY(x)) defs.emplace_back(std::pair(#x, PSTRINGIFY(x)));
+ #define ENTRY(x) if (pstring(#x) != PSTRINGIFY(x)) \
+ defs.emplace_back(std::pair(#x, PSTRINGIFY(x))); \
+ else defs.emplace_back(std::pair(#x, ""));
+ #define ENTRY_EX(x) defs.emplace_back(std::pair(#x, plib::pfmt("{}")(x)));
ENTRY(NL_VERSION_MAJOR)
ENTRY(NL_VERSION_MINOR)
ENTRY(NL_VERSION_PATCHLEVEL)
@@ -242,6 +245,15 @@ namespace netlist
ENTRY(__unix__)
ENTRY(__linux__)
+ ENTRY_EX(sizeof(base_device_t))
+ ENTRY_EX(sizeof(device_t))
+ ENTRY_EX(sizeof(logic_input_t))
+ ENTRY_EX(sizeof(logic_output_t))
+ ENTRY_EX(sizeof(param_model_t))
+ ENTRY_EX(sizeof(param_logic_t))
+ ENTRY_EX(sizeof(state_var))
+ ENTRY_EX(sizeof(pstring))
+
#undef ENTRY
}
@@ -275,6 +287,8 @@ namespace netlist
void netlist_state_t::reset()
{
+ m_setup = nullptr;
+
// Reset all nets once !
log().verbose("Call reset on all nets:");
for (auto & n : nets())
@@ -649,41 +663,6 @@ namespace netlist
}
}
- void detail::net_t::add_terminal(detail::core_terminal_t &terminal) noexcept(false)
- {
- for (auto &t : core_terms())
- if (t == &terminal)
- {
- state().log().fatal(MF_NET_1_DUPLICATE_TERMINAL_2(name(), t->name()));
- throw nl_exception(MF_NET_1_DUPLICATE_TERMINAL_2(name(), t->name()));
- }
-
- terminal.set_net(this);
-
- core_terms().push_back(&terminal);
- }
-
- void detail::net_t::remove_terminal(detail::core_terminal_t &terminal) noexcept(false)
- {
- if (plib::container::contains(core_terms(), &terminal))
- {
- terminal.set_net(nullptr);
- plib::container::remove(core_terms(), &terminal);
- }
- else
- {
- state().log().fatal(MF_REMOVE_TERMINAL_1_FROM_NET_2(terminal.name(), this->name()));
- throw nl_exception(MF_REMOVE_TERMINAL_1_FROM_NET_2(terminal.name(), this->name()));
- }
- }
-
- void detail::net_t::move_connections(detail::net_t &dest_net)
- {
- for (auto &ct : core_terms())
- dest_net.add_terminal(*ct);
- core_terms().clear();
- }
-
// ----------------------------------------------------------------------------------------
// logic_net_t
// ----------------------------------------------------------------------------------------
@@ -868,13 +847,13 @@ namespace netlist
param_str_t::param_str_t(core_device_t &device, const pstring &name, const pstring &val)
: param_t(&device, name)
{
- m_param = device.state().setup().get_initial_param_val(this->name(),val);
+ m_param = plib::make_unique(device.state().setup().get_initial_param_val(this->name(),val));
}
param_str_t::param_str_t(netlist_state_t &state, const pstring &name, const pstring &val)
: param_t(nullptr, name)
{
- m_param = state.setup().get_initial_param_val(this->name(),val);
+ m_param = plib::make_unique(state.setup().get_initial_param_val(this->name(),val));
}
void param_str_t::changed() noexcept
@@ -893,18 +872,18 @@ namespace netlist
pstring param_model_t::type()
{
- auto mod = state().parser().models().get_model(str());
+ auto mod = state().setup().models().get_model(str());
return mod.type();
}
pstring param_model_t::value_str(const pstring &entity)
{
- return state().parser().models().get_model(str()).value_str(entity);
+ return state().setup().models().get_model(str()).value_str(entity);
}
nl_fptype param_model_t::value(const pstring &entity)
{
- return state().parser().models().get_model(str()).value(entity);
+ return state().setup().models().get_model(str()).value(entity);
}
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 8693f9e54e4..90f1ea88d2e 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -627,12 +627,17 @@ namespace netlist
/// Going forward setting this to 8 will allow 8-bit signal
/// busses to be used in netlist, e.g. for more complex memory
/// arrangements.
- static constexpr const unsigned int INP_BITS = 1;
+ /// Mimimum value is 2 here to support tristate output on proxies.
+ static constexpr const unsigned int INP_BITS = 2;
static constexpr const unsigned int INP_MASK = (1 << INP_BITS) - 1;
static constexpr const unsigned int INP_HL_SHIFT = 0;
static constexpr const unsigned int INP_LH_SHIFT = INP_BITS;
+ static constexpr netlist_sig_t OUT_TRISTATE() { return INP_MASK; }
+
+ static_assert(INP_BITS * 2 <= sizeof(netlist_sig_t) * 8, "netlist_sig_t size not sufficient");
+
enum state_e {
STATE_INP_PASSIVE = 0,
STATE_INP_HL = (INP_MASK << INP_HL_SHIFT),
@@ -747,14 +752,10 @@ namespace netlist
// setup stuff
- void add_terminal(core_terminal_t &terminal) noexcept(false);
- void remove_terminal(core_terminal_t &terminal) noexcept(false);
-
bool is_logic() const noexcept;
bool is_analog() const noexcept;
void rebuild_list(); // rebuild m_list after a load
- void move_connections(net_t &dest_net);
std::vector &core_terms() noexcept { return m_core_terms; }
@@ -1018,6 +1019,47 @@ namespace netlist
logic_net_t m_my_net;
};
+ // -----------------------------------------------------------------------------
+ // tristate_output_t
+ // -----------------------------------------------------------------------------
+
+ class tristate_output_t : public logic_output_t
+ {
+ public:
+
+ tristate_output_t(device_t &dev, const pstring &aname,
+ netlist_time ts_off_on, netlist_time ts_on_off)
+ : logic_output_t(dev, aname)
+ , m_last_logic(dev, name() + "." + "m_last_logic", 2) // force change
+ , m_tristate(dev, name() + "." + "m_tristate", 2) // force change
+ , m_ts_off_on(ts_off_on)
+ , m_ts_on_off(ts_on_off)
+ {}
+
+ void push(netlist_sig_t newQ, netlist_time delay) noexcept
+ {
+ if (!m_tristate)
+ logic_output_t::push(newQ, delay);
+ m_last_logic = newQ;
+ }
+
+ void set_tristate(bool v) noexcept
+ {
+ if (v != m_tristate)
+ {
+ logic_output_t::push(v ? OUT_TRISTATE() : m_last_logic, v ? m_ts_off_on : m_ts_on_off);
+ m_tristate = v;
+ }
+ }
+
+ private:
+ using logic_output_t::initial;
+ using logic_output_t::set_Q_time;
+ state_var m_last_logic;
+ state_var m_tristate;
+ const netlist_time m_ts_off_on;
+ const netlist_time m_ts_on_off;
+ };
// -----------------------------------------------------------------------------
// analog_output_t
// -----------------------------------------------------------------------------
@@ -1161,22 +1203,22 @@ namespace netlist
const pstring &operator()() const noexcept { return str(); }
void set(const pstring ¶m)
{
- if (m_param != param)
+ if (*m_param != param)
{
- m_param = param;
+ *m_param = param;
changed();
update_param();
}
}
pstring valstr() const override
{
- return m_param;
+ return *m_param;
}
protected:
virtual void changed() noexcept;
- const pstring &str() const noexcept { return m_param; }
+ const pstring &str() const noexcept { return *m_param; }
private:
- pstring m_param;
+ plib::unique_ptr m_param;
};
// -----------------------------------------------------------------------------
@@ -2021,6 +2063,8 @@ namespace netlist
inline void detail::net_t::push_to_queue(netlist_time delay) noexcept
{
+ // FIXME: checking for has_connection doesn't have any noticable effect
+ // on performance.
if (has_connections())
{
m_next_scheduled_time = exec().time() + delay;
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 206a75c4127..675cbae5360 100755
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -19,8 +19,9 @@ namespace netlist
// nl_parse_t
// ----------------------------------------------------------------------------------------
- nlparse_t::nlparse_t(log_type &log)
+ nlparse_t::nlparse_t(log_type &log, abstract_t &abstract)
: m_factory(log)
+ , m_abstract(abstract)
, m_log(log)
, m_frontier_cnt(0)
{ }
@@ -344,12 +345,12 @@ namespace netlist
pstring pinfn = build_fqn(pin);
bool found = false;
- for (auto link = result().m_links.begin(); link != result().m_links.end(); )
+ for (auto link = m_abstract.m_links.begin(); link != m_abstract.m_links.end(); )
{
if ((link->first == pinfn) || (link->second == pinfn))
{
log().verbose("removing connection: {1} <==> {2}\n", link->first, link->second);
- link = result().m_links.erase(link);
+ link = m_abstract.m_links.erase(link);
found = true;
}
else
@@ -362,6 +363,17 @@ namespace netlist
}
}
+ void nlparse_t::register_model(const pstring &model_in)
+ {
+ auto pos = model_in.find(' ');
+ if (pos == pstring::npos)
+ throw nl_exception(MF_UNABLE_TO_PARSE_MODEL_1(model_in));
+ pstring model = plib::ucase(plib::trim(plib::left(model_in, pos)));
+ pstring def = plib::trim(model_in.substr(pos + 1));
+ if (!m_abstract.m_models.insert({model, def}).second)
+ throw nl_exception(MF_MODEL_ALREADY_EXISTS_1(model_in));
+ }
+
// ----------------------------------------------------------------------------------------
// Sources
@@ -382,8 +394,10 @@ namespace netlist
setup_t::setup_t(netlist_state_t &nlstate)
- : m_parser(nlstate.log())
+ : m_abstract()
+ , m_parser(nlstate.log(), m_abstract)
, m_nlstate(nlstate)
+ , m_models(m_abstract.m_models) // FIXME : parse abstract_t only
, m_netlist_params(nullptr)
, m_proxy_cnt(0)
{
@@ -405,8 +419,8 @@ pstring setup_t::termtype_as_str(detail::core_terminal_t &in)
pstring setup_t::get_initial_param_val(const pstring &name, const pstring &def) const
{
- auto i = m_parser.result().m_param_values.find(name);
- pstring v = (i != m_parser.result().m_param_values.end()) ? i->second : def;
+ auto i = m_abstract.m_param_values.find(name);
+ pstring v = (i != m_abstract.m_param_values.end()) ? i->second : def;
//printf("%s -> %s\n", name.c_str(), v.c_str());
@@ -474,8 +488,8 @@ pstring setup_t::resolve_alias(const pstring &name) const
// FIXME: Detect endless loop
do {
ret = temp;
- auto p = m_parser.result().m_alias.find(ret);
- temp = (p != m_parser.result().m_alias.end() ? p->second : "");
+ auto p = m_abstract.m_alias.find(ret);
+ temp = (p != m_abstract.m_alias.end() ? p->second : "");
} while (temp != "" && temp != ret);
log().debug("{1}==>{2}\n", name, ret);
@@ -491,7 +505,7 @@ pstring setup_t::de_alias(const pstring &alias) const
do {
ret = temp;
temp = "";
- for (const auto &e : m_parser.result().m_alias)
+ for (const auto &e : m_abstract.m_alias)
{
// FIXME: this will resolve first one found
if (e.second == ret)
@@ -519,7 +533,7 @@ std::vector setup_t::get_terminals_for_device_name(const pstring &devna
}
}
- for (const auto & t : m_parser.result().m_alias)
+ for (const auto & t : m_abstract.m_alias)
{
if (plib::startsWith(t.first, devname))
{
@@ -602,15 +616,12 @@ detail::core_terminal_t *setup_t::find_terminal(const pstring &terminal_in,
param_ref_t setup_t::find_param(const pstring ¶m_in) const
{
- // FIXME: examine use cases
- const pstring param_in_fqn = m_parser.build_fqn(param_in);
-
- const pstring outname(resolve_alias(param_in_fqn));
+ const pstring outname(resolve_alias(param_in));
auto ret(m_params.find(outname));
if (ret == m_params.end())
{
- log().fatal(MF_PARAMETER_1_2_NOT_FOUND(param_in_fqn, outname));
- throw nl_exception(MF_PARAMETER_1_2_NOT_FOUND(param_in_fqn, outname));
+ log().fatal(MF_PARAMETER_1_2_NOT_FOUND(param_in, outname));
+ throw nl_exception(MF_PARAMETER_1_2_NOT_FOUND(param_in, outname));
}
return ret->second;
}
@@ -647,7 +658,7 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(const detail::core_terminal_t &o
}
out.net().core_terms().clear();
- out.net().add_terminal(new_proxy->in());
+ add_terminal(out.net(), new_proxy->in());
auto *proxy(new_proxy.get());
if (!m_proxies.insert({&out, proxy}).second)
@@ -701,7 +712,7 @@ devices::nld_base_proxy *setup_t::get_a_d_proxy(detail::core_terminal_t &inp)
}
inp.net().core_terms().clear(); // clear the list
}
- ret->out().net().add_terminal(inp);
+ add_terminal(ret->out().net(), inp);
m_nlstate.register_device(new_proxy->name(), std::move(new_proxy));
return ret;
}
@@ -742,7 +753,7 @@ void setup_t::merge_nets(detail::net_t &thisnet, detail::net_t &othernet)
}
else
{
- othernet.move_connections(thisnet);
+ move_connections(othernet, thisnet);
}
}
@@ -754,7 +765,7 @@ void setup_t::connect_input_output(detail::core_terminal_t &in, detail::core_ter
{
auto *proxy = get_a_d_proxy(in);
- out.net().add_terminal(proxy->proxy_term());
+ add_terminal(out.net(), proxy->proxy_term());
}
else if (out.is_logic() && in.is_analog())
{
@@ -768,7 +779,7 @@ void setup_t::connect_input_output(detail::core_terminal_t &in, detail::core_ter
if (in.has_net())
merge_nets(out.net(), in.net());
else
- out.net().add_terminal(in);
+ add_terminal(out.net(), in);
}
}
@@ -812,7 +823,7 @@ void setup_t::connect_terminal_output(terminal_t &in, detail::core_terminal_t &o
merge_nets(out.net(), in.net());
}
else
- out.net().add_terminal(in);
+ add_terminal(out.net(), in);
}
else if (out.is_logic())
{
@@ -838,12 +849,12 @@ void setup_t::connect_terminals(detail::core_terminal_t &t1,detail::core_termina
else if (t2.has_net())
{
log().debug("T2 has net\n");
- t2.net().add_terminal(t1);
+ add_terminal(t2.net(), t1);
}
else if (t1.has_net())
{
log().debug("T1 has net\n");
- t1.net().add_terminal(t2);
+ add_terminal(t1.net(), t2);
}
else
{
@@ -853,8 +864,8 @@ void setup_t::connect_terminals(detail::core_terminal_t &t1,detail::core_termina
auto *anetp = anet.get();
m_nlstate.register_net(std::move(anet));
t1.set_net(anetp);
- anetp->add_terminal(t2);
- anetp->add_terminal(t1);
+ add_terminal(*anetp, t2);
+ add_terminal(*anetp, t1);
}
}
@@ -1005,16 +1016,16 @@ void setup_t::resolve_inputs()
tries--;
}
#else
- while (!m_parser.result().m_links.empty() && tries > 0)
+ while (!m_abstract.m_links.empty() && tries > 0)
{
- for (std::size_t i = 0; i < m_parser.result().m_links.size(); )
+ for (std::size_t i = 0; i < m_abstract.m_links.size(); )
{
- const pstring t1s(m_parser.result().m_links[i].first);
- const pstring t2s(m_parser.result().m_links[i].second);
+ const pstring t1s(m_abstract.m_links[i].first);
+ const pstring t2s(m_abstract.m_links[i].second);
detail::core_terminal_t *t1 = find_terminal(t1s);
detail::core_terminal_t *t2 = find_terminal(t2s);
if (connect(*t1, *t2))
- m_parser.result().m_links.erase(m_parser.result().m_links.begin() + static_cast(i));
+ m_abstract.m_links.erase(m_abstract.m_links.begin() + static_cast(i));
else
i++;
}
@@ -1023,7 +1034,7 @@ void setup_t::resolve_inputs()
#endif
if (tries == 0)
{
- for (auto & link : m_parser.result().m_links)
+ for (auto & link : m_abstract.m_links)
log().warning(MF_CONNECTING_1_TO_2(de_alias(link.first), de_alias(link.second)));
log().fatal(MF_LINK_TRIES_EXCEEDED(m_netlist_params->m_max_link_loops()));
@@ -1077,6 +1088,42 @@ void setup_t::resolve_inputs()
}
+void setup_t::add_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false)
+{
+ for (auto &t : net.core_terms())
+ if (t == &terminal)
+ {
+ log().fatal(MF_NET_1_DUPLICATE_TERMINAL_2(net.name(), t->name()));
+ throw nl_exception(MF_NET_1_DUPLICATE_TERMINAL_2(net.name(), t->name()));
+ }
+
+ terminal.set_net(&net);
+
+ net.core_terms().push_back(&terminal);
+}
+
+void setup_t::remove_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false)
+{
+ if (plib::container::contains(net.core_terms(), &terminal))
+ {
+ terminal.set_net(nullptr);
+ plib::container::remove(net.core_terms(), &terminal);
+ }
+ else
+ {
+ log().fatal(MF_REMOVE_TERMINAL_1_FROM_NET_2(terminal.name(), net.name()));
+ throw nl_exception(MF_REMOVE_TERMINAL_1_FROM_NET_2(terminal.name(), net.name()));
+ }
+}
+
+void setup_t::move_connections(detail::net_t &net, detail::net_t &dest_net)
+{
+ for (auto &ct : net.core_terms())
+ add_terminal(dest_net, *ct);
+ net.core_terms().clear();
+}
+
+
log_type &setup_t::log() noexcept { return m_nlstate.log(); }
const log_type &setup_t::log() const noexcept { return m_nlstate.log(); }
@@ -1085,20 +1132,9 @@ const log_type &setup_t::log() const noexcept { return m_nlstate.log(); }
// Models
// ----------------------------------------------------------------------------------------
-void models_t::register_model(const pstring &model_in)
-{
- auto pos = model_in.find(' ');
- if (pos == pstring::npos)
- throw nl_exception(MF_UNABLE_TO_PARSE_MODEL_1(model_in));
- pstring model = plib::ucase(plib::trim(plib::left(model_in, pos)));
- pstring def = plib::trim(model_in.substr(pos + 1));
- if (!m_models.insert({model, def}).second)
- throw nl_exception(MF_MODEL_ALREADY_EXISTS_1(model_in));
-}
-
//NOLINTNEXTLINE(misc-no-recursion)
-void models_t::model_parse(const pstring &model_in, model_map_t &map)
+void models_t::model_parse(const pstring &model_in, map_t &map)
{
pstring model = model_in;
std::size_t pos = 0;
@@ -1144,7 +1180,7 @@ void models_t::model_parse(const pstring &model_in, model_map_t &map)
}
}
-pstring models_t::model_t::model_string(const model_map_t &map)
+pstring models_t::model_t::model_string(const map_t &map)
{
// operator [] has no const implementation
pstring ret = map.at("COREMODEL") + "(";
@@ -1156,7 +1192,7 @@ pstring models_t::model_t::model_string(const model_map_t &map)
models_t::model_t models_t::get_model(const pstring &model)
{
- model_map_t &map = m_cache[model];
+ map_t &map = m_cache[model];
if (map.empty())
model_parse(model , map);
@@ -1305,7 +1341,7 @@ const logic_family_desc_t *setup_t::family_from_model(const pstring &model)
{
family_type ft(family_type::CUSTOM);
- auto mod(m_parser.models().get_model(model));
+ auto mod(m_models.get_model(model));
family_model_t modv(mod);
if (!ft.set_from_string(modv.m_TYPE()))
@@ -1367,7 +1403,7 @@ void setup_t::prepare_to_run()
// create defparams!
- for (auto & e : m_parser.result().m_defparams)
+ for (auto & e : m_abstract.m_defparams)
{
auto param(plib::make_unique(nlstate(), e.first, e.second));
register_param_t(*param);
@@ -1376,7 +1412,7 @@ void setup_t::prepare_to_run()
// make sure the solver and parameters are started first!
- for (auto & e : m_parser.result().m_device_factory)
+ for (auto & e : m_abstract.m_device_factory)
{
if ( m_parser.factory().is_class(e.second)
|| m_parser.factory().is_class(e.second))
@@ -1392,13 +1428,14 @@ void setup_t::prepare_to_run()
// set default model parameters
- m_parser.models().register_model(plib::pfmt("NMOS_DEFAULT _(CAPMOD={1})")(m_netlist_params->m_mos_capmodel()));
- m_parser.models().register_model(plib::pfmt("PMOS_DEFAULT _(CAPMOD={1})")(m_netlist_params->m_mos_capmodel()));
+ // FIXME: this is not optimal
+ m_parser.register_model(plib::pfmt("NMOS_DEFAULT _(CAPMOD={1})")(m_netlist_params->m_mos_capmodel()));
+ m_parser.register_model(plib::pfmt("PMOS_DEFAULT _(CAPMOD={1})")(m_netlist_params->m_mos_capmodel()));
// create devices
log().debug("Creating devices ...\n");
- for (auto & e : m_parser.result().m_device_factory)
+ for (auto & e : m_abstract.m_device_factory)
{
if ( !m_parser.factory().is_class(e.second)
&& !m_parser.factory().is_class(e.second))
@@ -1410,7 +1447,7 @@ void setup_t::prepare_to_run()
int errcnt(0);
log().debug("Looking for unknown parameters ...\n");
- for (auto &p : m_parser.result().m_param_values)
+ for (auto &p : m_abstract.m_param_values)
{
auto f = m_params.find(p.first);
if (f == m_params.end())
@@ -1439,8 +1476,8 @@ void setup_t::prepare_to_run()
{
if (use_deactivate)
{
- auto p = m_parser.result().m_param_values.find(d.second->name() + sHINT_NO_DEACTIVATE);
- if (p != m_parser.result().m_param_values.end())
+ auto p = m_abstract.m_param_values.find(d.second->name() + sHINT_NO_DEACTIVATE);
+ if (p != m_abstract.m_param_values.end())
{
//FIXME: check for errors ...
bool err(false);
@@ -1477,8 +1514,8 @@ void setup_t::prepare_to_run()
{
log().info(MI_REMOVE_DEVICE_1_CONNECTED_ONLY_TO_RAILS_2_3(
t->name(), t->N().net().name(), t->P().net().name()));
- t->setup_N().net().remove_terminal(t->setup_N());
- t->setup_P().net().remove_terminal(t->setup_P());
+ remove_terminal(t->setup_N().net(), t->setup_N());
+ remove_terminal(t->setup_P().net(), t->setup_P());
m_nlstate.remove_device(t);
}
}
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 2315f48f359..f86326be8c4 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -222,11 +222,12 @@ namespace netlist
class models_t
{
public:
- using model_map_t = std::unordered_map;
+ using raw_map_t = std::unordered_map;
+ using map_t = std::unordered_map;
class model_t
{
public:
- model_t(const pstring &model, const model_map_t &map)
+ model_t(const pstring &model, const map_t &map)
: m_model(model), m_map(map) { }
pstring value_str(const pstring &entity) const;
@@ -236,22 +237,24 @@ namespace netlist
pstring type() const { return value_str("COREMODEL"); }
private:
- static pstring model_string(const model_map_t &map);
+ static pstring model_string(const map_t &map);
const pstring m_model; // only for error messages
- const model_map_t &m_map;
+ const map_t &m_map;
};
- void register_model(const pstring &model_in);
+ models_t(const raw_map_t &models)
+ : m_models(models)
+ {}
model_t get_model(const pstring &model);
private:
- void model_parse(const pstring &model, model_map_t &map);
+ void model_parse(const pstring &model, map_t &map);
- std::unordered_map m_models;
- std::unordered_map m_cache;
+ const raw_map_t &m_models;
+ std::unordered_map m_cache;
};
// ----------------------------------------------------------------------------------------
@@ -268,6 +271,7 @@ namespace netlist
std::unordered_map m_alias;
std::vector m_links;
std::unordered_map m_param_values;
+ models_t::raw_map_t m_models;
// need to preserve order of device creation ...
std::vector> m_device_factory;
@@ -275,9 +279,9 @@ namespace netlist
std::vector> m_defparams;
};
- nlparse_t(log_type &log);
+ nlparse_t(log_type &log, abstract_t &abstract);
- void register_model(const pstring &model_in) { m_models.register_model(model_in); }
+ void register_model(const pstring &model_in);
void register_alias(const pstring &alias, const pstring &out);
void register_alias_nofqn(const pstring &alias, const pstring &out);
void register_dip_alias_arr(const pstring &terms);
@@ -368,26 +372,19 @@ namespace netlist
log_type &log() noexcept { return m_log; }
const log_type &log() const noexcept { return m_log; }
- models_t &models() noexcept { return m_models; }
- const models_t &models() const noexcept { return m_models; }
-
plib::psource_t::stream_ptr get_data_stream(const pstring &name);
- abstract_t &result() { return m_abstract; }
- const abstract_t &result() const { return m_abstract; }
-
private:
// FIXME: stale? - remove later
void remove_connections(const pstring &pin);
plib::ppreprocessor::defines_map_type m_defines;
plib::psource_collection_t<> m_includes;
- models_t m_models;
std::stack m_namespace_stack;
plib::psource_collection_t<> m_sources;
// FIXME: convert to hash and deal with sorting in nltool
factory::list_t m_factory;
- abstract_t m_abstract;
+ abstract_t &m_abstract;
log_type &m_log;
unsigned m_frontier_cnt;
@@ -439,6 +436,9 @@ namespace netlist
void prepare_to_run();
+ models_t &models() noexcept { return m_models; }
+ const models_t &models() const noexcept { return m_models; }
+
netlist_state_t &nlstate() { return m_nlstate; }
const netlist_state_t &nlstate() const { return m_nlstate; }
@@ -448,11 +448,13 @@ namespace netlist
log_type &log() noexcept;
const log_type &log() const noexcept;
+ // FIXME: needed from matrix_solver_t
+ void add_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
+
private:
void resolve_inputs();
pstring resolve_alias(const pstring &name) const;
- void delete_empty_nets();
void merge_nets(detail::net_t &thisnet, detail::net_t &othernet);
@@ -469,9 +471,18 @@ namespace netlist
devices::nld_base_proxy *get_a_d_proxy(detail::core_terminal_t &inp);
detail::core_terminal_t &resolve_proxy(detail::core_terminal_t &term);
+ // net manipulations
+
+ void remove_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
+ void move_connections(detail::net_t &net, detail::net_t &dest_net);
+ void delete_empty_nets();
+
+ nlparse_t::abstract_t m_abstract;
nlparse_t m_parser;
netlist_state_t &m_nlstate;
+ models_t m_models;
+
// FIXME: currently only used during setup
devices::nld_netlistparams *m_netlist_params;
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 9136a82a42a..4f341252a62 100644
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -30,47 +30,61 @@ namespace plib {
// Standard arena_deleter
//============================================================
- template
+ template
struct arena_deleter
{
- //using arena_storage_type = P *;
- using arena_storage_type = typename std::conditional::type;
- template
- typename std::enable_if::type getref(X *x) const noexcept
- { return *x;}
+ };
- template
- typename std::enable_if::type::is_stateless, X&>::type
- getref(X &x, Y y = nullptr) const noexcept
- {
- unused_var(y);
- return x;
- }
+
+ template
+ struct arena_deleter::type>
+ {
+ using arena_storage_type = P *;
constexpr arena_deleter(arena_storage_type a = arena_storage_type()) noexcept
: m_a(a) { }
-#if 1
template::value>::type>
arena_deleter(const arena_deleter &rhs) noexcept
: m_a(rhs.m_a) { }
-#else
- template::value>::type>
- arena_deleter(const arena_deleter &rhs) : m_a(rhs.m_a) { }
-#endif
+
void operator()(T *p) noexcept
{
// call destructor
p->~T();
- getref(m_a).deallocate(p, sizeof(T));
+ m_a->deallocate(p, sizeof(T));
}
//private:
arena_storage_type m_a;
};
+ template
+ struct arena_deleter::type>
+ {
+ using arena_storage_type = P;
+
+ constexpr arena_deleter(arena_storage_type a = arena_storage_type()) noexcept
+ {
+ plib::unused_var(a);
+ }
+
+ template::value>::type>
+ arena_deleter(const arena_deleter &rhs) noexcept
+ {
+ plib::unused_var(rhs);
+ }
+
+ void operator()(T *p) noexcept
+ {
+ // call destructor
+ p->~T();
+ P::deallocate(p, sizeof(T));
+ }
+ };
+
//============================================================
// owned_ptr: smart pointer with ownership information
//============================================================
diff --git a/src/lib/netlist/plib/pmempool.h b/src/lib/netlist/plib/pmempool.h
index 72a07613315..2490913dc20 100644
--- a/src/lib/netlist/plib/pmempool.h
+++ b/src/lib/netlist/plib/pmempool.h
@@ -45,6 +45,7 @@ namespace plib {
, m_stat_cur_alloc(0)
, m_stat_max_alloc(0)
{
+ icount()++;
}
PCOPYASSIGNMOVE(mempool, delete)
@@ -62,6 +63,11 @@ namespace plib {
aligned_arena::free(b);
//::operator delete(b->m_data);
}
+ if (icount()-- == 1)
+ {
+ if (sinfo().size() != 0)
+ plib::perrlogger("Still found {} info blocks after last mempool deleted\n", sinfo().size());
+ }
}
void *allocate(size_t align, size_t size)
@@ -231,6 +237,12 @@ namespace plib {
return spinfo;
}
+ static std::size_t &icount()
+ {
+ static std::size_t count = 0;
+ return count;
+ }
+
size_t m_min_alloc;
size_t m_min_align;
diff --git a/src/lib/netlist/plib/ppreprocessor.cpp b/src/lib/netlist/plib/ppreprocessor.cpp
index 44ad423c8b7..177599da924 100644
--- a/src/lib/netlist/plib/ppreprocessor.cpp
+++ b/src/lib/netlist/plib/ppreprocessor.cpp
@@ -556,7 +556,14 @@ namespace plib {
pstring n = args.next();
if (!is_valid_token(n))
error("define expected identifier");
- if (args.next_ws() == "(")
+ auto prevdef = get_define(n);
+ if (lti.size() == 2)
+ {
+ if (prevdef != nullptr && prevdef->m_replace != "")
+ error("redefinition of " + n);
+ m_defines.insert({n, define_t(n, "")});
+ }
+ else if (args.next_ws() == "(")
{
define_t def(n);
def.m_has_params = true;
@@ -576,6 +583,8 @@ namespace plib {
while (!args.eod())
r += args.next_ws();
def.m_replace = r;
+ if (prevdef != nullptr && prevdef->m_replace != r)
+ error("redefinition of " + n);
m_defines.insert({n, def});
}
else
@@ -583,6 +592,8 @@ namespace plib {
pstring r;
while (!args.eod())
r += args.next_ws();
+ if (prevdef != nullptr && prevdef->m_replace != r)
+ error("redefinition of " + n);
m_defines.insert({n, define_t(n, r)});
}
}
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index b88d3a41c73..0ac02df201c 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -446,9 +446,10 @@ void tool_app_t::run()
opt_logs(),
m_defines, opt_rfolders(), opt_includes());
+ // Inputs must be read before reset -> will clear setup and parser
+ inps = read_input(nt.setup(), opt_inp());
nt.exec().reset();
- inps = read_input(nt.setup(), opt_inp());
ttr = netlist::netlist_time_ext::from_fp(opt_ttr());
}
diff --git a/src/lib/netlist/solver/nld_matrix_solver.cpp b/src/lib/netlist/solver/nld_matrix_solver.cpp
index 291f56100a8..11c8a60df60 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.cpp
+++ b/src/lib/netlist/solver/nld_matrix_solver.cpp
@@ -56,7 +56,7 @@ namespace solver
log().fatal(MF_ERROR_CONNECTING_1_TO_2(m_fb_sync.name(), m_Q_sync.name()));
throw nl_exception(MF_ERROR_CONNECTING_1_TO_2(m_fb_sync.name(), m_Q_sync.name()));
}
- setup_base(nets);
+ setup_base(anetlist.setup(), nets);
// now setup the matrix
setup_matrix();
@@ -67,7 +67,7 @@ namespace solver
return &state().setup().get_connected_terminal(*term)->net();
}
- void matrix_solver_t::setup_base(const analog_net_t::list_t &nets)
+ void matrix_solver_t::setup_base(setup_t &setup, const analog_net_t::list_t &nets)
{
log().debug("New solver setup\n");
std::vector step_devices;
@@ -125,7 +125,7 @@ namespace solver
net_proxy_output = net_proxy_output_u.get();
m_inps.emplace_back(std::move(net_proxy_output_u));
}
- net_proxy_output->net().add_terminal(*p);
+ setup.add_terminal(net_proxy_output->net(), *p);
// FIXME: repeated calling - kind of brute force
net_proxy_output->net().rebuild_list();
log().debug("Added input {1}", net_proxy_output->name());
@@ -581,7 +581,7 @@ namespace solver
{
log().verbose("==============================================");
log().verbose("Solver {1}", this->name());
- log().verbose(" ==> {1} nets", this->m_terms.size()); //, (*(*groups[i].first())->m_core_terms.first())->name());
+ log().verbose(" ==> {1} nets", this->m_terms.size());
log().verbose(" has {1} dynamic elements", this->dynamic_device_count());
log().verbose(" has {1} timestep elements", this->timestep_device_count());
log().verbose(" {1:6.3} average newton raphson loops",
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index 4d9dcbbd9af..ffecbfbe72c 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -304,7 +304,7 @@ namespace solver
std::size_t m_ops;
// base setup - called from constructor
- void setup_base(const analog_net_t::list_t &nets) noexcept(false);
+ void setup_base(setup_t &setup, const analog_net_t::list_t &nets) noexcept(false);
void sort_terms(matrix_sort_type_e sort);
diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp
index 135a301dae7..ee62c0d6ab2 100644
--- a/src/mame/audio/alesis.cpp
+++ b/src/mame/audio/alesis.cpp
@@ -122,7 +122,7 @@ void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int
}
}
-WRITE8_MEMBER(alesis_dm3ag_device::write)
+void alesis_dm3ag_device::write(uint8_t data)
{
if (LOG) logerror("DM3AG '%s' write: %02x\n", tag(), data);
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index e624ab6e8d5..421bb09ca30 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -1314,20 +1314,20 @@ WRITE_LINE_MEMBER(demon_state::demon_sound4_w)
}
-READ8_MEMBER(demon_state::sound_porta_r)
+uint8_t demon_state::sound_porta_r()
{
/* bits 0-3 are the sound data; bit 4 is the data ready */
return m_sound_fifo[m_sound_fifo_out] | ((m_sound_fifo_in != m_sound_fifo_out) << 4);
}
-READ8_MEMBER(demon_state::sound_portb_r)
+uint8_t demon_state::sound_portb_r()
{
return m_last_portb_write;
}
-WRITE8_MEMBER(demon_state::sound_portb_w)
+void demon_state::sound_portb_w(uint8_t data)
{
/* watch for a 0->1 edge on bit 0 ("shift out") to advance the data pointer */
if ((data & 1) != (m_last_portb_write & 1) && (data & 1) != 0)
@@ -1345,7 +1345,7 @@ WRITE8_MEMBER(demon_state::sound_portb_w)
m_last_portb_write = data;
}
-WRITE8_MEMBER(demon_state::sound_output_w)
+void demon_state::sound_output_w(uint8_t data)
{
logerror("sound_output = %02X\n", data);
}
diff --git a/src/mame/audio/jaguar.cpp b/src/mame/audio/jaguar.cpp
index c3c044e95a0..a7cabde84fe 100644
--- a/src/mame/audio/jaguar.cpp
+++ b/src/mame/audio/jaguar.cpp
@@ -261,7 +261,7 @@ WRITE16_MEMBER( jaguar_state::jerry_regs_w )
WRITE32_MEMBER( jaguar_state::dsp_flags_w )
{
/* write the data through */
- m_dsp->ctrl_w(offset, data, mem_mask);
+ m_dsp->iobus_w(offset, data, mem_mask);
/* if they were clearing the A2S interrupt, see if we are headed for the spin */
/* loop with R22 != 0; if we are, just start spinning again */
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index d6970d34c53..b2c6f43e029 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -45,7 +45,7 @@ static const int scramble_timer[10] =
0x00, 0x10, 0x20, 0x30, 0x40, 0x90, 0xa0, 0xb0, 0xa0, 0xd0
};
-READ8_MEMBER( scramble_state::scramble_portB_r )
+uint8_t scramble_state::scramble_portB_r()
{
return scramble_timer[(m_audiocpu->total_cycles()/512) % 10];
}
@@ -74,12 +74,12 @@ static const int frogger_timer[10] =
0x00, 0x10, 0x08, 0x18, 0x40, 0x90, 0x88, 0x98, 0x88, 0xd0
};
-READ8_MEMBER( scramble_state::hustler_portB_r )
+uint8_t scramble_state::hustler_portB_r()
{
return frogger_timer[(m_audiocpu->total_cycles()/512) % 10];
}
-WRITE8_MEMBER( scramble_state::scramble_sh_irqtrigger_w )
+void scramble_state::scramble_sh_irqtrigger_w(uint8_t data)
{
/* the complement of bit 3 is connected to the flip-flop's clock */
m_konami_7474->clock_w((~data & 0x08) >> 3);
@@ -88,7 +88,7 @@ WRITE8_MEMBER( scramble_state::scramble_sh_irqtrigger_w )
machine().sound().system_mute((data & 0x10) >> 4);
}
-WRITE8_MEMBER( scramble_state::mrkougar_sh_irqtrigger_w )
+void scramble_state::mrkougar_sh_irqtrigger_w(uint8_t data)
{
/* the complement of bit 3 is connected to the flip-flop's clock */
m_konami_7474->clock_w((~data & 0x08) >> 3);
@@ -114,12 +114,12 @@ WRITE_LINE_MEMBER(scramble_state::scramble_sh_7474_q_callback)
m_audiocpu->set_input_line(0, !state ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(scramble_state::hotshock_sh_irqtrigger_w)
+void scramble_state::hotshock_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line(0, ASSERT_LINE);
}
-READ8_MEMBER( scramble_state::hotshock_soundlatch_r )
+uint8_t scramble_state::hotshock_soundlatch_r()
{
m_audiocpu->set_input_line(0, CLEAR_LINE);
return m_soundlatch->read();
@@ -139,7 +139,7 @@ READ8_MEMBER(scramble_state::harem_digitalker_intr_r)
return m_digitalker->digitalker_0_intr_r();
}
-WRITE8_MEMBER(scramble_state::harem_digitalker_control_w)
+void scramble_state::harem_digitalker_control_w(uint8_t data)
{
m_digitalker->digitalker_0_cs_w (data & 1 ? ASSERT_LINE : CLEAR_LINE);
m_digitalker->digitalker_0_cms_w(data & 2 ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/audio/starwars.cpp b/src/mame/audio/starwars.cpp
index 2f9074f2f56..4f590f1d45f 100644
--- a/src/mame/audio/starwars.cpp
+++ b/src/mame/audio/starwars.cpp
@@ -19,7 +19,7 @@
*
*************************************/
-READ8_MEMBER(starwars_state::r6532_porta_r)
+uint8_t starwars_state::r6532_porta_r()
{
/* Configured as follows: */
/* d7 (in) Main Ready Flag */
@@ -38,7 +38,7 @@ READ8_MEMBER(starwars_state::r6532_porta_r)
}
-WRITE8_MEMBER(starwars_state::r6532_porta_w)
+void starwars_state::r6532_porta_w(uint8_t data)
{
/* handle 5220 read */
m_tms->rsq_w((data & 2)>>1);
diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp
index 40d635d8d35..ab7f60956ba 100644
--- a/src/mame/drivers/68ksbc.cpp
+++ b/src/mame/drivers/68ksbc.cpp
@@ -83,7 +83,7 @@ void c68ksbc_state::c68ksbc(machine_config &config)
/* ROM definition */
ROM_START( 68ksbc )
- ROM_REGION(0x1000000, "maincpu", 0)
+ ROM_REGION(0x3000, "maincpu", 0)
ROM_LOAD( "t68k.bin", 0x0000, 0x2f78, CRC(20a8d0d0) SHA1(544fd8bd8ed017115388c8b0f7a7a59a32253e43) )
ROM_END
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index 2672faf4087..32999e0d1e2 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -252,7 +252,7 @@ INPUT_PORTS_END
*
*************************************/
-WRITE8_MEMBER( _88games_state::banking_callback )
+void _88games_state::banking_callback(uint8_t data)
{
logerror("%s: bank select %02x\n", machine().describe_context(), data);
diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp
index 5ba1f18924e..6145048bcc7 100644
--- a/src/mame/drivers/a2600.cpp
+++ b/src/mame/drivers/a2600.cpp
@@ -115,7 +115,7 @@ WRITE8_MEMBER(a2600_state::cart_over_all_w)
/* 0x300 - 0x3ff already masked out */
}
-WRITE8_MEMBER(a2600_base_state::switch_A_w)
+void a2600_base_state::switch_A_w(uint8_t data)
{
/* Left controller port */
m_joy1->joy_w( data >> 4 );
@@ -131,7 +131,7 @@ WRITE8_MEMBER(a2600_base_state::switch_A_w)
// }
}
-READ8_MEMBER(a2600_base_state::switch_A_r)
+uint8_t a2600_base_state::switch_A_r()
{
uint8_t val = 0;
@@ -144,7 +144,7 @@ READ8_MEMBER(a2600_base_state::switch_A_r)
return val;
}
-WRITE8_MEMBER(a2600_base_state::switch_B_w)
+void a2600_base_state::switch_B_w(uint8_t data)
{
}
@@ -152,13 +152,7 @@ WRITE_LINE_MEMBER(a2600_base_state::irq_callback)
{
}
-READ8_MEMBER(a2600_base_state::riot_input_port_8_r)
-{
- return m_swb->read();
-}
-
-
-READ16_MEMBER(a2600_base_state::a2600_read_input_port)
+uint16_t a2600_base_state::a2600_read_input_port(offs_t offset)
{
switch (offset)
{
@@ -192,7 +186,7 @@ READ16_MEMBER(a2600_base_state::a2600_read_input_port)
Q-Bert's Qubes (NTSC,F6) at 0x1594
Berzerk at 0xF093.
*/
-READ8_MEMBER(a2600_base_state::a2600_get_databus_contents)
+uint8_t a2600_base_state::a2600_get_databus_contents(offs_t offset)
{
uint16_t last_address, prev_address;
uint8_t last_byte, prev_byte;
@@ -230,11 +224,9 @@ static const rectangle visarea[4] = {
};
#endif
-WRITE16_MEMBER(a2600_base_state::a2600_tia_vsync_callback)
+void a2600_base_state::a2600_tia_vsync_callback(uint16_t data)
{
- int i;
-
- for ( i = 0; i < ARRAY_LENGTH(supported_screen_heights); i++ )
+ for ( int i = 0; i < ARRAY_LENGTH(supported_screen_heights); i++ )
{
if ( data >= supported_screen_heights[i] - 3 && data <= supported_screen_heights[i] + 3 )
{
@@ -247,11 +239,9 @@ WRITE16_MEMBER(a2600_base_state::a2600_tia_vsync_callback)
}
}
-WRITE16_MEMBER(a2600_base_state::a2600_tia_vsync_callback_pal)
+void a2600_base_state::a2600_tia_vsync_callback_pal(uint16_t data)
{
- int i;
-
- for ( i = 0; i < ARRAY_LENGTH(supported_screen_heights); i++ )
+ for ( int i = 0; i < ARRAY_LENGTH(supported_screen_heights); i++ )
{
if ( data >= supported_screen_heights[i] - 3 && data <= supported_screen_heights[i] + 3 )
{
@@ -530,14 +520,14 @@ void a2600_state::a2600(machine_config &config)
MOS6532_NEW(config, m_riot, MASTER_CLOCK_NTSC / 3);
m_riot->pa_rd_callback().set(FUNC(a2600_state::switch_A_r));
m_riot->pa_wr_callback().set(FUNC(a2600_state::switch_A_w));
- m_riot->pb_rd_callback().set(FUNC(a2600_state::riot_input_port_8_r));
+ m_riot->pb_rd_callback().set_ioport("SWB");
m_riot->pb_wr_callback().set(FUNC(a2600_state::switch_B_w));
m_riot->irq_wr_callback().set(FUNC(a2600_state::irq_callback));
#else
RIOT6532(config, m_riot, MASTER_CLOCK_NTSC / 3);
m_riot->in_pa_callback().set(FUNC(a2600_state::switch_A_r));
m_riot->out_pa_callback().set(FUNC(a2600_state::switch_A_w));
- m_riot->in_pb_callback().set(FUNC(a2600_state::riot_input_port_8_r));
+ m_riot->in_pb_callback().set_ioport("SWB");
m_riot->out_pb_callback().set(FUNC(a2600_state::switch_B_w));
m_riot->irq_callback().set(FUNC(a2600_state::irq_callback));
#endif
@@ -575,14 +565,14 @@ void a2600_state::a2600p(machine_config &config)
MOS6532_NEW(config, m_riot, MASTER_CLOCK_PAL / 3);
m_riot->pa_rd_callback().set(FUNC(a2600_state::switch_A_r));
m_riot->pa_wr_callback().set(FUNC(a2600_state::switch_A_w));
- m_riot->pb_rd_callback().set(FUNC(a2600_state::riot_input_port_8_r));
+ m_riot->pb_rd_callback().set_ioport("SWB");
m_riot->pb_wr_callback().set(FUNC(a2600_state::switch_B_w));
m_riot->irq_wr_callback().set(FUNC(a2600_state::irq_callback));
#else
RIOT6532(config, m_riot, MASTER_CLOCK_PAL / 3);
m_riot->in_pa_callback().set(FUNC(a2600_state::switch_A_r));
m_riot->out_pa_callback().set(FUNC(a2600_state::switch_A_w));
- m_riot->in_pb_callback().set(FUNC(a2600_state::riot_input_port_8_r));
+ m_riot->in_pb_callback().set_ioport("SWB");
m_riot->out_pb_callback().set(FUNC(a2600_state::switch_B_w));
m_riot->irq_callback().set(FUNC(a2600_state::irq_callback));
#endif
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index faa75435354..01d1f86e677 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -641,7 +641,7 @@ WRITE8_MEMBER( abc1600_state::cio_w )
m_cio->write(A2_A1, data);
}
-READ8_MEMBER( abc1600_state::cio_pa_r )
+uint8_t abc1600_state::cio_pa_r()
{
/*
@@ -672,7 +672,7 @@ READ8_MEMBER( abc1600_state::cio_pa_r )
return data;
}
-READ8_MEMBER( abc1600_state::cio_pb_r )
+uint8_t abc1600_state::cio_pb_r()
{
/*
@@ -700,7 +700,7 @@ READ8_MEMBER( abc1600_state::cio_pb_r )
return data;
}
-WRITE8_MEMBER( abc1600_state::cio_pb_w )
+void abc1600_state::cio_pb_w(uint8_t data)
{
/*
@@ -724,7 +724,7 @@ WRITE8_MEMBER( abc1600_state::cio_pb_w )
m_dart->rxca_w(prbr);
}
-READ8_MEMBER( abc1600_state::cio_pc_r )
+uint8_t abc1600_state::cio_pc_r()
{
/*
@@ -745,7 +745,7 @@ READ8_MEMBER( abc1600_state::cio_pc_r )
return data;
}
-WRITE8_MEMBER( abc1600_state::cio_pc_w )
+void abc1600_state::cio_pc_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 54d3d332575..028f9e1e142 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -219,7 +219,7 @@ void abc80_state::abc80_io(address_map &map)
// Z80PIO
//-------------------------------------------------
-READ8_MEMBER( abc80_state::pio_pa_r )
+uint8_t abc80_state::pio_pa_r()
{
/*
@@ -247,7 +247,7 @@ READ8_MEMBER( abc80_state::pio_pa_r )
return data;
}
-READ8_MEMBER( abc80_state::pio_pb_r )
+uint8_t abc80_state::pio_pb_r()
{
/*
@@ -283,7 +283,7 @@ READ8_MEMBER( abc80_state::pio_pb_r )
return data;
}
-WRITE8_MEMBER( abc80_state::pio_pb_w )
+void abc80_state::pio_pb_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/aci_ggm.cpp b/src/mame/drivers/aci_ggm.cpp
index b76a7599a55..1a028605d89 100644
--- a/src/mame/drivers/aci_ggm.cpp
+++ b/src/mame/drivers/aci_ggm.cpp
@@ -113,22 +113,17 @@ private:
void shift_clock_w(int state);
void shift_data_w(int state);
- u8 m_inp_mux;
- u16 m_digit_data;
- u8 m_shift_data;
- u8 m_shift_clock;
- u32 m_cart_mask;
- u8 m_overlay;
+ u8 m_inp_mux = 0;
+ u16 m_digit_data = 0;
+ u8 m_shift_data = 0;
+ u8 m_shift_clock = 0;
+
+ u32 m_cart_mask = 0;
+ u8 m_overlay = 0;
};
void ggm_state::machine_start()
{
- // zerofill
- m_inp_mux = 0;
- m_digit_data = 0;
- m_shift_data = 0;
- m_shift_clock = 0;
-
// register for savestates
save_item(NAME(m_inp_mux));
save_item(NAME(m_digit_data));
@@ -176,9 +171,8 @@ DEVICE_IMAGE_LOAD_MEMBER(ggm_state::cartridge)
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
- // keypad overlay
- std::string overlay(image.get_feature("overlay"));
- m_overlay = std::stoul(overlay, nullptr, 0) & 0xf;
+ // keypad overlay (will return 0 if it's not defined)
+ m_overlay = strtoul(image.get_feature("overlay"), nullptr, 0) & 0xf;
// extra ram (optional)
if (image.get_feature("ram"))
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 14dc844e182..496d0bbb17a 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -30,12 +30,12 @@
/******************************************************************************/
-WRITE8_MEMBER(actfancr_state::triothep_control_select_w)
+void actfancr_state::triothep_control_select_w(uint8_t data)
{
m_trio_control_select = data;
}
-READ8_MEMBER(actfancr_state::triothep_control_r)
+uint8_t actfancr_state::triothep_control_r()
{
switch (m_trio_control_select)
{
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index ad9e5f8a402..eb4b4e4387b 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -701,7 +701,7 @@ WRITE8_MEMBER( adam_state::adamnet_w )
// m6801_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::m6801_p1_w )
+void adam_state::m6801_p1_w(uint8_t data)
{
/*
@@ -726,7 +726,7 @@ WRITE8_MEMBER( adam_state::m6801_p1_w )
// m6801_p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_state::m6801_p2_r )
+uint8_t adam_state::m6801_p2_r()
{
/*
@@ -753,7 +753,7 @@ READ8_MEMBER( adam_state::m6801_p2_r )
// m6801_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::m6801_p2_w )
+void adam_state::m6801_p2_w(uint8_t data)
{
/*
@@ -782,7 +782,7 @@ WRITE8_MEMBER( adam_state::m6801_p2_w )
// m6801_p3_r -
//-------------------------------------------------
-READ8_MEMBER( adam_state::m6801_p3_r )
+uint8_t adam_state::m6801_p3_r()
{
/*
@@ -807,7 +807,7 @@ READ8_MEMBER( adam_state::m6801_p3_r )
// m6801_p3_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::m6801_p3_w )
+void adam_state::m6801_p3_w(uint8_t data)
{
/*
@@ -832,7 +832,7 @@ WRITE8_MEMBER( adam_state::m6801_p3_w )
// m6801_p4_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::m6801_p4_w )
+void adam_state::m6801_p4_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 89b2a7affaa..65bbce03615 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -26,7 +26,7 @@
/* Memory Maps */
-READ8_MEMBER( advision_state::rom_r )
+uint8_t advision_state::rom_r(offs_t offset)
{
offset += 0x400;
return m_cart->read_rom(offset & 0xfff);
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 1d984639dcc..cba3c579e0e 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -151,7 +151,7 @@ WRITE8_MEMBER(ajax_state::sound_bank_w)
m_k007232_2->set_bank(bank_A, bank_B);
}
-WRITE8_MEMBER(ajax_state::volume_callback0)
+void ajax_state::volume_callback0(uint8_t data)
{
m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11);
@@ -163,7 +163,7 @@ WRITE8_MEMBER(ajax_state::k007232_extvol_w)
m_k007232_2->set_volume(0, (data & 0x0f) * 0x11/2, (data & 0x0f) * 0x11/2);
}
-WRITE8_MEMBER(ajax_state::volume_callback1)
+void ajax_state::volume_callback1(uint8_t data)
{
/* channel B volume/pan */
m_k007232_2->set_volume(1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2);
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 119803cb1cd..36759cd6af8 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -18,12 +18,12 @@
#include "screen.h"
-WRITE8_MEMBER( alesis_state::kb_matrix_w )
+void alesis_state::kb_matrix_w(uint8_t data)
{
m_kb_matrix = data;
}
-READ8_MEMBER( alesis_state::kb_r )
+uint8_t alesis_state::kb_r()
{
uint8_t data = 0xff;
@@ -43,7 +43,7 @@ READ8_MEMBER( alesis_state::kb_r )
return data;
}
-WRITE8_MEMBER( alesis_state::led_w )
+void alesis_state::led_w(uint8_t data)
{
m_patt_led = BIT(data, 0) ? 1 : 0;
m_song_led = BIT(data, 0) ? 0 : 1;
@@ -56,7 +56,7 @@ WRITE8_MEMBER( alesis_state::led_w )
m_midi_led = BIT(data, 7) ? 0 : 1;
}
-READ8_MEMBER( alesis_state::p3_r )
+uint8_t alesis_state::p3_r()
{
uint8_t data = 0xff;
@@ -65,17 +65,17 @@ READ8_MEMBER( alesis_state::p3_r )
return data;
}
-WRITE8_MEMBER( alesis_state::p3_w )
+void alesis_state::p3_w(uint8_t data)
{
m_cassette->output(data & 0x04 ? -1.0 : +1.0);
}
-WRITE8_MEMBER( alesis_state::sr16_lcd_w )
+void alesis_state::sr16_lcd_w(uint8_t data)
{
m_lcdc->write(BIT(m_kb_matrix,7), data);
}
-WRITE8_MEMBER( alesis_state::mmt8_led_w )
+void alesis_state::mmt8_led_w(uint8_t data)
{
m_play_led = BIT(data, 0) ? 0 : 1;
m_record_led = BIT(data, 1) ? 0 : 1;
@@ -88,18 +88,18 @@ WRITE8_MEMBER( alesis_state::mmt8_led_w )
m_leds = data;
}
-READ8_MEMBER( alesis_state::mmt8_led_r )
+uint8_t alesis_state::mmt8_led_r()
{
return m_leds;
}
-WRITE8_MEMBER( alesis_state::track_led_w )
+void alesis_state::track_led_w(uint8_t data)
{
for (int i=0; i < 8; i++)
m_track_led[i] = BIT(data, i);
}
-READ8_MEMBER( alesis_state::mmt8_p3_r )
+uint8_t alesis_state::mmt8_p3_r()
{
// ---- -x-- Tape in
// ---- x--- Start/Stop input
@@ -110,7 +110,7 @@ READ8_MEMBER( alesis_state::mmt8_p3_r )
return data;
}
-WRITE8_MEMBER( alesis_state::mmt8_p3_w )
+void alesis_state::mmt8_p3_w(uint8_t data)
{
// ---x ---- Tape out
// --x- ---- Click out
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index c0712544c42..ddf4af77576 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -48,7 +48,7 @@ WRITE8_MEMBER(aliens_state::aliens_sh_irqtrigger_w)
m_audiocpu->set_input_line(0, HOLD_LINE);
}
-WRITE8_MEMBER(aliens_state::aliens_snd_bankswitch_w)
+void aliens_state::aliens_snd_bankswitch_w(uint8_t data)
{
/* b1: bank for chanel A */
/* b0: bank for chanel B */
@@ -172,7 +172,7 @@ INPUT_PORTS_END
***************************************************************************/
-WRITE8_MEMBER(aliens_state::volume_callback)
+void aliens_state::volume_callback(uint8_t data)
{
m_k007232->set_volume(0, (data & 0x0f) * 0x11, 0);
m_k007232->set_volume(1, 0, (data >> 4) * 0x11);
@@ -189,7 +189,7 @@ void aliens_state::machine_reset()
m_bank0000->set_bank(0);
}
-WRITE8_MEMBER( aliens_state::banking_callback )
+void aliens_state::banking_callback(uint8_t data)
{
m_rombank->set_entry(data & 0x1f);
}
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 0e976201b97..34bfef9944d 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -28,7 +28,7 @@ public:
void altos486(machine_config &config);
private:
- DECLARE_READ8_MEMBER(read_rmx_ack);
+ uint8_t read_rmx_ack(offs_t offset);
DECLARE_READ16_MEMBER(mmu_ram_r);
DECLARE_READ16_MEMBER(mmu_io_r);
@@ -49,7 +49,7 @@ private:
uint8_t m_prot[256];
};
-READ8_MEMBER(altos486_state::read_rmx_ack)
+uint8_t altos486_state::read_rmx_ack(offs_t offset)
{
if(offset == 4)
return m_maincpu->int_callback(*this, 0);
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 59ccd2b936d..3c0d6f218c1 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -45,15 +45,15 @@ public:
DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb);
private:
- DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
- DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
- DECLARE_READ8_MEMBER(port08_r);
- DECLARE_READ8_MEMBER(port09_r);
- DECLARE_WRITE8_MEMBER(port08_w);
- DECLARE_WRITE8_MEMBER(port09_w);
- DECLARE_WRITE8_MEMBER(port14_w);
+ uint8_t memory_read_byte(offs_t offset);
+ void memory_write_byte(offs_t offset, uint8_t data);
+ uint8_t io_read_byte(offs_t offset);
+ void io_write_byte(offs_t offset, uint8_t data);
+ uint8_t port08_r();
+ uint8_t port09_r();
+ void port08_w(uint8_t data);
+ void port09_w(uint8_t data);
+ void port14_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(busreq_w);
DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
@@ -210,31 +210,31 @@ static const z80_daisy_config daisy_chain_intf[] =
// turns off IPL mode, removes boot rom from memory map
-WRITE8_MEMBER( altos5_state::port14_w )
+void altos5_state::port14_w(uint8_t data)
{
m_ipl = 0;
setup_banks(2);
}
-READ8_MEMBER(altos5_state::memory_read_byte)
+uint8_t altos5_state::memory_read_byte(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM);
return prog_space.read_byte(offset);
}
-WRITE8_MEMBER(altos5_state::memory_write_byte)
+void altos5_state::memory_write_byte(offs_t offset, uint8_t data)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM);
prog_space.write_byte(offset, data);
}
-READ8_MEMBER(altos5_state::io_read_byte)
+uint8_t altos5_state::io_read_byte(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_IO);
return prog_space.read_byte(offset);
}
-WRITE8_MEMBER(altos5_state::io_write_byte)
+void altos5_state::io_write_byte(offs_t offset, uint8_t data)
{
address_space& prog_space = m_maincpu->space(AS_IO);
prog_space.write_byte(offset, data);
@@ -255,7 +255,7 @@ d2: unused configuration input (must be H to skip HD boot)
d3: selected floppy is single(L) or double sided(H)
d7: IRQ from FDC
*/
-READ8_MEMBER( altos5_state::port08_r )
+uint8_t altos5_state::port08_r()
{
uint8_t data = m_port08 | 0x87;
if (m_floppy)
@@ -266,7 +266,7 @@ READ8_MEMBER( altos5_state::port08_r )
/*
d0: HD IRQ
*/
-READ8_MEMBER( altos5_state::port09_r )
+uint8_t altos5_state::port09_r()
{
return m_port09 & 0xfe;
}
@@ -276,7 +276,7 @@ d4: DDEN (H = double density)
d5: DS (H = drive 2)
d6: SS (H = side 2)
*/
-WRITE8_MEMBER( altos5_state::port08_w )
+void altos5_state::port08_w(uint8_t data)
{
m_port08 = data & 0x70;
@@ -302,7 +302,7 @@ d3, 4: CPU bank select
d5: H = Write protect of common area
d6, 7: DMA bank select (not emulated)
*/
-WRITE8_MEMBER( altos5_state::port09_w )
+void altos5_state::port09_w(uint8_t data)
{
m_port09 = data;
setup_banks(2);
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index 4fb3c4c8bb0..35fca787dc1 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -53,7 +53,7 @@ private:
DECLARE_WRITE16_MEMBER(mmuaddr_w);
DECLARE_READ16_MEMBER(mmuflags_r);
DECLARE_WRITE16_MEMBER(mmuflags_w);
- DECLARE_READ8_MEMBER(get_slave_ack);
+ u8 get_slave_ack(offs_t offset);
DECLARE_READ16_MEMBER(fault_r);
DECLARE_READ16_MEMBER(errlo_r);
DECLARE_READ16_MEMBER(errhi_r);
@@ -495,7 +495,7 @@ WRITE16_MEMBER(altos8600_state::mode_w)
m_user = true;
}
-READ8_MEMBER(altos8600_state::get_slave_ack)
+u8 altos8600_state::get_slave_ack(offs_t offset)
{
if(offset == 2)
return m_pic[1]->acknowledge();
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index f63b98a889c..ab9945c8d88 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -347,13 +347,11 @@ public:
DECLARE_READ16_MEMBER( clock_r );
DECLARE_WRITE16_MEMBER( clock_w );
- DECLARE_READ8_MEMBER( dmac_scsi_data_read );
- DECLARE_WRITE8_MEMBER( dmac_scsi_data_write );
- DECLARE_READ8_MEMBER( dmac_io_read );
- DECLARE_WRITE8_MEMBER( dmac_io_write );
+ uint8_t dmac_scsi_data_read(offs_t offset);
+ void dmac_scsi_data_write(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( dmac_int_w );
- DECLARE_WRITE8_MEMBER( tpi_port_b_write );
+ void tpi_port_b_write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( tpi_int_w );
void cdtv(machine_config &config);
@@ -545,7 +543,7 @@ public:
{ }
DECLARE_WRITE_LINE_MEMBER( akiko_int_w );
- DECLARE_WRITE8_MEMBER( akiko_cia_0_port_a_write );
+ void akiko_cia_0_port_a_write(uint8_t data);
void handle_joystick_cia(u8 pra, u8 dra);
u16 handle_joystick_potgor(u16 potgor);
@@ -613,7 +611,7 @@ WRITE16_MEMBER( a500p_state::clock_w )
// CD-ROM CONTROLLER
//**************************************************************************
-READ8_MEMBER( cdtv_state::dmac_scsi_data_read )
+uint8_t cdtv_state::dmac_scsi_data_read(offs_t offset)
{
if (offset >= 0xb0 && offset <= 0xbf)
return m_tpi->read(offset);
@@ -621,29 +619,19 @@ READ8_MEMBER( cdtv_state::dmac_scsi_data_read )
return 0xff;
}
-WRITE8_MEMBER( cdtv_state::dmac_scsi_data_write )
+void cdtv_state::dmac_scsi_data_write(offs_t offset, uint8_t data)
{
if (offset >= 0xb0 && offset <= 0xbf)
m_tpi->write(offset, data);
}
-READ8_MEMBER( cdtv_state::dmac_io_read )
-{
- return m_cdrom->read();
-}
-
-WRITE8_MEMBER( cdtv_state::dmac_io_write )
-{
- m_cdrom->write(data);
-}
-
WRITE_LINE_MEMBER( cdtv_state::dmac_int_w )
{
m_dmac_irq = state;
update_int2();
}
-WRITE8_MEMBER( cdtv_state::tpi_port_b_write )
+void cdtv_state::tpi_port_b_write(uint8_t data)
{
m_cdrom->cmd_w(BIT(data, 0));
m_cdrom->enable_w(BIT(data, 1));
@@ -987,9 +975,9 @@ READ16_MEMBER( a4000_state::ide_r )
// this very likely doesn't respond to all the addresses, figure out which ones
if (BIT(offset, 12))
- data = m_ata->read_cs1((offset >> 1) & 0x07, mem_mask);
+ data = m_ata->cs1_r((offset >> 1) & 0x07, mem_mask);
else
- data = m_ata->read_cs0((offset >> 1) & 0x07, mem_mask);
+ data = m_ata->cs0_r((offset >> 1) & 0x07, mem_mask);
// swap
data = (data << 8) | (data >> 8);
@@ -1009,9 +997,9 @@ WRITE16_MEMBER( a4000_state::ide_w )
// this very likely doesn't respond to all the addresses, figure out which ones
if (BIT(offset, 12))
- m_ata->write_cs1((offset >> 1) & 0x07, data, mem_mask);
+ m_ata->cs1_w((offset >> 1) & 0x07, data, mem_mask);
else
- m_ata->write_cs0((offset >> 1) & 0x07, data, mem_mask);
+ m_ata->cs0_w((offset >> 1) & 0x07, data, mem_mask);
}
WRITE_LINE_MEMBER( a4000_state::ide_interrupt_w )
@@ -1152,7 +1140,7 @@ READ_LINE_MEMBER( cd32_state::cd32_sel_mirror_input )
return (bits & 0x20)>>5;
}
-WRITE8_MEMBER( cd32_state::akiko_cia_0_port_a_write )
+void cd32_state::akiko_cia_0_port_a_write(uint8_t data)
{
// bit 0, cd audio mute
m_cdda->set_output_gain(0, BIT(data, 0) ? 0.0 : 1.0);
@@ -1823,8 +1811,8 @@ void cdtv_state::cdtv(machine_config &config)
AMIGA_DMAC(config, m_dmac, amiga_state::CLK_7M_PAL);
m_dmac->scsi_read_handler().set(FUNC(cdtv_state::dmac_scsi_data_read));
m_dmac->scsi_write_handler().set(FUNC(cdtv_state::dmac_scsi_data_write));
- m_dmac->io_read_handler().set(FUNC(cdtv_state::dmac_io_read));
- m_dmac->io_write_handler().set(FUNC(cdtv_state::dmac_io_write));
+ m_dmac->io_read_handler().set(m_cdrom, FUNC(cr511b_device::read));
+ m_dmac->io_write_handler().set(m_cdrom, FUNC(cr511b_device::write));
m_dmac->int_handler().set(FUNC(cdtv_state::dmac_int_w));
TPI6525(config, m_tpi, 0);
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 7e76e51b7c3..2799abb6ec2 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -114,16 +114,16 @@ public:
void apfimag(machine_config &config);
private:
- DECLARE_READ8_MEMBER(videoram_r);
- DECLARE_READ8_MEMBER(pia0_porta_r);
- DECLARE_WRITE8_MEMBER(pia0_portb_w);
+ uint8_t videoram_r(offs_t offset);
+ uint8_t pia0_porta_r();
+ void pia0_portb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w);
- DECLARE_READ8_MEMBER(pia1_porta_r);
- DECLARE_READ8_MEMBER(pia1_portb_r);
- DECLARE_WRITE8_MEMBER(pia1_portb_w);
- DECLARE_WRITE8_MEMBER(apf_dischw_w);
- DECLARE_READ8_MEMBER(serial_r);
- DECLARE_WRITE8_MEMBER(serial_w);
+ uint8_t pia1_porta_r();
+ uint8_t pia1_portb_r();
+ void pia1_portb_w(uint8_t data);
+ void apf_dischw_w(offs_t offset, uint8_t data);
+ uint8_t serial_r(offs_t offset);
+ void serial_w(offs_t offset, uint8_t data);
void apfimag_map(address_map &map);
void apfm1000_map(address_map &map);
@@ -153,7 +153,7 @@ private:
};
-READ8_MEMBER( apf_state::videoram_r )
+uint8_t apf_state::videoram_r(offs_t offset)
{
if (BIT(m_pad_data, 7)) // AG line
{
@@ -184,7 +184,7 @@ READ8_MEMBER( apf_state::videoram_r )
}
}
-READ8_MEMBER( apf_state::pia0_porta_r )
+uint8_t apf_state::pia0_porta_r()
{
uint8_t data = 0xff;
@@ -195,7 +195,7 @@ READ8_MEMBER( apf_state::pia0_porta_r )
return data;
}
-WRITE8_MEMBER( apf_state::pia0_portb_w )
+void apf_state::pia0_portb_w(uint8_t data)
{
/* bit 7..6 video control */
m_crtc->ag_w(BIT(data, 7));
@@ -210,12 +210,12 @@ WRITE_LINE_MEMBER( apf_state::pia0_ca2_w )
m_ca2 = state;
}
-READ8_MEMBER( apf_state::pia1_porta_r )
+uint8_t apf_state::pia1_porta_r()
{
return m_key[m_keyboard_data]->read();
}
-READ8_MEMBER( apf_state::pia1_portb_r )
+uint8_t apf_state::pia1_portb_r()
{
uint8_t data = m_portb;
@@ -226,7 +226,7 @@ READ8_MEMBER( apf_state::pia1_portb_r )
}
-WRITE8_MEMBER( apf_state::pia1_portb_w )
+void apf_state::pia1_portb_w(uint8_t data)
{
/* bits 2..0 = keyboard line */
/* bit 3 = cass audio enable */
@@ -284,7 +284,7 @@ void apf_state::machine_reset()
}
}
-WRITE8_MEMBER( apf_state::apf_dischw_w)
+void apf_state::apf_dischw_w(offs_t offset, uint8_t data)
{
/* bit 3 is index of drive to select */
uint8_t drive = BIT(data, 3);
@@ -305,13 +305,13 @@ WRITE8_MEMBER( apf_state::apf_dischw_w)
logerror("disc w %04x %04x\n",offset,data);
}
-READ8_MEMBER( apf_state::serial_r)
+uint8_t apf_state::serial_r(offs_t offset)
{
logerror("serial r %04x\n",offset);
return 0;
}
-WRITE8_MEMBER( apf_state::serial_w)
+void apf_state::serial_w(offs_t offset, uint8_t data)
{
logerror("serial w %04x %04x\n",offset,data);
}
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index c6ecc243e96..5cf5e9c3e95 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -136,10 +136,10 @@ private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_READ8_MEMBER(ram_r);
- DECLARE_WRITE8_MEMBER(ram_w);
- DECLARE_READ8_MEMBER(pia_keyboard_r);
- DECLARE_WRITE8_MEMBER(pia_display_w);
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
+ uint8_t pia_keyboard_r();
+ void pia_display_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia_display_gate_w);
DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb);
TIMER_CALLBACK_MEMBER(ready_start_cb);
@@ -414,7 +414,7 @@ void apple1_state::machine_reset()
m_lastports[0] = m_lastports[1] = m_lastports[2] = m_lastports[3] = 0;
}
-READ8_MEMBER(apple1_state::ram_r)
+uint8_t apple1_state::ram_r(offs_t offset)
{
if (offset < m_ram_size)
{
@@ -424,7 +424,7 @@ READ8_MEMBER(apple1_state::ram_r)
return 0xff;
}
-WRITE8_MEMBER(apple1_state::ram_w)
+void apple1_state::ram_w(offs_t offset, uint8_t data)
{
if (offset < m_ram_size)
{
@@ -440,12 +440,12 @@ void apple1_state::apple1_map(address_map &map)
map(0xff00, 0xffff).rom().region(A1_CPU_TAG, 0);
}
-READ8_MEMBER(apple1_state::pia_keyboard_r)
+uint8_t apple1_state::pia_keyboard_r()
{
return m_transchar | 0x80; // bit 7 is wired high, similar-ish to the Apple II
}
-WRITE8_MEMBER(apple1_state::pia_display_w)
+void apple1_state::pia_display_w(uint8_t data)
{
data &= 0x7f; // D7 is ignored by the video h/w
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index c003c713e70..97ec6f7d1b5 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -369,7 +369,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w);
DECLARE_READ8_MEMBER(memexp_r);
DECLARE_WRITE8_MEMBER(memexp_w);
- DECLARE_READ8_MEMBER(nsc_backing_r);
+ uint8_t nsc_backing_r(offs_t offset);
void apple2cp(machine_config &config);
void laser128ex2(machine_config &config);
@@ -2380,7 +2380,7 @@ uint8_t apple2e_state::read_int_rom(int slotbias, int offset)
return m_ds1315->read(slotbias + offset);
}
-READ8_MEMBER(apple2e_state::nsc_backing_r) { return m_rom_ptr[offset]; }
+uint8_t apple2e_state::nsc_backing_r(offs_t offset) { return m_rom_ptr[offset]; }
READ8_MEMBER(apple2e_state::c100_r) { return read_slot_rom(1, offset); }
READ8_MEMBER(apple2e_state::c100_int_r) { return read_int_rom(0x100, offset); }
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 96f3550b3ef..5816891f935 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -485,7 +485,7 @@ private:
DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w);
DECLARE_WRITE_LINE_MEMBER(doc_irq_w);
DECLARE_WRITE_LINE_MEMBER(scc_irq_w);
- DECLARE_READ8_MEMBER(doc_adc_read);
+ uint8_t doc_adc_read();
DECLARE_READ8_MEMBER(apple2gs_read_vector);
#if !RUN_ADB_MICRO
@@ -502,17 +502,17 @@ private:
void keyglu_816_write(uint8_t offset, uint8_t data);
void keyglu_regen_irqs();
- DECLARE_READ8_MEMBER(adbmicro_p0_in);
- DECLARE_READ8_MEMBER(adbmicro_p1_in);
- DECLARE_READ8_MEMBER(adbmicro_p2_in);
- DECLARE_READ8_MEMBER(adbmicro_p3_in);
- DECLARE_WRITE8_MEMBER(adbmicro_p0_out);
- DECLARE_WRITE8_MEMBER(adbmicro_p1_out);
- DECLARE_WRITE8_MEMBER(adbmicro_p2_out);
- DECLARE_WRITE8_MEMBER(adbmicro_p3_out);
+ uint8_t adbmicro_p0_in();
+ uint8_t adbmicro_p1_in();
+ uint8_t adbmicro_p2_in();
+ uint8_t adbmicro_p3_in();
+ void adbmicro_p0_out(uint8_t data);
+ void adbmicro_p1_out(uint8_t data);
+ void adbmicro_p2_out(uint8_t data);
+ void adbmicro_p3_out(uint8_t data);
offs_t dasm_trampoline(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms);
- DECLARE_WRITE8_MEMBER(wdm_trampoline) { }; //m_a2host->wdm_w(space, offset, data); }
+ void wdm_trampoline(offs_t offset, uint8_t data) { }; //m_a2host->wdm_w(space, offset, data); }
private:
bool m_is_rom3;
@@ -1079,6 +1079,7 @@ void apple2gs_state::adb_write_datareg(uint8_t data)
break;
case 0xf2:
+ adb_post_response_1(0x80);
break;
default:
@@ -3770,12 +3771,12 @@ void apple2gs_state::a2gs_es5503_map(address_map &map)
http://www.llx.com/~nparker/a2/adb.html
***************************************************************************/
-READ8_MEMBER(apple2gs_state::adbmicro_p0_in)
+uint8_t apple2gs_state::adbmicro_p0_in()
{
return m_glu_bus;
}
-READ8_MEMBER(apple2gs_state::adbmicro_p1_in)
+uint8_t apple2gs_state::adbmicro_p1_in()
{
#if RUN_ADB_MICRO
switch (m_glu_kbd_y)
@@ -3805,7 +3806,7 @@ READ8_MEMBER(apple2gs_state::adbmicro_p1_in)
return 0xff;
}
-READ8_MEMBER(apple2gs_state::adbmicro_p2_in)
+uint8_t apple2gs_state::adbmicro_p2_in()
{
uint8_t rv = 0;
@@ -3815,7 +3816,7 @@ READ8_MEMBER(apple2gs_state::adbmicro_p2_in)
return rv;
}
-READ8_MEMBER(apple2gs_state::adbmicro_p3_in)
+uint8_t apple2gs_state::adbmicro_p3_in()
{
uint8_t rv = 0;
#if RUN_ADB_MICRO
@@ -3832,16 +3833,16 @@ READ8_MEMBER(apple2gs_state::adbmicro_p3_in)
return rv;
}
-WRITE8_MEMBER(apple2gs_state::adbmicro_p0_out)
+void apple2gs_state::adbmicro_p0_out(uint8_t data)
{
m_glu_bus = data;
}
-WRITE8_MEMBER(apple2gs_state::adbmicro_p1_out)
+void apple2gs_state::adbmicro_p1_out(uint8_t data)
{
}
-WRITE8_MEMBER(apple2gs_state::adbmicro_p2_out)
+void apple2gs_state::adbmicro_p2_out(uint8_t data)
{
if (!(data & 0x10))
{
@@ -3860,7 +3861,7 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p2_out)
}
}
-WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out)
+void apple2gs_state::adbmicro_p3_out(uint8_t data)
{
if (((data & 0x08) == 0x08) != m_adb_line)
{
@@ -4094,7 +4095,7 @@ WRITE_LINE_MEMBER(apple2gs_state::doc_irq_w)
}
}
-READ8_MEMBER(apple2gs_state::doc_adc_read)
+uint8_t apple2gs_state::doc_adc_read()
{
return 0x80;
}
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index 4ddfc719a62..d782dd9111d 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -76,16 +76,16 @@ private:
DECLARE_FLOPPY_FORMATS(floppy_formats);
DECLARE_WRITE_LINE_MEMBER(i8086_lock_w);
- DECLARE_WRITE8_MEMBER(i8089_ca1_w);
- DECLARE_WRITE8_MEMBER(i8089_ca2_w);
- DECLARE_WRITE8_MEMBER(i8255_portb_w);
- DECLARE_READ8_MEMBER(i8255_portc_r);
- DECLARE_WRITE8_MEMBER(i8255_portc_w);
+ void i8089_ca1_w(uint8_t data);
+ void i8089_ca2_w(uint8_t data);
+ void i8255_portb_w(uint8_t data);
+ uint8_t i8255_portc_r();
+ void i8255_portc_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
- DECLARE_READ8_MEMBER(sio_da_r);
- DECLARE_READ8_MEMBER(sio_ca_r);
- DECLARE_READ8_MEMBER(sio_db_r);
- DECLARE_READ8_MEMBER(sio_cb_r);
+ uint8_t sio_da_r();
+ uint8_t sio_ca_r();
+ uint8_t sio_db_r();
+ uint8_t sio_cb_r();
DECLARE_WRITE_LINE_MEMBER(write_centronics_fault);
DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
@@ -133,14 +133,14 @@ private:
// I/O
//**************************************************************************
-WRITE8_MEMBER( apricot_state::i8089_ca1_w )
+void apricot_state::i8089_ca1_w(uint8_t data)
{
m_iop->sel_w(0);
m_iop->ca_w(1);
m_iop->ca_w(0);
}
-WRITE8_MEMBER( apricot_state::i8089_ca2_w )
+void apricot_state::i8089_ca2_w(uint8_t data)
{
m_iop->sel_w(1);
m_iop->ca_w(1);
@@ -159,7 +159,7 @@ WRITE_LINE_MEMBER( apricot_state::write_centronics_perror )
m_centronics_perror = state;
}
-READ8_MEMBER( apricot_state::i8255_portc_r )
+uint8_t apricot_state::i8255_portc_r()
{
uint8_t data = 0;
@@ -171,7 +171,7 @@ READ8_MEMBER( apricot_state::i8255_portc_r )
return data;
}
-WRITE8_MEMBER( apricot_state::i8255_portb_w )
+void apricot_state::i8255_portb_w(uint8_t data)
{
// bit 0, crt reset
// bit 1, not connected
@@ -200,14 +200,14 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w )
// PB7 Centronics transceiver direction. 0 = output, 1 = input
}
-WRITE8_MEMBER( apricot_state::i8255_portc_w )
+void apricot_state::i8255_portc_w(uint8_t data)
{
// schematic page 294 says pc4 outputs to centronics pin 13, which is the "select" output from the printer.
m_centronics->write_strobe(BIT(data, 5));
// schematic page 294 says pc6 outputs to centronics pin 15, which is unused
}
-READ8_MEMBER( apricot_state::sio_da_r )
+uint8_t apricot_state::sio_da_r()
{
if (m_bus_locked)
return m_sio->m1_r();
@@ -215,7 +215,7 @@ READ8_MEMBER( apricot_state::sio_da_r )
return m_sio->da_r();
}
-READ8_MEMBER( apricot_state::sio_ca_r )
+uint8_t apricot_state::sio_ca_r()
{
if (m_bus_locked)
return m_sio->m1_r();
@@ -223,7 +223,7 @@ READ8_MEMBER( apricot_state::sio_ca_r )
return m_sio->ca_r();
}
-READ8_MEMBER( apricot_state::sio_cb_r )
+uint8_t apricot_state::sio_cb_r()
{
if (m_bus_locked)
return m_sio->m1_r();
@@ -231,7 +231,7 @@ READ8_MEMBER( apricot_state::sio_cb_r )
return m_sio->cb_r();
}
-READ8_MEMBER( apricot_state::sio_db_r )
+uint8_t apricot_state::sio_db_r()
{
if (m_bus_locked)
return m_sio->m1_r();
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 64da55393f1..162f58d5929 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -70,7 +70,7 @@ private:
DECLARE_WRITE_LINE_MEMBER(z0_w);
DECLARE_WRITE_LINE_MEMBER(hrq_w);
void argo_palette(palette_device &palette) const;
- DECLARE_READ8_MEMBER(dma_r);
+ uint8_t dma_r(offs_t offset);
I8275_DRAW_CHARACTER_MEMBER(display_pixels);
TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
@@ -234,7 +234,7 @@ WRITE_LINE_MEMBER(argo_state::z0_w)
// read - incoming 2514Hz
}
-READ8_MEMBER(argo_state::dma_r)
+uint8_t argo_state::dma_r(offs_t offset)
{
if (offset < 0xf800)
return m_maincpu->space(AS_PROGRAM).read_byte(offset);
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index f9faaf5c073..f852ec51479 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -418,35 +418,35 @@ private:
int m_printer_motor;
emu_timer *m_power_timer;
- DECLARE_READ8_MEMBER(ldsw);
- DECLARE_READ8_MEMBER(cgdrr);
- DECLARE_WRITE8_MEMBER(cgdrw);
- DECLARE_WRITE8_MEMBER(u3_p0);
- DECLARE_READ8_MEMBER(u3_p2);
- DECLARE_READ8_MEMBER(u3_p3);
- DECLARE_READ8_MEMBER(bv_p0);
- DECLARE_READ8_MEMBER(bv_p1);
- DECLARE_READ8_MEMBER(mkiv_pia_ina);
- DECLARE_WRITE8_MEMBER(mkiv_pia_outa);
- DECLARE_WRITE8_MEMBER(mlamps);
- DECLARE_READ8_MEMBER(cashcade_r);
- DECLARE_WRITE8_MEMBER(mk4_printer_w);
- DECLARE_READ8_MEMBER(mk4_printer_r);
+ uint8_t ldsw();
+ uint8_t cgdrr();
+ void cgdrw(uint8_t data);
+ void u3_p0(uint8_t data);
+ uint8_t u3_p2();
+ uint8_t u3_p3();
+ uint8_t bv_p0();
+ uint8_t bv_p1();
+ uint8_t mkiv_pia_ina();
+ void mkiv_pia_outa(uint8_t data);
+ void mlamps(uint8_t data);
+ uint8_t cashcade_r();
+ void mk4_printer_w(uint8_t data);
+ uint8_t mk4_printer_r();
DECLARE_WRITE_LINE_MEMBER(mkiv_pia_ca2);
DECLARE_WRITE_LINE_MEMBER(mkiv_pia_cb2);
- DECLARE_WRITE8_MEMBER(mkiv_pia_outb);
- DECLARE_READ8_MEMBER(via_a_r);
- DECLARE_READ8_MEMBER(via_b_r);
- DECLARE_WRITE8_MEMBER(via_a_w);
- DECLARE_WRITE8_MEMBER(via_b_w);
+ void mkiv_pia_outb(uint8_t data);
+ uint8_t via_a_r();
+ uint8_t via_b_r();
+ void via_a_w(uint8_t data);
+ void via_b_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(via_ca2_w);
DECLARE_WRITE_LINE_MEMBER(via_cb2_w);
- DECLARE_WRITE8_MEMBER(pblp_out);
- DECLARE_WRITE8_MEMBER(pbltlp_out);
- DECLARE_WRITE8_MEMBER(zn434_w);
- DECLARE_READ8_MEMBER(pa1_r);
- DECLARE_READ8_MEMBER(pb1_r);
- DECLARE_READ8_MEMBER(pc1_r);
+ void pblp_out(uint8_t data);
+ void pbltlp_out(uint8_t data);
+ void zn434_w(uint8_t data);
+ uint8_t pa1_r();
+ uint8_t pb1_r();
+ uint8_t pc1_r();
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -539,7 +539,7 @@ uint32_t aristmk4_state::screen_update_aristmk4(screen_device &screen, bitmap_rg
return 0;
}
-READ8_MEMBER(aristmk4_state::ldsw)
+uint8_t aristmk4_state::ldsw()
{
int U3_p2_ret= ioport("5002")->read();
if(U3_p2_ret & 0x1)
@@ -549,7 +549,7 @@ READ8_MEMBER(aristmk4_state::ldsw)
return m_cgdrsw = ioport("5005")->read();
}
-READ8_MEMBER(aristmk4_state::cgdrr)
+uint8_t aristmk4_state::cgdrr()
{
if(m_cgdrsw) // is the LC closed
{
@@ -558,12 +558,12 @@ READ8_MEMBER(aristmk4_state::cgdrr)
return 0x0; // otherwise the counter outputs are set low.
}
-WRITE8_MEMBER(aristmk4_state::cgdrw)
+void aristmk4_state::cgdrw(uint8_t data)
{
m_ripple = data;
}
-WRITE8_MEMBER(aristmk4_state::u3_p0)
+void aristmk4_state::u3_p0(uint8_t data)
{
m_u3_p0_w = data;
@@ -575,7 +575,7 @@ WRITE8_MEMBER(aristmk4_state::u3_p0)
//logerror("u3_p0_w: %02X\n",m_u3_p0_w);
}
-READ8_MEMBER(aristmk4_state::u3_p2)
+uint8_t aristmk4_state::u3_p2()
{
int u3_p2_ret= ioport("5002")->read();
int u3_p3_ret= ioport("5003")->read();
@@ -600,7 +600,7 @@ READ8_MEMBER(aristmk4_state::u3_p2)
return u3_p2_ret;
}
-READ8_MEMBER(aristmk4_state::u3_p3)
+uint8_t aristmk4_state::u3_p3()
{
int u3_p3_ret= ioport("5003")->read();
@@ -621,7 +621,7 @@ TIMER_CALLBACK_MEMBER(aristmk4_state::note_input_reset)
m_insnote=0; //reset note input after 150msec
}
-READ8_MEMBER(aristmk4_state::bv_p0)
+uint8_t aristmk4_state::bv_p0()
{
int bv_p0_ret=0x00;
@@ -644,7 +644,7 @@ READ8_MEMBER(aristmk4_state::bv_p0)
}
-READ8_MEMBER(aristmk4_state::bv_p1)
+uint8_t aristmk4_state::bv_p1()
{
int bv_p1_ret=0x00;
@@ -676,7 +676,7 @@ PORTB - MECHANICAL METERS
******************************************************************************/
//input a
-READ8_MEMBER(aristmk4_state::mkiv_pia_ina)
+uint8_t aristmk4_state::mkiv_pia_ina()
{
/* uncomment this code once RTC is fixed */
@@ -685,7 +685,7 @@ READ8_MEMBER(aristmk4_state::mkiv_pia_ina)
}
//output a
-WRITE8_MEMBER(aristmk4_state::mkiv_pia_outa)
+void aristmk4_state::mkiv_pia_outa(uint8_t data)
{
if(m_rtc_data_strobe)
{
@@ -714,7 +714,7 @@ WRITE_LINE_MEMBER(aristmk4_state::mkiv_pia_cb2)
}
//output b
-WRITE8_MEMBER(aristmk4_state::mkiv_pia_outb)
+void aristmk4_state::mkiv_pia_outb(uint8_t data)
{
uint8_t emet[5];
int i = 0;
@@ -792,7 +792,7 @@ TIMER_CALLBACK_MEMBER(aristmk4_state::hopper_reset)
}
// Port A read (SW1)
-READ8_MEMBER(aristmk4_state::via_a_r)
+uint8_t aristmk4_state::via_a_r()
{
int psg_ret=0;
@@ -810,7 +810,7 @@ READ8_MEMBER(aristmk4_state::via_a_r)
return psg_ret;
}
-READ8_MEMBER(aristmk4_state::via_b_r)
+uint8_t aristmk4_state::via_b_r()
{
int ret=ioport("via_port_b")->read();
@@ -861,13 +861,13 @@ READ8_MEMBER(aristmk4_state::via_b_r)
return ret;
}
-WRITE8_MEMBER(aristmk4_state::via_a_w)
+void aristmk4_state::via_a_w(uint8_t data)
{
//logerror("VIA port A write %02X\n",data);
m_psg_data = data;
}
-WRITE8_MEMBER(aristmk4_state::via_b_w)
+void aristmk4_state::via_b_w(uint8_t data)
{
m_ay8910_1 = ( data & 0x0F ) ; //only need first 4 bits per schematics
//NOTE: when bit 4 is off, we write to AY1, when bit 4 is on, we write to AY2
@@ -963,7 +963,7 @@ WRITE_LINE_MEMBER(aristmk4_state::via_cb2_w)
// Lamp output
-WRITE8_MEMBER(aristmk4_state::pblp_out)
+void aristmk4_state::pblp_out(uint8_t data)
{
m_lamps[ 1] = BIT(data, 0);
m_lamps[ 5] = BIT(data, 1);
@@ -976,7 +976,7 @@ WRITE8_MEMBER(aristmk4_state::pblp_out)
//logerror("Lights port A %02X\n",data);
}
-WRITE8_MEMBER(aristmk4_state::pbltlp_out)
+void aristmk4_state::pbltlp_out(uint8_t data)
{
m_lamps[ 8] = BIT(data, 0);
m_lamps[12] = BIT(data, 1);
@@ -989,32 +989,32 @@ WRITE8_MEMBER(aristmk4_state::pbltlp_out)
//logerror("Lights port B: %02X\n",data);
}
-WRITE8_MEMBER(aristmk4_state::mlamps)
+void aristmk4_state::mlamps(uint8_t data)
{
/* TAKE WIN AND GAMBLE LAMPS */
m_lamps[18] = BIT(data, 5);
m_lamps[13] = BIT(data, 6);
}
-WRITE8_MEMBER(aristmk4_state::zn434_w)
+void aristmk4_state::zn434_w(uint8_t data)
{
- // Introducted to prevent warning in log for write to AY1 PORT B
- // this is a write to the ZN434 DA convertors..
+ // Introduced to prevent warning in log for write to AY1 PORT B
+ // this is a write to the ZN434 DA converters..
}
-READ8_MEMBER(aristmk4_state::cashcade_r)
+uint8_t aristmk4_state::cashcade_r()
{
/* work around for cashcade games */
return cashcade_p[(m_cashcade_c++)%15];
}
-WRITE8_MEMBER(aristmk4_state::mk4_printer_w)
+void aristmk4_state::mk4_printer_w(uint8_t data)
{
//logerror("Printer: %c %d\n",data,data);
}
-READ8_MEMBER(aristmk4_state::mk4_printer_r)
+uint8_t aristmk4_state::mk4_printer_r()
{
return 0;
}
@@ -1685,17 +1685,17 @@ GFXDECODE_END
/* read m/c number */
-READ8_MEMBER(aristmk4_state::pa1_r)
+uint8_t aristmk4_state::pa1_r()
{
return (ioport("SW3")->read() << 4) + ioport("SW4")->read();
}
-READ8_MEMBER(aristmk4_state::pb1_r)
+uint8_t aristmk4_state::pb1_r()
{
return (ioport("SW5")->read() << 4) + ioport("SW6")->read();
}
-READ8_MEMBER(aristmk4_state::pc1_r)
+uint8_t aristmk4_state::pc1_r()
{
return 0;
}
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp
index 41608be4f40..ab846cbb586 100644
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@@ -91,7 +91,7 @@ public:
DECLARE_WRITE16_MEMBER(arcadia_multibios_change_game);
template DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r);
DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback);
- DECLARE_WRITE8_MEMBER(arcadia_cia_0_portb_w);
+ void arcadia_cia_0_portb_w(uint8_t data);
private:
inline void generic_decode(const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0);
@@ -142,7 +142,7 @@ WRITE16_MEMBER(arcadia_amiga_state::arcadia_multibios_change_game)
*
*************************************/
-WRITE8_MEMBER(arcadia_amiga_state::arcadia_cia_0_portb_w)
+void arcadia_amiga_state::arcadia_cia_0_portb_w(uint8_t data)
{
/* writing a 0 in the low bit clears one of the coins */
if ((data & 1) == 0)
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index e17eef39264..f3123075e8a 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -220,7 +220,7 @@ WRITE8_MEMBER(seawolf2_state::sound_2_w)// Port 41
*
*************************************/
-READ8_MEMBER(astrocde_state::input_mux_r)
+uint8_t astrocde_state::input_mux_r(offs_t offset)
{
return m_handle[offset & 3].read_safe(0xff);
}
@@ -395,7 +395,7 @@ WRITE8_MEMBER(tenpindx_state::lights_w)
*
*************************************/
-WRITE8_MEMBER(astrocde_state::votrax_speech_w)
+void astrocde_state::votrax_speech_w(uint8_t data)
{
m_votrax->inflection_w(data >> 6);
m_votrax->write(data & 0x3f);
diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp
index dddcea45f54..931510dffdf 100644
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@@ -37,8 +37,9 @@ public:
{ }
void astrocde(machine_config &config);
+
private:
- DECLARE_READ8_MEMBER(inputs_r);
+ uint8_t inputs_r(offs_t offset);
DECLARE_MACHINE_START(astrocde);
void astrocade_io(address_map &map);
@@ -105,7 +106,7 @@ void astrocde_home_state::astrocade_io(address_map &map)
*
*************************************/
-READ8_MEMBER(astrocde_home_state::inputs_r)
+uint8_t astrocde_home_state::inputs_r(offs_t offset)
{
if (BIT(offset, 2))
return m_keypad[offset & 3]->read();
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index facffe41658..06b8b047e0d 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -241,10 +241,10 @@ private:
required_device m_isabus;
required_device m_speaker;
- DECLARE_READ16_MEMBER( wd7600_ior );
- DECLARE_WRITE16_MEMBER( wd7600_iow );
+ uint16_t wd7600_ior(offs_t offset);
+ void wd7600_iow(offs_t offset, uint16_t data);
DECLARE_WRITE_LINE_MEMBER( wd7600_hold );
- DECLARE_WRITE8_MEMBER( wd7600_tc ) { m_isabus->eop_w(offset, data); }
+ void wd7600_tc(offs_t offset, uint8_t data) { m_isabus->eop_w(offset, data); }
DECLARE_WRITE_LINE_MEMBER( wd7600_spkr ) { m_speaker->level_w(state); }
void megapc_io(address_map &map);
void megapc_map(address_map &map);
@@ -383,7 +383,7 @@ void at_vrom_fix_state::init_megapcpla()
ROM[0x3ffff] = 0x41; // to correct checksum
}
-READ16_MEMBER( megapc_state::wd7600_ior )
+uint16_t megapc_state::wd7600_ior(offs_t offset)
{
if (offset < 4)
return m_isabus->dack_r(offset);
@@ -391,7 +391,7 @@ READ16_MEMBER( megapc_state::wd7600_ior )
return m_isabus->dack16_r(offset);
}
-WRITE16_MEMBER( megapc_state::wd7600_iow )
+void megapc_state::wd7600_iow(offs_t offset, uint16_t data)
{
if (offset < 4)
m_isabus->dack_w(offset, data);
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index 8330ea22bfc..b87e7ab7a47 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -285,17 +285,17 @@ private:
DECLARE_MACHINE_RESET(a400);
- DECLARE_WRITE8_MEMBER(gtia_cb);
+ void gtia_cb(uint8_t data);
- DECLARE_WRITE8_MEMBER(a600xl_pia_pb_w);
- DECLARE_WRITE8_MEMBER(a800xl_pia_pb_w);
+ void a600xl_pia_pb_w(uint8_t data);
+ void a800xl_pia_pb_w(uint8_t data);
DECLARE_READ8_MEMBER(read_d5xx); // at least one cart type can enable/disable roms when reading
DECLARE_WRITE8_MEMBER(disable_cart);
// these are needed to handle carts which can disable ROM without
// installing/disinstalling continuously RAM and ROM (with e.g. big
- // preformance hit in Williams carts)
+ // performance hit in Williams carts)
DECLARE_READ8_MEMBER(special_read_8000);
DECLARE_WRITE8_MEMBER(special_write_8000);
DECLARE_READ8_MEMBER(special_read_a000);
@@ -2078,7 +2078,7 @@ MACHINE_START_MEMBER( a400_state, a5200 )
*
**************************************************************/
-WRITE8_MEMBER(a400_state::gtia_cb)
+void a400_state::gtia_cb(uint8_t data)
{
m_dac->write(BIT(data, 3));
}
@@ -2089,12 +2089,12 @@ WRITE8_MEMBER(a400_state::gtia_cb)
*
**************************************************************/
-WRITE8_MEMBER(a400_state::a600xl_pia_pb_w)
+void a400_state::a600xl_pia_pb_w(uint8_t data)
{
m_mmu = data;
}
-WRITE8_MEMBER(a400_state::a800xl_pia_pb_w)
+void a400_state::a800xl_pia_pb_w(uint8_t data)
{
if (m_pia->port_b_z_mask() != 0xff)
{
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index 91d4f8a0ce7..e17cbfc0c1e 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -126,7 +126,7 @@ void atarigt_state::machine_start()
*
*************************************/
-WRITE8_MEMBER(atarigt_state::cage_irq_callback)
+void atarigt_state::cage_irq_callback(uint8_t data)
{
m_maincpu->set_input_line(M68K_IRQ_3, data != 0 ? ASSERT_LINE : CLEAR_LINE);
}
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 84330de60d4..5d31a1442ab 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -521,7 +521,7 @@ void st_state::mouse_tick()
// ikbd_port1_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::ikbd_port1_r )
+uint8_t st_state::ikbd_port1_r()
{
/*
@@ -565,7 +565,7 @@ READ8_MEMBER( st_state::ikbd_port1_r )
// ikbd_port2_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::ikbd_port2_r )
+uint8_t st_state::ikbd_port2_r()
{
/*
@@ -592,7 +592,7 @@ READ8_MEMBER( st_state::ikbd_port2_r )
// ikbd_port2_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::ikbd_port2_w )
+void st_state::ikbd_port2_w(uint8_t data)
{
/*
@@ -618,7 +618,7 @@ WRITE8_MEMBER( st_state::ikbd_port2_w )
// ikbd_port3_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::ikbd_port3_w )
+void st_state::ikbd_port3_w(uint8_t data)
{
/*
@@ -647,7 +647,7 @@ WRITE8_MEMBER( st_state::ikbd_port3_w )
// ikbd_port4_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::ikbd_port4_r )
+uint8_t st_state::ikbd_port4_r()
{
/*
@@ -681,7 +681,7 @@ READ8_MEMBER( st_state::ikbd_port4_r )
// ikbd_port4_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::ikbd_port4_w )
+void st_state::ikbd_port4_w(uint8_t data)
{
/*
@@ -1698,7 +1698,7 @@ INPUT_PORTS_END
// ay8910_interface psg_intf
//-------------------------------------------------
-WRITE8_MEMBER( st_state::psg_pa_w )
+void st_state::psg_pa_w(uint8_t data)
{
/*
@@ -1742,7 +1742,7 @@ WRITE8_MEMBER( st_state::psg_pa_w )
// ay8910_interface stbook_psg_intf
//-------------------------------------------------
-WRITE8_MEMBER( stbook_state::psg_pa_w )
+void stbook_state::psg_pa_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 9746a600f67..936e4035119 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -13,9 +13,11 @@
* Road Runner (1985) [3 sets]
* Road Blasters (1987) [10 sets]
- Known bugs:
+ TODO:
* indytemp: "Welcome" doesn't play at start (regression). Code for
speech (0x46) is written but fails to play due to timing issues.
+ * is MOTHERBOARD_ALPHA actually 16KB, or maybe only for the LSI version?
+ see romsets of indytempc, roadblstcg
****************************************************************************
@@ -883,24 +885,24 @@ void atarisy1_state::roadb110(machine_config &config)
ROM_LOAD16_BYTE_BIOS(0, "136032.205.l13", 0x00000, 0x04000, CRC(88d0be26) SHA1(d124045eccc562ff0423b23a240e27ad740fa0c9) ) \
ROM_LOAD16_BYTE_BIOS(0, "136032.206.l12", 0x00001, 0x04000, CRC(3c79ef05) SHA1(20fdca7131478e1ee12691bdafd2d5bb74cbd16f) ) \
ROM_SYSTEM_BIOS( 1, "ttl1", "TTL Motherboard (Rev 1)" ) \
- ROM_LOAD16_BYTE_BIOS(1, "136032.105.l13", 0x00000, 0x04000, CRC(690b37d3) SHA1(547372f1044a3442aa52fcd2b3546540aba59344) ) \
+ ROM_LOAD16_BYTE_BIOS(1, "136032.105.l13", 0x00000, 0x04000, CRC(79021d3c) SHA1(85febd34bcb166fc3326b5e5e4e80e157b660a08) ) \
ROM_LOAD16_BYTE_BIOS(1, "136032.106.l12", 0x00001, 0x04000, CRC(76ee86c4) SHA1(cbcd424510435a04e9041967a13781fd19b0f2c4) ) \
ROM_SYSTEM_BIOS( 2, "lsi", "LSI Motherboard" ) \
ROM_LOAD16_BYTE_BIOS(2, "136032.114.j11", 0x00000, 0x04000, CRC(195c54ad) SHA1(d7cda3cd3db4c6f77074ca05e96ae11b62e048b7) ) \
- ROM_LOAD16_BYTE_BIOS(2, "136032.115.j10", 0x00001, 0x04000, CRC(7275b4dc) SHA1(0896ab37ea832a1335046353612c1b4c86d8d040) )
+ ROM_LOAD16_BYTE_BIOS(2, "136032.115.j10", 0x00001, 0x04000, CRC(9af9fe29) SHA1(1d5077662e4111ece9f8a5124394dad8b1abdc13) )
#define MOTHERBOARD_ALPHA \
ROM_LOAD_BIOS(0, "136032.104.f5", 0x00000, 0x02000, CRC(7a29dc07) SHA1(72ba464da01bd6d3a91b8d9997d5ac14b6f47aad) ) \
ROM_LOAD_BIOS(1, "136032.104.f5", 0x00000, 0x02000, CRC(7a29dc07) SHA1(72ba464da01bd6d3a91b8d9997d5ac14b6f47aad) ) \
- ROM_LOAD_BIOS(2, "136032.107.b2", 0x00000, 0x02000, CRC(315e4bea) SHA1(a00ea23fbdbf075f8f3f184275be83387e8ac82b) ) /* is this bad? it just seems to be missing upper nibbles and hence some of the planes? */
+ ROM_LOAD_BIOS(2, "136032.107.b2", 0x00000, 0x02000, CRC(7a29dc07) SHA1(72ba464da01bd6d3a91b8d9997d5ac14b6f47aad) )
#define MOTHERBOARD_PROMS \
- ROM_LOAD_BIOS(0, "136032.101.e3", 0x00000, 0x00100, CRC(7e84972a) SHA1(84d422b53547271e3a07342704a05ef481db3f99) ) \
- ROM_LOAD_BIOS(0, "136032.102.e5", 0x00000, 0x00100, CRC(ebf1e0ae) SHA1(2d327e78832edd67ca3909c25b8c8c839637a1ed) ) \
- ROM_LOAD_BIOS(0, "136032.103.f7.bin", 0x00000, 0x000eb, CRC(92d6a0b4) SHA1(0a42a4816c89447b16e1f3245409591efea98a4a) ) /* N82S153 */ \
- ROM_LOAD_BIOS(1, "136032.101.e3", 0x00000, 0x00100, CRC(7e84972a) SHA1(84d422b53547271e3a07342704a05ef481db3f99) ) \
- ROM_LOAD_BIOS(1, "136032.102.e5", 0x00000, 0x00100, CRC(ebf1e0ae) SHA1(2d327e78832edd67ca3909c25b8c8c839637a1ed) ) \
- ROM_LOAD_BIOS(1, "136032.103.f7.bin", 0x00000, 0x000eb, CRC(92d6a0b4) SHA1(0a42a4816c89447b16e1f3245409591efea98a4a) ) /* N82S153 */
+ ROM_LOAD_BIOS(0, "136032.101.e3", 0x00000, 0x00100, CRC(7e84972a) SHA1(84d422b53547271e3a07342704a05ef481db3f99) ) \
+ ROM_LOAD_BIOS(0, "136032.102.e5", 0x00000, 0x00100, CRC(ebf1e0ae) SHA1(2d327e78832edd67ca3909c25b8c8c839637a1ed) ) \
+ ROM_LOAD_BIOS(0, "136032.103.f7", 0x00000, 0x000eb, CRC(92d6a0b4) SHA1(0a42a4816c89447b16e1f3245409591efea98a4a) ) /* N82S153 */ \
+ ROM_LOAD_BIOS(1, "136032.101.e3", 0x00000, 0x00100, CRC(7e84972a) SHA1(84d422b53547271e3a07342704a05ef481db3f99) ) \
+ ROM_LOAD_BIOS(1, "136032.102.e5", 0x00000, 0x00100, CRC(ebf1e0ae) SHA1(2d327e78832edd67ca3909c25b8c8c839637a1ed) ) \
+ ROM_LOAD_BIOS(1, "136032.103.f7", 0x00000, 0x000eb, CRC(92d6a0b4) SHA1(0a42a4816c89447b16e1f3245409591efea98a4a) ) /* N82S153 */
ROM_START( atarisy1 )
ROM_REGION( 0x88000, "maincpu", 0 ) /* 8.5*64k for 68000 code & slapstic ROM */
@@ -1840,31 +1842,29 @@ Dumped from the original Atari
// different IC positions and different GFX rom configuration.
ROM_START( roadblstgu )
ROM_REGION( 0x88000, "maincpu", 0 ) /* 8.5*64k for 68000 code & slapstic ROM */
- // expects bios roms 114/115, does not work properly with others (corrupt insert coin text)
- ROM_LOAD16_BYTE( "136032-114.j7", 0x00000, 0x04000, CRC(195c54ad) SHA1(d7cda3cd3db4c6f77074ca05e96ae11b62e048b7) )
- ROM_LOAD16_BYTE( "136032-115.j8", 0x00001, 0x04000, CRC(7275b4dc) SHA1(0896ab37ea832a1335046353612c1b4c86d8d040) )
+ MOTHERBOARD_BIOS
+ ROM_DEFAULT_BIOS("lsi") // only works with LSI BIOS
ROM_LOAD16_BYTE( "136048-1257.c11", 0x010000, 0x008000, CRC(604a5cc0) SHA1(a057a2e47ac7b7c727e9c1bfce28ba955ce75442) )
ROM_LOAD16_BYTE( "136048-1258.a11", 0x010001, 0x008000, CRC(3d10929d) SHA1(aa4d568e5d5b62fb8ea11094bad78bb8f713404e) )
ROM_LOAD16_BYTE( "136048-1259.c13", 0x020000, 0x008000, CRC(b9c807ac) SHA1(ca955790c98037045aa49425392581f21d33caa9) )
ROM_LOAD16_BYTE( "136048-1260.a13", 0x020001, 0x008000, CRC(eaeb1196) SHA1(82bf14244b342c97adde893f19a050baab30ab1e) )
-
- ROM_LOAD16_BYTE( "136048-1163.c12", 0x050000, 0x008000, CRC(054273b2) SHA1(4c820c00d3b67825c361edc9615c89c2a9a1c6d3) )//
- ROM_LOAD16_BYTE( "136048-1164.a12", 0x050001, 0x008000, CRC(49181bec) SHA1(79e042e4f079a9806ef12c5c8dfdc2e6e4f90011) )//
- ROM_LOAD16_BYTE( "136048-1165.c14", 0x060000, 0x008000, CRC(f63dc29a) SHA1(e54637b9d0b271aa9b58e89a442ac03ec812e1eb) )//
- ROM_LOAD16_BYTE( "136048-1166.a14", 0x060001, 0x008000, CRC(b1fc5955) SHA1(b860213a9b5ae7547c258812045e71795129598f) )//
- ROM_LOAD16_BYTE( "136048-1167.c16", 0x070000, 0x008000, CRC(c6d30d6f) SHA1(acb552976b2dcfa585097ea246ca88034549c8ab) )//
- ROM_LOAD16_BYTE( "136048-1168.a16", 0x070001, 0x008000, CRC(16951020) SHA1(5e5a6ad4ae87723060232c7ecb837f5fc2a9be68) )//
- ROM_LOAD16_BYTE( "136048-2147.c17", 0x080000, 0x004000, CRC(5c1adf67) SHA1(53838a2f5059797991aa337a7bec32f7e694610a) )//
- ROM_LOAD16_BYTE( "136048-2148.a17", 0x080001, 0x004000, CRC(d9ac8966) SHA1(7d056c1eb8184b4261c5713b0d5799b2fd8bde2a) )//
+ ROM_LOAD16_BYTE( "136048-1163.c12", 0x050000, 0x008000, CRC(054273b2) SHA1(4c820c00d3b67825c361edc9615c89c2a9a1c6d3) )
+ ROM_LOAD16_BYTE( "136048-1164.a12", 0x050001, 0x008000, CRC(49181bec) SHA1(79e042e4f079a9806ef12c5c8dfdc2e6e4f90011) )
+ ROM_LOAD16_BYTE( "136048-1165.c14", 0x060000, 0x008000, CRC(f63dc29a) SHA1(e54637b9d0b271aa9b58e89a442ac03ec812e1eb) )
+ ROM_LOAD16_BYTE( "136048-1166.a14", 0x060001, 0x008000, CRC(b1fc5955) SHA1(b860213a9b5ae7547c258812045e71795129598f) )
+ ROM_LOAD16_BYTE( "136048-1167.c16", 0x070000, 0x008000, CRC(c6d30d6f) SHA1(acb552976b2dcfa585097ea246ca88034549c8ab) )
+ ROM_LOAD16_BYTE( "136048-1168.a16", 0x070001, 0x008000, CRC(16951020) SHA1(5e5a6ad4ae87723060232c7ecb837f5fc2a9be68) )
+ ROM_LOAD16_BYTE( "136048-2147.c17", 0x080000, 0x004000, CRC(5c1adf67) SHA1(53838a2f5059797991aa337a7bec32f7e694610a) )
+ ROM_LOAD16_BYTE( "136048-2148.a17", 0x080001, 0x004000, CRC(d9ac8966) SHA1(7d056c1eb8184b4261c5713b0d5799b2fd8bde2a) )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for 6502 code */
ROM_LOAD( "136048-1149.e14", 0x4000, 0x4000, CRC(2e54f95e) SHA1(5056ddec3c88384ada1d2ee9b1532b9ba9f34e08) )
- ROM_LOAD( "136048-1169.e15", 0x8000, 0x4000, CRC(ee318052) SHA1(f66ff39499697b7439dc62567e727fec769c1505) )//
- ROM_LOAD( "136048-1170.e17", 0xc000, 0x4000, CRC(75dfec33) SHA1(3092348b98419bb23181d21406733d5d21cd3d82) )//
+ ROM_LOAD( "136048-1169.e15", 0x8000, 0x4000, CRC(ee318052) SHA1(f66ff39499697b7439dc62567e727fec769c1505) )
+ ROM_LOAD( "136048-1170.e17", 0xc000, 0x4000, CRC(75dfec33) SHA1(3092348b98419bb23181d21406733d5d21cd3d82) )
ROM_REGION( 0x2000, "alpha", 0 )
- ROM_LOAD( "136032.107.b2", 0x00000, 0x02000, CRC(7a29dc07) SHA1(72ba464da01bd6d3a91b8d9997d5ac14b6f47aad) )
+ MOTHERBOARD_ALPHA
ROM_REGION( 0x380000, "tiles", ROMREGION_INVERT | ROMREGION_ERASEFF )
ROM_LOAD( "136048-1101.b4", 0x000000, 0x008000, CRC(fe342d27) SHA1(72deac16ab9b6b811f49d70d700d6bc3a904f9d5) ) /* bank 1, plane 0 *///
@@ -1907,11 +1907,7 @@ ROM_START( roadblstgu )
ROM_LOAD( "136048-1174.a7", 0x000000, 0x000200, CRC(db4a4d53) SHA1(c5468f3585ec9bc23c9ee990b3ae3738b0309823) )//
ROM_LOAD( "136048-1173.a5", 0x000200, 0x000200, CRC(c80574af) SHA1(9a3dc83f70e79915ce0db3e6e69b5dcfee3acb6f) )//
- // FIXME: this game requires the LSI BIOS, so why are we loading the PROMs that are only present on TTL boards?
ROM_REGION( 0x201, "motherbrd_proms", 0) /* Motherboard PROM's (Only used by TTL version.) */
- ROM_SYSTEM_BIOS( 0, "ttl", "TTL Motherboard (Rev 2)" )
- ROM_SYSTEM_BIOS( 1, "ttl1", "TTL Motherboard (Rev 1)" )
- ROM_SYSTEM_BIOS( 2, "lsi", "LSI Motherboard" )
MOTHERBOARD_PROMS
ROM_END
@@ -2332,8 +2328,8 @@ Note: The text on the board says "cocktail" but I suppose this is the cockpit ve
ROM_START( roadblstcg )
ROM_REGION( 0x88000, "maincpu", 0 ) /* 8.5*64k for 68000 code & slapstic ROM */
- ROM_LOAD16_BYTE( "136032-117-l9", 0x000001, 0x004000, CRC(9af9fe29) SHA1(1d5077662e4111ece9f8a5124394dad8b1abdc13) ) // alt bios roms? (to put in bios structure, or are they specific to this set?)
- ROM_LOAD16_BYTE( "136032-116.m9", 0x000000, 0x004000, CRC(195c54ad) SHA1(d7cda3cd3db4c6f77074ca05e96ae11b62e048b7) ) //
+ MOTHERBOARD_BIOS
+ ROM_DEFAULT_BIOS("lsi") // only works with LSI BIOS
ROM_LOAD16_BYTE( "136048-1235.7p", 0x010000, 0x008000, CRC(58b2998f) SHA1(7e9f4ca2b15cf60c61e0615f214f9fcc518cb194) )
ROM_LOAD16_BYTE( "136048-1236.8p", 0x010001, 0x008000, CRC(02e23a40) SHA1(6525351669e95dab869c7adc7d992d12d9313aee) )
@@ -2348,7 +2344,6 @@ ROM_START( roadblstcg )
ROM_LOAD16_BYTE( "136048-2147.7k", 0x080000, 0x004000, CRC(5c1adf67) SHA1(53838a2f5059797991aa337a7bec32f7e694610a) )
ROM_LOAD16_BYTE( "136048-2148.8k", 0x080001, 0x004000, CRC(d9ac8966) SHA1(7d056c1eb8184b4261c5713b0d5799b2fd8bde2a) )
-
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for 6502 code */
ROM_LOAD( "136048-1149.c8", 0x4000, 0x4000, CRC(2e54f95e) SHA1(5056ddec3c88384ada1d2ee9b1532b9ba9f34e08) ) //
ROM_LOAD( "136048-1150.d7", 0x8000, 0x8000, CRC(e89e7fc8) SHA1(d944bc27de2f2f675680c62d999cacf84a08fd4b) )
@@ -2402,11 +2397,7 @@ ROM_START( roadblstcg )
ROM_LOAD( "136048-1174.12d", 0x000000, 0x000200, CRC(db4a4d53) SHA1(c5468f3585ec9bc23c9ee990b3ae3738b0309823) )
ROM_LOAD( "136048-1173.2d", 0x000200, 0x000200, CRC(c80574af) SHA1(9a3dc83f70e79915ce0db3e6e69b5dcfee3acb6f) )
- // FIXME: this game requires the LSI BIOS, so why are we loading the PROMs that are only present on TTL boards?
ROM_REGION( 0x201, "motherbrd_proms", 0) /* Motherboard PROM's (Only used by TTL version.) */
- ROM_SYSTEM_BIOS( 0, "ttl", "TTL Motherboard (Rev 2)" )
- ROM_SYSTEM_BIOS( 1, "ttl1", "TTL Motherboard (Rev 1)" )
- ROM_SYSTEM_BIOS( 2, "lsi", "LSI Motherboard" )
MOTHERBOARD_PROMS
ROM_END
@@ -2414,6 +2405,8 @@ ROM_END
ROM_START( roadblstc1 )
ROM_REGION( 0x88000, "maincpu", 0 ) /* 8.5*64k for 68000 code & slapstic ROM */
MOTHERBOARD_BIOS
+ ROM_DEFAULT_BIOS("lsi") // only works with LSI BIOS
+
ROM_LOAD16_BYTE( "136048-2135.7p", 0x010000, 0x008000, CRC(c0ef86df) SHA1(7dd4d2acba55dc001e009c37fae5a97a53ea1e66) )
ROM_LOAD16_BYTE( "136048-2136.8p", 0x010001, 0x008000, CRC(9637e2f0) SHA1(86257e1316356c1a7d86bcf7b57bcaff33ac3df5) )
ROM_LOAD16_BYTE( "136048-2137.7r", 0x020000, 0x008000, CRC(5382ab85) SHA1(1511dfaf8537980e506e4180a23ffcfcfec81451) )
@@ -2551,7 +2544,7 @@ GAME( 1985, indytemp2, indytemp, indytemp, indytemp, atarisy1_state, init_indyt
GAME( 1985, indytemp3, indytemp, indytemp, indytemp, atarisy1_state, init_indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 3)", MACHINE_IMPERFECT_SOUND )
GAME( 1985, indytemp4, indytemp, indytemp, indytemp, atarisy1_state, init_indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 4)", MACHINE_IMPERFECT_SOUND )
GAME( 1985, indytempd, indytemp, indytemp, indytemp, atarisy1_state, init_indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (German)", MACHINE_IMPERFECT_SOUND )
-GAME( 1985, indytempc, indytemp, indytemp, indytemc, atarisy1_state, init_indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (Cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1985, indytempc, indytemp, indytemp, indytemc, atarisy1_state, init_indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1985, roadrunn, atarisy1, roadrunn, roadrunn, atarisy1r_state, init_roadrunn, ROT0, "Atari Games", "Road Runner (rev 2)", 0 )
GAME( 1985, roadrunn2, roadrunn, roadrunn, roadrunn, atarisy1r_state, init_roadrunn, ROT0, "Atari Games", "Road Runner (rev 1+)", 0 )
@@ -2565,6 +2558,6 @@ GAME( 1987, roadblst2, roadblst, roadb110, roadblst, atarisy1r_state, init_road
GAME( 1987, roadblstg1, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (upright, German, rev 1)", 0 )
GAME( 1987, roadblst1, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (upright, rev 1)", 0 )
GAME( 1987, roadblstc, roadblst, roadb110, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (cockpit, rev 2)", 0 )
-GAME( 1987, roadblstcg, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (cockpit, German, rev 1)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1987, roadblstc1, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (cockpit, rev 1)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1987, roadblstcg, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (cockpit, German, rev 1)", 0 )
+GAME( 1987, roadblstc1, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (cockpit, rev 1)", 0 )
GAME( 1987, roadblstgu, roadblst, roadb109, roadblst, atarisy1r_state, init_roadblst, ROT0, "Atari Games", "Road Blasters (upright, German, rev ?)", 0 )
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 65ead905379..42a3ead991f 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -237,7 +237,7 @@ void atetris_mcu_state::atetrisb3_map(address_map &map)
*
*************************************/
-READ8_MEMBER(atetris_mcu_state::mcu_bus_r)
+uint8_t atetris_mcu_state::mcu_bus_r()
{
switch (m_mcu->p2_r() & 0xf0)
{
@@ -252,13 +252,13 @@ READ8_MEMBER(atetris_mcu_state::mcu_bus_r)
}
}
-WRITE8_MEMBER(atetris_mcu_state::mcu_p2_w)
+void atetris_mcu_state::mcu_p2_w(uint8_t data)
{
if ((data & 0xc0) == 0x80)
m_sn[(data >> 4) & 3]->write(m_mcu->p1_r());
}
-WRITE8_MEMBER(atetris_mcu_state::mcu_reg_w)
+void atetris_mcu_state::mcu_reg_w(offs_t offset, uint8_t data)
{
// FIXME: a lot of sound writes seem to get lost this way; why doesn't that hurt?
m_soundlatch[0]->write(offset | 0x20);
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 0dc5af430bf..f7c40ac8d6f 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -149,8 +149,8 @@ private:
READ8_MEMBER (exprom_r);
WRITE8_MEMBER(exprom_w);
- WRITE32_MEMBER(user_io_output);
- READ32_MEMBER(user_io_input);
+ void user_io_output(uint32_t data);
+ uint32_t user_io_input();
int m_user_io_state;
// Board Ctrl Reg Offsets
@@ -387,13 +387,13 @@ WRITE32_MEMBER(atlantis_state::dcs3_fifo_full_w)
/*************************************
* PCI9050 User I/O handlers
*************************************/
-WRITE32_MEMBER(atlantis_state::user_io_output)
+void atlantis_state::user_io_output(uint32_t data)
{
m_user_io_state = data;
logerror("atlantis_state::user_io_output m_user_io_state = %1x\n", m_user_io_state);
}
-READ32_MEMBER(atlantis_state::user_io_input)
+uint32_t atlantis_state::user_io_input()
{
// user io 0: 6016 nCONFIG -- output
// user io 1: 6016 nSTATUS -- input
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 34d0327143d..775147a910a 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -183,7 +183,7 @@ QUICKLOAD_LOAD_MEMBER(atom_state::quickload_cb)
eprom_r - EPROM slot select read
-------------------------------------------------*/
-READ8_MEMBER( atomeb_state::eprom_r )
+uint8_t atomeb_state::eprom_r()
{
return m_eprom;
}
@@ -192,7 +192,7 @@ READ8_MEMBER( atomeb_state::eprom_r )
eprom_w - EPROM slot select write
-------------------------------------------------*/
-WRITE8_MEMBER( atomeb_state::eprom_w )
+void atomeb_state::eprom_w(uint8_t data)
{
/*
@@ -217,7 +217,7 @@ WRITE8_MEMBER( atomeb_state::eprom_w )
ext_r - read external roms at 0xa000
-------------------------------------------------*/
-READ8_MEMBER( atomeb_state::ext_r )
+uint8_t atomeb_state::ext_r(offs_t offset)
{
if (m_ext[m_eprom & 0x0f]->exists())
return m_ext[m_eprom & 0x0f]->read_rom(offset);
@@ -229,7 +229,7 @@ READ8_MEMBER( atomeb_state::ext_r )
dor_r - read DOS roms at 0xe000
-------------------------------------------------*/
-READ8_MEMBER( atomeb_state::dos_r )
+uint8_t atomeb_state::dos_r(offs_t offset)
{
if (m_e0->exists() && !BIT(m_eprom, 7))
return m_e0->read_rom(offset);
@@ -452,7 +452,7 @@ INPUT_PORTS_END
I8255 interface
-------------------------------------------------*/
-WRITE8_MEMBER( atom_state::ppi_pa_w )
+void atom_state::ppi_pa_w(uint8_t data)
{
/*
@@ -479,7 +479,7 @@ WRITE8_MEMBER( atom_state::ppi_pa_w )
m_vdg->gm2_w(BIT(data, 7));
}
-READ8_MEMBER( atom_state::ppi_pb_r )
+uint8_t atom_state::ppi_pb_r()
{
/*
@@ -517,7 +517,7 @@ READ8_MEMBER( atom_state::ppi_pb_r )
return data;
}
-READ8_MEMBER( atom_state::ppi_pc_r )
+uint8_t atom_state::ppi_pc_r()
{
/*
@@ -551,7 +551,7 @@ READ8_MEMBER( atom_state::ppi_pc_r )
return data;
}
-WRITE8_MEMBER( atom_state::ppi_pc_w )
+void atom_state::ppi_pc_w(uint8_t data)
{
/*
@@ -629,7 +629,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(atom_state::cassette_output_tick)
mc6847 interface
-------------------------------------------------*/
-READ8_MEMBER( atom_state::vdg_videoram_r )
+uint8_t atom_state::vdg_videoram_r(offs_t offset)
{
if (offset == ~0) return 0xff;
diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp
index e7c4c3e46d0..38811b20388 100644
--- a/src/mame/drivers/atpci.cpp
+++ b/src/mame/drivers/atpci.cpp
@@ -27,7 +27,7 @@ public:
protected:
void at_softlists(machine_config &config);
- DECLARE_WRITE8_MEMBER(boot_state_w);
+ void boot_state_w(uint8_t data);
void tx_config(device_t *device);
void sb_config(device_t *device);
@@ -40,7 +40,7 @@ private:
required_device m_maincpu;
};
-WRITE8_MEMBER(at586_state::boot_state_w)
+void at586_state::boot_state_w(uint8_t data)
{
logerror("Boot state %02x\n", data);
printf("[%02X]",data);
diff --git a/src/mame/drivers/ave_arb.cpp b/src/mame/drivers/ave_arb.cpp
index 47349ee1fdf..0f376257b99 100644
--- a/src/mame/drivers/ave_arb.cpp
+++ b/src/mame/drivers/ave_arb.cpp
@@ -100,14 +100,14 @@ private:
// cartridge
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load);
- DECLARE_READ8_MEMBER(cartridge_r);
+ u8 cartridge_r(offs_t offset);
u32 m_cart_mask;
// I/O handlers
void update_display();
- DECLARE_WRITE8_MEMBER(leds_w);
- DECLARE_WRITE8_MEMBER(control_w);
- DECLARE_READ8_MEMBER(input_r);
+ void leds_w(u8 data);
+ void control_w(u8 data);
+ u8 input_r();
u16 m_inp_mux;
u16 m_led_select;
@@ -156,7 +156,7 @@ DEVICE_IMAGE_LOAD_MEMBER(arb_state::cart_load)
return image_init_result::PASS;
}
-READ8_MEMBER(arb_state::cartridge_r)
+u8 arb_state::cartridge_r(offs_t offset)
{
return m_cart->read_rom(offset & m_cart_mask);
}
@@ -175,14 +175,14 @@ void arb_state::update_display()
m_display->matrix(m_led_select | 0x200, m_led_data);
}
-WRITE8_MEMBER(arb_state::leds_w)
+void arb_state::leds_w(u8 data)
{
// PA0-PA7: led latch input
m_led_latch = ~data & 0xff;
update_display();
}
-WRITE8_MEMBER(arb_state::control_w)
+void arb_state::control_w(u8 data)
{
// PB0-PB3: 74145 A-D
// 74145 0-8: input mux, led row select
@@ -197,7 +197,7 @@ WRITE8_MEMBER(arb_state::control_w)
m_dac->write(BIT(data, 7));
}
-READ8_MEMBER(arb_state::input_r)
+u8 arb_state::input_r()
{
u8 data = 0;
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index 2b044eda37f..fb9c96f70c9 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -57,8 +57,8 @@ private:
DECLARE_WRITE8_MEMBER(b16_6845_data_w);
DECLARE_READ8_MEMBER(unk_dev_r);
DECLARE_WRITE8_MEMBER(unk_dev_w);
- DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
+ uint8_t memory_read_byte(offs_t offset);
+ void memory_write_byte(offs_t offset, uint8_t data);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -253,13 +253,13 @@ static GFXDECODE_START( gfx_b16 )
GFXDECODE_ENTRY( "pcg", 0x0000, b16_charlayout, 0, 1 )
GFXDECODE_END
-READ8_MEMBER(b16_state::memory_read_byte)
+uint8_t b16_state::memory_read_byte(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM);
return prog_space.read_byte(offset);
}
-WRITE8_MEMBER(b16_state::memory_write_byte)
+void b16_state::memory_write_byte(offs_t offset, uint8_t data)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM);
return prog_space.write_byte(offset, data);
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 2681cdb1cbe..dafc874de14 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -17,8 +17,6 @@
Copy the text and Paste into the emulator.
=3E^=0F^=D3^=13^=3E^=07^=D3^=13^=3E^=00^=D3^=12^=76^-1000X
- ToDo:
- - Blank the display if digits aren't being refreshed
***************************************************************************/
@@ -28,6 +26,7 @@
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80daisy.h"
+#include "video/pwm.h"
#include "babbage.lh"
#define MAIN_CLOCK 25e5
@@ -41,13 +40,13 @@ public:
, m_pio_1(*this, "z80pio_1")
, m_pio_2(*this, "z80pio_2")
, m_ctc(*this, "z80ctc")
- , m_keyboard(*this, "X%u", 0)
- , m_digits(*this, "digit%u", 0U)
+ , m_display(*this, "display")
+ , m_io_keyboard(*this, "X%u", 0U)
{ }
void babbage(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(pio2_a_r);
DECLARE_WRITE8_MEMBER(pio1_b_w);
DECLARE_WRITE8_MEMBER(pio2_b_w);
@@ -59,18 +58,16 @@ protected:
void babbage_io(address_map &map);
void babbage_map(address_map &map);
-private:
- uint8_t m_segment;
+ uint8_t m_seg;
uint8_t m_key;
uint8_t m_prev_key;
bool m_step;
- virtual void machine_start() override { m_digits.resolve(); }
required_device m_maincpu;
required_device m_pio_1;
required_device m_pio_2;
required_device m_ctc;
- required_ioport_array<4> m_keyboard;
- output_finder<33> m_digits;
+ required_device m_display;
+ required_ioport_array<4> m_io_keyboard;
};
@@ -172,18 +169,15 @@ READ8_MEMBER( babbage_state::pio2_a_r )
WRITE8_MEMBER( babbage_state::pio2_b_w )
{
if (BIT(data, 7))
- {
m_step = false;
- }
- else if (!m_step)
+ else
+ if (!m_step)
{
- m_segment = data;
+ m_seg = data;
m_step = true;
}
else
- {
- m_digits[data] = m_segment;
- }
+ m_display->matrix(data, m_seg);
}
static const z80_daisy_config babbage_daisy_chain[] =
@@ -200,7 +194,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback)
for (u8 i = 0; i < 4; i++)
{
- inp = m_keyboard[i]->read();
+ inp = m_io_keyboard[i]->read();
for (u8 j = 0; j < 5; j++)
if (BIT(inp, j))
@@ -240,6 +234,8 @@ void babbage_state::babbage(machine_config &config)
/* video hardware */
config.set_default_layout(layout_babbage);
+ PWM_DISPLAY(config, m_display).set_size(6, 8);
+ m_display->set_segmask(0x3f, 0xff);
/* Devices */
Z80CTC(config, m_ctc, MAIN_CLOCK);
@@ -268,7 +264,7 @@ void babbage_state::babbage(machine_config &config)
***************************************************************************/
ROM_START(babbage)
- ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF)
+ ROM_REGION(0x0800, "maincpu", ROMREGION_ERASEFF)
ROM_LOAD("mon.rom", 0x0000, 0x0200, CRC(469bd607) SHA1(8f3489a0f96de6a03b05c1ee01b89d9848f4b152) )
ROM_END
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 5633b8fdc3c..edf66797a63 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -116,7 +116,7 @@ DIP locations verified for:
#include "speaker.h"
-WRITE8_MEMBER(baraduke_state::inputport_select_w)
+void baraduke_state::inputport_select_w(uint8_t data)
{
if ((data & 0xe0) == 0x60)
m_inputport_selected = data & 0x07;
@@ -128,7 +128,7 @@ WRITE8_MEMBER(baraduke_state::inputport_select_w)
}
}
-READ8_MEMBER(baraduke_state::inputport_r)
+uint8_t baraduke_state::inputport_r()
{
switch (m_inputport_selected)
{
@@ -151,13 +151,13 @@ READ8_MEMBER(baraduke_state::inputport_r)
}
}
-WRITE8_MEMBER(baraduke_state::baraduke_lamps_w)
+void baraduke_state::baraduke_lamps_w(uint8_t data)
{
m_lamps[0] = BIT(data, 3);
m_lamps[1] = BIT(data, 4);
}
-WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w)
+void baraduke_state::baraduke_irq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE);
}
@@ -177,7 +177,7 @@ void baraduke_state::baraduke_map(address_map &map)
map(0x6000, 0xffff).rom(); /* ROM */
}
-READ8_MEMBER(baraduke_state::soundkludge_r)
+uint8_t baraduke_state::soundkludge_r()
{
return ((m_counter++) >> 4) & 0xff;
}
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 6e3e193ca05..2f32dd90b95 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -53,10 +53,10 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
- DECLARE_WRITE8_MEMBER(fpga_w);
- DECLARE_WRITE8_MEMBER(port0_w);
- DECLARE_WRITE8_MEMBER(port2_w);
- DECLARE_READ8_MEMBER(port2_r);
+ void fpga_w(uint8_t data);
+ void port0_w(uint8_t data);
+ void port2_w(uint8_t data);
+ uint8_t port2_r();
void barata(machine_config &config);
private:
unsigned char row_selection;
@@ -274,7 +274,7 @@ void barata_state::fpga_send(unsigned char cmd)
}
}
-WRITE8_MEMBER(barata_state::fpga_w)
+void barata_state::fpga_w(uint8_t data)
{
static unsigned char old_data = 0;
if (!BIT(old_data, 5) && BIT(data, 5)){
@@ -284,17 +284,17 @@ WRITE8_MEMBER(barata_state::fpga_w)
old_data = data;
}
-WRITE8_MEMBER(barata_state::port0_w)
+void barata_state::port0_w(uint8_t data)
{
row_selection = data;
}
-WRITE8_MEMBER(barata_state::port2_w)
+void barata_state::port2_w(uint8_t data)
{
/* why does it write to PORT2 ? */
}
-READ8_MEMBER(barata_state::port2_r)
+uint8_t barata_state::port2_r()
{
if (!BIT(row_selection, 0)) return ioport("PLAYER1_ROW1")->read();
if (!BIT(row_selection, 1)) return ioport("PLAYER1_ROW2")->read();
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index 907cf613ab2..30d92570710 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -52,8 +52,8 @@ public:
protected:
void kbd_put(u8 data);
- DECLARE_READ8_MEMBER(unk_r);
- DECLARE_READ8_MEMBER(from_term);
+ uint8_t unk_r();
+ uint8_t from_term();
void basic52_io(address_map &map);
void basic52_mem(address_map &map);
uint8_t m_term_data;
@@ -87,12 +87,12 @@ static INPUT_PORTS_START( basic52 )
INPUT_PORTS_END
-READ8_MEMBER(basic52_state::from_term)
+uint8_t basic52_state::from_term()
{
return m_term_data;
}
-READ8_MEMBER( basic52_state::unk_r)
+uint8_t basic52_state::unk_r()
{
return m_term_data; // won't boot without this
}
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp
index 5f4defc2fc1..c7402d1ed4d 100644
--- a/src/mame/drivers/battlera.cpp
+++ b/src/mame/drivers/battlera.cpp
@@ -113,12 +113,12 @@ void battlera_state::machine_reset()
/******************************************************************************/
-WRITE8_MEMBER(battlera_state::control_data_w)
+void battlera_state::control_data_w(uint8_t data)
{
m_control_port_select=data;
}
-READ8_MEMBER(battlera_state::control_data_r)
+uint8_t battlera_state::control_data_r()
{
switch (m_control_port_select)
{
@@ -162,12 +162,12 @@ WRITE_LINE_MEMBER(battlera_state::adpcm_int)
m_audiocpu->set_input_line(1, HOLD_LINE);
}
-WRITE8_MEMBER(battlera_state::adpcm_data_w)
+void battlera_state::adpcm_data_w(uint8_t data)
{
m_msm5205next = data;
}
-WRITE8_MEMBER(battlera_state::adpcm_reset_w)
+void battlera_state::adpcm_reset_w(uint8_t data)
{
m_msm->reset_w(0);
}
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index ebe7675ec85..24c93e75ef5 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -166,8 +166,8 @@ void bebox_state::bebox_peripherals(machine_config &config)
m_dma8237[0]->out_eop_callback().set(FUNC(bebox_state::bebox_dma8237_out_eop));
m_dma8237[0]->in_memr_callback().set(FUNC(bebox_state::bebox_dma_read_byte));
m_dma8237[0]->out_memw_callback().set(FUNC(bebox_state::bebox_dma_write_byte));
- m_dma8237[0]->in_ior_callback<2>().set(FUNC(bebox_state::bebox_dma8237_fdc_dack_r));
- m_dma8237[0]->out_iow_callback<2>().set(FUNC(bebox_state::bebox_dma8237_fdc_dack_w));
+ m_dma8237[0]->in_ior_callback<2>().set(m_smc37c78, FUNC(smc37c78_device::dma_r));
+ m_dma8237[0]->out_iow_callback<2>().set(m_smc37c78, FUNC(smc37c78_device::dma_w));
m_dma8237[0]->out_dack_callback<0>().set(FUNC(bebox_state::pc_dack0_w));
m_dma8237[0]->out_dack_callback<1>().set(FUNC(bebox_state::pc_dack1_w));
m_dma8237[0]->out_dack_callback<2>().set(FUNC(bebox_state::pc_dack2_w));
@@ -178,7 +178,7 @@ void bebox_state::bebox_peripherals(machine_config &config)
PIC8259(config, m_pic8259[0], 0);
m_pic8259[0]->out_int_callback().set(FUNC(bebox_state::bebox_pic8259_master_set_int_line));
m_pic8259[0]->in_sp_callback().set_constant(1);
- m_pic8259[0]->read_slave_ack_callback().set(FUNC(bebox_state::get_slave_ack));
+ m_pic8259[0]->read_slave_ack_callback().set(m_pic8259[1], FUNC(pic8259_device::acknowledge));
PIC8259(config, m_pic8259[1], 0);
m_pic8259[1]->out_int_callback().set(FUNC(bebox_state::bebox_pic8259_slave_set_int_line));
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index 89a8fc15435..fc346f97d84 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -846,13 +846,13 @@ WRITE_LINE_MEMBER(sc4_state::bfm_sc4_duart_txa)
-READ8_MEMBER(sc4_state::bfm_sc4_duart_input_r)
+uint8_t sc4_state::bfm_sc4_duart_input_r()
{
// printf("bfm_sc4_duart_input_r\n");
return m_optic_pattern;
}
-WRITE8_MEMBER(sc4_state::bfm_sc4_duart_output_w)
+void sc4_state::bfm_sc4_duart_output_w(uint8_t data)
{
// logerror("bfm_sc4_duart_output_w\n");
m_reel56_latch = data;
@@ -876,13 +876,13 @@ WRITE_LINE_MEMBER(sc4_state::m68307_duart_txa)
logerror("m68307_duart_tx %02x\n", state);
}
-READ8_MEMBER(sc4_state::m68307_duart_input_r)
+uint8_t sc4_state::m68307_duart_input_r()
{
logerror("m68307_duart_input_r\n");
return 0x00;
}
-WRITE8_MEMBER(sc4_state::m68307_duart_output_w)
+void sc4_state::m68307_duart_output_w(uint8_t data)
{
logerror("m68307_duart_output_w %02x\n", data);
}
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index 2a91c2bc2e6..b4b64fba746 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -323,13 +323,13 @@ WRITE_LINE_MEMBER(bfm_sc5_state::bfm_sc5_duart_txa)
logerror("bfm_sc5_duart_tx\n");
}
-READ8_MEMBER(bfm_sc5_state::bfm_sc5_duart_input_r)
+uint8_t bfm_sc5_state::bfm_sc5_duart_input_r()
{
logerror("bfm_sc5_duart_input_r\n");
return 0xff;
}
-WRITE8_MEMBER(bfm_sc5_state::bfm_sc5_duart_output_w)
+void bfm_sc5_state::bfm_sc5_duart_output_w(uint8_t data)
{
logerror("bfm_sc5_duart_output_w\n");
}
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index 25f46b8bae7..5a1a602c000 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -78,12 +78,7 @@ public:
void big10(machine_config &config);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
- void main_io(address_map &map);
- void main_map(address_map &map);
-
- DECLARE_READ8_MEMBER(mux_r);
- DECLARE_WRITE8_MEMBER(mux_w);
+ virtual void machine_start() override { save_item(NAME(m_mux_data)); m_lamp.resolve(); }
private:
uint8_t m_mux_data;
@@ -91,6 +86,12 @@ private:
required_device m_hopper;
required_ioport_array<6> m_in;
output_finder<> m_lamp;
+
+ void main_io(address_map &map);
+ void main_map(address_map &map);
+
+ uint8_t mux_r();
+ void mux_w(uint8_t data);
};
@@ -103,14 +104,14 @@ private:
****************************************/
-WRITE8_MEMBER(big10_state::mux_w)
+void big10_state::mux_w(uint8_t data)
{
m_mux_data = ~data;
m_hopper->motor_w(BIT(data, 6));
m_lamp = BIT(~data, 7); // maybe a coin counter?
}
-READ8_MEMBER(big10_state::mux_r)
+uint8_t big10_state::mux_r()
{
uint8_t result = 0xff;
for (int b = 0; b < 6; b++)
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 8107526fe62..900be856020 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -108,11 +108,11 @@ public:
DECLARE_WRITE8_MEMBER(sound_cmd_w);
DECLARE_WRITE16_MEMBER(tx_vram_w);
- DECLARE_WRITE8_MEMBER(blackt96_soundio_port_a_w);
- DECLARE_READ8_MEMBER(blackt96_soundio_port_b_r);
- DECLARE_WRITE8_MEMBER(blackt96_soundio_port_b_w);
- DECLARE_READ8_MEMBER(blackt96_soundio_port_c_r);
- DECLARE_WRITE8_MEMBER(blackt96_soundio_port_c_w);
+ void blackt96_soundio_port_a_w(uint8_t data);
+ uint8_t blackt96_soundio_port_b_r();
+ void blackt96_soundio_port_b_w(uint8_t data);
+ uint8_t blackt96_soundio_port_c_r();
+ void blackt96_soundio_port_c_w(uint8_t data);
DECLARE_READ16_MEMBER( random_r ) // todo, get rid of this once we work out where reads are from
{
@@ -393,33 +393,33 @@ static GFXDECODE_START( gfx_blackt96 )
GFXDECODE_END
-WRITE8_MEMBER(blackt96_state::blackt96_soundio_port_a_w)
+void blackt96_state::blackt96_soundio_port_a_w(uint8_t data)
{
// soundbank
logerror("%s: blackt96_soundio_port_a_w (set soundbank %02x)\n", machine().describe_context().c_str(), data);
m_oki1bank->set_entry(data & 0x07);
}
-READ8_MEMBER(blackt96_state::blackt96_soundio_port_b_r)
+uint8_t blackt96_state::blackt96_soundio_port_b_r()
{
//logerror("%s: blackt96_soundio_port_b_r (data read is %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
return m_port_b_latch;
}
-WRITE8_MEMBER(blackt96_state::blackt96_soundio_port_b_w)
+void blackt96_state::blackt96_soundio_port_b_w(uint8_t data)
{
m_port_b_latch = data;
//logerror("%s: blackt96_soundio_port_b_w (set latch to %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
}
-READ8_MEMBER(blackt96_state::blackt96_soundio_port_c_r)
+uint8_t blackt96_state::blackt96_soundio_port_c_r()
{
// bit 0x40 = sound command ready?
if (m_soundcmd_ready) return 0x40;
return 0x00;
}
-WRITE8_MEMBER(blackt96_state::blackt96_soundio_port_c_w)
+void blackt96_state::blackt96_soundio_port_c_w(uint8_t data)
{
// logerror("%s: blackt96_soundio_port_c_w (PREV DATA %02x CURR DATA %02x)\n", machine().describe_context().c_str(), m_port_c_data, data);
// data & 0x80 unuused?
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 94ebb553f50..c3158356de4 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -86,7 +86,7 @@ WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w)
}
-WRITE8_MEMBER(bladestl_state::bladestl_port_B_w)
+void bladestl_state::bladestl_port_B_w(uint8_t data)
{
// bits 3-5 = ROM bank select
m_upd7759->set_rom_bank((data & 0x38) >> 3);
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index d5cc4cc9d31..d986e70e341 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -43,14 +43,14 @@ WRITE8_MEMBER(blktiger_state::blktiger_to_mcu_w)
m_z80_latch = data;
}
-READ8_MEMBER(blktiger_state::blktiger_from_main_r)
+uint8_t blktiger_state::blktiger_from_main_r()
{
m_mcu->set_input_line(MCS51_INT1_LINE, CLEAR_LINE);
//printf("%02x read\n",latch);
return m_z80_latch;
}
-WRITE8_MEMBER(blktiger_state::blktiger_to_main_w)
+void blktiger_state::blktiger_to_main_w(uint8_t data)
{
//printf("%02x write\n",data);
m_i8751_latch = data;
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index 318fba0869f..ba110574629 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -58,7 +58,7 @@ public:
DECLARE_WRITE8_MEMBER(sound_irq_w);
- DECLARE_WRITE8_MEMBER(banking_callback);
+ void banking_callback(uint8_t data);
void blockhl(machine_config &config);
void audio_map(address_map &map);
@@ -194,7 +194,7 @@ void blockhl_state::machine_start()
m_rombank->configure_entries(0, 4, memregion("maincpu")->base(), 0x2000);
}
-WRITE8_MEMBER( blockhl_state::banking_callback )
+void blockhl_state::banking_callback(uint8_t data)
{
// bits 0-1 = ROM bank
m_rombank->set_entry(data & 0x03);
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index 54b7007b4c5..7795f327f4e 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -65,7 +65,7 @@
*
*************************************/
-WRITE8_MEMBER(blueprnt_state::dipsw_w)
+void blueprnt_state::dipsw_w(uint8_t data)
{
m_dipsw = data;
}
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 45125c983e8..d0e0ebd6aec 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -138,12 +138,11 @@ private:
uint8_t random_read();
DECLARE_READ16_MEMBER(protection_r);
DECLARE_WRITE16_MEMBER(scroll_w);
- DECLARE_READ8_MEMBER(via_b_in);
- DECLARE_WRITE8_MEMBER(via_a_out);
- DECLARE_WRITE8_MEMBER(via_b_out);
+ void via_a_out(uint8_t data);
+ void via_b_out(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(via_ca2_out);
- DECLARE_READ8_MEMBER(dips1_r);
- DECLARE_WRITE8_MEMBER(input_mux_w);
+ uint8_t dips1_r();
+ void input_mux_w(uint8_t data);
void int_ack_w(uint8_t data);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void init_stats(const uint8_t *table, int table_len, int address);
@@ -236,19 +235,12 @@ WRITE16_MEMBER(bmcbowl_state::scroll_w)
//TODO - scroll
}
-
-READ8_MEMBER(bmcbowl_state::via_b_in)
-{
- return ioport("IN3")->read();
-}
-
-
-WRITE8_MEMBER(bmcbowl_state::via_a_out)
+void bmcbowl_state::via_a_out(uint8_t data)
{
// related to video hw ? BG scroll ?
}
-WRITE8_MEMBER(bmcbowl_state::via_b_out)
+void bmcbowl_state::via_b_out(uint8_t data)
{
//used
}
@@ -446,7 +438,7 @@ static INPUT_PORTS_START( bmcbowl )
INPUT_PORTS_END
-READ8_MEMBER(bmcbowl_state::dips1_r)
+uint8_t bmcbowl_state::dips1_r()
{
switch(m_selected_input)
{
@@ -458,7 +450,7 @@ READ8_MEMBER(bmcbowl_state::dips1_r)
}
-WRITE8_MEMBER(bmcbowl_state::input_mux_w)
+void bmcbowl_state::input_mux_w(uint8_t data)
{
m_selected_input = data;
}
@@ -507,7 +499,7 @@ void bmcbowl_state::bmcbowl(machine_config &config)
/* via */
via6522_device &via(VIA6522(config, "via6522_0", XTAL(3'579'545) / 4)); // clock not verified (controls music tempo)
- via.readpb_handler().set(FUNC(bmcbowl_state::via_b_in));
+ via.readpb_handler().set_ioport("IN3");
via.writepa_handler().set(FUNC(bmcbowl_state::via_a_out));
via.writepb_handler().set(FUNC(bmcbowl_state::via_b_out));
via.ca2_handler().set(FUNC(bmcbowl_state::via_ca2_out));
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index 67ccb984eba..ab94c778a4e 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -102,7 +102,7 @@ public:
DECLARE_WRITE8_MEMBER(vram_attr_w);
DECLARE_READ8_MEMBER(beep_r);
DECLARE_WRITE8_MEMBER(beep_w);
- DECLARE_WRITE8_MEMBER(piaA_w);
+ void piaA_w(uint8_t data);
DECLARE_READ8_MEMBER(keyb_nmi_r);
DECLARE_WRITE8_MEMBER(firq_mask_w);
DECLARE_READ8_MEMBER(firq_status_r);
@@ -776,7 +776,7 @@ void bml3_state::machine_reset()
m_firq_mask = -1; // disable firq
}
-WRITE8_MEMBER(bml3_state::piaA_w)
+void bml3_state::piaA_w(uint8_t data)
{
address_space &mem = m_maincpu->space(AS_PROGRAM);
/* ROM banking:
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index 5eea1b374c1..687957c58e5 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -301,7 +301,7 @@ void boogwing_state::machine_reset()
m_priority = 0;
}
-WRITE8_MEMBER(boogwing_state::sound_bankswitch_w)
+void boogwing_state::sound_bankswitch_w(uint8_t data)
{
m_oki[1]->set_rom_bank((data & 2) >> 1);
m_oki[0]->set_rom_bank(data & 1);
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index 92f954c9ed4..8276aca6732 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -262,13 +262,13 @@ INPUT_PORTS_END
-WRITE8_MEMBER(bottom9_state::volume_callback0)
+void bottom9_state::volume_callback0(uint8_t data)
{
m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11);
}
-WRITE8_MEMBER(bottom9_state::volume_callback1)
+void bottom9_state::volume_callback1(uint8_t data)
{
m_k007232_2->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index f4e059b90b5..ceda47a9c61 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -176,7 +176,7 @@ WRITE8_MEMBER(btime_state::audio_nmi_enable_w)
m_audionmi->in_w<0>(BIT(data, 0));
}
-WRITE8_MEMBER(btime_state::ay_audio_nmi_enable_w)
+void btime_state::ay_audio_nmi_enable_w(uint8_t data)
{
/* port A bit 0, when 1, inhibits the NMI */
if (m_audio_nmi_enable_type == AUDIO_ENABLE_AY8910)
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 7bcc6580078..93337ce0e5b 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -124,7 +124,7 @@ WRITE_LINE_MEMBER(bw12_state::motor1_w)
floppy_motor_on_off();
}
-READ8_MEMBER( bw12_state::ls259_r )
+uint8_t bw12_state::ls259_r(offs_t offset)
{
if (!machine().side_effects_disabled())
m_latch->write_bit(offset >> 1, BIT(offset, 0));
@@ -346,7 +346,7 @@ WRITE_LINE_MEMBER( bw12_state::write_centronics_perror )
m_centronics_perror = state;
}
-READ8_MEMBER( bw12_state::pia_pa_r )
+uint8_t bw12_state::pia_pa_r()
{
/*
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index c573744b49a..a6db1e20bb0 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -59,7 +59,7 @@ enum
// read -
//-------------------------------------------------
-READ8_MEMBER( bw2_state::read )
+uint8_t bw2_state::read(offs_t offset)
{
int rom = 1, vram = 1, ram1 = 1, ram2 = 1, ram3 = 1, ram4 = 1, ram5 = 1, ram6 = 1;
@@ -116,7 +116,7 @@ READ8_MEMBER( bw2_state::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( bw2_state::write )
+void bw2_state::write(offs_t offset, uint8_t data)
{
int vram = 1, ram1 = 1, ram2 = 1, ram3 = 1, ram4 = 1, ram5 = 1, ram6 = 1;
@@ -370,7 +370,7 @@ WRITE_LINE_MEMBER( bw2_state::write_centronics_busy )
// I8255A interface
//-------------------------------------------------
-WRITE8_MEMBER( bw2_state::ppi_pa_w )
+void bw2_state::ppi_pa_w(uint8_t data)
{
/*
@@ -400,7 +400,7 @@ WRITE8_MEMBER( bw2_state::ppi_pa_w )
m_centronics->write_strobe(BIT(data, 7));
}
-READ8_MEMBER( bw2_state::ppi_pb_r )
+uint8_t bw2_state::ppi_pb_r()
{
/*
@@ -425,7 +425,7 @@ READ8_MEMBER( bw2_state::ppi_pb_r )
return data;
}
-WRITE8_MEMBER( bw2_state::ppi_pc_w )
+void bw2_state::ppi_pc_w(uint8_t data)
{
/*
@@ -439,7 +439,7 @@ WRITE8_MEMBER( bw2_state::ppi_pc_w )
m_bank = data & 0x07;
}
-READ8_MEMBER( bw2_state::ppi_pc_r )
+uint8_t bw2_state::ppi_pc_r()
{
/*
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index aa92864ba67..4b187ace728 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -144,29 +144,29 @@ public:
DECLARE_READ_LINE_MEMBER( mmu_exrom_r );
DECLARE_READ_LINE_MEMBER( mmu_sense40_r );
- DECLARE_WRITE8_MEMBER( vic_k_w );
+ void vic_k_w(uint8_t data);
- DECLARE_READ8_MEMBER( sid_potx_r );
- DECLARE_READ8_MEMBER( sid_poty_r );
+ uint8_t sid_potx_r();
+ uint8_t sid_poty_r();
DECLARE_WRITE_LINE_MEMBER( cia1_cnt_w );
DECLARE_WRITE_LINE_MEMBER( cia1_sp_w );
- DECLARE_READ8_MEMBER( cia1_pa_r );
- DECLARE_WRITE8_MEMBER( cia1_pa_w );
- DECLARE_READ8_MEMBER( cia1_pb_r );
- DECLARE_WRITE8_MEMBER( cia1_pb_w );
+ uint8_t cia1_pa_r();
+ void cia1_pa_w(uint8_t data);
+ uint8_t cia1_pb_r();
+ void cia1_pb_w(uint8_t data);
- DECLARE_READ8_MEMBER( cia2_pa_r );
- DECLARE_WRITE8_MEMBER( cia2_pa_w );
+ uint8_t cia2_pa_r();
+ void cia2_pa_w(uint8_t data);
- DECLARE_READ8_MEMBER( cpu_r );
- DECLARE_WRITE8_MEMBER( cpu_w );
+ uint8_t cpu_r();
+ void cpu_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( iec_srq_w );
DECLARE_WRITE_LINE_MEMBER( iec_data_w );
- DECLARE_READ8_MEMBER( exp_dma_cd_r );
- DECLARE_WRITE8_MEMBER( exp_dma_cd_w );
+ uint8_t exp_dma_cd_r(offs_t offset);
+ void exp_dma_cd_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( exp_dma_w );
DECLARE_WRITE_LINE_MEMBER( exp_reset_w );
@@ -175,8 +175,8 @@ public:
DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_c128);
- DECLARE_READ8_MEMBER( cia2_pb_r );
- DECLARE_WRITE8_MEMBER( cia2_pb_w );
+ uint8_t cia2_pb_r();
+ void cia2_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( write_user_pa2 ) { m_user_pa2 = state; }
DECLARE_WRITE_LINE_MEMBER( write_user_pb0 ) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; }
@@ -1091,7 +1091,7 @@ GFXDECODE_END
// MOS8564_INTERFACE( vic_intf )
//-------------------------------------------------
-WRITE8_MEMBER( c128_state::vic_k_w )
+void c128_state::vic_k_w(uint8_t data)
{
m_vic_k = data;
}
@@ -1101,7 +1101,7 @@ WRITE8_MEMBER( c128_state::vic_k_w )
// MOS6581_INTERFACE( sid_intf )
//-------------------------------------------------
-READ8_MEMBER( c128_state::sid_potx_r )
+uint8_t c128_state::sid_potx_r()
{
uint8_t data = 0xff;
@@ -1128,7 +1128,7 @@ READ8_MEMBER( c128_state::sid_potx_r )
return data;
}
-READ8_MEMBER( c128_state::sid_poty_r )
+uint8_t c128_state::sid_poty_r()
{
uint8_t data = 0xff;
@@ -1160,7 +1160,7 @@ READ8_MEMBER( c128_state::sid_poty_r )
// MOS6526_INTERFACE( cia1_intf )
//-------------------------------------------------
-READ8_MEMBER( c128_state::cia1_pa_r )
+uint8_t c128_state::cia1_pa_r()
{
/*
@@ -1208,7 +1208,7 @@ READ8_MEMBER( c128_state::cia1_pa_r )
return data;
}
-WRITE8_MEMBER( c128_state::cia1_pa_w )
+void c128_state::cia1_pa_w(uint8_t data)
{
/*
@@ -1228,7 +1228,7 @@ WRITE8_MEMBER( c128_state::cia1_pa_w )
m_joy2->joy_w(data & 0x1f);
}
-READ8_MEMBER( c128_state::cia1_pb_r )
+uint8_t c128_state::cia1_pb_r()
{
/*
@@ -1272,7 +1272,7 @@ READ8_MEMBER( c128_state::cia1_pb_r )
return data;
}
-WRITE8_MEMBER( c128_state::cia1_pb_w )
+void c128_state::cia1_pb_w(uint8_t data)
{
/*
@@ -1315,7 +1315,7 @@ WRITE_LINE_MEMBER( c128_state::cia1_sp_w )
// MOS6526_INTERFACE( cia2_intf )
//-------------------------------------------------
-READ8_MEMBER( c128_state::cia2_pa_r )
+uint8_t c128_state::cia2_pa_r()
{
/*
@@ -1344,7 +1344,7 @@ READ8_MEMBER( c128_state::cia2_pa_r )
return data;
}
-WRITE8_MEMBER( c128_state::cia2_pa_w )
+void c128_state::cia2_pa_w(uint8_t data)
{
/*
@@ -1376,12 +1376,12 @@ WRITE8_MEMBER( c128_state::cia2_pa_w )
update_iec();
}
-READ8_MEMBER( c128_state::cia2_pb_r )
+uint8_t c128_state::cia2_pb_r()
{
return m_user_pb;
}
-WRITE8_MEMBER( c128_state::cia2_pb_w )
+void c128_state::cia2_pb_w(uint8_t data)
{
m_user->write_c((data>>0)&1);
m_user->write_d((data>>1)&1);
@@ -1397,7 +1397,7 @@ WRITE8_MEMBER( c128_state::cia2_pb_w )
// M6510_INTERFACE( cpu_intf )
//-------------------------------------------------
-READ8_MEMBER( c128_state::cpu_r)
+uint8_t c128_state::cpu_r()
{
/*
@@ -1424,7 +1424,7 @@ READ8_MEMBER( c128_state::cpu_r)
return data;
}
-WRITE8_MEMBER( c128_state::cpu_w )
+void c128_state::cpu_w(uint8_t data)
{
/*
@@ -1501,7 +1501,7 @@ WRITE_LINE_MEMBER( c128_state::iec_data_w )
// C64_EXPANSION_INTERFACE( expansion_intf )
//-------------------------------------------------
-READ8_MEMBER( c128_state::exp_dma_cd_r )
+uint8_t c128_state::exp_dma_cd_r(offs_t offset)
{
int ba = 0, aec = 1, z80io = 1;
offs_t vma = 0;
@@ -1509,7 +1509,7 @@ READ8_MEMBER( c128_state::exp_dma_cd_r )
return read_memory(offset, vma, ba, aec, z80io);
}
-WRITE8_MEMBER( c128_state::exp_dma_cd_w )
+void c128_state::exp_dma_cd_w(offs_t offset, uint8_t data)
{
int ba = 0, aec = 1, z80io = 1;
offs_t vma = 0;
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 7847994757c..3753fdf91f0 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -102,28 +102,28 @@ public:
void check_interrupts();
int read_pla(offs_t offset, offs_t va, int rw, int aec, int ba);
- uint8_t read_memory(address_space &space, offs_t offset, offs_t va, int aec, int ba);
- void write_memory(address_space &space, offs_t offset, uint8_t data, int aec, int ba);
+ uint8_t read_memory(offs_t offset, offs_t va, int aec, int ba);
+ void write_memory(offs_t offset, uint8_t data, int aec, int ba);
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
DECLARE_READ8_MEMBER( vic_videoram_r );
DECLARE_READ8_MEMBER( vic_colorram_r );
- DECLARE_READ8_MEMBER( sid_potx_r );
- DECLARE_READ8_MEMBER( sid_poty_r );
+ uint8_t sid_potx_r();
+ uint8_t sid_poty_r();
- DECLARE_READ8_MEMBER( cia1_pa_r );
- DECLARE_WRITE8_MEMBER( cia1_pa_w );
- DECLARE_READ8_MEMBER( cia1_pb_r );
- DECLARE_WRITE8_MEMBER( cia1_pb_w );
+ uint8_t cia1_pa_r();
+ void cia1_pa_w(uint8_t data);
+ uint8_t cia1_pb_r();
+ void cia1_pb_w(uint8_t data);
- DECLARE_READ8_MEMBER( cia2_pa_r );
- DECLARE_WRITE8_MEMBER( cia2_pa_w );
+ uint8_t cia2_pa_r();
+ void cia2_pa_w(uint8_t data);
- DECLARE_READ8_MEMBER( cpu_r );
- DECLARE_WRITE8_MEMBER( cpu_w );
+ uint8_t cpu_r();
+ void cpu_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( write_restore );
DECLARE_WRITE_LINE_MEMBER( exp_dma_w );
@@ -131,8 +131,8 @@ public:
DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_c64);
- DECLARE_READ8_MEMBER( cia2_pb_r );
- DECLARE_WRITE8_MEMBER( cia2_pb_w );
+ uint8_t cia2_pb_r();
+ void cia2_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( write_user_pa2 ) { m_user_pa2 = state; }
DECLARE_WRITE_LINE_MEMBER( write_user_pb0 ) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; }
@@ -179,8 +179,8 @@ public:
: c64_state(mconfig, type, tag)
{ }
- DECLARE_READ8_MEMBER( cpu_r );
- DECLARE_WRITE8_MEMBER( cpu_w );
+ uint8_t cpu_r();
+ void cpu_w(uint8_t data);
void ntsc_sx(machine_config &config);
void ntsc_dx(machine_config &config);
void pal_sx(machine_config &config);
@@ -205,11 +205,11 @@ public:
: c64c_state(mconfig, type, tag)
{ }
- DECLARE_READ8_MEMBER( cpu_r );
- DECLARE_WRITE8_MEMBER( cpu_w );
+ uint8_t cpu_r();
+ void cpu_w(uint8_t data);
- DECLARE_READ8_MEMBER( cia1_pa_r );
- DECLARE_READ8_MEMBER( cia1_pb_r );
+ uint8_t cia1_pa_r();
+ uint8_t cia1_pb_r();
void pal_gs(machine_config &config);
};
@@ -459,7 +459,7 @@ int c64_state::read_pla(offs_t offset, offs_t va, int rw, int aec, int ba)
// read_memory -
//-------------------------------------------------
-uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, int aec, int ba)
+uint8_t c64_state::read_memory(offs_t offset, offs_t va, int aec, int ba)
{
int rw = 1;
int io1 = 1, io2 = 1;
@@ -550,7 +550,7 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i
// write_memory -
//-------------------------------------------------
-void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data, int aec, int ba)
+void c64_state::write_memory(offs_t offset, uint8_t data, int aec, int ba)
{
int rw = 0;
offs_t va = 0;
@@ -622,14 +622,14 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data,
// read -
//-------------------------------------------------
-READ8_MEMBER( c64_state::read )
+uint8_t c64_state::read(offs_t offset)
{
int aec = 1, ba = 1;
// VIC address bus is floating
offs_t va = 0x3fff;
- return read_memory(space, offset, va, aec, ba);
+ return read_memory(offset, va, aec, ba);
}
@@ -637,11 +637,11 @@ READ8_MEMBER( c64_state::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( c64_state::write )
+void c64_state::write(offs_t offset, uint8_t data)
{
int aec = 1, ba = 1;
- write_memory(space, offset, data, aec, ba);
+ write_memory(offset, data, aec, ba);
}
@@ -657,7 +657,7 @@ READ8_MEMBER( c64_state::vic_videoram_r )
// A15/A14 are not connected to VIC so they are floating
//offset |= 0xc000;
- return read_memory(space, offset, va, aec, ba);
+ return read_memory(offset, va, aec, ba);
}
@@ -861,7 +861,7 @@ INPUT_PORTS_END
// MOS6581_INTERFACE( sid_intf )
//-------------------------------------------------
-READ8_MEMBER( c64_state::sid_potx_r )
+uint8_t c64_state::sid_potx_r()
{
uint8_t data = 0xff;
@@ -888,7 +888,7 @@ READ8_MEMBER( c64_state::sid_potx_r )
return data;
}
-READ8_MEMBER( c64_state::sid_poty_r )
+uint8_t c64_state::sid_poty_r()
{
uint8_t data = 0xff;
@@ -920,7 +920,7 @@ READ8_MEMBER( c64_state::sid_poty_r )
// MOS6526_INTERFACE( cia1_intf )
//-------------------------------------------------
-READ8_MEMBER( c64_state::cia1_pa_r )
+uint8_t c64_state::cia1_pa_r()
{
/*
@@ -968,7 +968,7 @@ READ8_MEMBER( c64_state::cia1_pa_r )
return data;
}
-WRITE8_MEMBER( c64_state::cia1_pa_w )
+void c64_state::cia1_pa_w(uint8_t data)
{
/*
@@ -988,7 +988,7 @@ WRITE8_MEMBER( c64_state::cia1_pa_w )
m_joy2->joy_w(data & 0x1f);
}
-READ8_MEMBER( c64_state::cia1_pb_r )
+uint8_t c64_state::cia1_pb_r()
{
/*
@@ -1028,7 +1028,7 @@ READ8_MEMBER( c64_state::cia1_pb_r )
return data;
}
-WRITE8_MEMBER( c64_state::cia1_pb_w )
+void c64_state::cia1_pb_w(uint8_t data)
{
/*
@@ -1050,7 +1050,7 @@ WRITE8_MEMBER( c64_state::cia1_pb_w )
m_vic->lp_w(BIT(data, 4));
}
-READ8_MEMBER( c64gs_state::cia1_pa_r )
+uint8_t c64gs_state::cia1_pa_r()
{
/*
@@ -1078,7 +1078,7 @@ READ8_MEMBER( c64gs_state::cia1_pa_r )
return data;
}
-READ8_MEMBER( c64gs_state::cia1_pb_r )
+uint8_t c64gs_state::cia1_pb_r()
{
/*
@@ -1111,7 +1111,7 @@ READ8_MEMBER( c64gs_state::cia1_pb_r )
// MOS6526_INTERFACE( cia2_intf )
//-------------------------------------------------
-READ8_MEMBER( c64_state::cia2_pa_r )
+uint8_t c64_state::cia2_pa_r()
{
/*
@@ -1140,7 +1140,7 @@ READ8_MEMBER( c64_state::cia2_pa_r )
return data;
}
-WRITE8_MEMBER( c64_state::cia2_pa_w )
+void c64_state::cia2_pa_w(uint8_t data)
{
/*
@@ -1170,12 +1170,12 @@ WRITE8_MEMBER( c64_state::cia2_pa_w )
m_iec->host_data_w(!BIT(data, 5));
}
-READ8_MEMBER( c64_state::cia2_pb_r )
+uint8_t c64_state::cia2_pb_r()
{
return m_user_pb;
}
-WRITE8_MEMBER( c64_state::cia2_pb_w )
+void c64_state::cia2_pb_w(uint8_t data)
{
m_user->write_c((data>>0)&1);
m_user->write_d((data>>1)&1);
@@ -1191,7 +1191,7 @@ WRITE8_MEMBER( c64_state::cia2_pb_w )
// M6510_INTERFACE( cpu_intf )
//-------------------------------------------------
-READ8_MEMBER( c64_state::cpu_r )
+uint8_t c64_state::cpu_r()
{
/*
@@ -1213,7 +1213,7 @@ READ8_MEMBER( c64_state::cpu_r )
return data;
}
-WRITE8_MEMBER( c64_state::cpu_w )
+void c64_state::cpu_w(uint8_t data)
{
/*
@@ -1245,7 +1245,7 @@ WRITE8_MEMBER( c64_state::cpu_w )
// M6510_INTERFACE( sx64_cpu_intf )
//-------------------------------------------------
-READ8_MEMBER( sx64_state::cpu_r )
+uint8_t sx64_state::cpu_r()
{
/*
@@ -1263,7 +1263,7 @@ READ8_MEMBER( sx64_state::cpu_r )
return 0x07;
}
-WRITE8_MEMBER( sx64_state::cpu_w )
+void sx64_state::cpu_w(uint8_t data)
{
/*
@@ -1289,7 +1289,7 @@ WRITE8_MEMBER( sx64_state::cpu_w )
// M6510_INTERFACE( c64gs_cpu_intf )
//-------------------------------------------------
-READ8_MEMBER( c64gs_state::cpu_r )
+uint8_t c64gs_state::cpu_r()
{
/*
@@ -1307,7 +1307,7 @@ READ8_MEMBER( c64gs_state::cpu_r )
return 0x07;
}
-WRITE8_MEMBER( c64gs_state::cpu_w )
+void c64gs_state::cpu_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index d826c3f1828..f393f81ce47 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -84,10 +84,10 @@ public:
DECLARE_WRITE8_MEMBER(DMAgic_w);
DECLARE_READ8_MEMBER(CIASelect_r);
DECLARE_WRITE8_MEMBER(CIASelect_w);
- DECLARE_READ8_MEMBER(cia0_porta_r);
- DECLARE_WRITE8_MEMBER(cia0_porta_w);
- DECLARE_READ8_MEMBER(cia0_portb_r);
- DECLARE_WRITE8_MEMBER(cia0_portb_w);
+ uint8_t cia0_porta_r();
+ void cia0_porta_w(uint8_t data);
+ uint8_t cia0_portb_r();
+ void cia0_portb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(cia0_irq);
DECLARE_READ8_MEMBER(dummy_r);
@@ -439,12 +439,12 @@ WRITE8_MEMBER(c65_state::CIASelect_w)
}
-READ8_MEMBER(c65_state::cia0_porta_r)
+uint8_t c65_state::cia0_porta_r()
{
return 0xff;
}
-READ8_MEMBER(c65_state::cia0_portb_r)
+uint8_t c65_state::cia0_portb_r()
{
static const char *const c64ports[] = { "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7" };
static const char *const c65ports[] = { "C8", "C9" };
@@ -470,13 +470,13 @@ READ8_MEMBER(c65_state::cia0_portb_r)
return res;
}
-WRITE8_MEMBER(c65_state::cia0_porta_w)
+void c65_state::cia0_porta_w(uint8_t data)
{
m_keyb_c0_c7 = ~data;
// printf("%02x\n",m_keyb_c0_c7);
}
-WRITE8_MEMBER(c65_state::cia0_portb_w)
+void c65_state::cia0_portb_w(uint8_t data)
{
}
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index ea2924cfe28..c76c2c9d4fa 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -126,7 +126,7 @@ INPUT_PORTS_END
/* Z80-PIO Interface */
-READ8_MEMBER( c80_state::pio1_pa_r )
+uint8_t c80_state::pio1_pa_r()
{
/*
@@ -162,7 +162,7 @@ READ8_MEMBER( c80_state::pio1_pa_r )
return data;
}
-WRITE8_MEMBER( c80_state::pio1_pa_w )
+void c80_state::pio1_pa_w(uint8_t data)
{
/*
@@ -189,7 +189,7 @@ WRITE8_MEMBER( c80_state::pio1_pa_w )
m_cassette->output(BIT(data, 6) ? +1.0 : -1.0);
}
-WRITE8_MEMBER( c80_state::pio1_pb_w )
+void c80_state::pio1_pb_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 4b3dbe20342..6e52b3976be 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -52,9 +52,9 @@ public:
DECLARE_WRITE8_MEMBER(bg_tile_w);
DECLARE_WRITE8_MEMBER(fg_tile_w);
DECLARE_WRITE8_MEMBER(fg_color_w);
- DECLARE_WRITE8_MEMBER(nmi_and_coins_w);
- DECLARE_WRITE8_MEMBER(ppi2_b_w);
- DECLARE_WRITE8_MEMBER(ppi2_c_w);
+ void nmi_and_coins_w(uint8_t data);
+ void ppi2_b_w(uint8_t data);
+ void ppi2_c_w(uint8_t data);
void show_out();
void init_cabaret();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
@@ -163,7 +163,7 @@ void cabaret_state::show_out()
#endif
}
-WRITE8_MEMBER(cabaret_state::nmi_and_coins_w)
+void cabaret_state::nmi_and_coins_w(uint8_t data)
{
if ((m_nmi_enable ^ data) & (~0xdd))
{
@@ -184,13 +184,13 @@ WRITE8_MEMBER(cabaret_state::nmi_and_coins_w)
show_out();
}
-WRITE8_MEMBER(cabaret_state::ppi2_b_w)
+void cabaret_state::ppi2_b_w(uint8_t data)
{
m_out[1] = data;
show_out();
}
-WRITE8_MEMBER(cabaret_state::ppi2_c_w)
+void cabaret_state::ppi2_c_w(uint8_t data)
{
m_out[2] = data;
show_out();
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index d161ef96880..1a623a4f0d6 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -92,13 +92,13 @@ public:
void vvillage(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(sc0_vram_w);
- DECLARE_WRITE8_MEMBER(sc0_attr_w);
- DECLARE_WRITE8_MEMBER(vvillage_scroll_w);
- DECLARE_WRITE8_MEMBER(vvillage_vregs_w);
- DECLARE_READ8_MEMBER(vvillage_rng_r);
- DECLARE_WRITE8_MEMBER(vvillage_output_w);
- DECLARE_WRITE8_MEMBER(vvillage_lamps_w);
+ void sc0_vram_w(offs_t offset, uint8_t data);
+ void sc0_attr_w(offs_t offset, uint8_t data);
+ void vvillage_scroll_w(uint8_t data);
+ void vvillage_vregs_w(uint8_t data);
+ uint8_t vvillage_rng_r();
+ void vvillage_output_w(uint8_t data);
+ void vvillage_lamps_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_sc0_tile_info);
void caswin_palette(palette_device &palette) const;
uint32_t screen_update_vvillage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -141,27 +141,27 @@ uint32_t caswin_state::screen_update_vvillage(screen_device &screen, bitmap_ind1
return 0;
}
-WRITE8_MEMBER(caswin_state::sc0_vram_w)
+void caswin_state::sc0_vram_w(offs_t offset, uint8_t data)
{
m_sc0_vram[offset] = data;
m_sc0_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(caswin_state::sc0_attr_w)
+void caswin_state::sc0_attr_w(offs_t offset, uint8_t data)
{
m_sc0_attr[offset] = data;
m_sc0_tilemap->mark_tile_dirty(offset);
}
/*These two are tested during the two cherry sub-games.I really don't know what is supposed to do...*/
-WRITE8_MEMBER(caswin_state::vvillage_scroll_w)
+void caswin_state::vvillage_scroll_w(uint8_t data)
{
//...
}
/*---- --x- window effect? */
/*---- ---x flip screen */
-WRITE8_MEMBER(caswin_state::vvillage_vregs_w)
+void caswin_state::vvillage_vregs_w(uint8_t data)
{
flip_screen_set(data & 1);
}
@@ -172,12 +172,12 @@ WRITE8_MEMBER(caswin_state::vvillage_vregs_w)
*
**********************/
-READ8_MEMBER(caswin_state::vvillage_rng_r)
+uint8_t caswin_state::vvillage_rng_r()
{
return machine().rand();
}
-WRITE8_MEMBER(caswin_state::vvillage_output_w)
+void caswin_state::vvillage_output_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0,data & 1);
machine().bookkeeping().coin_counter_w(1,data & 1);
@@ -186,7 +186,7 @@ WRITE8_MEMBER(caswin_state::vvillage_output_w)
machine().bookkeeping().coin_lockout_w(1,data & 0x20);
}
-WRITE8_MEMBER(caswin_state::vvillage_lamps_w)
+void caswin_state::vvillage_lamps_w(uint8_t data)
{
/*
---x ---- lamp button 5
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index c4b6ad042ba..a0aba3460c2 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -297,7 +297,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(cat_duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(cat_duart_txa);
DECLARE_WRITE_LINE_MEMBER(cat_duart_txb);
- DECLARE_WRITE8_MEMBER(cat_duart_output);
+ void cat_duart_output(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(prn_ack_ff);
DECLARE_READ16_MEMBER(cat_floppy_control_r);
@@ -1032,7 +1032,7 @@ WRITE_LINE_MEMBER(cat_state::cat_duart_txb) // memit sends stuff here; connects
* OP6: TD01 "
* OP7: TD00 "
*/
-WRITE8_MEMBER(cat_state::cat_duart_output)
+void cat_state::cat_duart_output(uint8_t data)
{
#ifdef DEBUG_DUART_OUTPUT_LINES
fprintf(stderr,"Duart output io lines changed to: %02X\n", data);
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index d9eb765e244..75d4fdd336a 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -162,31 +162,31 @@ public:
DECLARE_READ8_MEMBER( ext_read );
DECLARE_WRITE8_MEMBER( ext_write );
- DECLARE_READ8_MEMBER( sid_potx_r );
- DECLARE_READ8_MEMBER( sid_poty_r );
+ uint8_t sid_potx_r();
+ uint8_t sid_poty_r();
- DECLARE_READ8_MEMBER( tpi1_pa_r );
- DECLARE_WRITE8_MEMBER( tpi1_pa_w );
- DECLARE_READ8_MEMBER( tpi1_pb_r );
- DECLARE_WRITE8_MEMBER( tpi1_pb_w );
+ uint8_t tpi1_pa_r();
+ void tpi1_pa_w(uint8_t data);
+ uint8_t tpi1_pb_r();
+ void tpi1_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( tpi1_ca_w );
DECLARE_WRITE_LINE_MEMBER( tpi1_cb_w );
- DECLARE_WRITE8_MEMBER( tpi2_pa_w );
- DECLARE_WRITE8_MEMBER( tpi2_pb_w );
- DECLARE_READ8_MEMBER( tpi2_pc_r );
+ void tpi2_pa_w(uint8_t data);
+ void tpi2_pb_w(uint8_t data);
+ uint8_t tpi2_pc_r();
- DECLARE_READ8_MEMBER( cia_pa_r );
- DECLARE_WRITE8_MEMBER( cia_pa_w );
- DECLARE_READ8_MEMBER( cia_pb_r );
+ uint8_t cia_pa_r();
+ void cia_pa_w(uint8_t data);
+ uint8_t cia_pb_r();
- DECLARE_READ8_MEMBER( ext_tpi_pb_r );
- DECLARE_WRITE8_MEMBER( ext_tpi_pb_w );
- DECLARE_WRITE8_MEMBER( ext_tpi_pc_w );
+ uint8_t ext_tpi_pb_r();
+ void ext_tpi_pb_w(uint8_t data);
+ void ext_tpi_pc_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( ext_cia_irq_w );
- DECLARE_READ8_MEMBER( ext_cia_pb_r );
- DECLARE_WRITE8_MEMBER( ext_cia_pb_w );
+ uint8_t ext_cia_pb_r();
+ void ext_cia_pb_w(uint8_t data);
MC6845_UPDATE_ROW( crtc_update_row );
@@ -240,7 +240,7 @@ public:
virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas,
int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4) override;
- DECLARE_READ8_MEMBER( tpi2_pc_r );
+ uint8_t tpi2_pc_r();
void b256hp(machine_config &config);
void b128hp(machine_config &config);
void cbm710(machine_config &config);
@@ -296,8 +296,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( tpi1_ca_w );
DECLARE_WRITE_LINE_MEMBER( tpi1_cb_w );
- DECLARE_READ8_MEMBER( tpi2_pc_r );
- DECLARE_WRITE8_MEMBER( tpi2_pc_w );
+ uint8_t tpi2_pc_r();
+ void tpi2_pc_w(uint8_t data);
DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_p500);
// video state
@@ -1441,7 +1441,7 @@ MC6845_UPDATE_ROW( cbm2_state::crtc_update_row )
// MOS6581_INTERFACE( sid_intf )
//-------------------------------------------------
-READ8_MEMBER( cbm2_state::sid_potx_r )
+uint8_t cbm2_state::sid_potx_r()
{
uint8_t data = 0xff;
@@ -1468,7 +1468,7 @@ READ8_MEMBER( cbm2_state::sid_potx_r )
return data;
}
-READ8_MEMBER( cbm2_state::sid_poty_r )
+uint8_t cbm2_state::sid_poty_r()
{
uint8_t data = 0xff;
@@ -1500,7 +1500,7 @@ READ8_MEMBER( cbm2_state::sid_poty_r )
// tpi6525_interface tpi1_intf
//-------------------------------------------------
-READ8_MEMBER( cbm2_state::tpi1_pa_r )
+uint8_t cbm2_state::tpi1_pa_r()
{
/*
@@ -1530,7 +1530,7 @@ READ8_MEMBER( cbm2_state::tpi1_pa_r )
return data;
}
-WRITE8_MEMBER( cbm2_state::tpi1_pa_w )
+void cbm2_state::tpi1_pa_w(uint8_t data)
{
/*
@@ -1561,7 +1561,7 @@ WRITE8_MEMBER( cbm2_state::tpi1_pa_w )
m_ieee2->nrfd_w(BIT(data, 7));
}
-READ8_MEMBER( cbm2_state::tpi1_pb_r )
+uint8_t cbm2_state::tpi1_pb_r()
{
/*
@@ -1594,7 +1594,7 @@ READ8_MEMBER( cbm2_state::tpi1_pb_r )
return data;
}
-WRITE8_MEMBER( cbm2_state::tpi1_pb_w )
+void cbm2_state::tpi1_pb_w(uint8_t data)
{
/*
@@ -1671,17 +1671,17 @@ uint8_t cbm2_state::read_keyboard()
return data;
}
-WRITE8_MEMBER( cbm2_state::tpi2_pa_w )
+void cbm2_state::tpi2_pa_w(uint8_t data)
{
m_tpi2_pa = data;
}
-WRITE8_MEMBER( cbm2_state::tpi2_pb_w )
+void cbm2_state::tpi2_pb_w(uint8_t data)
{
m_tpi2_pb = data;
}
-READ8_MEMBER( cbm2_state::tpi2_pc_r )
+uint8_t cbm2_state::tpi2_pc_r()
{
/*
@@ -1701,7 +1701,7 @@ READ8_MEMBER( cbm2_state::tpi2_pc_r )
return (m_ntsc << 6) | (read_keyboard() & 0x3f);
}
-READ8_MEMBER( cbm2hp_state::tpi2_pc_r )
+uint8_t cbm2hp_state::tpi2_pc_r()
{
/*
@@ -1721,7 +1721,7 @@ READ8_MEMBER( cbm2hp_state::tpi2_pc_r )
return read_keyboard();
}
-READ8_MEMBER( p500_state::tpi2_pc_r )
+uint8_t p500_state::tpi2_pc_r()
{
/*
@@ -1741,7 +1741,7 @@ READ8_MEMBER( p500_state::tpi2_pc_r )
return read_keyboard();
}
-WRITE8_MEMBER( p500_state::tpi2_pc_w )
+void p500_state::tpi2_pc_w(uint8_t data)
{
/*
@@ -1765,7 +1765,7 @@ WRITE8_MEMBER( p500_state::tpi2_pc_w )
// MOS6526_INTERFACE( cia_intf )
//-------------------------------------------------
-READ8_MEMBER( cbm2_state::cia_pa_r )
+uint8_t cbm2_state::cia_pa_r()
{
/*
@@ -1797,7 +1797,7 @@ READ8_MEMBER( cbm2_state::cia_pa_r )
return data;
}
-WRITE8_MEMBER( cbm2_state::cia_pa_w )
+void cbm2_state::cia_pa_w(uint8_t data)
{
/*
@@ -1824,7 +1824,7 @@ WRITE8_MEMBER( cbm2_state::cia_pa_w )
m_cia_pa = data;
}
-READ8_MEMBER( cbm2_state::cia_pb_r )
+uint8_t cbm2_state::cia_pb_r()
{
/*
@@ -1876,7 +1876,7 @@ void cbm2_state::set_busy2(int state)
}
}
-READ8_MEMBER( cbm2_state::ext_tpi_pb_r )
+uint8_t cbm2_state::ext_tpi_pb_r()
{
/*
@@ -1907,7 +1907,7 @@ READ8_MEMBER( cbm2_state::ext_tpi_pb_r )
return data;
}
-WRITE8_MEMBER( cbm2_state::ext_tpi_pb_w )
+void cbm2_state::ext_tpi_pb_w(uint8_t data)
{
/*
@@ -1936,7 +1936,7 @@ WRITE8_MEMBER( cbm2_state::ext_tpi_pb_w )
m_ext_cia->flag_w(BIT(data, 6));
}
-WRITE8_MEMBER( cbm2_state::ext_tpi_pc_w )
+void cbm2_state::ext_tpi_pc_w(uint8_t data)
{
/*
@@ -1969,7 +1969,7 @@ WRITE_LINE_MEMBER( cbm2_state::ext_cia_irq_w )
m_tpi1->i3_w(!state);
}
-READ8_MEMBER( cbm2_state::ext_cia_pb_r )
+uint8_t cbm2_state::ext_cia_pb_r()
{
/*
@@ -2000,7 +2000,7 @@ READ8_MEMBER( cbm2_state::ext_cia_pb_r )
return data;
}
-WRITE8_MEMBER( cbm2_state::ext_cia_pb_w )
+void cbm2_state::ext_cia_pb_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 6e6488571fd..ebfbd314f7f 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -616,7 +616,7 @@ READ8_MEMBER(centiped_state::bullsdrt_data_port_r)
*
*************************************/
-READ8_MEMBER(centiped_state::caterplr_unknown_r)
+uint8_t centiped_state::caterplr_unknown_r()
{
return machine().rand() % 0xff;
}
diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp
index 9d40a746014..ffed4490e53 100644
--- a/src/mame/drivers/cfx9850.cpp
+++ b/src/mame/drivers/cfx9850.cpp
@@ -44,27 +44,28 @@ public:
, m_opt(0)
{ }
- DECLARE_WRITE8_MEMBER(kol_w);
- DECLARE_WRITE8_MEMBER(koh_w);
- DECLARE_WRITE8_MEMBER(port_w);
- DECLARE_WRITE8_MEMBER(opt_w);
- DECLARE_READ8_MEMBER(ki_r);
- DECLARE_READ8_MEMBER(in0_r);
+ void cfx9850(machine_config &config);
+
+private:
required_shared_ptr m_video_ram;
required_shared_ptr m_display_ram;
- void cfx9850_palette(palette_device &palette) const;
- u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
- void cfx9850(machine_config &config);
- void cfx9850_mem(address_map &map);
-protected:
required_ioport_array<12> m_ko_port;
required_device m_maincpu;
-private:
u16 m_ko; // KO lines KO1 - KO14
u8 m_port; // PORT lines PORT0 - PORT7 (serial I/O)
u8 m_opt; // OPT lines OPT0 - OPT7 (contrast)
+
+ void kol_w(u8 data);
+ void koh_w(u8 data);
+ void port_w(u8 data);
+ void opt_w(u8 data);
+ u8 ki_r();
+ u8 in0_r();
+ void cfx9850_palette(palette_device &palette) const;
+ u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ void cfx9850_mem(address_map &map);
};
@@ -81,14 +82,14 @@ void cfx9850_state::cfx9850_mem(address_map &map)
}
-WRITE8_MEMBER(cfx9850_state::kol_w)
+void cfx9850_state::kol_w(u8 data)
{
m_ko = (m_ko & 0xff00) | data;
logerror("KO is now %04x\n", m_ko);
}
-WRITE8_MEMBER(cfx9850_state::koh_w)
+void cfx9850_state::koh_w(u8 data)
{
m_ko = (m_ko & 0x00ff) | (data << 8);
logerror("KO is now %04x\n", m_ko);
@@ -103,7 +104,7 @@ WRITE8_MEMBER(cfx9850_state::koh_w)
// -----2-- PORT2 - NC / CP29
// ------1- PORT1 - NC / CP30
// -------0 PORT0 - display (enable?) related? + CP31
-WRITE8_MEMBER(cfx9850_state::port_w)
+void cfx9850_state::port_w(u8 data)
{
m_port = data;
logerror("PORT is now %02x\n", m_port);
@@ -118,14 +119,14 @@ WRITE8_MEMBER(cfx9850_state::port_w)
// -----2-- OPT2 - contrast (TC74HC4066AFS pin 6)
// ------1- OPT1 - contrast (TC74HC4066AFS pin 5)
// -------0 OPT0 - contrast (TC74HC4066AFS pin 13)
-WRITE8_MEMBER(cfx9850_state::opt_w)
+void cfx9850_state::opt_w(u8 data)
{
m_opt = data;
logerror("OPT is now %02x\n", m_opt);
}
-READ8_MEMBER(cfx9850_state::ki_r)
+u8 cfx9850_state::ki_r()
{
u8 data = 0;
@@ -141,7 +142,7 @@ READ8_MEMBER(cfx9850_state::ki_r)
}
-READ8_MEMBER(cfx9850_state::in0_r)
+u8 cfx9850_state::in0_r()
{
// battery level?
// bit4 -> if reset CPU keeps restarting (several unknown instructions before jumping to 0)
diff --git a/src/mame/drivers/cgang.cpp b/src/mame/drivers/cgang.cpp
index a166a5f23a4..5748098cf03 100644
--- a/src/mame/drivers/cgang.cpp
+++ b/src/mame/drivers/cgang.cpp
@@ -165,26 +165,26 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(door_motor_tick);
void refresh_motor_output();
- DECLARE_READ8_MEMBER(ppi1_b_r);
- DECLARE_READ8_MEMBER(ppi1_c_r);
- DECLARE_READ8_MEMBER(ppi2_a_r);
- DECLARE_READ8_MEMBER(ppi2_b_r);
- DECLARE_WRITE8_MEMBER(ppi2_c_w);
- DECLARE_WRITE8_MEMBER(ppi3_a_w);
- DECLARE_WRITE8_MEMBER(ppi3_b_w);
- DECLARE_WRITE8_MEMBER(ppi3_c_w);
+ u8 ppi1_b_r();
+ u8 ppi1_c_r();
+ u8 ppi2_a_r();
+ u8 ppi2_b_r();
+ void ppi2_c_w(u8 data);
+ void ppi3_a_w(u8 data);
+ void ppi3_b_w(u8 data);
+ void ppi3_c_w(u8 data);
void set_en_sol(int i, int state);
- DECLARE_WRITE8_MEMBER(ppi4_a_w);
- DECLARE_WRITE8_MEMBER(ppi4_b_w);
- DECLARE_WRITE8_MEMBER(ppi4_c_w);
+ void ppi4_a_w(u8 data);
+ void ppi4_b_w(u8 data);
+ void ppi4_c_w(u8 data);
- template DECLARE_WRITE8_MEMBER(adpcm_w);
- DECLARE_WRITE8_MEMBER(spot_w);
- DECLARE_WRITE8_MEMBER(output_spot_w) { m_spot_lamps[offset >> 6] = data; }
+ template void adpcm_w(u8 data);
+ void spot_w(u8 data);
+ void output_spot_w(offs_t offset, u8 data) { m_spot_lamps[offset >> 6] = data; }
- DECLARE_WRITE8_MEMBER(ppi5_a_w);
- DECLARE_WRITE8_MEMBER(ppi5_b_w);
- DECLARE_READ8_MEMBER(ppi5_c_r);
+ void ppi5_a_w(u8 data);
+ void ppi5_b_w(u8 data);
+ u8 ppi5_c_r();
int m_watchdog_clk = 0;
int m_main_irq = 0;
@@ -359,7 +359,7 @@ void cgang_state::refresh_motor_output()
// maincpu (PPI1-PPI4)
-READ8_MEMBER(cgang_state::ppi1_b_r)
+u8 cgang_state::ppi1_b_r()
{
u8 data = 0xff;
@@ -376,7 +376,7 @@ READ8_MEMBER(cgang_state::ppi1_b_r)
return data;
}
-READ8_MEMBER(cgang_state::ppi1_c_r)
+u8 cgang_state::ppi1_c_r()
{
u8 data = 0x7f;
@@ -396,7 +396,7 @@ READ8_MEMBER(cgang_state::ppi1_c_r)
return data;
}
-READ8_MEMBER(cgang_state::ppi2_a_r)
+u8 cgang_state::ppi2_a_r()
{
u8 data = 0x60;
@@ -424,7 +424,7 @@ READ8_MEMBER(cgang_state::ppi2_a_r)
return data;
}
-READ8_MEMBER(cgang_state::ppi2_b_r)
+u8 cgang_state::ppi2_b_r()
{
u8 data = 0x1f;
@@ -436,7 +436,7 @@ READ8_MEMBER(cgang_state::ppi2_b_r)
return data;
}
-WRITE8_MEMBER(cgang_state::ppi2_c_w)
+void cgang_state::ppi2_c_w(u8 data)
{
// PC0: coincounter
// PC1: coinlock solenoid
@@ -449,7 +449,7 @@ WRITE8_MEMBER(cgang_state::ppi2_c_w)
m_misc_lamps[1] = BIT(data, 3);
}
-WRITE8_MEMBER(cgang_state::ppi3_a_w)
+void cgang_state::ppi3_a_w(u8 data)
{
// PA0-PA4: cosmogang motor direction
m_cg_motor_dir = data & 0x1f;
@@ -459,7 +459,7 @@ WRITE8_MEMBER(cgang_state::ppi3_a_w)
m_misc_lamps[i + 6] = BIT(data, i + 5);
}
-WRITE8_MEMBER(cgang_state::ppi3_b_w)
+void cgang_state::ppi3_b_w(u8 data)
{
// PB0-PB4: cosmogang motor power
m_cg_motor_on = data & 0x1f;
@@ -471,7 +471,7 @@ WRITE8_MEMBER(cgang_state::ppi3_b_w)
m_misc_lamps[i + 8] = BIT(data, i + 5);
}
-WRITE8_MEMBER(cgang_state::ppi3_c_w)
+void cgang_state::ppi3_c_w(u8 data)
{
// PC0-PC3: 7448
// PC4-PC7: 7445
@@ -488,7 +488,7 @@ void cgang_state::set_en_sol(int i, int state)
m_sol_filter[i]->adjust(attotime::from_msec(1), i << 1 | state);
}
-WRITE8_MEMBER(cgang_state::ppi4_a_w)
+void cgang_state::ppi4_a_w(u8 data)
{
// PA2-PA4: round leds
for (int i = 0; i < 3; i++)
@@ -499,7 +499,7 @@ WRITE8_MEMBER(cgang_state::ppi4_a_w)
set_en_sol(i, BIT(data, i + 5));
}
-WRITE8_MEMBER(cgang_state::ppi4_b_w)
+void cgang_state::ppi4_b_w(u8 data)
{
// PB0,PB1: energy crate solenoids (4-5)
for (int i = 0; i < 2; i++)
@@ -513,7 +513,7 @@ WRITE8_MEMBER(cgang_state::ppi4_b_w)
m_misc_lamps[5] = BIT(data, 7);
}
-WRITE8_MEMBER(cgang_state::ppi4_c_w)
+void cgang_state::ppi4_c_w(u8 data)
{
// PC0,PC1: gun xenon lamps
for (int i = 0; i < 2; i++)
@@ -538,7 +538,7 @@ WRITE8_MEMBER(cgang_state::ppi4_c_w)
// audiocpu
template
-WRITE8_MEMBER(cgang_state::adpcm_w)
+void cgang_state::adpcm_w(u8 data)
{
m_adpcm[N]->port_w(data);
@@ -547,7 +547,7 @@ WRITE8_MEMBER(cgang_state::adpcm_w)
m_adpcm[N]->start_w(1);
}
-WRITE8_MEMBER(cgang_state::spot_w)
+void cgang_state::spot_w(u8 data)
{
// d0-d2: ufo boss spotlights
// d3-d7: cosmo spotlights
@@ -555,7 +555,7 @@ WRITE8_MEMBER(cgang_state::spot_w)
m_spot->matrix(1, data);
}
-WRITE8_MEMBER(cgang_state::ppi5_a_w)
+void cgang_state::ppi5_a_w(u8 data)
{
// PA0,PA1: ADPCM reset
m_adpcm[0]->reset_w(BIT(data, 0));
@@ -573,14 +573,14 @@ WRITE8_MEMBER(cgang_state::ppi5_a_w)
m_ufo_sol = BIT(data, 7);
}
-WRITE8_MEMBER(cgang_state::ppi5_b_w)
+void cgang_state::ppi5_b_w(u8 data)
{
// PB0-PB7: ufo lamps
for (int i = 0; i < 8; i++)
m_ufo_lamps[i] = BIT(data, i);
}
-READ8_MEMBER(cgang_state::ppi5_c_r)
+u8 cgang_state::ppi5_c_r()
{
u8 data = 0;
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index 6e131a7d82c..bba5826c4c6 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -88,8 +88,8 @@ private:
DECLARE_WRITE8_MEMBER(chanbara_colorram_w);
DECLARE_WRITE8_MEMBER(chanbara_videoram2_w);
DECLARE_WRITE8_MEMBER(chanbara_colorram2_w);
- DECLARE_WRITE8_MEMBER(chanbara_ay_out_0_w);
- DECLARE_WRITE8_MEMBER(chanbara_ay_out_1_w);
+ void chanbara_ay_out_0_w(uint8_t data);
+ void chanbara_ay_out_1_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_bg2_tile_info);
void chanbara_palette(palette_device &palette) const;
@@ -363,14 +363,14 @@ GFXDECODE_END
/***************************************************************************/
-WRITE8_MEMBER(chanbara_state::chanbara_ay_out_0_w)
+void chanbara_state::chanbara_ay_out_0_w(uint8_t data)
{
//printf("chanbara_ay_out_0_w %02x\n",data);
m_scroll = data;
}
-WRITE8_MEMBER(chanbara_state::chanbara_ay_out_1_w)
+void chanbara_state::chanbara_ay_out_1_w(uint8_t data)
{
//printf("chanbara_ay_out_1_w %02x\n",data);
diff --git a/src/mame/drivers/chessmate.cpp b/src/mame/drivers/chessmate.cpp
index e6083139533..b89352c7076 100644
--- a/src/mame/drivers/chessmate.cpp
+++ b/src/mame/drivers/chessmate.cpp
@@ -90,9 +90,9 @@ private:
// I/O handlers
void update_display();
- DECLARE_WRITE8_MEMBER(control_w);
- DECLARE_WRITE8_MEMBER(digit_w);
- DECLARE_READ8_MEMBER(input_r);
+ void control_w(u8 data);
+ void digit_w(u8 data);
+ u8 input_r();
u8 m_inp_mux;
u8 m_7seg_data;
@@ -134,7 +134,7 @@ void chmate_state::update_display()
m_display->matrix_partial(0, 4, 1 << m_inp_mux, m_7seg_data);
}
-WRITE8_MEMBER(chmate_state::control_w)
+void chmate_state::control_w(u8 data)
{
// d0-d2: 74145 to input mux/digit select
m_inp_mux = data & 7;
@@ -151,13 +151,13 @@ WRITE8_MEMBER(chmate_state::control_w)
m_maincpu->set_input_line(M6502_IRQ_LINE, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_MEMBER(chmate_state::digit_w)
+void chmate_state::digit_w(u8 data)
{
m_7seg_data = data;
update_display();
}
-READ8_MEMBER(chmate_state::input_r)
+u8 chmate_state::input_r()
{
u8 data = 0;
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index d5a94d0f287..239192f4e47 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -255,7 +255,7 @@ INPUT_PORTS_END
-WRITE8_MEMBER(chqflag_state::volume_callback0)
+void chqflag_state::volume_callback0(uint8_t data)
{
// volume/pan for one of the channels on this chip
// which channel and which bits are left/right is a guess
@@ -269,7 +269,7 @@ WRITE8_MEMBER(chqflag_state::k007232_extvolume_w)
m_k007232[0]->set_volume(1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2);
}
-WRITE8_MEMBER(chqflag_state::volume_callback1)
+void chqflag_state::volume_callback1(uint8_t data)
{
m_k007232[1]->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232[1]->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 4e998a5bc26..f95ab22ae49 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -17,7 +17,7 @@ WRITE_LINE_MEMBER( cidelsa_state::q_w )
/* Sound Interface */
-WRITE8_MEMBER( draco_state::sound_bankswitch_w )
+void draco_state::sound_bankswitch_w(uint8_t data)
{
/*
@@ -35,7 +35,7 @@ WRITE8_MEMBER( draco_state::sound_bankswitch_w )
membank("bank1")->set_entry(bank);
}
-WRITE8_MEMBER( draco_state::sound_g_w )
+void draco_state::sound_g_w(uint8_t data)
{
/*
@@ -64,24 +64,24 @@ WRITE8_MEMBER( draco_state::sound_g_w )
}
}
-READ8_MEMBER( draco_state::sound_in_r )
+uint8_t draco_state::sound_in_r()
{
return ~(m_sound) & 0x07;
}
-READ8_MEMBER( draco_state::psg_r )
+uint8_t draco_state::psg_r()
{
return m_psg_latch;
}
-WRITE8_MEMBER( draco_state::psg_w )
+void draco_state::psg_w(uint8_t data)
{
m_psg_latch = data;
}
/* Read/Write Handlers */
-WRITE8_MEMBER( cidelsa_state::destryer_out1_w )
+void cidelsa_state::destryer_out1_w(uint8_t data)
{
/*
bit description
@@ -99,7 +99,7 @@ WRITE8_MEMBER( cidelsa_state::destryer_out1_w )
/* CDP1852 Interfaces */
-WRITE8_MEMBER( cidelsa_state::altair_out1_w )
+void cidelsa_state::altair_out1_w(uint8_t data)
{
/*
bit description
@@ -119,7 +119,7 @@ WRITE8_MEMBER( cidelsa_state::altair_out1_w )
m_leds[2] = BIT(data, 5); // FIRE
}
-WRITE8_MEMBER( draco_state::out1_w )
+void draco_state::out1_w(uint8_t data)
{
/*
bit description
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index d3f78ab5202..21f2c49bfe2 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -146,7 +146,7 @@ WRITE_LINE_MEMBER(cinemat_state::mux_select_w)
*
*************************************/
-READ8_MEMBER(cinemat_state::joystick_read)
+uint8_t cinemat_state::joystick_read()
{
if (machine().phase() != machine_phase::RUNNING)
return 0;
diff --git a/src/mame/drivers/cit101.cpp b/src/mame/drivers/cit101.cpp
index 5d1049db3c2..0ac8d542236 100644
--- a/src/mame/drivers/cit101.cpp
+++ b/src/mame/drivers/cit101.cpp
@@ -94,10 +94,8 @@ private:
DECLARE_WRITE8_MEMBER(screen_control_w);
DECLARE_WRITE8_MEMBER(brightness_w);
- DECLARE_WRITE8_MEMBER(nvr_address_w);
- DECLARE_READ8_MEMBER(nvr_data_r);
- DECLARE_WRITE8_MEMBER(nvr_data_w);
- DECLARE_WRITE8_MEMBER(nvr_control_w);
+ void nvr_address_w(u8 data);
+ void nvr_control_w(u8 data);
void mem_map(address_map &map);
void io_map(address_map &map);
@@ -276,23 +274,13 @@ WRITE8_MEMBER(cit101_state::brightness_w)
m_brightness = pal5bit(~data & 0x1f);
}
-WRITE8_MEMBER(cit101_state::nvr_address_w)
+void cit101_state::nvr_address_w(u8 data)
{
m_nvr->set_address(data & 0x3f);
m_nvr->set_clk(BIT(data, 6));
}
-READ8_MEMBER(cit101_state::nvr_data_r)
-{
- return m_nvr->data();
-}
-
-WRITE8_MEMBER(cit101_state::nvr_data_w)
-{
- m_nvr->set_data(data);
-}
-
-WRITE8_MEMBER(cit101_state::nvr_control_w)
+void cit101_state::nvr_control_w(u8 data)
{
m_nvr->set_control(BIT(data, 5), !BIT(data, 4), BIT(data, 7), BIT(data, 6));
}
@@ -391,8 +379,8 @@ void cit101_state::cit101(machine_config &config)
i8255_device &ppi(I8255A(config, "ppi", 0));
ppi.out_pa_callback().set(FUNC(cit101_state::nvr_address_w));
- ppi.in_pb_callback().set(FUNC(cit101_state::nvr_data_r));
- ppi.out_pb_callback().set(FUNC(cit101_state::nvr_data_w));
+ ppi.in_pb_callback().set(m_nvr, FUNC(er2055_device::data));
+ ppi.out_pb_callback().set(m_nvr, FUNC(er2055_device::set_data));
ppi.in_pc_callback().set("comm", FUNC(rs232_port_device::cts_r)).lshift(0);
ppi.in_pc_callback().append("comm", FUNC(rs232_port_device::dcd_r)).lshift(1); // tied to DSR for loopback test
ppi.in_pc_callback().append("comm", FUNC(rs232_port_device::ri_r)).lshift(2); // tied to CTS for loopback test
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 7ee439fb337..87b59a9ad6f 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -35,10 +35,10 @@ public:
void clayshoo(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(analog_reset_w);
- DECLARE_READ8_MEMBER(analog_r);
- DECLARE_WRITE8_MEMBER(input_port_select_w);
- DECLARE_READ8_MEMBER(input_port_r);
+ void analog_reset_w(uint8_t data);
+ uint8_t analog_r();
+ void input_port_select_w(uint8_t data);
+ uint8_t input_port_r();
uint32_t screen_update_clayshoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(reset_analog_bit);
uint8_t difficulty_input_port_r(int bit);
@@ -68,7 +68,7 @@ private:
*
*************************************/
-WRITE8_MEMBER(clayshoo_state::input_port_select_w)
+void clayshoo_state::input_port_select_w(uint8_t data)
{
m_input_port_select = data;
}
@@ -92,7 +92,7 @@ uint8_t clayshoo_state::difficulty_input_port_r( int bit )
}
-READ8_MEMBER(clayshoo_state::input_port_r)
+uint8_t clayshoo_state::input_port_r()
{
uint8_t ret = 0;
@@ -132,7 +132,7 @@ static attotime compute_duration( device_t *device, int analog_pos )
}
-WRITE8_MEMBER(clayshoo_state::analog_reset_w)
+void clayshoo_state::analog_reset_w(uint8_t data)
{
/* reset the analog value, and start the two times that will fire
off in a short period proportional to the position of the
@@ -145,7 +145,7 @@ WRITE8_MEMBER(clayshoo_state::analog_reset_w)
}
-READ8_MEMBER(clayshoo_state::analog_r)
+uint8_t clayshoo_state::analog_r()
{
return m_analog_port_val;
}
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 4535395e18f..f1179caf4f3 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -385,12 +385,12 @@ public:
m_lcd_size = data;
}
- WRITE8_MEMBER(via0_pa_w)
+ void via0_pa_w(uint8_t data)
{
m_key_column = data;
}
- WRITE8_MEMBER(via0_pb_w)
+ void via0_pb_w(uint8_t data)
{
write_key_poll((data >> 0) & 1);
m_rtc->cs2_w((data >> 1) & 1);
@@ -439,7 +439,7 @@ public:
}
}
- WRITE8_MEMBER(via1_pa_w)
+ void via1_pa_w(uint8_t data)
{
m_rtc->d0_w(BIT(data, 0));
m_centronics->write_data0(BIT(data, 0));
@@ -465,7 +465,7 @@ public:
m_centronics->write_data7(BIT(data, 7));
}
- WRITE8_MEMBER(via1_pb_w)
+ void via1_pb_w(uint8_t data)
{
//int centronics_unknown = !BIT(data,5);
}
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index bdfdf088c84..2a54d3e6f1b 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -257,9 +257,9 @@ public:
DECLARE_WRITE8_MEMBER( aic_ad565_msb_w );
DECLARE_WRITE8_MEMBER( aic_ad565_lsb_w );
- DECLARE_READ8_MEMBER( q133_1_porta_r );
- DECLARE_WRITE8_MEMBER( q133_1_porta_w );
- DECLARE_WRITE8_MEMBER( q133_1_portb_w );
+ uint8_t q133_1_porta_r();
+ void q133_1_porta_w(uint8_t data);
+ void q133_1_portb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( cmi_iix_vblank );
IRQ_CALLBACK_MEMBER( cpu1_interrupt_callback );
@@ -268,10 +268,10 @@ public:
// Video-related
DECLARE_READ8_MEMBER( video_r );
DECLARE_READ8_MEMBER( lightpen_r );
- DECLARE_READ8_MEMBER( pia_q219_b_r );
+ uint8_t pia_q219_b_r();
DECLARE_WRITE8_MEMBER( video_w );
- DECLARE_WRITE8_MEMBER( vscroll_w );
- DECLARE_WRITE8_MEMBER( video_attr_w );
+ void vscroll_w(uint8_t data);
+ void video_attr_w(uint8_t data);
DECLARE_READ8_MEMBER( vram_r );
DECLARE_WRITE8_MEMBER( vram_w );
DECLARE_READ8_MEMBER( tvt_r );
@@ -311,8 +311,8 @@ public:
// Master card
DECLARE_READ8_MEMBER( cmi02_r );
DECLARE_WRITE8_MEMBER( cmi02_w );
- DECLARE_WRITE8_MEMBER( cmi02_chsel_w );
- DECLARE_WRITE8_MEMBER( master_tune_w );
+ void cmi02_chsel_w(uint8_t data);
+ void master_tune_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( cmi02_ptm_irq );
DECLARE_WRITE_LINE_MEMBER( cmi02_ptm_o2 );
DECLARE_WRITE_LINE_MEMBER( cmi02_pia2_irqa_w );
@@ -594,7 +594,7 @@ READ8_MEMBER( cmi_state::lightpen_r )
return m_lp_x >> 1;
}
-READ8_MEMBER( cmi_state::pia_q219_b_r )
+uint8_t cmi_state::pia_q219_b_r()
{
return ((m_lp_x << 7) & 0x80) | m_q219_b_touch;
}
@@ -606,12 +606,12 @@ WRITE8_MEMBER( cmi_state::video_w )
video_write(offset);
}
-WRITE8_MEMBER( cmi_state::vscroll_w )
+void cmi_state::vscroll_w(uint8_t data)
{
// TODO: Partial updates. Also, this should be done through a PIA
}
-WRITE8_MEMBER( cmi_state::video_attr_w )
+void cmi_state::video_attr_w(uint8_t data)
{
// TODO
}
@@ -1277,12 +1277,12 @@ WRITE_LINE_MEMBER( cmi_state::wd1791_drq )
28 - 2B = PIA
*/
-WRITE8_MEMBER( cmi_state::master_tune_w )
+void cmi_state::master_tune_w(uint8_t data)
{
// double mfreq = (double)data * ((double)MASTER_OSCILLATOR / 2.0) / 256.0;
}
-WRITE8_MEMBER( cmi_state::cmi02_chsel_w )
+void cmi_state::cmi02_chsel_w(uint8_t data)
{
m_cmi02_pia_chsel = data;
}
@@ -1725,7 +1725,7 @@ WRITE_LINE_MEMBER( cmi_state::pia_q219_irqb )
IRQA/B = /RTINT?
*/
-READ8_MEMBER( cmi_state::q133_1_porta_r )
+uint8_t cmi_state::q133_1_porta_r()
{
if (BIT(m_q133_pia[0]->b_output(), 1))
{
@@ -1734,13 +1734,13 @@ READ8_MEMBER( cmi_state::q133_1_porta_r )
return 0xff;
}
-WRITE8_MEMBER( cmi_state::q133_1_porta_w )
+void cmi_state::q133_1_porta_w(uint8_t data)
{
m_msm5832_addr = data & 0xf;
m_msm5832->address_w(data & 0x0f);
}
-WRITE8_MEMBER( cmi_state::q133_1_portb_w )
+void cmi_state::q133_1_portb_w(uint8_t data)
{
m_msm5832->hold_w(BIT(data, 0));
m_msm5832->read_w(BIT(data, 1));
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 6e3d6d5a4b6..6e0fecf13ef 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -682,13 +682,13 @@ GFXDECODE_END
/**********************************************************************************/
-WRITE8_MEMBER(cninja_state::sound_bankswitch_w)
+void cninja_state::sound_bankswitch_w(uint8_t data)
{
/* the second OKIM6295 ROM is bank switched */
m_oki2->set_rom_bank(data & 1);
}
-WRITE8_MEMBER(cninja_state::cninjabl2_oki_bank_w)
+void cninja_state::cninjabl2_oki_bank_w(uint8_t data)
{
m_okibank->set_entry(data & 7);
}
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 3c2339d98b8..0b8c552f7f0 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -1911,7 +1911,7 @@ READ16_MEMBER(cobra_state::sub_ata0_r)
{
mem_mask = ( mem_mask << 8 ) | ( mem_mask >> 8 );
- uint32_t data = m_ata->read_cs0(offset, mem_mask);
+ uint32_t data = m_ata->cs0_r(offset, mem_mask);
data = ( data << 8 ) | ( data >> 8 );
return data;
@@ -1922,14 +1922,14 @@ WRITE16_MEMBER(cobra_state::sub_ata0_w)
mem_mask = ( mem_mask << 8 ) | ( mem_mask >> 8 );
data = ( data << 8 ) | ( data >> 8 );
- m_ata->write_cs0(offset, data, mem_mask);
+ m_ata->cs0_w(offset, data, mem_mask);
}
READ16_MEMBER(cobra_state::sub_ata1_r)
{
mem_mask = ( mem_mask << 8 ) | ( mem_mask >> 8 );
- uint32_t data = m_ata->read_cs1(offset, mem_mask);
+ uint32_t data = m_ata->cs1_r(offset, mem_mask);
return ( data << 8 ) | ( data >> 8 );
}
@@ -1939,7 +1939,7 @@ WRITE16_MEMBER(cobra_state::sub_ata1_w)
mem_mask = ( mem_mask << 8 ) | ( mem_mask >> 8 );
data = ( data << 8 ) | ( data >> 8 );
- m_ata->write_cs1(offset, data, mem_mask);
+ m_ata->cs1_w(offset, data, mem_mask);
}
READ32_MEMBER(cobra_state::sub_comram_r)
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 86ecbabcfd3..82a119c776d 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -329,7 +329,7 @@ WRITE8_MEMBER(combatsc_state::combatsc_voice_reset_w)
m_upd7759->reset_w(data & 1);
}
-WRITE8_MEMBER(combatsc_state::combatsc_portA_w)
+void combatsc_state::combatsc_portA_w(uint8_t data)
{
/* unknown. always write 0 */
}
diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp
index 14c334fee6f..273370c4579 100644
--- a/src/mame/drivers/compgolf.cpp
+++ b/src/mame/drivers/compgolf.cpp
@@ -27,17 +27,17 @@
*
*************************************/
-WRITE8_MEMBER(compgolf_state::compgolf_scrollx_lo_w)
+void compgolf_state::compgolf_scrollx_lo_w(uint8_t data)
{
m_scrollx_lo = data;
}
-WRITE8_MEMBER(compgolf_state::compgolf_scrolly_lo_w)
+void compgolf_state::compgolf_scrolly_lo_w(uint8_t data)
{
m_scrolly_lo = data;
}
-WRITE8_MEMBER(compgolf_state::compgolf_ctrl_w)
+void compgolf_state::compgolf_ctrl_w(uint8_t data)
{
/* bit 4 and 6 are always set */
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 7be709ab659..f5dc5662f4b 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -72,8 +72,8 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_READ8_MEMBER( xi_r );
- DECLARE_WRITE8_MEMBER( xo_w );
+ uint8_t xi_r();
+ void xo_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( xmt_w );
IRQ_CALLBACK_MEMBER( int_ack );
@@ -299,7 +299,7 @@ uint32_t compucolor2_state::screen_update(screen_device &screen, bitmap_rgb32 &b
return 0;
}
-READ8_MEMBER( compucolor2_state::xi_r )
+uint8_t compucolor2_state::xi_r()
{
uint8_t data = 0xff;
@@ -321,7 +321,7 @@ READ8_MEMBER( compucolor2_state::xi_r )
return data;
}
-WRITE8_MEMBER( compucolor2_state::xo_w )
+void compucolor2_state::xo_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index e5a76dd6d9d..688cf20f5a4 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -485,7 +485,7 @@ WRITE_LINE_MEMBER( comx35_state::q_w )
m_exp->q_w(state);
}
-WRITE8_MEMBER( comx35_state::sc_w )
+void comx35_state::sc_w(uint8_t data)
{
switch (data)
{
diff --git a/src/mame/drivers/conic_cchess2.cpp b/src/mame/drivers/conic_cchess2.cpp
index dcb90d16121..2b56ffd24ba 100644
--- a/src/mame/drivers/conic_cchess2.cpp
+++ b/src/mame/drivers/conic_cchess2.cpp
@@ -78,11 +78,11 @@ private:
// I/O handlers
void update_display();
void update_dac();
- DECLARE_WRITE8_MEMBER(pia0_pa_w);
- DECLARE_WRITE8_MEMBER(pia0_pb_w);
- DECLARE_READ8_MEMBER(pia1_pa_r);
- DECLARE_READ8_MEMBER(pia1_pb_r);
- DECLARE_WRITE8_MEMBER(pia1_pb_w);
+ void pia0_pa_w(u8 data);
+ void pia0_pb_w(u8 data);
+ u8 pia1_pa_r();
+ u8 pia1_pb_r();
+ void pia1_pb_w(u8 data);
u8 m_inp_mux = 0;
u8 m_led_data = 0;
@@ -112,7 +112,7 @@ void cchess2_state::update_dac()
m_dac->write(m_dac_on & BIT(m_inp_mux, 1));
}
-WRITE8_MEMBER(cchess2_state::pia0_pa_w)
+void cchess2_state::pia0_pa_w(u8 data)
{
// d0-d7: input mux/led select
// d1: dac data
@@ -121,14 +121,14 @@ WRITE8_MEMBER(cchess2_state::pia0_pa_w)
update_dac();
}
-WRITE8_MEMBER(cchess2_state::pia0_pb_w)
+void cchess2_state::pia0_pb_w(u8 data)
{
// d0-d7: led data
m_led_data = data;
update_display();
}
-READ8_MEMBER(cchess2_state::pia1_pa_r)
+u8 cchess2_state::pia1_pa_r()
{
u8 data = 0;
@@ -140,7 +140,7 @@ READ8_MEMBER(cchess2_state::pia1_pa_r)
return ~data;
}
-READ8_MEMBER(cchess2_state::pia1_pb_r)
+u8 cchess2_state::pia1_pb_r()
{
u8 data = 0;
@@ -152,7 +152,7 @@ READ8_MEMBER(cchess2_state::pia1_pb_r)
return data;
}
-WRITE8_MEMBER(cchess2_state::pia1_pb_w)
+void cchess2_state::pia1_pb_w(u8 data)
{
// d7: dac on
m_dac_on = BIT(data, 7);
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index f27f2e9f957..15b1665a721 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -95,11 +95,11 @@ public:
void update_dacia_irq();
DECLARE_WRITE8_MEMBER(dacia_w);
DECLARE_READ8_MEMBER(dacia_r);
- DECLARE_WRITE8_MEMBER(via1_b_w);
- DECLARE_WRITE8_MEMBER(via1_cb1_w);
- DECLARE_WRITE8_MEMBER(cdrom_data_w);
- DECLARE_WRITE8_MEMBER(cdrom_ctrl_w);
- DECLARE_READ8_MEMBER(cdrom_data_r);
+ void via1_b_w(uint8_t data);
+ void via1_cb1_w(uint8_t data);
+ void cdrom_data_w(uint8_t data);
+ void cdrom_ctrl_w(uint8_t data);
+ uint8_t cdrom_data_r();
void init_cops();
int m_irq;
@@ -202,7 +202,7 @@ uint32_t cops_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap,
*
*************************************/
-WRITE8_MEMBER(cops_state::cdrom_data_w)
+void cops_state::cdrom_data_w(uint8_t data)
{
const char *regs[4] = { "CMD", "PARAM", "WRITE", "CTRL" };
m_cdrom_data = bitswap<8>(data,0,1,2,3,4,5,6,7);
@@ -210,13 +210,13 @@ WRITE8_MEMBER(cops_state::cdrom_data_w)
if (LOG_CDROM) logerror("%s:cdrom_data_w(reg = %s, data = %02x)\n", machine().describe_context(), regs[reg & 0x03], m_cdrom_data);
}
-WRITE8_MEMBER(cops_state::cdrom_ctrl_w)
+void cops_state::cdrom_ctrl_w(uint8_t data)
{
if (LOG_CDROM) logerror("%s:cdrom_ctrl_w(%02x)\n", machine().describe_context(), data);
m_cdrom_ctrl = data;
}
-READ8_MEMBER(cops_state::cdrom_data_r)
+uint8_t cops_state::cdrom_data_r()
{
const char *regs[4] = { "STATUS", "RESULT", "READ", "FIFOST" };
uint8_t reg = ((m_cdrom_ctrl & 4) >> 1) | ((m_cdrom_ctrl & 8) >> 3);
@@ -760,7 +760,7 @@ WRITE_LINE_MEMBER(cops_state::via1_irq)
m_maincpu->set_input_line(M6502_IRQ_LINE, m_irq ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(cops_state::via1_b_w)
+void cops_state::via1_b_w(uint8_t data)
{
m_sn_data = bitswap<8>(data,0,1,2,3,4,5,6,7);
if (m_sn_cb1)
@@ -769,7 +769,7 @@ WRITE8_MEMBER(cops_state::via1_b_w)
}
}
-WRITE8_MEMBER(cops_state::via1_cb1_w)
+void cops_state::via1_cb1_w(uint8_t data)
{
m_sn_cb1 = data;
}
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index 97f50ef2fe7..8aec2a4fe7b 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -13,10 +13,13 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/mcs48/mcs48.h"
#include "machine/i8155.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
+#include "video/pwm.h"
+
#include "speaker.h"
#include "cp1.lh"
@@ -29,9 +32,9 @@ public:
m_i8155(*this, "i8155"),
m_i8155_cp3(*this, "i8155_cp3"),
m_cassette(*this, "cassette"),
+ m_display(*this, "display"),
m_io_lines(*this, "LINE%u", 0U),
- m_io_config(*this, "CONFIG"),
- m_digits(*this, "digit%u", 0U)
+ m_io_config(*this, "CONFIG")
{ }
void cp1(machine_config &config);
@@ -58,9 +61,9 @@ private:
required_device m_i8155;
required_device m_i8155_cp3;
required_device m_cassette;
+ required_device m_display;
required_ioport_array<5> m_io_lines;
required_ioport m_io_config;
- output_finder<6> m_digits;
uint8_t m_7seg;
uint8_t m_port2;
@@ -153,19 +156,8 @@ WRITE8_MEMBER(cp1_state::i8155_write)
WRITE8_MEMBER(cp1_state::i8155_porta_w)
{
- data &= 0x7f; // PA7 is not connected
-
- if (m_7seg)
- {
- if (!(m_matrix & 0x01)) m_digits[5] = data;
- if (!(m_matrix & 0x02)) m_digits[4] = data;
- if (!(m_matrix & 0x04)) m_digits[3] = data;
- if (!(m_matrix & 0x08)) m_digits[2] = data | 0x80; // this digit has always the dot active
- if (!(m_matrix & 0x10)) m_digits[1] = data;
- if (!(m_matrix & 0x20)) m_digits[0] = data;
- }
-
- m_7seg ^= 0x01;
+ m_7seg = data & 0x7f; // PA7 is not connected
+ m_display->matrix(~m_matrix, m_7seg);
}
READ8_MEMBER(cp1_state::i8155_portb_r)
@@ -181,9 +173,9 @@ WRITE8_MEMBER(cp1_state::i8155_portb_w)
WRITE8_MEMBER(cp1_state::i8155_portc_w)
{
- // --xx xxxx keyboard matrix
-
+ // --xx xxxx keyboard matrix, 7seg select
m_matrix = data & 0x3f;
+ m_display->matrix(~m_matrix, m_7seg);
}
@@ -232,7 +224,6 @@ INPUT_PORTS_END
void cp1_state::machine_start()
{
- m_digits.resolve();
}
void cp1_state::machine_reset()
@@ -286,6 +277,8 @@ void cp1_state::cp1(machine_config &config)
I8155(config, "i8155_cp3", 0);
+ PWM_DISPLAY(config, m_display).set_size(6, 7);
+ m_display->set_segmask(0x3f, 0x7f);
config.set_default_layout(layout_cp1);
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 0795c89dcfa..3404ddf2680 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -8910,6 +8910,40 @@ ROM_START( vsavh )
ROM_LOAD( "vsavh.key", 0x000000, 0x000014, CRC(a7dd6409) SHA1(5c60390e540ea538b1cd0b31635a8ffa1844fa24) )
ROM_END
+ROM_START( vsavb )
+ ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
+ ROM_LOAD16_WORD_SWAP( "vm3b.03d", 0x000000, 0x080000, CRC(22ffba4b) SHA1(2c214c43115fc0978d5ebb814a19b8ee23faab3f) )
+ ROM_LOAD16_WORD_SWAP( "vm3b.04d", 0x080000, 0x080000, CRC(88624909) SHA1(052c8f49ac3bc3d231cfea38c5bad89c3380834e) )
+ ROM_LOAD16_WORD_SWAP( "vm3.05a", 0x100000, 0x080000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
+ ROM_LOAD16_WORD_SWAP( "vm3.06a", 0x180000, 0x080000, CRC(2f4fd3a9) SHA1(48549ff0121312ea4a18d0fa167a32f905c14c9f) )
+ ROM_LOAD16_WORD_SWAP( "vm3.07b", 0x200000, 0x080000, CRC(cbda91b8) SHA1(31b20aa92422384b1d7a4706ad4c01ea2bd0e0d1) )
+ ROM_LOAD16_WORD_SWAP( "vm3.08a", 0x280000, 0x080000, CRC(6ca47259) SHA1(485d8f3a132ccb3f7930cae74de8662d2d44e412) )
+ ROM_LOAD16_WORD_SWAP( "vm3.09b", 0x300000, 0x080000, CRC(f4a339e3) SHA1(abd101a55f7d9ddb8aba04fe8d3f0f5d2006c925) )
+ ROM_LOAD16_WORD_SWAP( "vm3.10b", 0x380000, 0x080000, CRC(fffbb5b8) SHA1(38aecb820bd1cbd17287848c3ffb013e1d464ddf) )
+
+ ROM_REGION( 0x2000000, "gfx", 0 )
+ ROM_LOAD64_WORD( "vm3.13m", 0x0000000, 0x400000, CRC(fd8a11eb) SHA1(21b9773959e17976ff46b75a6a405042836b2c5f) )
+ ROM_LOAD64_WORD( "vm3.15m", 0x0000002, 0x400000, CRC(dd1e7d4e) SHA1(30476e061cdebdb1838b83f4ebd5efae12b7dbfb) )
+ ROM_LOAD64_WORD( "vm3.17m", 0x0000004, 0x400000, CRC(6b89445e) SHA1(2abd489839d143c46e25f4fc3db476b70607dc03) )
+ ROM_LOAD64_WORD( "vm3.19m", 0x0000006, 0x400000, CRC(3830fdc7) SHA1(ebd3f559c254d349e256c9feb3477f1ed7518206) )
+ ROM_LOAD64_WORD( "vm3.14m", 0x1000000, 0x400000, CRC(c1a28e6c) SHA1(012803af33174c0602649d2a2d84f6ee79f54ad2) )
+ ROM_LOAD64_WORD( "vm3.16m", 0x1000002, 0x400000, CRC(194a7304) SHA1(a19a9a6fb829953b054dc5c3b0dc017f60d37928) )
+ ROM_LOAD64_WORD( "vm3.18m", 0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
+ ROM_LOAD64_WORD( "vm3.20m", 0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
+
+ ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+ ROM_LOAD( "vm3.01", 0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
+ ROM_CONTINUE( 0x10000, 0x18000 )
+ ROM_LOAD( "vm3.02", 0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
+
+ ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+ ROM_LOAD16_WORD_SWAP( "vm3.11m", 0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
+ ROM_LOAD16_WORD_SWAP( "vm3.12m", 0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
+
+ ROM_REGION( 0x20, "key", 0 )
+ ROM_LOAD( "vsavb.key", 0x000000, 0x000014, CRC(5274e635) SHA1(4a36bc9cc4497bdfaecf7dd638b5deace131c111) )
+ROM_END
+
ROM_START( vsav2 )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_WORD_SWAP( "vs2j.03", 0x000000, 0x80000, CRC(89fd86b4) SHA1(a52f40618d7f12f1df5862ad8e15fea60bef22a2) )
@@ -10242,6 +10276,7 @@ GAME( 1997, vsavu, vsav, cps2, cps2_2p6b, cps2_state, init_cps2, RO
GAME( 1997, vsavj, vsav, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Vampire Savior: The Lord of Vampire (Japan 970519)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, vsava, vsav, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Vampire Savior: The Lord of Vampire (Asia 970519)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, vsavh, vsav, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Vampire Savior: The Lord of Vampire (Hispanic 970519)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavb, vsav, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Vampire Savior: The Lord of Vampire (Brazil 970519)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, mshvsf, 0, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Marvel Super Heroes Vs. Street Fighter (Euro 970625)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, mshvsfu, mshvsf, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970827)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, mshvsfu1, mshvsf, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970625)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index 147f8619994..4a382ffd5c7 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -68,9 +68,9 @@ IRQ_CALLBACK_MEMBER( crimfght_state::audiocpu_irq_ack )
return 0xff;
}
-WRITE8_MEMBER(crimfght_state::ym2151_ct_w)
+void crimfght_state::ym2151_ct_w(uint8_t data)
{
- // ne output from the 007232 is connected to a ls399 which
+ // one output from the 007232 is connected to a ls399 which
// has inputs connected to the ct1 and ct2 outputs from
// the ym2151 used to select the bank
@@ -260,7 +260,7 @@ INPUT_PORTS_END
***************************************************************************/
-WRITE8_MEMBER(crimfght_state::volume_callback)
+void crimfght_state::volume_callback(uint8_t data)
{
m_k007232->set_volume(0, (data & 0x0f) * 0x11, 0);
m_k007232->set_volume(1, 0, (data >> 4) * 0x11);
@@ -272,7 +272,7 @@ void crimfght_state::machine_start()
m_rombank->set_entry(0);
}
-WRITE8_MEMBER( crimfght_state::banking_callback )
+void crimfght_state::banking_callback(uint8_t data)
{
m_rombank->set_entry(data & 0x0f);
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index 52a4809eaa7..593b2fd1a3b 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -63,7 +63,7 @@ public:
DECLARE_READ16_MEMBER(csplayh5_mux_r);
DECLARE_WRITE16_MEMBER(csplayh5_mux_w);
- DECLARE_WRITE16_MEMBER(tmp68301_parallel_port_w);
+ void tmp68301_parallel_port_w(uint16_t data);
#if USE_H8
DECLARE_READ16_MEMBER(test_r);
@@ -342,7 +342,7 @@ WRITE_LINE_MEMBER(csplayh5_state::ide_irq)
}
#endif
-WRITE16_MEMBER(csplayh5_state::tmp68301_parallel_port_w)
+void csplayh5_state::tmp68301_parallel_port_w(uint16_t data)
{
/*
-x-- ---- used during ROM check, h8 reset assert?
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp
index 144e4b9f89f..310ad4d86fa 100644
--- a/src/mame/drivers/ct486.cpp
+++ b/src/mame/drivers/ct486.cpp
@@ -47,10 +47,10 @@ public:
virtual void machine_start() override;
- DECLARE_READ16_MEMBER( cs4031_ior );
- DECLARE_WRITE16_MEMBER( cs4031_iow );
+ uint16_t cs4031_ior(offs_t offset);
+ void cs4031_iow(offs_t offset, uint16_t data);
DECLARE_WRITE_LINE_MEMBER( cs4031_hold );
- DECLARE_WRITE8_MEMBER( cs4031_tc ) { m_isabus->eop_w(offset, data); }
+ void cs4031_tc(offs_t offset, uint8_t data) { m_isabus->eop_w(offset, data); }
DECLARE_WRITE_LINE_MEMBER( cs4031_spkr ) { m_speaker->level_w(state); }
void ct486(machine_config &config);
void ct486_io(address_map &map);
@@ -66,7 +66,7 @@ void ct486_state::machine_start()
{
}
-READ16_MEMBER( ct486_state::cs4031_ior )
+uint16_t ct486_state::cs4031_ior(offs_t offset)
{
if (offset < 4)
return m_isabus->dack_r(offset);
@@ -74,7 +74,7 @@ READ16_MEMBER( ct486_state::cs4031_ior )
return m_isabus->dack16_r(offset);
}
-WRITE16_MEMBER( ct486_state::cs4031_iow )
+void ct486_state::cs4031_iow(offs_t offset, uint16_t data)
{
if (offset < 4)
m_isabus->dack_w(offset, data);
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index a8c5713533a..9f0f723f4b1 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -342,7 +342,7 @@ public:
template DECLARE_READ_LINE_MEMBER(cd32_sel_mirror_input);
DECLARE_WRITE_LINE_MEMBER( akiko_int_w );
- DECLARE_WRITE8_MEMBER( akiko_cia_0_port_a_write );
+ void akiko_cia_0_port_a_write(uint8_t data);
void init_cubo();
void init_mgprem11();
@@ -406,7 +406,7 @@ WRITE_LINE_MEMBER( cubo_state::akiko_int_w )
*************************************/
-WRITE8_MEMBER( cubo_state::akiko_cia_0_port_a_write )
+void cubo_state::akiko_cia_0_port_a_write(uint8_t data)
{
/* bit 0 = cd audio mute */
m_cdda->set_output_gain( 0, ( data & 1 ) ? 0.0 : 1.0 );
diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp
index 7d5dca51587..cb824eb7250 100644
--- a/src/mame/drivers/cvicny.cpp
+++ b/src/mame/drivers/cvicny.cpp
@@ -2,38 +2,36 @@
// copyright-holders:Robbbert
/***************************************************************************
- CVICNY8080 - Practice-z80 - a homebrew from Czechoslavakia.
+CVICNY8080 - Practice-z80 - a homebrew from Czechoslavakia.
- More data at :
- http://www.nostalcomp.cz/cvicny8080.php
+More data at :
+ https://web.archive.org/web/20190202185251/http://www.nostalcomp.cz/cvicny8080.php
- 21/OCT/2011 New working driver. [Robbbert]
+2011-10-21 New working driver. [Robbbert]
- Keys:
- 0-9,A-F : hexadecimal numbers
- ADR : enter an address to work with. After the 4 digits are entered,
- the data at that address shows, and you can modify the data.
- + (inc) : Enter the data into memory, and increment the address by 1.
- GO : execute the program located at the current address.
+Keys:
+ 0-9,A-F : hexadecimal numbers
+ ADR : enter an address to work with. After the 4 digits are entered,
+ the data at that address shows, and you can modify the data.
+ + (inc) : Enter the data into memory, and increment the address by 1.
+ GO : execute the program located at the current address.
- Pasting:
- 0-F : as is
- + (inc) : ^
- ADR : -
- GO : X
+Pasting:
+ 0-F : as is
+ + (inc) : ^
+ ADR : -
+ GO : X
- Test Paste:
- 11^22^33^44^55^66^77^88^99^-0800
- Now press up-arrow to confirm the data has been entered.
+Test Paste:
+ 11^22^33^44^55^66^77^88^99^-0800
+ Now press up-arrow to confirm the data has been entered.
- ToDo:
- - When ADR is pressed, sometimes a segment stays alight. Bug?
- - Blank the display if digits aren't being refreshed
****************************************************************************/
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "video/pwm.h"
#include "cvicny.lh"
class cvicny_state : public driver_device
@@ -41,9 +39,9 @@ class cvicny_state : public driver_device
public:
cvicny_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- , m_digit_last(0)
, m_maincpu(*this, "maincpu")
- , m_digits(*this, "digit%u", 0U)
+ , m_display(*this, "display")
+ , m_io_keyboard(*this, "X%u", 0U)
{ }
void cvicny(machine_config &config);
@@ -53,31 +51,27 @@ public:
DECLARE_WRITE8_MEMBER(segment_w );
private:
uint8_t m_digit;
- uint8_t m_digit_last;
- virtual void machine_start() override { m_digits.resolve(); }
+ uint8_t m_seg;
required_device m_maincpu;
- output_finder<8> m_digits;
+ required_device m_display;
+ required_ioport_array<8> m_io_keyboard;
};
WRITE8_MEMBER( cvicny_state::segment_w ) // output segments on the selected digit
{
- if (m_digit != m_digit_last)
- m_digits[m_digit] = data;
-
- m_digit_last = m_digit;
+ m_seg = data;
+ m_display->matrix(1<matrix(1<read();
+ u8 data = m_io_keyboard[m_digit]->read();
return ((data << 4) ^ 0xf0) | data;
}
@@ -143,11 +137,13 @@ void cvicny_state::cvicny(machine_config &config)
/* video hardware */
config.set_default_layout(layout_cvicny);
+ PWM_DISPLAY(config, m_display).set_size(8, 8);
+ m_display->set_segmask(0xff, 0xff);
}
/* ROM definition */
ROM_START( cvicny )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x0800, "maincpu", 0 )
ROM_LOAD("cvicny8080.bin", 0x0000, 0x05ea, CRC(e6119052) SHA1(d03c2cbfd047f0d090a787fbbde6353593cc2dd8) )
ROM_END
diff --git a/src/mame/drivers/cxg_dominator.cpp b/src/mame/drivers/cxg_dominator.cpp
index ff1e72eb1f3..eafc0d5ab7f 100644
--- a/src/mame/drivers/cxg_dominator.cpp
+++ b/src/mame/drivers/cxg_dominator.cpp
@@ -71,10 +71,10 @@ private:
void main_map(address_map &map);
// I/O handlers
- DECLARE_WRITE64_MEMBER(lcd_s_w);
- DECLARE_WRITE8_MEMBER(control_w);
- DECLARE_WRITE8_MEMBER(leds_w);
- DECLARE_READ8_MEMBER(input_r);
+ void lcd_s_w(offs_t offset, u64 data);
+ void control_w(u8 data);
+ void leds_w(offs_t offset, u8 data);
+ u8 input_r(offs_t offset);
};
void dominator_state::machine_start()
@@ -91,7 +91,7 @@ void dominator_state::machine_start()
// LC7582 LCD
-WRITE64_MEMBER(dominator_state::lcd_s_w)
+void dominator_state::lcd_s_w(offs_t offset, u64 data)
{
u8 d[4];
@@ -115,7 +115,7 @@ WRITE64_MEMBER(dominator_state::lcd_s_w)
// TTL
-WRITE8_MEMBER(dominator_state::control_w)
+void dominator_state::control_w(u8 data)
{
// d0: LC7582 DATA
// d1: LC7582 CLK
@@ -128,13 +128,13 @@ WRITE8_MEMBER(dominator_state::control_w)
m_dac->write(BIT(data, 3));
}
-WRITE8_MEMBER(dominator_state::leds_w)
+void dominator_state::leds_w(offs_t offset, u8 data)
{
// led data
m_display->matrix(1 << offset, data);
}
-READ8_MEMBER(dominator_state::input_r)
+u8 dominator_state::input_r(offs_t offset)
{
u8 data = 0;
diff --git a/src/mame/drivers/cxg_sphinx40.cpp b/src/mame/drivers/cxg_sphinx40.cpp
index 0c689f19412..b421d629582 100644
--- a/src/mame/drivers/cxg_sphinx40.cpp
+++ b/src/mame/drivers/cxg_sphinx40.cpp
@@ -96,16 +96,16 @@ private:
void nvram_map(address_map &map);
// I/O handlers
- DECLARE_WRITE64_MEMBER(lcd_seg_w);
+ void lcd_seg_w(u64 data);
void update_display();
- DECLARE_WRITE8_MEMBER(cb_mux_w);
- DECLARE_WRITE8_MEMBER(cb_leds_w);
- DECLARE_READ8_MEMBER(cb_r);
+ void cb_mux_w(u8 data);
+ void cb_leds_w(u8 data);
+ u8 cb_r();
- DECLARE_READ8_MEMBER(input_r);
- DECLARE_WRITE8_MEMBER(input_w);
- DECLARE_WRITE8_MEMBER(lcd_w);
+ u8 input_r();
+ void input_w(u8 data);
+ void lcd_w(u8 data);
u8 m_cb_mux = 0;
u8 m_led_data = 0;
@@ -131,7 +131,7 @@ void sphinx40_state::machine_start()
// HD61603 LCD
-WRITE64_MEMBER(sphinx40_state::lcd_seg_w)
+void sphinx40_state::lcd_seg_w(u64 data)
{
// output individual segments
for (int i = 0; i < 64; i++)
@@ -153,14 +153,14 @@ void sphinx40_state::update_display()
m_display->matrix(m_cb_mux, m_led_data);
}
-WRITE8_MEMBER(sphinx40_state::cb_mux_w)
+void sphinx40_state::cb_mux_w(u8 data)
{
// PA0-PA7: chessboard input/led mux
m_cb_mux = ~data;
update_display();
}
-WRITE8_MEMBER(sphinx40_state::cb_leds_w)
+void sphinx40_state::cb_leds_w(u8 data)
{
// PB0-PB7: chessboard leds
m_led_data = ~data;
@@ -170,7 +170,7 @@ WRITE8_MEMBER(sphinx40_state::cb_leds_w)
// TTL
-READ8_MEMBER(sphinx40_state::cb_r)
+u8 sphinx40_state::cb_r()
{
u8 data = 0;
@@ -182,13 +182,13 @@ READ8_MEMBER(sphinx40_state::cb_r)
return data;
}
-WRITE8_MEMBER(sphinx40_state::input_w)
+void sphinx40_state::input_w(u8 data)
{
// d0-d3: input mux (buttons)
m_inp_mux = ~data & 0xf;
}
-READ8_MEMBER(sphinx40_state::input_r)
+u8 sphinx40_state::input_r()
{
u8 data = 0;
@@ -200,7 +200,7 @@ READ8_MEMBER(sphinx40_state::input_r)
return ~data & 0x1f;
}
-WRITE8_MEMBER(sphinx40_state::lcd_w)
+void sphinx40_state::lcd_w(u8 data)
{
// d0-d3: HD61603 data
m_lcd->data_w(data & 0xf);
diff --git a/src/mame/drivers/cz101.cpp b/src/mame/drivers/cz101.cpp
index f21ba712804..c34c37936cf 100644
--- a/src/mame/drivers/cz101.cpp
+++ b/src/mame/drivers/cz101.cpp
@@ -57,9 +57,8 @@ private:
void maincpu_map(address_map &map);
- DECLARE_WRITE8_MEMBER(port_b_w);
- DECLARE_READ8_MEMBER(port_c_r);
- DECLARE_WRITE8_MEMBER(port_c_w);
+ void port_b_w(uint8_t data);
+ void port_c_w(uint8_t data);
DECLARE_WRITE8_MEMBER(led_1_w);
DECLARE_WRITE8_MEMBER(led_2_w);
@@ -322,7 +321,7 @@ READ8_MEMBER( cz101_state::keys_r )
// ---4---- music lsi irq input
// ----3210 key select output
-WRITE8_MEMBER( cz101_state::port_b_w )
+void cz101_state::port_b_w(uint8_t data)
{
LOG("port_b_w: %02x\n", data);
@@ -338,7 +337,7 @@ WRITE8_MEMBER( cz101_state::port_b_w )
// ------1- midi input
// -------0 midi output
-WRITE8_MEMBER( cz101_state::port_c_w )
+void cz101_state::port_c_w(uint8_t data)
{
LOG("port_c_w: %02x\n", data);
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 5b53a00c76b..c7327511c1b 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -504,7 +504,7 @@ GFXDECODE_END
/**********************************************************************************/
-WRITE8_MEMBER(dassault_state::sound_bankswitch_w)
+void dassault_state::sound_bankswitch_w(uint8_t data)
{
/* the second OKIM6295 ROM is bank switched */
m_oki2->set_rom_bank(data & 1);
diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp
index a49a560fe80..4e86ef3bf2e 100644
--- a/src/mame/drivers/datum.cpp
+++ b/src/mame/drivers/datum.cpp
@@ -55,6 +55,7 @@ Z1000G
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "bus/rs232/rs232.h"
+#include "video/pwm.h"
#include "datum.lh"
@@ -66,9 +67,9 @@ public:
, m_pia1(*this, "pia1")
, m_pia2(*this, "pia2")
, m_acia(*this, "acia")
- , m_keyboard(*this, "X%u", 0)
, m_maincpu(*this, "maincpu")
- , m_digits(*this, "digit%u", 0U)
+ , m_display(*this, "display")
+ , m_io_keyboard(*this, "X%u", 0U)
{ }
void datum(machine_config &config);
@@ -81,14 +82,14 @@ private:
DECLARE_WRITE8_MEMBER(pb_w);
void datum_mem(address_map &map);
uint8_t m_keydata;
+ uint8_t m_seg;
virtual void machine_reset() override;
- virtual void machine_start() override { m_digits.resolve(); }
required_device m_pia1;
required_device m_pia2;
required_device m_acia;
- required_ioport_array<4> m_keyboard;
required_device m_maincpu;
- output_finder<16> m_digits;
+ required_device m_display;
+ required_ioport_array<4> m_io_keyboard;
};
@@ -156,13 +157,14 @@ INPUT_CHANGED_MEMBER( datum_state::trigger_nmi )
void datum_state::machine_reset()
{
m_keydata = 0;
+ m_seg = 0;
}
// read keyboard
READ8_MEMBER( datum_state::pa_r )
{
if (m_keydata < 4)
- return m_keyboard[m_keydata]->read();
+ return m_io_keyboard[m_keydata]->read();
return 0xff;
}
@@ -170,21 +172,15 @@ READ8_MEMBER( datum_state::pa_r )
// write display segments
WRITE8_MEMBER( datum_state::pa_w )
{
- data ^= 0xff;
- if (m_keydata > 3)
- {
- m_digits[m_keydata] = bitswap<8>(data & 0x7f, 7, 0, 5, 6, 4, 2, 1, 3);
- m_keydata = 0;
- }
-
- return;
+ m_seg = bitswap<8>(~data, 7, 0, 5, 6, 4, 2, 1, 3);
+ m_display->matrix(1<(data, 7, 6, 5, 4, 0, 1, 2, 3) & 15;
- return;
+ m_display->matrix(1<set_segmask(0x3f0, 0x7f);
/* Devices */
PIA6821(config, m_pia1, 0); // keyboard & display
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 55eab934533..ede808fea5e 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -83,7 +83,7 @@ private:
// screen updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(bank_w);
+ void bank_w(uint8_t data);
DECLARE_READ8_MEMBER(irq_source_r);
DECLARE_WRITE8_MEMBER(irq_source_w);
DECLARE_READ8_MEMBER(palette_r);
@@ -92,11 +92,11 @@ private:
DECLARE_WRITE8_MEMBER(vram_w);
DECLARE_READ8_MEMBER(vram_bank_r);
DECLARE_WRITE8_MEMBER(vram_bank_w);
- DECLARE_WRITE8_MEMBER(mux_w);
+ void mux_w(uint8_t data);
DECLARE_READ8_MEMBER(in_mux_r);
DECLARE_READ8_MEMBER(in_mux_type_r);
DECLARE_WRITE8_MEMBER(output_w);
- DECLARE_WRITE8_MEMBER(lamps_w);
+ void lamps_w(uint8_t data);
DECLARE_WRITE8_MEMBER(watchdog_w);
TIMER_DEVICE_CALLBACK_MEMBER(dblcrown_irq_scanline);
@@ -169,7 +169,7 @@ uint32_t dblcrown_state::screen_update( screen_device &screen, bitmap_ind16 &bit
return 0;
}
-WRITE8_MEMBER( dblcrown_state::bank_w)
+void dblcrown_state::bank_w(uint8_t data)
{
m_bank = data;
membank("rom_bank")->set_entry(m_bank & 0x1f);
@@ -251,7 +251,7 @@ WRITE8_MEMBER( dblcrown_state::vram_bank_w)
printf("vram bank = %02x\n",data);
}
-WRITE8_MEMBER( dblcrown_state::mux_w)
+void dblcrown_state::mux_w(uint8_t data)
{
m_mux_data = data;
}
@@ -305,7 +305,7 @@ WRITE8_MEMBER( dblcrown_state::output_w )
}
-WRITE8_MEMBER( dblcrown_state::lamps_w )
+void dblcrown_state::lamps_w(uint8_t data)
{
/* bits
7654 3210
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index fcfb9f20ae5..2f14b88c7bd 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -287,8 +287,8 @@ private:
DECLARE_WRITE8_MEMBER(ddenlovr_transparency_mask2_w);
DECLARE_READ8_MEMBER(unk_r);
DECLARE_READ16_MEMBER(unk16_r);
- DECLARE_WRITE8_MEMBER(ddenlovr_select2_w);
- DECLARE_READ8_MEMBER(rongrong_input2_r);
+ void ddenlovr_select2_w(uint8_t data);
+ uint8_t rongrong_input2_r();
DECLARE_READ16_MEMBER(quiz365_input2_r);
DECLARE_WRITE8_MEMBER(quiz365_coincounter_w);
DECLARE_READ16_MEMBER(quiz365_protection_r);
@@ -303,10 +303,10 @@ private:
DECLARE_WRITE8_MEMBER(nettoqc_coincounter_w);
DECLARE_READ16_MEMBER(ultrchmp_protection2_r);
DECLARE_WRITE16_MEMBER(ultrchmp_protection2_w);
- DECLARE_READ8_MEMBER(rongrong_input_r);
- DECLARE_WRITE8_MEMBER(rongrong_select_w);
+ uint8_t rongrong_input_r();
+ void rongrong_select_w(uint8_t data);
DECLARE_READ8_MEMBER(magic_r);
- DECLARE_WRITE8_MEMBER(mmpanic_rombank_w);
+ void mmpanic_rombank_w(uint8_t data);
DECLARE_WRITE8_MEMBER(mmpanic_blitter2_w);
DECLARE_WRITE_LINE_MEMBER(mmpanic_blitter_irq);
DECLARE_WRITE8_MEMBER(mmpanic_leds_w);
@@ -316,16 +316,16 @@ private:
DECLARE_READ8_MEMBER(funkyfig_busy_r);
DECLARE_WRITE8_MEMBER(funkyfig_blitter_w);
DECLARE_WRITE_LINE_MEMBER(funkyfig_blitter_irq);
- DECLARE_WRITE8_MEMBER(funkyfig_rombank_w);
- DECLARE_READ8_MEMBER(funkyfig_dsw_r);
+ void funkyfig_rombank_w(uint8_t data);
+ uint8_t funkyfig_dsw_r();
DECLARE_READ8_MEMBER(funkyfig_coin_r);
DECLARE_READ8_MEMBER(funkyfig_key_r);
DECLARE_WRITE8_MEMBER(funkyfig_lockout_w);
- DECLARE_WRITE8_MEMBER(hanakanz_rombank_w);
- DECLARE_WRITE8_MEMBER(hanakanz_keyb_w);
+ void hanakanz_rombank_w(uint8_t data);
+ void hanakanz_keyb_w(uint8_t data);
DECLARE_WRITE8_MEMBER(hanakanz_dsw_w);
DECLARE_READ8_MEMBER(hanakanz_keyb_r);
- DECLARE_READ8_MEMBER(hanakanz_dsw_r);
+ uint8_t hanakanz_dsw_r();
DECLARE_READ8_MEMBER(hanakanz_busy_r);
DECLARE_READ8_MEMBER(hanakanz_gfxrom_r);
DECLARE_WRITE8_MEMBER(hanakanz_coincounter_w);
@@ -341,13 +341,13 @@ private:
DECLARE_READ8_MEMBER(mjchuuka_gfxrom_1_r);
DECLARE_WRITE8_MEMBER(mjchuuka_palette_w);
DECLARE_WRITE8_MEMBER(mjchuuka_coincounter_w);
- DECLARE_WRITE8_MEMBER(mjmyster_rambank_w);
+ void mjmyster_rambank_w(uint8_t data);
DECLARE_WRITE8_MEMBER(mjmyster_select2_w);
DECLARE_READ8_MEMBER(mjmyster_coins_r);
DECLARE_READ8_MEMBER(mjmyster_keyb_r);
DECLARE_READ8_MEMBER(mjmyster_dsw_r);
DECLARE_WRITE8_MEMBER(mjmyster_coincounter_w);
- DECLARE_WRITE8_MEMBER(hginga_rombank_w);
+ void hginga_rombank_w(uint8_t data);
DECLARE_READ8_MEMBER(hginga_protection_r);
DECLARE_WRITE8_MEMBER(hginga_input_w);
DECLARE_READ8_MEMBER(hginga_coins_r);
@@ -360,9 +360,9 @@ private:
DECLARE_WRITE8_MEMBER(hgokou_input_w);
DECLARE_READ8_MEMBER(hgokou_protection_r);
DECLARE_READ8_MEMBER(hgokbang_input_r);
- DECLARE_WRITE8_MEMBER(hparadis_select_w);
+ void hparadis_select_w(uint8_t data);
DECLARE_READ8_MEMBER(hparadis_input_r);
- DECLARE_READ8_MEMBER(hparadis_dsw_r);
+ uint8_t hparadis_dsw_r();
DECLARE_WRITE8_MEMBER(hparadis_coin_w);
DECLARE_READ8_MEMBER(mjmywrld_coins_r);
DECLARE_READ16_MEMBER(akamaru_protection1_r);
@@ -373,7 +373,7 @@ private:
DECLARE_READ16_MEMBER(akamaru_dsw_r);
DECLARE_READ16_MEMBER(akamaru_blitter_r);
DECLARE_READ16_MEMBER(akamaru_e0010d_r);
- DECLARE_WRITE8_MEMBER(mjflove_rombank_w);
+ void mjflove_rombank_w(uint8_t data);
DECLARE_READ8_MEMBER(mjflove_protection_r);
DECLARE_READ8_MEMBER(mjflove_keyb_r);
DECLARE_WRITE_LINE_MEMBER(mjflove_blitter_irq);
@@ -384,8 +384,8 @@ private:
DECLARE_WRITE8_MEMBER(mjgnight_protection_w);
DECLARE_WRITE8_MEMBER(mjgnight_coincounter_w);
DECLARE_READ8_MEMBER(sryudens_keyb_r);
- DECLARE_WRITE8_MEMBER(sryudens_coincounter_w);
- DECLARE_WRITE8_MEMBER(sryudens_rambank_w);
+ void sryudens_coincounter_w(uint8_t data);
+ void sryudens_rambank_w(uint8_t data);
DECLARE_READ8_MEMBER(daimyojn_keyb1_r);
DECLARE_READ8_MEMBER(daimyojn_keyb2_r);
DECLARE_WRITE8_MEMBER(daimyojn_protection_w);
@@ -405,21 +405,21 @@ private:
DECLARE_WRITE8_MEMBER(htengoku_rombank_w);
DECLARE_WRITE8_MEMBER(htengoku_blit_romregion_w);
DECLARE_VIDEO_START(htengoku);
- DECLARE_WRITE8_MEMBER(htengoku_dsw_w);
- DECLARE_READ8_MEMBER(htengoku_dsw_r);
+ void htengoku_dsw_w(uint8_t data);
+ uint8_t htengoku_dsw_r();
DECLARE_WRITE8_MEMBER(quizchq_oki_bank_w);
DECLARE_WRITE8_MEMBER(ddenlovr_oki_bank_w);
DECLARE_WRITE_LINE_MEMBER(quiz365_oki_bank1_w);
DECLARE_WRITE_LINE_MEMBER(quiz365_oki_bank2_w);
- DECLARE_WRITE8_MEMBER(ddenlovr_select_w);
- DECLARE_READ8_MEMBER(quiz365_input_r);
+ void ddenlovr_select_w(uint8_t data);
+ uint8_t quiz365_input_r();
DECLARE_WRITE8_MEMBER(nettoqc_oki_bank_w);
DECLARE_WRITE8_MEMBER(hanakanz_oki_bank_w);
- DECLARE_WRITE8_MEMBER(mjchuuka_oki_bank_w);
- DECLARE_READ8_MEMBER(hginga_dsw_r);
+ void mjchuuka_oki_bank_w(uint8_t data);
+ uint8_t hginga_dsw_r();
DECLARE_WRITE8_MEMBER(mjflove_okibank_w);
DECLARE_WRITE8_MEMBER(jongtei_okibank_w);
- DECLARE_READ8_MEMBER(seljan2_dsw_r);
+ uint8_t seljan2_dsw_r();
DECLARE_WRITE8_MEMBER(daimyojn_okibank_w);
void ddenlovr_flipscreen_w( uint8_t data );
@@ -1868,17 +1868,17 @@ READ16_MEMBER(ddenlovr_state::unk16_r)
}
-WRITE8_MEMBER(ddenlovr_state::ddenlovr_select_w )
+void ddenlovr_state::ddenlovr_select_w(uint8_t data)
{
m_dsw_sel = data;
}
-WRITE8_MEMBER(ddenlovr_state::ddenlovr_select2_w)
+void ddenlovr_state::ddenlovr_select2_w(uint8_t data)
{
m_input_sel = data;
}
-READ8_MEMBER(ddenlovr_state::rongrong_input2_r)
+uint8_t ddenlovr_state::rongrong_input2_r()
{
// logerror("%04x: input2_r offset %d select %x\n", m_maincpu->pc(), offset, m_input_sel);
/* 0 and 1 are read from offset 1, 2 from offset 0... */
@@ -1892,7 +1892,7 @@ READ8_MEMBER(ddenlovr_state::rongrong_input2_r)
}
-READ8_MEMBER(ddenlovr_state::quiz365_input_r )
+uint8_t ddenlovr_state::quiz365_input_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -2263,7 +2263,7 @@ void ddenlovr_state::ultrchmp_map(address_map &map)
Rong Rong
***************************************************************************/
-READ8_MEMBER(ddenlovr_state::rongrong_input_r)
+uint8_t ddenlovr_state::rongrong_input_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -2273,7 +2273,7 @@ READ8_MEMBER(ddenlovr_state::rongrong_input_r)
return 0xff;
}
-WRITE8_MEMBER(ddenlovr_state::rongrong_select_w)
+void ddenlovr_state::rongrong_select_w(uint8_t data)
{
//logerror("%04x: rongrong_select_w %02x\n",m_maincpu->pc(),data);
@@ -2387,7 +2387,7 @@ READ8_MEMBER(ddenlovr_state::magic_r)
return 0x01;
}
-WRITE8_MEMBER(ddenlovr_state::mmpanic_rombank_w)
+void ddenlovr_state::mmpanic_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x7);
/* Bit 4? */
@@ -2550,7 +2550,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::funkyfig_blitter_irq)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe0); // Z80
}
-WRITE8_MEMBER(ddenlovr_state::funkyfig_rombank_w)
+void ddenlovr_state::funkyfig_rombank_w(uint8_t data)
{
m_dsw_sel = data;
@@ -2559,7 +2559,7 @@ WRITE8_MEMBER(ddenlovr_state::funkyfig_rombank_w)
membank("bank2")->set_entry(((data & 0xe0) >> 5));
}
-READ8_MEMBER(ddenlovr_state::funkyfig_dsw_r)
+uint8_t ddenlovr_state::funkyfig_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -2658,7 +2658,7 @@ void ddenlovr_state::funkyfig_sound_portmap(address_map &map)
***************************************************************************/
-WRITE8_MEMBER(ddenlovr_state::hanakanz_rombank_w)
+void ddenlovr_state::hanakanz_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x0f);
membank("bank2")->set_entry(((data & 0xf0) >> 4));
@@ -2673,7 +2673,7 @@ void ddenlovr_state::hanakanz_map(address_map &map)
}
-WRITE8_MEMBER(ddenlovr_state::hanakanz_keyb_w)
+void ddenlovr_state::hanakanz_keyb_w(uint8_t data)
{
m_keyb = data;
}
@@ -2697,7 +2697,7 @@ READ8_MEMBER(ddenlovr_state::hanakanz_keyb_r)
return val;
}
-READ8_MEMBER(ddenlovr_state::hanakanz_dsw_r)
+uint8_t ddenlovr_state::hanakanz_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -3007,7 +3007,7 @@ WRITE8_MEMBER(ddenlovr_state::mjchuuka_coincounter_w)
#endif
}
-WRITE8_MEMBER(ddenlovr_state::mjchuuka_oki_bank_w )
+void ddenlovr_state::mjchuuka_oki_bank_w(uint8_t data)
{
// data & 0x08 ?
m_oki->set_rom_bank(data & 1);
@@ -3113,7 +3113,7 @@ void ddenlovr_state::mjmyster_map(address_map &map)
map(0xf200, 0xffff).nopw(); // ""
}
-WRITE8_MEMBER(ddenlovr_state::mjmyster_rambank_w)
+void ddenlovr_state::mjmyster_rambank_w(uint8_t data)
{
membank("bank2")->set_entry(data & 0x07);
//logerror("%04x: rambank = %02x\n", m_maincpu->pc(), data);
@@ -3218,7 +3218,7 @@ void ddenlovr_state::mjmyster_portmap(address_map &map)
Hanafuda Hana Ginga
***************************************************************************/
-WRITE8_MEMBER(ddenlovr_state::hginga_rombank_w)
+void ddenlovr_state::hginga_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x7);
m_hginga_rombank = data;
@@ -3245,7 +3245,7 @@ void ddenlovr_state::hginga_map(address_map &map)
map(0xf700, 0xf706).nopw();
}
-READ8_MEMBER(ddenlovr_state::hginga_dsw_r )
+uint8_t ddenlovr_state::hginga_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW4")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW3")->read();
@@ -3552,7 +3552,7 @@ void ddenlovr_state::hgokbang_portmap(address_map &map)
Super Hana Paradise
***************************************************************************/
-WRITE8_MEMBER(ddenlovr_state::hparadis_select_w)
+void ddenlovr_state::hparadis_select_w(uint8_t data)
{
m_dsw_sel = data;
m_keyb = 0;
@@ -3580,7 +3580,7 @@ READ8_MEMBER(ddenlovr_state::hparadis_input_r)
return 0xff;
}
-READ8_MEMBER(ddenlovr_state::hparadis_dsw_r)
+uint8_t ddenlovr_state::hparadis_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -3782,7 +3782,7 @@ void ddenlovr_state::akamaru_map(address_map &map)
Mahjong Fantasic Love
***************************************************************************/
-WRITE8_MEMBER(ddenlovr_state::mjflove_rombank_w)
+void ddenlovr_state::mjflove_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0xf);
// bit 4 enables palette ram
@@ -3988,7 +3988,7 @@ READ8_MEMBER(ddenlovr_state::sryudens_keyb_r)
return val;
}
-WRITE8_MEMBER(ddenlovr_state::sryudens_coincounter_w)
+void ddenlovr_state::sryudens_coincounter_w(uint8_t data)
{
// bit 0 = coin counter
// bit 1 = out counter
@@ -4008,7 +4008,7 @@ WRITE8_MEMBER(ddenlovr_state::sryudens_coincounter_w)
#endif
}
-WRITE8_MEMBER(ddenlovr_state::sryudens_rambank_w)
+void ddenlovr_state::sryudens_rambank_w(uint8_t data)
{
membank("bank2")->set_entry(data & 0x0f);
//logerror("%04x: rambank = %02x\n", m_maincpu->pc(), data);
@@ -4135,7 +4135,7 @@ WRITE8_MEMBER(ddenlovr_state::seljan2_palette_w)
logerror("%s: warning, palette_w with palette disabled, %04x <- %02x\n", machine().describe_context(), offset, data);
}
-READ8_MEMBER(ddenlovr_state::seljan2_dsw_r )
+uint8_t ddenlovr_state::seljan2_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
@@ -4222,12 +4222,12 @@ WRITE8_MEMBER(ddenlovr_state::htengoku_select_w)
m_keyb = 0;
}
-WRITE8_MEMBER(ddenlovr_state::htengoku_dsw_w)
+void ddenlovr_state::htengoku_dsw_w(uint8_t data)
{
m_dsw_sel = data;
}
-READ8_MEMBER(ddenlovr_state::htengoku_dsw_r)
+uint8_t ddenlovr_state::htengoku_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW0")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW1")->read();
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 0d2a055b07e..20270a163fd 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -68,7 +68,7 @@ WRITE8_MEMBER(ddribble_state::ddribble_coin_counter_w)
machine().bookkeeping().coin_counter_w(1,(data >> 1) & 0x01);
}
-READ8_MEMBER(ddribble_state::ddribble_vlm5030_busy_r)
+uint8_t ddribble_state::ddribble_vlm5030_busy_r()
{
return machine().rand(); /* patch */
/* FIXME: remove ? */
@@ -78,7 +78,7 @@ READ8_MEMBER(ddribble_state::ddribble_vlm5030_busy_r)
#endif
}
-WRITE8_MEMBER(ddribble_state::ddribble_vlm5030_ctrl_w)
+void ddribble_state::ddribble_vlm5030_ctrl_w(uint8_t data)
{
/* b7 : vlm data bus OE */
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index e053f627c3c..73819a4cbe4 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -168,80 +168,6 @@ WRITE8_MEMBER(dec8_state::dec8_i8751_w)
}
}
-/********************************
-*
-* MCU simulations
-*
-********************************/
-
-WRITE8_MEMBER(dec8_state::csilver_i8751_w)
-{
- /* Japan coinage first, then World coinage - US coinage shall be the same as the Japan one */
- int lneed1[2][4] = {{1, 1, 1, 2}, {1, 1, 1, 1}}; /* slot 1 : coins needed */
- int lcred1[2][4] = {{1, 2, 3, 1}, {2, 3, 4, 6}}; /* slot 1 : credits awarded */
- int lneed2[2][4] = {{1, 1, 1, 2}, {1, 2, 3, 4}}; /* slot 2 : coins needed */
- int lcred2[2][4] = {{1, 2, 3, 1}, {1, 1, 1, 1}}; /* slot 2 : credits awarded */
-
- m_i8751_return = 0;
-
- switch (offset)
- {
- case 0: /* High byte */
- m_i8751_value = (m_i8751_value & 0xff) | (data << 8);
- m_maincpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE); /* Signal main cpu */
- break;
- case 1: /* Low byte */
- m_i8751_value = (m_i8751_value & 0xff00) | data;
- break;
- }
-
- /* Coins are controlled by the i8751 */
- if ((ioport("IN2")->read() & 3) == 3) m_latch = 1;
- if ((ioport("IN2")->read() & 1) != 1 && m_latch)
- {
- m_coin1++;
- m_latch = 0;
- m_snd = 0x1200;
- m_i8751_return = 0x1200;
- if (m_coin1>=m_need1)
- {
- m_coin1-=m_need1;
- m_credits+=m_cred1;
- }
- }
- if ((ioport("IN2")->read() & 2) != 2 && m_latch)
- {
- m_coin2++;
- m_latch = 0;
- m_snd = 0x1200;
- m_i8751_return = 0x1200;
- if (m_coin2>=m_need2)
- {
- m_coin2-=m_need2;
- m_credits+=m_cred2;
- }
- }
- if (m_credits>99) m_credits=99; /* not handled by main CPU */
-
- if (m_i8751_value == 0x054a) { m_i8751_return = 0xb5; m_coinage_id = 0; } /* Japanese version ID */
- if (m_i8751_value == 0x054c) { m_i8751_return = 0xb3; m_coinage_id = 1; } /* World version ID */
-
- if (offset == 0)
- {
- if ((m_i8751_value >> 8) == 0x01) /* Coinage settings */
- {
- m_i8751_return = m_i8751_value;
- m_need1 = lneed1[m_coinage_id][(m_i8751_value & 0x03) >> 0];
- m_need2 = lneed2[m_coinage_id][(m_i8751_value & 0x0c) >> 2];
- m_cred1 = lcred1[m_coinage_id][(m_i8751_value & 0x03) >> 0];
- m_cred2 = lcred2[m_coinage_id][(m_i8751_value & 0x0c) >> 2];
- }
- if ((m_i8751_value >> 8) == 0x02) { m_i8751_return = m_snd | m_credits; m_snd = 0; } /* Credits request */
- if ((m_i8751_value >> 8) == 0x03 && m_credits) { m_i8751_return = 0; m_credits--; } /* Credits clear */
- }
-}
-
-
/******************************************************************************/
WRITE8_MEMBER(dec8_state::dec8_bank_w)
@@ -545,7 +471,7 @@ void dec8_state::csilver_map(address_map &map)
map(0x1808, 0x180b).w(FUNC(dec8_state::dec8_scroll2_w));
map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w));
map(0x180d, 0x180d).w(FUNC(dec8_state::csilver_control_w));
- map(0x180e, 0x180f).w(FUNC(dec8_state::csilver_i8751_w));
+ map(0x180e, 0x180f).w(FUNC(dec8_state::dec8_i8751_w));
map(0x1c00, 0x1c00).r(FUNC(dec8_state::i8751_h_r));
map(0x1e00, 0x1e00).r(FUNC(dec8_state::i8751_l_r));
map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w));
@@ -725,27 +651,27 @@ void dec8_state::csilver_s_map(address_map &map)
*/
-READ8_MEMBER(dec8_state::i8751_port0_r)
+uint8_t dec8_state::i8751_port0_r()
{
return m_i8751_port0;
}
-WRITE8_MEMBER(dec8_state::i8751_port0_w)
+void dec8_state::i8751_port0_w(uint8_t data)
{
m_i8751_port0 = data;
}
-READ8_MEMBER(dec8_state::i8751_port1_r)
+uint8_t dec8_state::i8751_port1_r()
{
return m_i8751_port1;
}
-WRITE8_MEMBER(dec8_state::i8751_port1_w)
+void dec8_state::i8751_port1_w(uint8_t data)
{
m_i8751_port1 = data;
}
-WRITE8_MEMBER(dec8_state::gondo_mcu_to_main_w)
+void dec8_state::gondo_mcu_to_main_w(uint8_t data)
{
// P2 - controls latches for main CPU communication
if ((data&0x10)==0)
@@ -763,7 +689,7 @@ WRITE8_MEMBER(dec8_state::gondo_mcu_to_main_w)
m_i8751_p2 = data;
}
-WRITE8_MEMBER(dec8_state::shackled_mcu_to_main_w)
+void dec8_state::shackled_mcu_to_main_w(uint8_t data)
{
// P2 - controls latches for main CPU communication
if ((data&0x10)==0)
@@ -796,7 +722,7 @@ WRITE8_MEMBER(dec8_state::shackled_mcu_to_main_w)
Super Real Darwin is similar but only appears to have a single port
*/
-WRITE8_MEMBER(dec8_state::srdarwin_mcu_to_main_w)
+void dec8_state::srdarwin_mcu_to_main_w(uint8_t data)
{
// P2 - controls latches for main CPU communication
if ((data & 0x10) == 0)
@@ -821,6 +747,27 @@ WRITE8_MEMBER(dec8_state::srdarwin_mcu_to_main_w)
m_maincpu->set_input_line(MCS51_INT1_LINE, CLEAR_LINE);
}
+
+void dec8_state::csilver_mcu_to_main_w(uint8_t data)
+{
+ if (~data & 0x10)
+ m_i8751_port0 = m_i8751_value >> 8;
+
+ if (~data & 0x20)
+ m_i8751_port1 = m_i8751_value & 0xff;
+
+ if (~data & 0x40)
+ {
+ m_i8751_return = (m_i8751_return & 0xff) | (m_i8751_port0 << 8);
+ m_subcpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE); // FIRQ to main cpu
+ }
+
+ if (~data & 0x80)
+ m_i8751_return = (m_i8751_return & 0xff00) | m_i8751_port1;
+
+ m_i8751_p2 = data;
+}
+
/******************************************************************************/
#define PLAYER1_JOYSTICK /* Player 1 controls */ \
@@ -1333,8 +1280,8 @@ static INPUT_PORTS_START( csilver )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("IN2")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // coins read through MCU
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // ^
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1383,6 +1330,10 @@ static INPUT_PORTS_START( csilver )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
+
+ PORT_START("I8751") /* hooked up on the i8751 */
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
INPUT_PORTS_END
/* verified from M6809 code - coinage needs further checking when the MCU is available */
@@ -1403,6 +1354,7 @@ static INPUT_PORTS_START( csilverj )
INPUT_PORTS_END
+
/* verified from HD6309 code */
static INPUT_PORTS_START( oscar )
PORT_START("IN0")
@@ -2182,6 +2134,7 @@ void dec8_state::meikyuh(machine_config &config)
m_audiocpu->set_addrmap(AS_PROGRAM, &dec8_state::dec8_s_map);
}
+
void dec8_state::csilver(machine_config &config)
{
/* basic machine hardware */
@@ -2196,6 +2149,16 @@ void dec8_state::csilver(machine_config &config)
config.set_maximum_quantum(attotime::from_hz(6000));
+ I8751(config, m_mcu, XTAL(8'000'000));
+ m_mcu->port_in_cb<0>().set(FUNC(dec8_state::i8751_port0_r));
+ m_mcu->port_out_cb<0>().set(FUNC(dec8_state::i8751_port0_w));
+ m_mcu->port_in_cb<1>().set(FUNC(dec8_state::i8751_port1_r));
+ m_mcu->port_out_cb<1>().set(FUNC(dec8_state::i8751_port1_w));
+ m_mcu->port_out_cb<2>().set(FUNC(dec8_state::csilver_mcu_to_main_w));
+ m_mcu->port_in_cb<3>().set_ioport("I8751");
+
+ config.set_perfect_quantum(m_maincpu);
+
/* video hardware */
BUFFERED_SPRITERAM8(config, m_spriteram);
@@ -3231,6 +3194,7 @@ Lower board (DATA EAST DE-0251-2):
*/
+
ROM_START( csilver )
ROM_REGION( 0x48000, "maincpu", 0 )
ROM_LOAD( "dx03-12.18d", 0x08000, 0x08000, CRC(2d926e7c) SHA1(cf38e92904edb1870b0a4965f9049d67efe8cf6a) )
@@ -3245,7 +3209,8 @@ ROM_START( csilver )
ROM_REGION( 0x1000, "mcu", 0 ) /* i8751 microcontroller */
// 017F: B4 4C 0D : cjne a,#$4C,$018F (ID code 0x4c = World version)
- ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, CRC(ca663965) SHA1(a5fb7afdfd324761bde4bb90ba12efc9954627af) ) // dx-8.19a ?
+ // 3 bytes (always bit 0x08 set incorrectly) had to be hand fixed, hence 'BAD_DUMP'
+ ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, BAD_DUMP CRC(c0266263) SHA1(27ac6fa4af7195f04249c04dec168ab82158704e) ) // dx-8.19a ?
ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */
ROM_LOAD( "dx00.3d", 0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) )
@@ -3282,7 +3247,8 @@ ROM_START( csilverj )
ROM_LOAD( "dx05.a6", 0x00000, 0x10000, CRC(eb32cf25) SHA1(9390c88033259c65eb15320e31f5d696970987cc) )
ROM_REGION( 0x1000, "mcu", 0 ) /* i8751 microcontroller */
- ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
+ // hand modified version of csilver ROM
+ ROM_LOAD( "id8751h_japan.mcu", 0x0000, 0x1000, BAD_DUMP CRC(6e801217) SHA1(2d8f7ae533dd8146acf8461d61ddd839544adf55) )
ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */
ROM_LOAD( "dx00.a1", 0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) )
@@ -3320,7 +3286,8 @@ ROM_START( csilverja ) // DE-0250-3 + DE-0251-2
ROM_LOAD( "dx05.3f", 0x00000, 0x10000, CRC(eb32cf25) SHA1(9390c88033259c65eb15320e31f5d696970987cc) )
ROM_REGION( 0x1000, "mcu", 0 ) /* i8751 microcontroller */
- ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
+ // hand modified version of csilver ROM
+ ROM_LOAD( "id8751h_japan.mcu", 0x0000, 0x1000, BAD_DUMP CRC(6e801217) SHA1(2d8f7ae533dd8146acf8461d61ddd839544adf55) )
ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */
ROM_LOAD( "dx00.3d", 0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) )
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 8351036a2b0..cfac359b976 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -299,8 +299,8 @@ private:
required_device m_dac;
DECLARE_WRITE_LINE_MEMBER(duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(duart_txa);
- DECLARE_READ8_MEMBER(duart_input);
- DECLARE_WRITE8_MEMBER(duart_output);
+ uint8_t duart_input();
+ void duart_output(uint8_t data);
DECLARE_READ8_MEMBER(nvram_recall);
DECLARE_WRITE8_MEMBER(led_write);
DECLARE_WRITE8_MEMBER(nvram_store);
@@ -338,7 +338,7 @@ WRITE_LINE_MEMBER(dectalk_state::duart_irq_handler)
m_maincpu->set_input_line(M68K_IRQ_6, state);
}
-READ8_MEMBER(dectalk_state::duart_input)
+uint8_t dectalk_state::duart_input()
{
uint8_t data = 0;
data |= m_duart_inport&0xf;
@@ -348,7 +348,7 @@ READ8_MEMBER(dectalk_state::duart_input)
return data;
}
-WRITE8_MEMBER(dectalk_state::duart_output)
+void dectalk_state::duart_output(uint8_t data)
{
m_duart_outport = data;
#ifdef SERIAL_TO_STDERR
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index edd0580fc6b..d006205fddf 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -263,13 +263,13 @@ void djboy_state::soundcpu_port_am(address_map &map)
/******************************************************************************/
-READ8_MEMBER(djboy_state::beast_p0_r)
+uint8_t djboy_state::beast_p0_r()
{
// ?
return 0;
}
-WRITE8_MEMBER(djboy_state::beast_p0_w)
+void djboy_state::beast_p0_w(uint8_t data)
{
if (!BIT(m_beast_p0, 1) && BIT(data, 1))
{
@@ -282,7 +282,7 @@ WRITE8_MEMBER(djboy_state::beast_p0_w)
m_beast_p0 = data;
}
-READ8_MEMBER(djboy_state::beast_p1_r)
+uint8_t djboy_state::beast_p1_r()
{
if (BIT(m_beast_p0, 0) == 0)
return m_beastlatch->read();
@@ -290,12 +290,12 @@ READ8_MEMBER(djboy_state::beast_p1_r)
return 0; // ?
}
-WRITE8_MEMBER(djboy_state::beast_p1_w)
+void djboy_state::beast_p1_w(uint8_t data)
{
m_beast_p1 = data;
}
-READ8_MEMBER(djboy_state::beast_p2_r)
+uint8_t djboy_state::beast_p2_r()
{
switch ((m_beast_p0 >> 2) & 3)
{
@@ -306,12 +306,12 @@ READ8_MEMBER(djboy_state::beast_p2_r)
}
}
-WRITE8_MEMBER(djboy_state::beast_p2_w)
+void djboy_state::beast_p2_w(uint8_t data)
{
m_beast_p2 = data;
}
-READ8_MEMBER(djboy_state::beast_p3_r)
+uint8_t djboy_state::beast_p3_r()
{
uint8_t dsw = 0;
uint8_t dsw1 = ~m_port_dsw[0]->read();
@@ -327,7 +327,7 @@ READ8_MEMBER(djboy_state::beast_p3_r)
return (dsw << 4) | (m_beastlatch->pending_r() ? 0x0 : 0x4) | (m_slavelatch->pending_r() ? 0x8 : 0x0);
}
-WRITE8_MEMBER(djboy_state::beast_p3_w)
+void djboy_state::beast_p3_w(uint8_t data)
{
m_beast_p3 = data;
m_slavecpu->set_input_line(INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index f6b6140985b..f1dc5ef5647 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -86,6 +86,7 @@
#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "speaker.h"
+#include "video/pwm.h"
#include "dolphunk.lh"
@@ -98,7 +99,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_speaker(*this, "speaker")
, m_cass(*this, "cassette")
- , m_digits(*this, "digit%u", 0U)
+ , m_display(*this, "display")
{ }
void dauphin(machine_config &config);
@@ -117,11 +118,10 @@ private:
bool m_cassbit;
bool m_cassold;
bool m_speaker_state;
- virtual void machine_start() override { m_digits.resolve(); }
required_device m_maincpu;
required_device m_speaker;
required_device m_cass;
- output_finder<4> m_digits;
+ required_device m_display;
};
READ_LINE_MEMBER( dauphin_state::cass_r )
@@ -131,7 +131,7 @@ READ_LINE_MEMBER( dauphin_state::cass_r )
WRITE8_MEMBER( dauphin_state::port00_w )
{
- m_digits[offset] = data;
+ m_display->matrix(1<set_segmask(0x0f, 0xff);
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -250,7 +252,7 @@ void dauphin_state::dauphin(machine_config &config)
/* ROM definition */
ROM_START( dauphin )
- ROM_REGION( 0x8000, "maincpu", 0 )
+ ROM_REGION( 0x1000, "maincpu", 0 )
ROM_LOAD( "dolphin_mo.rom", 0x0000, 0x0100, CRC(a8811f48) SHA1(233c629dc20fac286c8c1559e461bb0b742a675e) )
// This one is used in winarcadia but it is a bad dump, we use the corrected one above
//ROM_LOAD( "dolphin_mo.rom", 0x0000, 0x0100, BAD_DUMP CRC(1ac4ac18) SHA1(62a63de6fcd6cd5fcee930d31c73fe603647f06c) )
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index 876a8a1527c..5cfa432e01f 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -40,7 +40,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dragrace_state::dragrace_frame_callback)
}
-WRITE8_MEMBER(dragrace_state::speed1_w)
+void dragrace_state::speed1_w(uint8_t data)
{
unsigned freq = ~data & 0x1f;
m_discrete->write(DRAGRACE_MOTOR1_DATA, freq);
@@ -49,7 +49,7 @@ WRITE8_MEMBER(dragrace_state::speed1_w)
output().set_value("tachometer", freq);
}
-WRITE8_MEMBER(dragrace_state::speed2_w)
+void dragrace_state::speed2_w(uint8_t data)
{
unsigned freq = ~data & 0x1f;
m_discrete->write(DRAGRACE_MOTOR2_DATA, freq);
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 6807e990f74..fa768209258 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -78,16 +78,16 @@ private:
required_device m_aysnd;
required_memory_bank m_mainbank;
- DECLARE_WRITE8_MEMBER(p1_w);
- DECLARE_WRITE8_MEMBER(p2_w);
+ void p1_w(uint8_t data);
+ void p2_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(prog_w);
- DECLARE_WRITE8_MEMBER(bus_w);
+ void bus_w(uint8_t data);
DECLARE_WRITE8_MEMBER(io_w);
DECLARE_READ_LINE_MEMBER(t0_r);
DECLARE_READ_LINE_MEMBER(t1_r);
- DECLARE_READ8_MEMBER(p1_r);
- DECLARE_READ8_MEMBER(p2_r);
- DECLARE_READ8_MEMBER(bus_r);
+ uint8_t p1_r();
+ uint8_t p2_r();
+ uint8_t bus_r();
DECLARE_READ8_MEMBER(io_r);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
@@ -111,12 +111,12 @@ void drw80pkr_state::machine_start()
* Write Handlers *
******************/
-WRITE8_MEMBER(drw80pkr_state::p1_w)
+void drw80pkr_state::p1_w(uint8_t data)
{
m_p1 = data;
}
-WRITE8_MEMBER(drw80pkr_state::p2_w)
+void drw80pkr_state::p2_w(uint8_t data)
{
m_p2 = data;
}
@@ -134,7 +134,7 @@ WRITE_LINE_MEMBER(drw80pkr_state::prog_w)
}
}
-WRITE8_MEMBER(drw80pkr_state::bus_w)
+void drw80pkr_state::bus_w(uint8_t data)
{
m_bus = data;
}
@@ -204,17 +204,17 @@ READ_LINE_MEMBER(drw80pkr_state::t1_r)
return m_t1;
}
-READ8_MEMBER(drw80pkr_state::p1_r)
+uint8_t drw80pkr_state::p1_r()
{
return m_p1;
}
-READ8_MEMBER(drw80pkr_state::p2_r)
+uint8_t drw80pkr_state::p2_r()
{
return m_p2;
}
-READ8_MEMBER(drw80pkr_state::bus_r)
+uint8_t drw80pkr_state::bus_r()
{
return m_bus;
}
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index dc487f2307f..dc902f5df72 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -100,11 +100,11 @@ private:
DECLARE_WRITE8_MEMBER(block_addr_hi_w);
DECLARE_WRITE8_MEMBER(block_h_w);
DECLARE_WRITE8_MEMBER(layers_w);
- DECLARE_WRITE8_MEMBER(input_w);
+ void input_w(uint8_t data);
DECLARE_READ8_MEMBER(service_r);
DECLARE_READ8_MEMBER(input_r);
DECLARE_WRITE8_MEMBER(rombank_w);
- DECLARE_READ8_MEMBER(dsw_r);
+ uint8_t dsw_r();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void dunhuang_io_map(address_map &map);
@@ -439,7 +439,7 @@ void dunhuang_state::dunhuang_map(address_map &map)
// Inputs
-WRITE8_MEMBER(dunhuang_state::input_w)
+void dunhuang_state::input_w(uint8_t data)
{
m_input = data;
}
@@ -452,7 +452,7 @@ READ8_MEMBER(dunhuang_state::service_r)
;
}
-READ8_MEMBER(dunhuang_state::dsw_r)
+uint8_t dunhuang_state::dsw_r()
{
if (!(m_input & 0x01)) return m_dsw[0]->read();
if (!(m_input & 0x02)) return m_dsw[1]->read();
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index 4a5a84b1b33..37dc73a84e8 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -123,8 +123,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(write_brgb);
DECLARE_WRITE_LINE_MEMBER(write_brgc);
- DECLARE_WRITE8_MEMBER(ksm_ppi_porta_w);
- DECLARE_WRITE8_MEMBER(ksm_ppi_portc_w);
+ void ksm_ppi_porta_w(uint8_t data);
+ void ksm_ppi_portc_w(uint8_t data);
void ksm_io(address_map &map);
void ksm_mem(address_map &map);
@@ -247,13 +247,13 @@ void ksm_state::video_start()
m_brg = timer_alloc(TIMER_ID_BRG);
}
-WRITE8_MEMBER(ksm_state::ksm_ppi_porta_w)
+void ksm_state::ksm_ppi_porta_w(uint8_t data)
{
LOG("PPI port A line %d\n", data);
m_video.line = data;
}
-WRITE8_MEMBER(ksm_state::ksm_ppi_portc_w)
+void ksm_state::ksm_ppi_portc_w(uint8_t data)
{
brgc = (data >> 5) & 3;
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index de6a7c383d2..ecae7f5a1d3 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -1108,12 +1108,12 @@ READ8_MEMBER(dynax_state::tenkai_ip_r)
}
-WRITE8_MEMBER(dynax_state::tenkai_dswsel_w)
+void dynax_state::tenkai_dswsel_w(uint8_t data)
{
m_dsw_sel = data;
}
-READ8_MEMBER(dynax_state::tenkai_dsw_r)
+uint8_t dynax_state::tenkai_dsw_r()
{
if (!BIT(m_dsw_sel, 0)) return ioport("DSW0")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW1")->read();
@@ -1151,28 +1151,28 @@ void dynax_state::tenkai_update_rombank()
// logerror("rombank = %02x\n", m_rombank);
}
-READ8_MEMBER(dynax_state::tenkai_p3_r)
+uint8_t dynax_state::tenkai_p3_r()
{
return 0x00;
}
-WRITE8_MEMBER(dynax_state::tenkai_p3_w)
+void dynax_state::tenkai_p3_w(uint8_t data)
{
m_rombank = ((data & 0x04) << 1) | (m_rombank & 0x07);
tenkai_update_rombank();
}
-WRITE8_MEMBER(dynax_state::tenkai_p4_w)
+void dynax_state::tenkai_p4_w(uint8_t data)
{
m_rombank = (m_rombank & 0x08) | ((data & 0x0e) >> 1);
tenkai_update_rombank();
}
-READ8_MEMBER(dynax_state::tenkai_p5_r)
+uint8_t dynax_state::tenkai_p5_r()
{
return m_tenkai_p5_val;
}
-WRITE8_MEMBER(dynax_state::tenkai_p6_w)
+void dynax_state::tenkai_p6_w(uint8_t data)
{
m_tenkai_p5_val &= 0x0f;
@@ -1180,7 +1180,7 @@ WRITE8_MEMBER(dynax_state::tenkai_p6_w)
m_tenkai_p5_val |= (1 << 4);
}
-WRITE8_MEMBER(dynax_state::tenkai_p7_w)
+void dynax_state::tenkai_p7_w(uint8_t data)
{
m_tenkai_p5_val &= 0xf0;
@@ -1188,13 +1188,13 @@ WRITE8_MEMBER(dynax_state::tenkai_p7_w)
m_tenkai_p5_val |= (1 << 3);
}
-WRITE8_MEMBER(dynax_state::tenkai_p8_w)
+void dynax_state::tenkai_p8_w(uint8_t data)
{
m_rombank = ((data & 0x08) << 1) | (m_rombank & 0x0f);
tenkai_update_rombank();
}
-READ8_MEMBER(dynax_state::tenkai_p8_r)
+uint8_t dynax_state::tenkai_p8_r()
{
return 0x00;
}
@@ -1297,7 +1297,7 @@ WRITE8_MEMBER(dynax_state::gekisha_hopper_w)
// popmessage("%02x %02x", gekisha_val[0], gekisha_val[1]);
}
-WRITE8_MEMBER(dynax_state::gekisha_p4_w)
+void dynax_state::gekisha_p4_w(uint8_t data)
{
m_bankdev->set_bank((data >> 2) & 3);
}
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index 3a126dc3056..db1814c700c 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -104,7 +104,7 @@ void eacc_state::eacc_mem(address_map &map)
map.global_mask(0xc7ff); // A11,A12,A13 not connected
map(0x0000, 0x001f).ram().share("nvram"); // inside cpu, battery-backed
map(0x0020, 0x007f).ram(); // inside cpu
- map(0x4000, 0x47ff).rom().mirror(0x8000);
+ map(0x4000, 0x47ff).rom().mirror(0x8000).region("maincpu",0);
map(0x8000, 0x8003).mirror(0x7fc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
}
@@ -277,8 +277,8 @@ void eacc_state::eacc(machine_config &config)
******************************************************************************/
ROM_START(eacc)
- ROM_REGION(0x10000, "maincpu", 0)
- ROM_LOAD("eacc.bin", 0x4000, 0x0800, CRC(287a63c0) SHA1(f61b397d33ea40e5742e34d5f5468572125e8b39) )
+ ROM_REGION(0x0800, "maincpu", 0)
+ ROM_LOAD("eacc.bin", 0x0000, 0x0800, CRC(287a63c0) SHA1(f61b397d33ea40e5742e34d5f5468572125e8b39) )
ROM_END
diff --git a/src/mame/drivers/eispc.cpp b/src/mame/drivers/eispc.cpp
index 2168bae6b31..dd4de0ae963 100644
--- a/src/mame/drivers/eispc.cpp
+++ b/src/mame/drivers/eispc.cpp
@@ -148,8 +148,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(dreq0_ck_w);
DECLARE_WRITE_LINE_MEMBER( epc_dma_hrq_changed );
DECLARE_WRITE_LINE_MEMBER( epc_dma8237_out_eop );
- DECLARE_READ8_MEMBER( epc_dma_read_byte );
- DECLARE_WRITE8_MEMBER( epc_dma_write_byte );
+ uint8_t epc_dma_read_byte(offs_t offset);
+ void epc_dma_write_byte(offs_t offset, uint8_t data);
template uint8_t epc_dma8237_io_r(offs_t offset);
template void epc_dma8237_io_w(offs_t offset, uint8_t data);
template DECLARE_WRITE_LINE_MEMBER(epc_dack_w);
@@ -164,8 +164,8 @@ private:
// PPI
required_device m_ppi8255;
- DECLARE_WRITE8_MEMBER(ppi_portb_w);
- DECLARE_READ8_MEMBER(ppi_portc_r);
+ void ppi_portb_w(uint8_t data);
+ uint8_t ppi_portc_r();
uint8_t m_ppi_portb;
required_ioport m_io_dsw;
required_ioport m_io_j10;
@@ -695,7 +695,7 @@ WRITE_LINE_MEMBER(epc_state::speaker_ck_w)
*
**********************************************************/
-READ8_MEMBER( epc_state::ppi_portc_r )
+uint8_t epc_state::ppi_portc_r()
{
uint8_t data;
@@ -710,7 +710,7 @@ READ8_MEMBER( epc_state::ppi_portc_r )
return data;
}
-WRITE8_MEMBER( epc_state::ppi_portb_w )
+void epc_state::ppi_portb_w(uint8_t data)
{
LOGPPI("PPI Port B write: %02x\n", data);
LOGPPI(" PB0 - Enable beeper : %d\n", (data & 0x01) ? 1 : 0);
@@ -987,7 +987,7 @@ WRITE_LINE_MEMBER( epc_state::epc_dma_hrq_changed )
}
-READ8_MEMBER( epc_state::epc_dma_read_byte )
+uint8_t epc_state::epc_dma_read_byte(offs_t offset)
{
if ((m_dma_active & 0x0f) == 0)
{
@@ -999,7 +999,7 @@ READ8_MEMBER( epc_state::epc_dma_read_byte )
return m_maincpu->space(AS_PROGRAM).read_byte(offset | u32(m_dma_segment[seg]) << 16);
}
-WRITE8_MEMBER( epc_state::epc_dma_write_byte )
+void epc_state::epc_dma_write_byte(offs_t offset, uint8_t data)
{
if ((m_dma_active & 0x0f) == 0)
{
diff --git a/src/mame/drivers/emma2.cpp b/src/mame/drivers/emma2.cpp
index e348dd17dc8..5fc6a007dee 100644
--- a/src/mame/drivers/emma2.cpp
+++ b/src/mame/drivers/emma2.cpp
@@ -39,7 +39,6 @@ and 16k of static RAM.
To Do:
- Cassette LED doesn't work.
-- Display should blank if PB0 not being pulsed.
- Code up the expansion unit (rom is there but no schematic exists)
- Need software.
@@ -52,6 +51,7 @@ To Do:
#include "machine/6821pia.h"
#include "imagedev/cassette.h"
#include "speaker.h"
+#include "video/pwm.h"
#include "emma2.lh"
@@ -64,8 +64,8 @@ public:
, m_cassette(*this, "cassette")
, m_via(*this, "via")
, m_pia(*this, "pia")
- , m_keyboard(*this, "X%u", 0)
- , m_digits(*this, "digit%u", 0U)
+ , m_display(*this, "display")
+ , m_io_keyboard(*this, "X%u", 0U)
{ }
void emma2(machine_config &config);
@@ -75,18 +75,17 @@ private:
DECLARE_WRITE8_MEMBER(digit_w);
DECLARE_READ8_MEMBER(keyboard_r);
virtual void machine_reset() override;
- virtual void machine_start() override;
void mem_map(address_map &map);
uint8_t m_digit;
- bool m_dig_change;
+ uint8_t m_seg;
required_device m_maincpu;
required_device m_cassette;
required_device m_via;
required_device m_pia;
- required_ioport_array<8> m_keyboard;
- output_finder<8> m_digits;
+ required_device m_display;
+ required_ioport_array<8> m_io_keyboard;
};
void emma2_state::mem_map(address_map &map)
@@ -155,39 +154,27 @@ WRITE8_MEMBER( emma2_state::digit_w )
{
m_cassette->output( BIT(data, 6) ? +1.0 : -1.0);
- data &= 7;
- if (data != m_digit)
- {
- m_digit = data;
- m_dig_change = true;
- }
+ m_digit = data & 7;
+ m_display->matrix(1 << m_digit, m_seg);
}
WRITE8_MEMBER( emma2_state::segment_w )
{
- if (m_dig_change)
- {
- m_dig_change = false;
- m_digits[m_digit] = data;
- }
+ m_seg = data;
+ m_display->matrix(1 << m_digit, m_seg);
}
READ8_MEMBER( emma2_state::keyboard_r )
{
- u8 data = m_keyboard[m_digit]->read();
+ u8 data = m_io_keyboard[m_digit]->read();
data |= ((m_cassette)->input() < 0.0) ? 0x80 : 0;
return data;
}
-void emma2_state::machine_start()
-{
- m_digits.resolve();
-}
-
void emma2_state::machine_reset()
{
+ m_seg = 0;
m_digit = 0;
- m_dig_change = 0;
}
void emma2_state::emma2(machine_config &config)
@@ -198,6 +185,8 @@ void emma2_state::emma2(machine_config &config)
/* video hardware */
config.set_default_layout(layout_emma2);
+ PWM_DISPLAY(config, m_display).set_size(8, 8);
+ m_display->set_segmask(0xff, 0xff);
/* Devices */
VIA6522(config, m_via, 1'000'000); // #2 from cpu
diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp
index cc0609461aa..1f2ffe31567 100644
--- a/src/mame/drivers/enigma2.cpp
+++ b/src/mame/drivers/enigma2.cpp
@@ -105,8 +105,8 @@ private:
DECLARE_READ8_MEMBER(dip_switch_r);
DECLARE_WRITE8_MEMBER(sound_data_w);
DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w);
- DECLARE_READ8_MEMBER(sound_latch_r);
- DECLARE_WRITE8_MEMBER(protection_data_w);
+ uint8_t sound_latch_r();
+ void protection_data_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_enigma2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -411,13 +411,13 @@ WRITE8_MEMBER(enigma2_state::sound_data_w)
}
-READ8_MEMBER(enigma2_state::sound_latch_r)
+uint8_t enigma2_state::sound_latch_r()
{
return bitswap<8>(m_sound_latch,0,1,2,3,4,5,6,7);
}
-WRITE8_MEMBER(enigma2_state::protection_data_w)
+void enigma2_state::protection_data_w(uint8_t data)
{
if (LOG_PROT) logerror("%s: Protection Data Write: %x\n", machine().describe_context(), data);
m_protection_data = data;
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index a03e24c239c..4d5a226e1d7 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -77,10 +77,10 @@ private:
DECLARE_FLOPPY_FORMATS( floppy_formats );
- DECLARE_WRITE8_MEMBER(mirage_via_write_porta);
- DECLARE_WRITE8_MEMBER(mirage_via_write_portb);
+ void mirage_via_write_porta(uint8_t data);
+ void mirage_via_write_portb(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(mirage_doc_irq);
- DECLARE_READ8_MEMBER(mirage_adc_read);
+ uint8_t mirage_adc_read();
void mirage_map(address_map &map);
@@ -109,7 +109,7 @@ WRITE_LINE_MEMBER(enmirage_state::mirage_doc_irq)
// m_maincpu->set_input_line(M6809_IRQ_LINE, state);
}
-READ8_MEMBER(enmirage_state::mirage_adc_read)
+uint8_t enmirage_state::mirage_adc_read()
{
return 0x00;
}
@@ -137,7 +137,7 @@ void enmirage_state::mirage_map(address_map &map)
// bits 0-2: column select from 0-7
// bits 3/4 = right and left LED enable
// bits 5/6/7 keypad rows 0/1/2 return
-WRITE8_MEMBER(enmirage_state::mirage_via_write_porta)
+void enmirage_state::mirage_via_write_porta(uint8_t data)
{
u8 segdata = data & 7;
m_display->matrix(((data >> 3) & 3) ^ 3, (1<serial_in(data);
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250));
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index 87b2fda19dd..4f3fd8c0f4e 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -421,9 +421,9 @@ private:
DECLARE_WRITE8_MEMBER(mapper_w);
DECLARE_WRITE8_MEMBER(analog_w);
- DECLARE_WRITE8_MEMBER(duart_output);
+ void duart_output(uint8_t data);
- DECLARE_READ8_MEMBER(esq1_adc_read);
+ uint8_t esq1_adc_read();
DECLARE_READ8_MEMBER(es5503_sample_r);
@@ -453,7 +453,7 @@ void esq1_state::sq80_es5503_map(address_map &map)
map(0x000000, 0x1ffff).r(FUNC(esq1_state::es5503_sample_r));
}
-READ8_MEMBER(esq1_state::esq1_adc_read)
+uint8_t esq1_state::esq1_adc_read()
{
return m_adc_value[m_adc_target];
}
@@ -560,7 +560,7 @@ void esq1_state::sq80_map(address_map &map)
// OP5 = metronome hi
// OP6/7 = tape out
-WRITE8_MEMBER(esq1_state::duart_output)
+void esq1_state::duart_output(uint8_t data)
{
int bank = m_adc_target = ((data >> 1) & 0x7);
// printf("DP [%02x]: %d mlo %d mhi %d tape %d\n", data, data&1, (data>>4)&1, (data>>5)&1, (data>>6)&3);
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index 7b961a884bc..5e385e8f08f 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -248,13 +248,13 @@ private:
DECLARE_READ16_MEMBER(lower_r);
DECLARE_WRITE16_MEMBER(lower_w);
- DECLARE_READ16_MEMBER(analog_r);
- DECLARE_WRITE16_MEMBER(analog_w);
+ uint16_t analog_r();
+ void analog_w(offs_t offset, uint16_t data);
DECLARE_WRITE_LINE_MEMBER(duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(duart_tx_a);
DECLARE_WRITE_LINE_MEMBER(duart_tx_b);
- DECLARE_WRITE8_MEMBER(duart_output);
+ void duart_output(uint8_t data);
void es5505_clock_changed(u32 data);
@@ -470,13 +470,13 @@ void esq5505_state::es5505_clock_changed(u32 data)
m_pump->set_unscaled_clock(data);
}
-WRITE16_MEMBER(esq5505_state::analog_w)
+void esq5505_state::analog_w(offs_t offset, uint16_t data)
{
offset &= 0x7;
m_analog_values[offset] = data;
}
-READ16_MEMBER(esq5505_state::analog_r)
+uint16_t esq5505_state::analog_r()
{
return m_analog_values[m_duart_io & 7];
}
@@ -495,7 +495,7 @@ WRITE_LINE_MEMBER(esq5505_state::duart_irq_handler)
update_irq_to_maincpu();
}
-WRITE8_MEMBER(esq5505_state::duart_output)
+void esq5505_state::duart_output(uint8_t data)
{
floppy_image_device *floppy = m_floppy_connector ? m_floppy_connector->get_device() : nullptr;
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp
index 890748050b0..af0c49e5f22 100644
--- a/src/mame/drivers/esqasr.cpp
+++ b/src/mame/drivers/esqasr.cpp
@@ -75,7 +75,7 @@ private:
virtual void machine_reset() override;
DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq);
- DECLARE_READ16_MEMBER(esq5506_read_adc);
+ u16 esq5506_read_adc();
void es5506_clock_changed(u32 data);
void asr_map(address_map &map);
@@ -107,7 +107,7 @@ WRITE_LINE_MEMBER(esqasr_state::esq5506_otto_irq)
{
}
-READ16_MEMBER(esqasr_state::esq5506_read_adc)
+u16 esqasr_state::esq5506_read_adc()
{
return 0;
}
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index d537b16d0bd..681e76d41b8 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -134,13 +134,13 @@ private:
DECLARE_WRITE_LINE_MEMBER(duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(duart_tx_a);
DECLARE_WRITE_LINE_MEMBER(duart_tx_b);
- DECLARE_WRITE8_MEMBER(duart_output);
+ void duart_output(u8 data);
u8 m_duart_io;
bool m_bCalibSecondByte;
DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq);
- DECLARE_READ16_MEMBER(esq5506_read_adc);
+ u16 esq5506_read_adc();
void es5506_clock_changed(u32 data);
void kt_map(address_map &map);
void ts_map(address_map &map);
@@ -190,7 +190,7 @@ WRITE_LINE_MEMBER(esqkt_state::esq5506_otto_irq)
#endif
}
-READ16_MEMBER(esqkt_state::esq5506_read_adc)
+u16 esqkt_state::esq5506_read_adc()
{
switch ((m_duart_io & 7) ^ 7)
{
@@ -224,7 +224,7 @@ WRITE_LINE_MEMBER(esqkt_state::duart_irq_handler)
m_maincpu->set_input_line(M68K_IRQ_3, state);
}
-WRITE8_MEMBER(esqkt_state::duart_output)
+void esqkt_state::duart_output(u8 data)
{
m_duart_io = data;
diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp
index 93c3352479c..e5bbe345e73 100644
--- a/src/mame/drivers/esqmr.cpp
+++ b/src/mame/drivers/esqmr.cpp
@@ -231,7 +231,7 @@ private:
virtual void machine_reset() override;
DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq);
- DECLARE_READ16_MEMBER(esq5506_read_adc);
+ u16 esq5506_read_adc();
DECLARE_WRITE_LINE_MEMBER(duart_tx_a);
DECLARE_WRITE_LINE_MEMBER(duart_tx_b);
@@ -265,7 +265,7 @@ WRITE_LINE_MEMBER(esqmr_state::esq5506_otto_irq)
{
}
-READ16_MEMBER(esqmr_state::esq5506_read_adc)
+u16 esqmr_state::esq5506_read_adc()
{
return 0;
}
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index 6cf98f4d71a..ad007626b8c 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -57,13 +57,13 @@ private:
virtual void machine_start() override;
- DECLARE_READ8_MEMBER(keypad_r);
- DECLARE_WRITE8_MEMBER(display_w);
- template DECLARE_WRITE8_MEMBER(led_w);
- DECLARE_READ8_MEMBER(pia_ar);
- DECLARE_WRITE8_MEMBER(pia_aw);
- DECLARE_READ8_MEMBER(pia_br);
- DECLARE_WRITE8_MEMBER(pia_bw);
+ uint8_t keypad_r(offs_t offset);
+ void display_w(offs_t offset, uint8_t data);
+ template void led_w(uint8_t data);
+ uint8_t pia_ar();
+ void pia_aw(uint8_t data);
+ uint8_t pia_br();
+ void pia_bw(uint8_t data);
void mem_map(address_map &map);
@@ -84,7 +84,7 @@ void et3400_state::machine_start()
}
-READ8_MEMBER(et3400_state::keypad_r)
+uint8_t et3400_state::keypad_r(offs_t offset)
{
uint8_t data = 0xff;
@@ -95,7 +95,7 @@ READ8_MEMBER(et3400_state::keypad_r)
return data;
}
-WRITE8_MEMBER(et3400_state::display_w)
+void et3400_state::display_w(offs_t offset, uint8_t data)
{
// A6-A4 decoded by IC22 (74LS42); D0 inverted by one gate of IC21 (74S00)
uint8_t digit = (offset >> 4) & 7;
@@ -104,7 +104,7 @@ WRITE8_MEMBER(et3400_state::display_w)
}
template
-WRITE8_MEMBER(et3400_state::led_w)
+void et3400_state::led_w(uint8_t data)
{
// This computer sets each segment, one at a time.
m_digit[Digit - 1] = bitswap<8>(~data, 7, 0, 1, 2, 3, 4, 5, 6);
@@ -113,25 +113,25 @@ WRITE8_MEMBER(et3400_state::led_w)
// d1,2,3 = Baud rate
// d4 = gnd
// d7 = rs232 in
-READ8_MEMBER(et3400_state::pia_ar)
+uint8_t et3400_state::pia_ar()
{
return ioport("BAUD")->read() | (m_rs232->rxd_r() << 7);
}
// d0 = rs232 out
-WRITE8_MEMBER(et3400_state::pia_aw)
+void et3400_state::pia_aw(uint8_t data)
{
m_rs232->write_txd(BIT(data, 0));
}
// d7 = cass in
-READ8_MEMBER(et3400_state::pia_br)
+uint8_t et3400_state::pia_br()
{
return (m_cass->input() > +0.0) << 7;
}
// d0 = cass out
-WRITE8_MEMBER(et3400_state::pia_bw)
+void et3400_state::pia_bw(uint8_t data)
{
m_cass->output(BIT(data, 0) ? -1.0 : +1.0);
}
diff --git a/src/mame/drivers/eurit.cpp b/src/mame/drivers/eurit.cpp
index a651376e047..24b9ad57b44 100644
--- a/src/mame/drivers/eurit.cpp
+++ b/src/mame/drivers/eurit.cpp
@@ -9,6 +9,9 @@
#include "emu.h"
#include "cpu/m37710/m37710.h"
#include "machine/am79c30.h"
+#include "video/hd44780.h"
+#include "emupal.h"
+#include "screen.h"
class eurit_state : public driver_device
{
@@ -16,37 +19,63 @@ public:
eurit_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
+ , m_keys(*this, "KEY%c", 'A')
+ , m_key_scan(0x1f)
{
}
void eurit30(machine_config &mconfig);
+protected:
+ virtual void machine_start() override;
+
private:
- void p4_w(u8 data);
- void p6_w(u8 data);
+ HD44780_PIXEL_UPDATE(lcd_pixel_update);
+
+ void key_scan_w(u8 data);
+ u8 key_matrix_r();
void mem_map(address_map &map);
- required_device m_maincpu;
+ void palette_init(palette_device &palette);
- u8 m_p4 = 0;
+ required_device m_maincpu;
+ required_ioport_array<5> m_keys;
+
+ u8 m_key_scan;
};
-void eurit_state::p4_w(u8 data)
+void eurit_state::machine_start()
{
- m_p4 = data;
+ save_item(NAME(m_key_scan));
}
-void eurit_state::p6_w(u8 data)
+HD44780_PIXEL_UPDATE(eurit_state::lcd_pixel_update)
{
- if (BIT(data, 6))
- logerror("%s: Writing $%X to LCDC %s register\n", machine().describe_context(), (m_p4 & 0xf0) >> 4, BIT(data, 4) ? "data" : "instruction");
+ if (x < 5 && y < 8 && line < 2 && pos < 20)
+ bitmap.pix16(line * 8 + y, pos * 6 + x) = state;
+}
+
+
+void eurit_state::key_scan_w(u8 data)
+{
+ m_key_scan = data >> 3;
+}
+
+u8 eurit_state::key_matrix_r()
+{
+ u8 ret = 0xff;
+ for (int i = 0; i < 5; i++)
+ if (!BIT(m_key_scan, i))
+ ret &= m_keys[i]->read();
+
+ return ret;
}
void eurit_state::mem_map(address_map &map)
{
- map(0x000480, 0x007fff).ram();
+ map(0x000480, 0x007fff).ram(); // probably NVRAM (0x000480 counts seconds for software RTC)
map(0x008000, 0x00ffff).rom().region("firmware", 0x8000);
map(0x040000, 0x05ffff).rom().region("firmware", 0);
map(0x0c0000, 0x0c0007).rw("dsc", FUNC(am79c30a_device::read), FUNC(am79c30a_device::write));
@@ -54,17 +83,91 @@ void eurit_state::mem_map(address_map &map)
static INPUT_PORTS_START(eurit30)
+ PORT_START("KEYA")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key A0")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key A1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("#") PORT_CODE(KEYCODE_EQUALS)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("0 0...9") PORT_CODE(KEYCODE_0)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("*") PORT_CODE(KEYCODE_MINUS)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("ESC") PORT_CODE(KEYCODE_BACKSPACE)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key A7") // phone off hook?
+
+ PORT_START("KEYB")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z2") PORT_CODE(KEYCODE_X)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Menu") PORT_CODE(KEYCODE_ENTER)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("9 YZ") PORT_CODE(KEYCODE_9)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("8 VWX") PORT_CODE(KEYCODE_8)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("7 STU") PORT_CODE(KEYCODE_7)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key B5")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("MIC") PORT_CODE(KEYCODE_M)
+
+ PORT_START("KEYC")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z6") PORT_CODE(KEYCODE_N)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z3") PORT_CODE(KEYCODE_C)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("6 PQR") PORT_CODE(KEYCODE_6)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("5 MNO") PORT_CODE(KEYCODE_5)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("4 JKL") PORT_CODE(KEYCODE_4)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key C5")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("+") PORT_CODE(KEYCODE_UP)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key C7")
+
+ PORT_START("KEYD")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z4") PORT_CODE(KEYCODE_V)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z5") PORT_CODE(KEYCODE_B)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("3 GHI") PORT_CODE(KEYCODE_3)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("2 DEF") PORT_CODE(KEYCODE_2)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("1 ABC") PORT_CODE(KEYCODE_1)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Unknown Key D5")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME(UTF8_RIGHT) PORT_CODE(KEYCODE_RIGHT)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME(UTF8_LEFT) PORT_CODE(KEYCODE_LEFT)
+
+ PORT_START("KEYE")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Center Right") PORT_CODE(KEYCODE_F)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Next to Left") PORT_CODE(KEYCODE_S)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("-") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Next to Right") PORT_CODE(KEYCODE_G)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Right") PORT_CODE(KEYCODE_H)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Center Left") PORT_CODE(KEYCODE_D)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Fox Key Left") PORT_CODE(KEYCODE_A)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Z1") PORT_CODE(KEYCODE_Z)
INPUT_PORTS_END
+void eurit_state::palette_init(palette_device &palette)
+{
+ palette.set_pen_color(0, rgb_t(131, 136, 139));
+ palette.set_pen_color(1, rgb_t( 92, 83, 88));
+}
+
void eurit_state::eurit30(machine_config &config)
{
- M37730S2(config, m_maincpu, 8'000'000); // type and clock unknown
+ M37730S2(config, m_maincpu, 4'096'000);
m_maincpu->set_addrmap(AS_PROGRAM, &eurit_state::mem_map);
- m_maincpu->p4_out_cb().set(FUNC(eurit_state::p4_w));
- m_maincpu->p6_out_cb().set(FUNC(eurit_state::p6_w));
+ m_maincpu->p4_in_cb().set("lcdc", FUNC(hd44780_device::db_r)); // not actually used for input?
+ m_maincpu->p4_out_cb().set("lcdc", FUNC(hd44780_device::db_w));
+ m_maincpu->p4_out_cb().append(FUNC(eurit_state::key_scan_w));
+ m_maincpu->p5_in_cb().set(FUNC(eurit_state::key_matrix_r));
+ m_maincpu->p6_out_cb().set("lcdc", FUNC(hd44780_device::e_w)).bit(6);
+ m_maincpu->p6_out_cb().append("lcdc", FUNC(hd44780_device::rw_w)).bit(5); // not actually used for read mode?
+ m_maincpu->p6_out_cb().append("lcdc", FUNC(hd44780_device::rs_w)).bit(4);
am79c30a_device &dsc(AM79C30A(config, "dsc", 12'288'000));
dsc.int_callback().set_inputline(m_maincpu, M37710_LINE_IRQ0);
+
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+ screen.set_screen_update("lcdc", FUNC(hd44780_device::screen_update));
+ screen.set_size(6*20, 8*2);
+ screen.set_visarea_full();
+ screen.set_palette("palette");
+
+ PALETTE(config, "palette", FUNC(eurit_state::palette_init), 2);
+
+ hd44780_device &lcdc(SED1278_0B(config, "lcdc", 0));
+ lcdc.set_lcd_size(2, 20);
+ lcdc.set_pixel_update_cb(FUNC(eurit_state::lcd_pixel_update));
}
@@ -74,4 +177,4 @@ ROM_START(eurit30)
ROM_END
-SYST(1996, eurit30, 0, 0, eurit30, eurit30, eurit_state, empty_init, "Ascom", "Eurit 30", MACHINE_IS_SKELETON)
+SYST(1996, eurit30, 0, 0, eurit30, eurit30, eurit_state, empty_init, "Ascom", "Eurit 30", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp
index d5c71f0db77..a0a6a32b452 100644
--- a/src/mame/drivers/eva.cpp
+++ b/src/mame/drivers/eva.cpp
@@ -62,9 +62,9 @@ private:
// devices
required_device m_maincpu;
- DECLARE_READ8_MEMBER(read_k);
- DECLARE_WRITE16_MEMBER(write_o);
- DECLARE_WRITE16_MEMBER(write_r);
+ u8 read_k();
+ void write_o(u16 data);
+ void write_r(u16 data);
};
class eva24_state : public base_state
@@ -85,9 +85,9 @@ private:
// devices
required_device m_maincpu;
- DECLARE_READ8_MEMBER(read_g);
- DECLARE_WRITE8_MEMBER(write_g);
- DECLARE_WRITE8_MEMBER(write_d);
+ u8 read_g();
+ void write_g(u8 data);
+ void write_d(u8 data);
u8 m_g = 0;
};
@@ -105,19 +105,19 @@ void eva24_state::machine_start()
// EVA-24
-WRITE8_MEMBER(eva24_state::write_g)
+void eva24_state::write_g(u8 data)
{
// G3: TMS5100 PDC pin
m_tms5100->pdc_w(data >> 3 & 1);
m_g = data;
}
-READ8_MEMBER(eva24_state::read_g)
+u8 eva24_state::read_g()
{
return m_g;
}
-WRITE8_MEMBER(eva24_state::write_d)
+void eva24_state::write_d(u8 data)
{
// D3210: TMS5100 CTL8421
m_tms5100->ctl_w(data & 0xf);
@@ -126,19 +126,19 @@ WRITE8_MEMBER(eva24_state::write_d)
// EVA-11
-WRITE16_MEMBER(eva11_state::write_r)
+void eva11_state::write_r(u16 data)
{
// R7: TMS5100 PDC pin
m_tms5100->pdc_w(data >> 7 & 1);
}
-WRITE16_MEMBER(eva11_state::write_o)
+void eva11_state::write_o(u16 data)
{
// O3210: TMS5100 CTL8421
m_tms5100->ctl_w(data & 0xf);
}
-READ8_MEMBER(eva11_state::read_k)
+u8 eva11_state::read_k()
{
// K84: TMS5100 CTL81(O30)
u8 ctl = m_tms5100->ctl_r();
diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp
index f89a3242dd4..8fe90169a96 100644
--- a/src/mame/drivers/exerion.cpp
+++ b/src/mame/drivers/exerion.cpp
@@ -158,14 +158,14 @@ INPUT_CHANGED_MEMBER(exerion_state::coin_inserted)
/* This is the first of many Exerion "features". No clue if it's */
/* protection or some sort of timer. */
-READ8_MEMBER(exerion_state::exerion_porta_r)
+uint8_t exerion_state::exerion_porta_r()
{
m_porta ^= 0x40;
return m_porta;
}
-WRITE8_MEMBER(exerion_state::exerion_portb_w)
+void exerion_state::exerion_portb_w(uint8_t data)
{
/* pull the expected value from the ROM */
m_porta = memregion("maincpu")->base()[0x5f76];
@@ -175,7 +175,7 @@ WRITE8_MEMBER(exerion_state::exerion_portb_w)
}
-READ8_MEMBER(exerion_state::exerion_protection_r)
+uint8_t exerion_state::exerion_protection_r(offs_t offset)
{
if (m_maincpu->pc() == 0x4143)
return memregion("maincpu")->base()[0x33c0 + (m_main_ram[0xd] << 2) + offset];
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 1fb0df22581..3bb840559f0 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -149,7 +149,7 @@ WRITE_LINE_MEMBER(fastfred_state::imago_dma_irq_w)
m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(fastfred_state::imago_sprites_bank_w)
+void fastfred_state::imago_sprites_bank_w(uint8_t data)
{
m_imago_sprites_bank = (data & 2) >> 1;
}
@@ -184,7 +184,7 @@ WRITE_LINE_MEMBER(fastfred_state::nmi_mask_w)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-WRITE8_MEMBER(fastfred_state::sound_nmi_mask_w)
+void fastfred_state::sound_nmi_mask_w(uint8_t data)
{
m_sound_nmi_mask = data & 1;
}
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index bac17f048fc..dfb52a86d35 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -180,13 +180,13 @@ GFXDECODE_END
***************************************************************************/
-WRITE8_MEMBER(fastlane_state::volume_callback0)
+void fastlane_state::volume_callback0(uint8_t data)
{
m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11);
}
-WRITE8_MEMBER(fastlane_state::volume_callback1)
+void fastlane_state::volume_callback1(uint8_t data)
{
m_k007232_2->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp
index 4d390cde0b1..7b91ee74e07 100644
--- a/src/mame/drivers/fccpu30.cpp
+++ b/src/mame/drivers/fccpu30.cpp
@@ -97,7 +97,7 @@
* - A32/D32 VMEbus master/slave interface with system controller function (VMEchip ASIC)
* - Ethernet transceiver interface (AM79C90)
* - SCSI bus interface with independent data bus on P2 connector (MB87033/34)
- * - Flopyy disk interface on P2 connector (FCD37C65C)
+ * - Floppy disk interface on P2 connector (FCD37C65C)
* - Four serial ports (DUSCC SCN68562 x 2)
* - 20 bit digital i/o for user applications( 2 x 68230 PI/T )
* - Real-Time Clock with interrupt (72423)
@@ -107,7 +107,7 @@
*
* Address Map
* --------------------------------------------------------------------------
- * Range Decscription
+ * Range Desccription
* --------------------------------------------------------------------------
* 00000000-0xxFFFFF Shared DRAM D8-D32 xx=0x1F-0x03 for 32Mb-4Mb
* 0yy00000-FAFFFFFF VME A32 D8-D32 yy=xx+1
@@ -287,16 +287,16 @@ private:
int fga_irq_level;
/* Rotary switch PIT input */
- DECLARE_READ8_MEMBER (rotary_rd);
- DECLARE_READ8_MEMBER (flop_dmac_r);
- DECLARE_WRITE8_MEMBER (flop_dmac_w);
- DECLARE_READ8_MEMBER (pit1c_r);
- DECLARE_WRITE8_MEMBER (pit1c_w);
- DECLARE_READ8_MEMBER (pit2a_r);
- DECLARE_WRITE8_MEMBER (pit2a_w);
- DECLARE_READ8_MEMBER (board_mem_id_rd);
- DECLARE_READ8_MEMBER (pit2c_r);
- DECLARE_WRITE8_MEMBER (pit2c_w);
+ uint8_t rotary_rd();
+ uint8_t flop_dmac_r();
+ void flop_dmac_w(uint8_t data);
+ uint8_t pit1c_r();
+ void pit1c_w(uint8_t data);
+ uint8_t pit2a_r();
+ void pit2a_w(uint8_t data);
+ uint8_t board_mem_id_rd();
+ uint8_t pit2c_r();
+ void pit2c_w(uint8_t data);
/* VME bus accesses */
//DECLARE_READ16_MEMBER (vme_a24_r);
@@ -487,42 +487,42 @@ WRITE32_MEMBER (cpu30_state::bootvect_w){
*
* "To start VMEPROM, the rotary switches must both be set to 'F':" Hmm...
*/
-READ8_MEMBER (cpu30_state::rotary_rd){
+uint8_t cpu30_state::rotary_rd(){
LOG("%s\n", FUNCNAME);
return 0xff; // TODO: make this configurable from commandline or artwork
}
// PIT#1 Port B TODO: implement floppy and dma control
-READ8_MEMBER (cpu30_state::flop_dmac_r){
+uint8_t cpu30_state::flop_dmac_r(){
LOG("%s\n", FUNCNAME);
return 0xff;
}
-WRITE8_MEMBER (cpu30_state::flop_dmac_w){
+void cpu30_state::flop_dmac_w(uint8_t data){
LOG("%s(%02x)\n", FUNCNAME, data);
}
#define FPCP_SENSE 0x40 /* Port C bit 6 is low if a Floating Point Co Processor is installed */
// PIT#1 Port C TODO: implement timer+port interrupts
// TODO: Connect PC0, PC1, PC4 and PC7 to B5 and/or P2 connector
-READ8_MEMBER (cpu30_state::pit1c_r){
+uint8_t cpu30_state::pit1c_r(){
LOG("%s\n", FUNCNAME);
m_maincpu->set_fpu_enable(1); // Lets assume the FPCP is always installed ( which is default for 68030 atm )
return 0xff & ~FPCP_SENSE; // Should really be command line for the edge cases...
}
-WRITE8_MEMBER (cpu30_state::pit1c_w){
+void cpu30_state::pit1c_w(uint8_t data){
LOG("%s(%02x)\n", FUNCNAME, data);
}
// PIT#2 Port A TODO: Connect to B5 and /or P2 connector
-READ8_MEMBER (cpu30_state::pit2a_r){
+uint8_t cpu30_state::pit2a_r(){
LOG("%s\n", FUNCNAME);
logerror("Unsupported user i/o on PIT2 port A detected\n");
return 0xff;
}
-WRITE8_MEMBER (cpu30_state::pit2a_w){
+void cpu30_state::pit2a_w(uint8_t data){
LOG("%s(%02x)\n", FUNCNAME, data);
logerror("Unsupported user i/o on PIT2 port A detected\n");
}
@@ -541,11 +541,11 @@ WRITE8_MEMBER (cpu30_state::pit2a_w){
* contain the same identification number. In the case of the CPU-30 R4, the
* number is 0x0a
*
- * The speed of the board is meassured by looping some instructions and meassure the time it takes with a timer
+ * The speed of the board is measured by looping some instructions and measure the time it takes with a timer
* Currently this doesn't work so the wrong speed is displayed on the screen. To fix this timing needs to be more exact.
- * Speed meassure subroutine is at address 0xffe033c4 in the FGA-002 firmware with CRC (faa38972) (for example)
+ * Speed measure subroutine is at address 0xffe033c4 in the FGA-002 firmware with CRC (faa38972) (for example)
*/
-READ8_MEMBER (cpu30_state::board_mem_id_rd)
+uint8_t cpu30_state::board_mem_id_rd()
{
int sz;
LOG("%s\n", FUNCNAME);
@@ -591,12 +591,12 @@ READ8_MEMBER (cpu30_state::board_mem_id_rd)
}
// PIT#2 Port C TODO: implement timer interrupt, DMA i/o, memory control and Hardware ID
-READ8_MEMBER (cpu30_state::pit2c_r){
+uint8_t cpu30_state::pit2c_r(){
LOG("%s\n", FUNCNAME);
return 0xfe;
}
-WRITE8_MEMBER (cpu30_state::pit2c_w){
+void cpu30_state::pit2c_w(uint8_t data){
LOG("%s(%02x)\n", FUNCNAME, data);
}
diff --git a/src/mame/drivers/fidel_card.cpp b/src/mame/drivers/fidel_card.cpp
index 215fd9daa26..9717115c937 100644
--- a/src/mame/drivers/fidel_card.cpp
+++ b/src/mame/drivers/fidel_card.cpp
@@ -237,9 +237,9 @@ private:
// I/O handlers
void update_display();
- DECLARE_WRITE8_MEMBER(speech_w);
- DECLARE_WRITE8_MEMBER(mcu_p1_w);
- DECLARE_READ8_MEMBER(mcu_p2_r);
+ void speech_w(u8 data);
+ void mcu_p1_w(u8 data);
+ u8 mcu_p2_r();
DECLARE_READ_LINE_MEMBER(mcu_t0_r);
template void ioexp_port_w(uint8_t data);
};
@@ -278,7 +278,7 @@ void card_state::update_display()
m_dac->write(BIT(~m_inp_mux, 7) & BIT(m_vfd_data, 13));
}
-WRITE8_MEMBER(card_state::speech_w)
+void card_state::speech_w(u8 data)
{
if (m_speech == nullptr)
return;
@@ -326,14 +326,14 @@ void card_state::ioexp_port_w(uint8_t data)
// I8041 MCU
-WRITE8_MEMBER(card_state::mcu_p1_w)
+void card_state::mcu_p1_w(u8 data)
{
// P10-P17: input mux, digit select
m_inp_mux = data;
update_display();
}
-READ8_MEMBER(card_state::mcu_p2_r)
+u8 card_state::mcu_p2_r()
{
// P20-P23: I8243 P2
u8 data = m_i8243->p2_r() & 0x0f;
diff --git a/src/mame/drivers/fidel_cc1.cpp b/src/mame/drivers/fidel_cc1.cpp
index eb1ec8ce428..902b3c0d3d5 100644
--- a/src/mame/drivers/fidel_cc1.cpp
+++ b/src/mame/drivers/fidel_cc1.cpp
@@ -107,9 +107,9 @@ private:
// I/O handlers
void update_display();
- DECLARE_READ8_MEMBER(ppi_porta_r);
- DECLARE_WRITE8_MEMBER(ppi_portb_w);
- DECLARE_WRITE8_MEMBER(ppi_portc_w);
+ u8 ppi_porta_r();
+ void ppi_portb_w(u8 data);
+ void ppi_portc_w(u8 data);
u8 m_led_select;
u8 m_7seg_data;
@@ -140,7 +140,7 @@ void cc1_state::update_display()
m_display->matrix(m_led_select, m_7seg_data);
}
-READ8_MEMBER(cc1_state::ppi_porta_r)
+u8 cc1_state::ppi_porta_r()
{
// 74148(priority encoder) I0-I7: inputs
// d0-d2: 74148 S0-S2, d3: 74148 GS
@@ -153,14 +153,14 @@ READ8_MEMBER(cc1_state::ppi_porta_r)
return data | ((m_delay->enabled()) ? 0x10 : 0);
}
-WRITE8_MEMBER(cc1_state::ppi_portb_w)
+void cc1_state::ppi_portb_w(u8 data)
{
// d0-d6: digit segment data
m_7seg_data = bitswap<7>(data,0,1,2,3,4,5,6);
update_display();
}
-WRITE8_MEMBER(cc1_state::ppi_portc_w)
+void cc1_state::ppi_portc_w(u8 data)
{
// d6: trigger monostable 555 (R=15K, C=1uF)
if (~data & m_led_select & 0x40 && !m_delay->enabled())
diff --git a/src/mame/drivers/fidel_cc10.cpp b/src/mame/drivers/fidel_cc10.cpp
index 701bcfe3d8e..03b2cab3b19 100644
--- a/src/mame/drivers/fidel_cc10.cpp
+++ b/src/mame/drivers/fidel_cc10.cpp
@@ -89,10 +89,10 @@ private:
// I/O handlers
void update_display();
- DECLARE_WRITE8_MEMBER(ppi_porta_w);
- DECLARE_WRITE8_MEMBER(ppi_portb_w);
- DECLARE_READ8_MEMBER(ppi_portc_r);
- DECLARE_WRITE8_MEMBER(ppi_portc_w);
+ void ppi_porta_w(u8 data);
+ void ppi_portb_w(u8 data);
+ u8 ppi_portc_r();
+ void ppi_portc_w(u8 data);
u8 m_inp_mux;
u8 m_led_select;
@@ -126,7 +126,7 @@ void ccx_state::update_display()
m_display->matrix(m_led_select, m_7seg_data);
}
-WRITE8_MEMBER(ccx_state::ppi_porta_w)
+void ccx_state::ppi_porta_w(u8 data)
{
// d7: enable beeper on falling edge (556 monostable) (unpopulated on ACR)
if (m_beeper != nullptr && ~data & m_7seg_data & 0x80 && !m_beeper_off->enabled())
@@ -140,7 +140,7 @@ WRITE8_MEMBER(ccx_state::ppi_porta_w)
update_display();
}
-WRITE8_MEMBER(ccx_state::ppi_portb_w)
+void ccx_state::ppi_portb_w(u8 data)
{
// d0: lose led, d1: check(win) led
// d2-d5: digit select
@@ -148,7 +148,7 @@ WRITE8_MEMBER(ccx_state::ppi_portb_w)
update_display();
}
-READ8_MEMBER(ccx_state::ppi_portc_r)
+u8 ccx_state::ppi_portc_r()
{
u8 data = 0;
@@ -160,7 +160,7 @@ READ8_MEMBER(ccx_state::ppi_portc_r)
return ~data & 0xf;
}
-WRITE8_MEMBER(ccx_state::ppi_portc_w)
+void ccx_state::ppi_portc_w(u8 data)
{
// d4-d7: input mux (inverted)
m_inp_mux = ~data >> 4 & 0xf;
diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp
index d78062c2ba5..eb707d0ff7f 100644
--- a/src/mame/drivers/fidel_csc.cpp
+++ b/src/mame/drivers/fidel_csc.cpp
@@ -270,18 +270,18 @@ protected:
u16 read_inputs();
void update_display();
void update_sound();
- DECLARE_READ8_MEMBER(speech_r);
+ u8 speech_r(offs_t offset);
- DECLARE_WRITE8_MEMBER(pia0_pa_w);
- DECLARE_WRITE8_MEMBER(pia0_pb_w);
- DECLARE_READ8_MEMBER(pia0_pa_r);
+ void pia0_pa_w(u8 data);
+ void pia0_pb_w(u8 data);
+ u8 pia0_pa_r();
DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w);
DECLARE_READ_LINE_MEMBER(pia0_ca1_r);
DECLARE_READ_LINE_MEMBER(pia0_cb1_r);
- DECLARE_WRITE8_MEMBER(pia1_pa_w);
- DECLARE_WRITE8_MEMBER(pia1_pb_w);
- DECLARE_READ8_MEMBER(pia1_pb_r);
+ void pia1_pa_w(u8 data);
+ void pia1_pb_w(u8 data);
+ u8 pia1_pb_r();
DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w);
u8 m_led_data;
@@ -398,7 +398,7 @@ void csc_state::update_sound()
m_dac->write(BIT(1 << m_inp_mux, 9));
}
-READ8_MEMBER(csc_state::speech_r)
+u8 csc_state::speech_r(offs_t offset)
{
return m_speech_rom[m_speech_bank << 12 | offset];
}
@@ -406,13 +406,13 @@ READ8_MEMBER(csc_state::speech_r)
// 6821 PIA 0
-READ8_MEMBER(csc_state::pia0_pa_r)
+u8 csc_state::pia0_pa_r()
{
// d0-d5: button row 0-5
return (read_inputs() & 0x3f) | 0xc0;
}
-WRITE8_MEMBER(csc_state::pia0_pa_w)
+void csc_state::pia0_pa_w(u8 data)
{
// d6,d7: 7442 A0,A1
m_inp_mux = (m_inp_mux & ~3) | (data >> 6 & 3);
@@ -420,7 +420,7 @@ WRITE8_MEMBER(csc_state::pia0_pa_w)
update_sound();
}
-WRITE8_MEMBER(csc_state::pia0_pb_w)
+void csc_state::pia0_pb_w(u8 data)
{
// d0-d7: led row data
m_led_data = data;
@@ -458,7 +458,7 @@ WRITE_LINE_MEMBER(csc_state::pia0_ca2_w)
// 6821 PIA 1
-WRITE8_MEMBER(csc_state::pia1_pa_w)
+void csc_state::pia1_pa_w(u8 data)
{
// d0-d5: TSI C0-C5
m_speech->data_w(data & 0x3f);
@@ -468,7 +468,7 @@ WRITE8_MEMBER(csc_state::pia1_pa_w)
update_display();
}
-WRITE8_MEMBER(csc_state::pia1_pb_w)
+void csc_state::pia1_pb_w(u8 data)
{
// d0: speech ROM A12
m_speech->force_update(); // update stream to now
@@ -481,7 +481,7 @@ WRITE8_MEMBER(csc_state::pia1_pb_w)
m_speech->set_output_gain(0, (data & 0x10) ? 0.25 : 1.0);
}
-READ8_MEMBER(csc_state::pia1_pb_r)
+u8 csc_state::pia1_pb_r()
{
// d2: printer?
u8 data = 0x04;
diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp
index 0b18d43a514..216b84c21c1 100644
--- a/src/mame/drivers/fidel_elite.cpp
+++ b/src/mame/drivers/fidel_elite.cpp
@@ -134,13 +134,13 @@ protected:
// I/O handlers
void update_display();
- DECLARE_READ8_MEMBER(speech_r);
- DECLARE_WRITE8_MEMBER(segment_w);
- DECLARE_WRITE8_MEMBER(led_w);
- DECLARE_READ8_MEMBER(input_r);
- DECLARE_WRITE8_MEMBER(ppi_porta_w);
- DECLARE_READ8_MEMBER(ppi_portb_r);
- DECLARE_WRITE8_MEMBER(ppi_portc_w);
+ u8 speech_r(offs_t offset);
+ void segment_w(offs_t offset, u8 data);
+ void led_w(offs_t offset, u8 data);
+ u8 input_r();
+ void ppi_porta_w(u8 data);
+ u8 ppi_portb_r();
+ void ppi_portc_w(u8 data);
bool m_rotate;
u8 m_led_data;
@@ -209,12 +209,12 @@ void elite_state::update_display()
m_display->matrix(1 << m_inp_mux, m_led_data << 8 | seg_data);
}
-READ8_MEMBER(elite_state::speech_r)
+u8 elite_state::speech_r(offs_t offset)
{
return m_speech_rom[m_speech_bank << 12 | offset];
}
-WRITE8_MEMBER(elite_state::segment_w)
+void elite_state::segment_w(offs_t offset, u8 data)
{
// a0-a2,d7: digit segment
u8 mask = 1 << offset;
@@ -222,14 +222,14 @@ WRITE8_MEMBER(elite_state::segment_w)
update_display();
}
-WRITE8_MEMBER(elite_state::led_w)
+void elite_state::led_w(offs_t offset, u8 data)
{
// a0-a2,d0: led data
m_led_data = (m_led_data & ~(1 << offset)) | ((data & 1) << offset);
update_display();
}
-READ8_MEMBER(elite_state::input_r)
+u8 elite_state::input_r()
{
u8 data = 0;
@@ -254,7 +254,7 @@ READ8_MEMBER(elite_state::input_r)
// 8255 PPI (PC: done with TTL instead)
-WRITE8_MEMBER(elite_state::ppi_porta_w)
+void elite_state::ppi_porta_w(u8 data)
{
// d0-d5: TSI C0-C5
// d6: TSI START line
@@ -264,7 +264,7 @@ WRITE8_MEMBER(elite_state::ppi_porta_w)
// d7: printer? (black wire to LED pcb)
}
-WRITE8_MEMBER(elite_state::ppi_portc_w)
+void elite_state::ppi_portc_w(u8 data)
{
// d0-d3: 7442 a0-a3
// 7442 0-8: led select, input mux
@@ -286,7 +286,7 @@ WRITE8_MEMBER(elite_state::ppi_portc_w)
m_rombank->set_entry(data >> 6 & 3);
}
-READ8_MEMBER(elite_state::ppi_portb_r)
+u8 elite_state::ppi_portb_r()
{
// d0: printer? white wire from LED pcb
u8 data = 1;
diff --git a/src/mame/drivers/fidel_excel.cpp b/src/mame/drivers/fidel_excel.cpp
index 6a5db5bc199..868fb8b22ed 100644
--- a/src/mame/drivers/fidel_excel.cpp
+++ b/src/mame/drivers/fidel_excel.cpp
@@ -202,9 +202,9 @@ private:
template TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
// I/O handlers
- DECLARE_READ8_MEMBER(speech_r);
- DECLARE_WRITE8_MEMBER(ttl_w);
- DECLARE_READ8_MEMBER(ttl_r);
+ u8 speech_r(offs_t offset);
+ void ttl_w(offs_t offset, u8 data);
+ u8 ttl_r(offs_t offset);
u8 m_select;
u8 m_7seg_data;
@@ -242,7 +242,7 @@ INPUT_CHANGED_MEMBER(excel_state::speech_bankswitch)
m_speech_bank = (m_speech_bank & 1) | newval << 1;
}
-READ8_MEMBER(excel_state::speech_r)
+u8 excel_state::speech_r(offs_t offset)
{
// TSI A11 is A12, program controls A11, user controls A13,A14(language switches)
offset = (offset & 0x7ff) | (offset << 1 & 0x1000);
@@ -252,7 +252,7 @@ READ8_MEMBER(excel_state::speech_r)
// TTL
-WRITE8_MEMBER(excel_state::ttl_w)
+void excel_state::ttl_w(offs_t offset, u8 data)
{
// a0-a2,d0: 74259(1)
u8 mask = 1 << offset;
@@ -294,7 +294,7 @@ WRITE8_MEMBER(excel_state::ttl_w)
}
}
-READ8_MEMBER(excel_state::ttl_r)
+u8 excel_state::ttl_r(offs_t offset)
{
u8 sel = m_select & 0xf;
u8 d7 = 0x80;
diff --git a/src/mame/drivers/fidel_sc6.cpp b/src/mame/drivers/fidel_sc6.cpp
index 927f3a2928f..f396a449d19 100644
--- a/src/mame/drivers/fidel_sc6.cpp
+++ b/src/mame/drivers/fidel_sc6.cpp
@@ -69,11 +69,11 @@ private:
// I/O handlers
void update_display();
- DECLARE_WRITE8_MEMBER(mux_w);
- DECLARE_WRITE8_MEMBER(select_w);
+ void mux_w(u8 data);
+ void select_w(u8 data);
u8 read_inputs();
- DECLARE_READ8_MEMBER(input_r);
+ u8 input_r();
DECLARE_READ_LINE_MEMBER(input6_r);
DECLARE_READ_LINE_MEMBER(input7_r);
@@ -106,7 +106,7 @@ void sc6_state::update_display()
m_display->matrix(m_led_select, 1 << m_inp_mux);
}
-WRITE8_MEMBER(sc6_state::mux_w)
+void sc6_state::mux_w(u8 data)
{
// P24-P27: 7442 A-D
// 7442 0-8: input mux, 7seg data
@@ -117,7 +117,7 @@ WRITE8_MEMBER(sc6_state::mux_w)
m_dac->write(BIT(1 << m_inp_mux, 9));
}
-WRITE8_MEMBER(sc6_state::select_w)
+void sc6_state::select_w(u8 data)
{
// P16,P17: digit select
m_led_select = ~data >> 6 & 3;
@@ -139,7 +139,7 @@ u8 sc6_state::read_inputs()
return ~data;
}
-READ8_MEMBER(sc6_state::input_r)
+u8 sc6_state::input_r()
{
// P10-P15: multiplexed inputs low
return (read_inputs() & 0x3f) | 0xc0;
diff --git a/src/mame/drivers/fidel_vcc.cpp b/src/mame/drivers/fidel_vcc.cpp
index ffaededb2fe..3ea064afb4c 100644
--- a/src/mame/drivers/fidel_vcc.cpp
+++ b/src/mame/drivers/fidel_vcc.cpp
@@ -152,12 +152,12 @@ private:
// I/O handlers
void update_display();
- DECLARE_READ8_MEMBER(speech_r);
- DECLARE_WRITE8_MEMBER(ppi_porta_w);
- DECLARE_READ8_MEMBER(ppi_portb_r);
- DECLARE_WRITE8_MEMBER(ppi_portb_w);
- DECLARE_READ8_MEMBER(ppi_portc_r);
- DECLARE_WRITE8_MEMBER(ppi_portc_w);
+ u8 speech_r(offs_t offset);
+ void ppi_porta_w(u8 data);
+ u8 ppi_portb_r();
+ void ppi_portb_w(u8 data);
+ u8 ppi_portc_r();
+ void ppi_portc_w(u8 data);
u8 m_led_select;
u8 m_7seg_data;
@@ -199,7 +199,7 @@ void vcc_state::update_display()
m_display->matrix(m_led_select >> 2 & 0xf, outdata);
}
-READ8_MEMBER(vcc_state::speech_r)
+u8 vcc_state::speech_r(offs_t offset)
{
return m_speech_rom[m_speech_bank << 12 | offset];
}
@@ -207,7 +207,7 @@ READ8_MEMBER(vcc_state::speech_r)
// I8255 PPI
-WRITE8_MEMBER(vcc_state::ppi_porta_w)
+void vcc_state::ppi_porta_w(u8 data)
{
// d0-d6: digit segment data, bits are xABCDEFG
m_7seg_data = bitswap<8>(data,7,0,1,2,3,4,5,6);
@@ -227,13 +227,13 @@ WRITE8_MEMBER(vcc_state::ppi_porta_w)
}
}
-READ8_MEMBER(vcc_state::ppi_portb_r)
+u8 vcc_state::ppi_portb_r()
{
// d7: TSI BUSY line
return (m_speech->busy_r()) ? 0x80 : 0x00;
}
-WRITE8_MEMBER(vcc_state::ppi_portb_w)
+void vcc_state::ppi_portb_w(u8 data)
{
// d0,d2-d5: digit/led select
// _d6: enable language switches
@@ -241,7 +241,7 @@ WRITE8_MEMBER(vcc_state::ppi_portb_w)
update_display();
}
-READ8_MEMBER(vcc_state::ppi_portc_r)
+u8 vcc_state::ppi_portc_r()
{
u8 data = 0;
@@ -258,7 +258,7 @@ READ8_MEMBER(vcc_state::ppi_portc_r)
return ~data & 0xf;
}
-WRITE8_MEMBER(vcc_state::ppi_portc_w)
+void vcc_state::ppi_portc_w(u8 data)
{
// d4-d7: input mux (inverted)
m_inp_mux = ~data >> 4 & 0xf;
diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp
index 7542d07aa62..5dba5bf8982 100644
--- a/src/mame/drivers/fidel_vsc.cpp
+++ b/src/mame/drivers/fidel_vsc.cpp
@@ -202,8 +202,8 @@ private:
// address maps
void main_map(address_map &map);
void main_io(address_map &map);
- DECLARE_READ8_MEMBER(main_io_trampoline_r);
- DECLARE_WRITE8_MEMBER(main_io_trampoline_w);
+ u8 main_io_trampoline_r(offs_t offset);
+ void main_io_trampoline_w(offs_t offset, u8 data);
// periodic interrupts
template TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
@@ -211,13 +211,13 @@ private:
// I/O handlers
void update_display();
- DECLARE_READ8_MEMBER(speech_r);
- DECLARE_WRITE8_MEMBER(ppi_porta_w);
- DECLARE_WRITE8_MEMBER(ppi_portb_w);
- DECLARE_WRITE8_MEMBER(ppi_portc_w);
- DECLARE_READ8_MEMBER(pio_porta_r);
- DECLARE_READ8_MEMBER(pio_portb_r);
- DECLARE_WRITE8_MEMBER(pio_portb_w);
+ u8 speech_r(offs_t offset);
+ void ppi_porta_w(u8 data);
+ void ppi_portb_w(u8 data);
+ void ppi_portc_w(u8 data);
+ u8 pio_porta_r();
+ u8 pio_portb_r();
+ void pio_portb_w(u8 data);
u8 m_led_data;
u8 m_7seg_data;
@@ -260,7 +260,7 @@ void vsc_state::update_display()
m_display->matrix(m_cb_mux, m_led_data << 8 | m_7seg_data);
}
-READ8_MEMBER(vsc_state::speech_r)
+u8 vsc_state::speech_r(offs_t offset)
{
return m_speech_rom[m_speech_bank << 12 | offset];
}
@@ -268,7 +268,7 @@ READ8_MEMBER(vsc_state::speech_r)
// I8255 PPI
-WRITE8_MEMBER(vsc_state::ppi_porta_w)
+void vsc_state::ppi_porta_w(u8 data)
{
// d0-d5: TSI C0-C5
m_speech->data_w(data & 0x3f);
@@ -278,14 +278,14 @@ WRITE8_MEMBER(vsc_state::ppi_porta_w)
update_display();
}
-WRITE8_MEMBER(vsc_state::ppi_portb_w)
+void vsc_state::ppi_portb_w(u8 data)
{
// d0-d7: led row data
m_led_data = data;
update_display();
}
-WRITE8_MEMBER(vsc_state::ppi_portc_w)
+void vsc_state::ppi_portc_w(u8 data)
{
// d0-d3: select digits
// d0-d7: select leds, chessboard input mux
@@ -296,7 +296,7 @@ WRITE8_MEMBER(vsc_state::ppi_portc_w)
// Z80 PIO
-READ8_MEMBER(vsc_state::pio_porta_r)
+u8 vsc_state::pio_porta_r()
{
u8 data = 0;
@@ -318,7 +318,7 @@ READ8_MEMBER(vsc_state::pio_porta_r)
return data;
}
-READ8_MEMBER(vsc_state::pio_portb_r)
+u8 vsc_state::pio_portb_r()
{
u8 data = 0;
@@ -328,7 +328,7 @@ READ8_MEMBER(vsc_state::pio_portb_r)
return data;
}
-WRITE8_MEMBER(vsc_state::pio_portb_w)
+void vsc_state::pio_portb_w(u8 data)
{
// d0,d1: keypad input mux
// d5: enable language switch
@@ -361,7 +361,7 @@ void vsc_state::main_map(address_map &map)
}
// VSC io: A2 is 8255 _CE, A3 is Z80 PIO _CE - in theory, both chips can be accessed simultaneously
-READ8_MEMBER(vsc_state::main_io_trampoline_r)
+u8 vsc_state::main_io_trampoline_r(offs_t offset)
{
u8 data = 0xff; // open bus
if (~offset & 4)
@@ -372,7 +372,7 @@ READ8_MEMBER(vsc_state::main_io_trampoline_r)
return data;
}
-WRITE8_MEMBER(vsc_state::main_io_trampoline_w)
+void vsc_state::main_io_trampoline_w(offs_t offset, u8 data)
{
if (~offset & 4)
m_ppi8255->write(offset & 3, data);
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index 0e94cf52187..f02cf728002 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -65,7 +65,7 @@ WRITE8_MEMBER(finalizr_state::finalizr_i8039_irq_w)
m_audiocpu->set_input_line(0, ASSERT_LINE);
}
-WRITE8_MEMBER(finalizr_state::i8039_irqen_w)
+void finalizr_state::i8039_irqen_w(uint8_t data)
{
/* bit 0x80 goes active low, indicating that the
external IRQ being serviced is complete
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 0bc5e606678..81a2327f7c0 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -335,12 +335,12 @@ READ32_MEMBER(firebeat_state::ata_command_r )
// printf("ata_command_r: %08X, %08X\n", offset, mem_mask);
if (ACCESSING_BITS_16_31)
{
- r = m_ata->read_cs0(offset*2, BYTESWAP16((mem_mask >> 16) & 0xffff));
+ r = m_ata->cs0_r(offset*2, BYTESWAP16((mem_mask >> 16) & 0xffff));
return BYTESWAP16(r) << 16;
}
else
{
- r = m_ata->read_cs0((offset*2) + 1, BYTESWAP16((mem_mask >> 0) & 0xffff));
+ r = m_ata->cs0_r((offset*2) + 1, BYTESWAP16((mem_mask >> 0) & 0xffff));
return BYTESWAP16(r) << 0;
}
}
@@ -351,11 +351,11 @@ WRITE32_MEMBER(firebeat_state::ata_command_w )
if (ACCESSING_BITS_16_31)
{
- m_ata->write_cs0(offset*2, BYTESWAP16((data >> 16) & 0xffff), BYTESWAP16((mem_mask >> 16) & 0xffff));
+ m_ata->cs0_w(offset*2, BYTESWAP16((data >> 16) & 0xffff), BYTESWAP16((mem_mask >> 16) & 0xffff));
}
else
{
- m_ata->write_cs0((offset*2) + 1, BYTESWAP16((data >> 0) & 0xffff), BYTESWAP16((mem_mask >> 0) & 0xffff));
+ m_ata->cs0_w((offset*2) + 1, BYTESWAP16((data >> 0) & 0xffff), BYTESWAP16((mem_mask >> 0) & 0xffff));
}
}
@@ -367,12 +367,12 @@ READ32_MEMBER(firebeat_state::ata_control_r )
if (ACCESSING_BITS_16_31)
{
- r = m_ata->read_cs1(offset*2, BYTESWAP16((mem_mask >> 16) & 0xffff));
+ r = m_ata->cs1_r(offset*2, BYTESWAP16((mem_mask >> 16) & 0xffff));
return BYTESWAP16(r) << 16;
}
else
{
- r = m_ata->read_cs1((offset*2) + 1, BYTESWAP16((mem_mask >> 0) & 0xffff));
+ r = m_ata->cs1_r((offset*2) + 1, BYTESWAP16((mem_mask >> 0) & 0xffff));
return BYTESWAP16(r) << 0;
}
}
@@ -381,11 +381,11 @@ WRITE32_MEMBER(firebeat_state::ata_control_w )
{
if (ACCESSING_BITS_16_31)
{
- m_ata->write_cs1(offset*2, BYTESWAP16(data >> 16) & 0xffff, BYTESWAP16((mem_mask >> 16) & 0xffff));
+ m_ata->cs1_w(offset*2, BYTESWAP16(data >> 16) & 0xffff, BYTESWAP16((mem_mask >> 16) & 0xffff));
}
else
{
- m_ata->write_cs1((offset*2) + 1, BYTESWAP16(data >> 0) & 0xffff, BYTESWAP16((mem_mask >> 0) & 0xffff));
+ m_ata->cs1_w((offset*2) + 1, BYTESWAP16(data >> 0) & 0xffff, BYTESWAP16((mem_mask >> 0) & 0xffff));
}
}
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 8e94da7359d..057cd731b97 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -96,8 +96,8 @@ private:
DECLARE_WRITE8_MEMBER(self_reset_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w);
- DECLARE_READ8_MEMBER(riot_porta_r);
- DECLARE_WRITE8_MEMBER(riot_porta_w);
+ uint8_t riot_porta_r();
+ void riot_porta_w(uint8_t data);
TILE_GET_INFO_MEMBER(bgtile_get_info);
uint32_t screen_update_firefox(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(video_timer_callback);
@@ -345,7 +345,7 @@ WRITE_LINE_MEMBER(firefox_state::sound_reset_w)
*
*************************************/
-READ8_MEMBER(firefox_state::riot_porta_r)
+uint8_t firefox_state::riot_porta_r()
{
/* bit 7 = MAINFLAG */
/* bit 6 = SOUNDFLAG */
@@ -359,7 +359,7 @@ READ8_MEMBER(firefox_state::riot_porta_r)
return (m_soundlatch->pending_r() ? 0x80 : 0x00) | (m_soundlatch2->pending_r() ? 0x40 : 0x00) | 0x10 | (m_tms->readyq_r() << 2);
}
-WRITE8_MEMBER(firefox_state::riot_porta_w)
+void firefox_state::riot_porta_w(uint8_t data)
{
/* handle 5220 read */
m_tms->rsq_w((data>>1) & 1);
diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp
index a184903a2be..972eaa21f96 100644
--- a/src/mame/drivers/flkatck.cpp
+++ b/src/mame/drivers/flkatck.cpp
@@ -188,7 +188,7 @@ static GFXDECODE_START( gfx_flkatck )
GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 32 )
GFXDECODE_END
-WRITE8_MEMBER(flkatck_state::volume_callback)
+void flkatck_state::volume_callback(uint8_t data)
{
m_k007232->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 30fe9cfb9d9..4db7f63ebb3 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -965,16 +965,6 @@ READ8_MEMBER(fm7_state::fm7_fmirq_r)
return ret;
}
-READ8_MEMBER(fm7_state::fm77av_joy_1_r)
-{
- return m_joy1->read();
-}
-
-READ8_MEMBER(fm7_state::fm77av_joy_2_r)
-{
- return m_joy2->read();
-}
-
READ8_MEMBER(fm7_state::fm7_unknown_r)
{
// Port 0xFDFC is read by Dig Dug. Controller port, perhaps?
@@ -2145,8 +2135,8 @@ void fm7_state::fm77av(machine_config &config)
SPEAKER(config, "mono").front_center();
YM2203(config, m_ym, 4.9152_MHz_XTAL / 4);
m_ym->irq_handler().set(FUNC(fm7_state::fm77av_fmirq));
- m_ym->port_a_read_callback().set(FUNC(fm7_state::fm77av_joy_1_r));
- m_ym->port_b_read_callback().set(FUNC(fm7_state::fm77av_joy_2_r));
+ m_ym->port_a_read_callback().set_ioport("joy1");
+ m_ym->port_b_read_callback().set_ioport("joy2");
m_ym->add_route(ALL_OUTPUTS,"mono", 1.00);
BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index bea9210ef2f..c9988667c6a 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -656,12 +656,12 @@ WRITE8_MEMBER(towns_state::towns_floppy_w)
}
}
-READ16_MEMBER(towns_state::towns_fdc_dma_r)
+uint16_t towns_state::towns_fdc_dma_r()
{ uint16_t data = m_fdc->data_r();
return data;
}
-WRITE16_MEMBER(towns_state::towns_fdc_dma_w)
+void towns_state::towns_fdc_dma_w(uint16_t data)
{
m_fdc->data_w(data);
}
@@ -1734,7 +1734,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device)
}
}
-READ16_MEMBER(towns_state::towns_cdrom_dma_r)
+uint16_t towns_state::towns_cdrom_dma_r()
{
if(m_towns_cd.buffer_ptr >= 2048)
return 0x00;
@@ -2012,12 +2012,12 @@ WRITE_LINE_MEMBER(towns_state::rtc_busy_w)
}
// SCSI controller - I/O ports 0xc30 and 0xc32
-READ16_MEMBER(towns_state::towns_scsi_dma_r)
+uint16_t towns_state::towns_scsi_dma_r()
{
return m_scsi->fmscsi_data_r();
}
-WRITE16_MEMBER(towns_state::towns_scsi_dma_w)
+void towns_state::towns_scsi_dma_w(uint16_t data)
{
m_scsi->fmscsi_data_w(data & 0xff);
}
@@ -2783,7 +2783,7 @@ void towns_state::machine_reset()
m_towns_fm_irq_flag = 0;
}
-READ8_MEMBER(towns_state::get_slave_ack)
+uint8_t towns_state::get_slave_ack(offs_t offset)
{
if (offset==7) { // IRQ = 7
return m_pic_slave->acknowledge();
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index d23a6b336bb..6f3f3ce2e85 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -326,7 +326,7 @@ GFXDECODE_END
*
*************************************/
-READ8_MEMBER(foodf_state::pot_r)
+uint8_t foodf_state::pot_r(offs_t offset)
{
return (ioport("DSW")->read() >> offset) << 7;
}
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index ff12238af46..b9ffadaca49 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -55,14 +55,16 @@ public:
void init_pesadelo();
void pesadelo(machine_config &config);
-private:
+protected:
virtual void machine_start() override;
virtual void machine_reset() override;
+
+private:
void io_mem(address_map &map);
void program_mem(address_map &map);
- DECLARE_READ8_MEMBER(ay8910_read_input);
- DECLARE_WRITE8_MEMBER(ay8910_set_input_mask);
+ uint8_t ay8910_read_input();
+ void ay8910_set_input_mask(uint8_t data);
required_device m_maincpu;
@@ -101,12 +103,12 @@ static INPUT_PORTS_START( pesadelo )
INPUT_PORTS_END
-READ8_MEMBER(forte2_state::ay8910_read_input)
+uint8_t forte2_state::ay8910_read_input()
{
return ioport("IN0")->read() | (m_input_mask & 0x3f);
}
-WRITE8_MEMBER(forte2_state::ay8910_set_input_mask)
+void forte2_state::ay8910_set_input_mask(uint8_t data)
{
/* PSG reg 15, writes 0 at coin insert, 0xff at boot and game over */
m_input_mask = data;
diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp
index af5436ecd82..1987638c7d8 100644
--- a/src/mame/drivers/fruitpc.cpp
+++ b/src/mame/drivers/fruitpc.cpp
@@ -38,14 +38,14 @@ private:
required_device m_isabus;
required_ioport_array<4> m_inp;
- DECLARE_READ8_MEMBER(fruit_inp_r);
- DECLARE_WRITE8_MEMBER(dma8237_1_dack_w);
+ uint8_t fruit_inp_r(offs_t offset);
+ void dma8237_1_dack_w(uint8_t data);
static void fruitpc_sb_conf(device_t *device);
void fruitpc_io(address_map &map);
void fruitpc_map(address_map &map);
};
-READ8_MEMBER(fruitpc_state::fruit_inp_r)
+uint8_t fruitpc_state::fruit_inp_r(offs_t offset)
{
return m_inp[offset & 0x03]->read();
}
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( fruitpc )
INPUT_PORTS_END
//TODO: use atmb device
-WRITE8_MEMBER( fruitpc_state::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); }
+void fruitpc_state::dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); }
static void fruitpc_isa8_cards(device_slot_interface &device)
{
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index e31ae730960..c399dbb34c6 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -658,7 +658,7 @@
* Read/Write Handlers *
**********************/
-WRITE8_MEMBER(funworld_state::funworld_lamp_a_w)
+void funworld_state::funworld_lamp_a_w(uint8_t data)
{
/* - bits -
7654 3210
@@ -686,7 +686,7 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_a_w)
// popmessage("Lamps A: %02X", (data ^ 0xff));
}
-WRITE8_MEMBER(funworld_state::funworld_lamp_b_w)
+void funworld_state::funworld_lamp_b_w(uint8_t data)
{
/* - bits -
7654 3210
@@ -2966,12 +2966,12 @@ GFXDECODE_END
*/
/* these ports are set to output anyway, but this quietens the log */
-READ8_MEMBER(funworld_state::funquiz_ay8910_a_r)
+uint8_t funworld_state::funquiz_ay8910_a_r()
{
return 0x00;
}
-READ8_MEMBER(funworld_state::funquiz_ay8910_b_r)
+uint8_t funworld_state::funquiz_ay8910_b_r()
{
return 0x00;
}
diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index effd653945a..90009bc79d7 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/src/mame/drivers/gaelco3d.cpp
@@ -388,7 +388,7 @@ WRITE32_MEMBER(gaelco3d_state::tms_m68k_ram_w)
}
-WRITE8_MEMBER(gaelco3d_state::tms_iack_w)
+void gaelco3d_state::tms_iack_w(offs_t offset, uint8_t data)
{
if (LOG)
logerror("iack_w(%d) - %06X\n", data, offset);
@@ -551,7 +551,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(gaelco3d_state::adsp_autobuffer_irq)
m_adsp->set_state_int(ADSP2100_I0 + m_adsp_ireg, reg);
}
-WRITE32_MEMBER(gaelco3d_state::adsp_tx_callback)
+void gaelco3d_state::adsp_tx_callback(offs_t offset, uint32_t data)
{
/* check if it's for SPORT1 */
if (offset != 1)
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 6c3a47d90bb..83523b472ea 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -759,7 +759,7 @@ WRITE_LINE_MEMBER(galaga_state::nmion_w)
m_sub2_nmi_mask = !state;
}
-WRITE8_MEMBER(galaga_state::out)
+void galaga_state::out(uint8_t data)
{
m_leds[1] = BIT(data, 0);
m_leds[0] = BIT(data, 1);
@@ -772,7 +772,7 @@ WRITE_LINE_MEMBER(galaga_state::lockout)
machine().bookkeeping().coin_lockout_global_w(state);
}
-READ8_MEMBER(galaga_state::namco_52xx_rom_r)
+uint8_t galaga_state::namco_52xx_rom_r(offs_t offset)
{
uint32_t length = memregion("52xx")->bytes();
//printf("ROM read %04X\n", offset);
@@ -787,7 +787,7 @@ READ8_MEMBER(galaga_state::namco_52xx_rom_r)
return (offset < length) ? memregion("52xx")->base()[offset] : 0xff;
}
-READ8_MEMBER(galaga_state::namco_52xx_si_r)
+uint8_t galaga_state::namco_52xx_si_r()
{
/* pulled to GND */
return 0;
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 962de624fa0..caafede0388 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -770,7 +770,7 @@ WRITE8_MEMBER(galaxian_state::konami_ay8910_w)
}
-WRITE8_MEMBER(galaxian_state::konami_sound_control_w)
+void galaxian_state::konami_sound_control_w(uint8_t data)
{
uint8_t old = m_konami_sound_control;
m_konami_sound_control = data;
@@ -785,7 +785,7 @@ WRITE8_MEMBER(galaxian_state::konami_sound_control_w)
}
-READ8_MEMBER(galaxian_state::konami_sound_timer_r)
+uint8_t galaxian_state::konami_sound_timer_r()
{
/*
The timer is clocked at KONAMI_SOUND_CLOCK and cascades through a
@@ -845,13 +845,13 @@ WRITE8_MEMBER(galaxian_state::konami_sound_filter_w)
}
-WRITE8_MEMBER(galaxian_state::konami_portc_0_w)
+void galaxian_state::konami_portc_0_w(uint8_t data)
{
logerror("%s:ppi0_portc_w = %02X\n", machine().describe_context(), data);
}
-WRITE8_MEMBER(galaxian_state::konami_portc_1_w)
+void galaxian_state::konami_portc_1_w(uint8_t data)
{
logerror("%s:ppi1_portc_w = %02X\n", machine().describe_context(), data);
}
@@ -881,13 +881,13 @@ WRITE8_MEMBER(galaxian_state::theend_ppi8255_w)
}
-WRITE8_MEMBER(galaxian_state::theend_coin_counter_w)
+void galaxian_state::theend_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x80);
}
-WRITE8_MEMBER(galaxian_state::theend_protection_w)
+void galaxian_state::theend_protection_w(uint8_t data)
{
/*
Handled by a PAL16VR8(?) at 6J. Both inputs and outputs are a nibble.
@@ -926,7 +926,7 @@ WRITE8_MEMBER(galaxian_state::theend_protection_w)
}
-READ8_MEMBER(galaxian_state::theend_protection_r)
+uint8_t galaxian_state::theend_protection_r()
{
return m_protection_result;
}
@@ -954,7 +954,7 @@ WRITE8_MEMBER(galaxian_state::explorer_sound_control_w)
}
-READ8_MEMBER(galaxian_state::explorer_sound_latch_r)
+uint8_t galaxian_state::explorer_sound_latch_r()
{
m_audiocpu->set_input_line(0, CLEAR_LINE);
return m_soundlatch->read();
@@ -985,7 +985,7 @@ WRITE8_MEMBER(galaxian_state::sfx_sample_io_w)
}
-WRITE8_MEMBER(galaxian_state::sfx_sample_control_w)
+void galaxian_state::sfx_sample_control_w(uint8_t data)
{
uint8_t old = m_sfx_sample_control;
m_sfx_sample_control = data;
@@ -1030,7 +1030,7 @@ void galaxian_state::monsterz_set_latch()
}
-WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w)
+void galaxian_state::monsterz_porta_1_w(uint8_t data)
{
// d7 high: set latch + advance address high bits (and reset low bits?)
if (data & 0x80)
@@ -1040,7 +1040,7 @@ WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w)
}
}
-WRITE8_MEMBER(galaxian_state::monsterz_portb_1_w)
+void galaxian_state::monsterz_portb_1_w(uint8_t data)
{
// d3 high: set latch + advance address low bits
if (data & 0x08)
@@ -1050,7 +1050,7 @@ WRITE8_MEMBER(galaxian_state::monsterz_portb_1_w)
}
}
-WRITE8_MEMBER(galaxian_state::monsterz_portc_1_w)
+void galaxian_state::monsterz_portc_1_w(uint8_t data)
{
}
@@ -1098,10 +1098,10 @@ WRITE8_MEMBER(galaxian_state::frogger_ay8910_w)
}
-READ8_MEMBER(galaxian_state::frogger_sound_timer_r)
+uint8_t galaxian_state::frogger_sound_timer_r()
{
/* same as regular Konami sound but with bits 3,5 swapped */
- uint8_t konami_value = konami_sound_timer_r(space, 0);
+ uint8_t konami_value = konami_sound_timer_r();
return bitswap<8>(konami_value, 7,6,3,4,5,2,1,0);
}
@@ -1186,7 +1186,7 @@ WRITE8_MEMBER(galaxian_state::scorpion_ay8910_w)
}
-READ8_MEMBER(galaxian_state::scorpion_protection_r)
+uint8_t galaxian_state::scorpion_protection_r()
{
uint16_t paritybits;
uint8_t parity = 0;
@@ -1201,7 +1201,7 @@ READ8_MEMBER(galaxian_state::scorpion_protection_r)
}
-WRITE8_MEMBER(galaxian_state::scorpion_protection_w)
+void galaxian_state::scorpion_protection_w(uint8_t data)
{
/* bit 5 low is a reset */
if (!(data & 0x20))
@@ -1211,7 +1211,7 @@ WRITE8_MEMBER(galaxian_state::scorpion_protection_w)
if (!(data & 0x10))
{
/* each clock shifts left one bit and ORs in the inverse of the parity */
- m_protection_state = (m_protection_state << 1) | (~scorpion_protection_r(space, 0) & 1);
+ m_protection_state = (m_protection_state << 1) | (~scorpion_protection_r() & 1);
}
}
@@ -1220,7 +1220,7 @@ READ8_MEMBER(galaxian_state::scorpion_digitalker_intr_r)
return m_digitalker->digitalker_0_intr_r();
}
-WRITE8_MEMBER(galaxian_state::scorpion_digitalker_control_w)
+void galaxian_state::scorpion_digitalker_control_w(uint8_t data)
{
m_digitalker->digitalker_0_cs_w(data & 1 ? ASSERT_LINE : CLEAR_LINE);
m_digitalker->digitalker_0_cms_w(data & 2 ? ASSERT_LINE : CLEAR_LINE);
@@ -1486,7 +1486,7 @@ READ8_MEMBER(galaxian_state::dingoe_3001_r)
*
*************************************/
-WRITE8_MEMBER(galaxian_state::moonwar_port_select_w)
+void galaxian_state::moonwar_port_select_w(uint8_t data)
{
m_moonwar_port_select = data & 0x10;
}
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp
index 8e63b24593b..fbb59b0cd2b 100644
--- a/src/mame/drivers/gameplan.cpp
+++ b/src/mame/drivers/gameplan.cpp
@@ -91,7 +91,7 @@ TODO:
*
*************************************/
-WRITE8_MEMBER(gameplan_state::io_select_w)
+void gameplan_state::io_select_w(uint8_t data)
{
switch (data)
{
@@ -105,7 +105,7 @@ WRITE8_MEMBER(gameplan_state::io_select_w)
}
-READ8_MEMBER(gameplan_state::io_port_r)
+uint8_t gameplan_state::io_port_r()
{
static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3", "DSW0", "DSW1" };
@@ -138,7 +138,7 @@ WRITE_LINE_MEMBER(gameplan_state::audio_reset_w)
}
-WRITE8_MEMBER(gameplan_state::audio_cmd_w)
+void gameplan_state::audio_cmd_w(uint8_t data)
{
m_riot->porta_in_set(data, 0x7f);
}
@@ -165,11 +165,6 @@ WRITE_LINE_MEMBER(gameplan_state::r6532_irq)
}
-WRITE8_MEMBER(gameplan_state::r6532_soundlatch_w)
-{
- m_soundlatch->write(data);
-}
-
/*************************************
*
@@ -967,7 +962,7 @@ void gameplan_state::gameplan(machine_config &config)
m_audiocpu->set_addrmap(AS_PROGRAM, &gameplan_state::gameplan_audio_map);
RIOT6532(config, m_riot, GAMEPLAN_AUDIO_CPU_CLOCK);
- m_riot->out_pb_callback().set(FUNC(gameplan_state::r6532_soundlatch_w));
+ m_riot->out_pb_callback().set(m_soundlatch, FUNC(generic_latch_8_device::write));
m_riot->irq_callback().set(FUNC(gameplan_state::r6532_irq));
/* video hardware */
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index 8c0630c1db3..3188074a7e9 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -484,7 +484,7 @@ static const char *const gaplus_sample_names[] =
***************************************************************************/
-WRITE8_MEMBER(gaplus_state::out_lamps0)
+void gaplus_state::out_lamps0(uint8_t data)
{
m_lamps[0] = BIT(data, 0);
m_lamps[1] = BIT(data, 1);
@@ -492,7 +492,7 @@ WRITE8_MEMBER(gaplus_state::out_lamps0)
machine().bookkeeping().coin_counter_w(0, ~data & 8);
}
-WRITE8_MEMBER(gaplus_state::out_lamps1)
+void gaplus_state::out_lamps1(uint8_t data)
{
machine().bookkeeping().coin_counter_w(1, ~data & 1);
}
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index 78c4691b1c3..ac428dd0e67 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -345,7 +345,7 @@
* Read/Write Handlers *
****************************/
-WRITE8_MEMBER(gatron_state::output_port_0_w)
+void gatron_state::output_port_0_w(uint8_t data)
{
/*---------------
Poker 4-1 lamps
@@ -422,7 +422,7 @@ WRITE8_MEMBER(gatron_state::output_port_0_w)
}
-WRITE8_MEMBER(gatron_state::output_port_1_w)
+void gatron_state::output_port_1_w(uint8_t data)
{
/*----------------
Lamps & Counters
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index 61c4e0dbf31..628fa176224 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -122,20 +122,20 @@ private:
DECLARE_READ32_MEMBER(bballoon_speedup_r);
DECLARE_READ32_MEMBER(touryuu_port_10000000_r);
- DECLARE_WRITE8_MEMBER(qs1000_p1_w);
- DECLARE_WRITE8_MEMBER(qs1000_p2_w);
- DECLARE_WRITE8_MEMBER(qs1000_p3_w);
+ void qs1000_p1_w(uint8_t data);
+ void qs1000_p2_w(uint8_t data);
+ void qs1000_p3_w(uint8_t data);
int m_rom_pagesize;
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ32_MEMBER(s3c2410_gpio_port_r);
- DECLARE_WRITE32_MEMBER(s3c2410_gpio_port_w);
- DECLARE_READ32_MEMBER(s3c2410_core_pin_r);
- DECLARE_WRITE8_MEMBER(s3c2410_nand_command_w );
- DECLARE_WRITE8_MEMBER(s3c2410_nand_address_w );
- DECLARE_READ8_MEMBER(s3c2410_nand_data_r );
- DECLARE_WRITE8_MEMBER(s3c2410_nand_data_w );
+ uint32_t s3c2410_gpio_port_r(offs_t offset);
+ void s3c2410_gpio_port_w(offs_t offset, uint32_t data);
+ uint32_t s3c2410_core_pin_r(offs_t offset);
+ void s3c2410_nand_command_w(uint8_t data);
+ void s3c2410_nand_address_w(uint8_t data);
+ uint8_t s3c2410_nand_data_r();
+ void s3c2410_nand_data_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_scl_w );
DECLARE_READ_LINE_MEMBER(s3c2410_i2c_sda_r );
DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_sda_w );
@@ -168,15 +168,15 @@ NAND Flash Controller (4KB internal buffer)
24-ch external interrupts Controller (Wake-up source 16-ch)
*/
-WRITE8_MEMBER( ghosteo_state::qs1000_p1_w )
+void ghosteo_state::qs1000_p1_w(uint8_t data)
{
}
-WRITE8_MEMBER( ghosteo_state::qs1000_p2_w )
+void ghosteo_state::qs1000_p2_w(uint8_t data)
{
}
-WRITE8_MEMBER( ghosteo_state::qs1000_p3_w )
+void ghosteo_state::qs1000_p3_w(uint8_t data)
{
// .... .xxx - Data ROM bank (64kB)
// ...x .... - ?
@@ -193,7 +193,7 @@ WRITE8_MEMBER( ghosteo_state::qs1000_p3_w )
static const uint8_t security_data[] = { 0x01, 0xC4, 0xFF, 0x22, 0xFF, 0xFF, 0xFF, 0xFF };
-READ32_MEMBER(ghosteo_state::s3c2410_gpio_port_r)
+uint32_t ghosteo_state::s3c2410_gpio_port_r(offs_t offset)
{
uint32_t data = m_bballoon_port[offset];
switch (offset)
@@ -213,7 +213,7 @@ READ32_MEMBER(ghosteo_state::s3c2410_gpio_port_r)
return data;
}
-WRITE32_MEMBER(ghosteo_state::s3c2410_gpio_port_w)
+void ghosteo_state::s3c2410_gpio_port_w(offs_t offset, uint32_t data)
{
uint32_t old_value = m_bballoon_port[offset];
m_bballoon_port[offset] = data;
@@ -258,7 +258,7 @@ NCON : NAND flash memory address step selection
*/
-READ32_MEMBER(ghosteo_state::s3c2410_core_pin_r)
+uint32_t ghosteo_state::s3c2410_core_pin_r(offs_t offset)
{
int data = 0;
switch (offset)
@@ -272,7 +272,7 @@ READ32_MEMBER(ghosteo_state::s3c2410_core_pin_r)
// NAND
-WRITE8_MEMBER(ghosteo_state::s3c2410_nand_command_w )
+void ghosteo_state::s3c2410_nand_command_w(uint8_t data)
{
struct nand_t &nand = m_nand;
#if NAND_LOG
@@ -296,7 +296,7 @@ WRITE8_MEMBER(ghosteo_state::s3c2410_nand_command_w )
}
}
-WRITE8_MEMBER(ghosteo_state::s3c2410_nand_address_w )
+void ghosteo_state::s3c2410_nand_address_w(uint8_t data)
{
struct nand_t &nand = m_nand;
#if NAND_LOG
@@ -330,7 +330,7 @@ WRITE8_MEMBER(ghosteo_state::s3c2410_nand_address_w )
}
}
-READ8_MEMBER(ghosteo_state::s3c2410_nand_data_r )
+uint8_t ghosteo_state::s3c2410_nand_data_r()
{
struct nand_t &nand = m_nand;
uint8_t data = 0;
@@ -376,7 +376,7 @@ READ8_MEMBER(ghosteo_state::s3c2410_nand_data_r )
return data;
}
-WRITE8_MEMBER(ghosteo_state::s3c2410_nand_data_w )
+void ghosteo_state::s3c2410_nand_data_w(uint8_t data)
{
#if NAND_LOG
logerror( "s3c2410_nand_data_w %02X\n", data);
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index 578c4373e6d..76e5f116817 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -34,17 +34,17 @@ public:
private:
void gmaster_palette(palette_device &palette) const;
- DECLARE_READ8_MEMBER(gmaster_io_r);
- DECLARE_WRITE8_MEMBER(gmaster_io_w);
- DECLARE_READ8_MEMBER(gmaster_portb_r);
- DECLARE_READ8_MEMBER(gmaster_portc_r);
- DECLARE_READ8_MEMBER(gmaster_portd_r);
- DECLARE_READ8_MEMBER(gmaster_portf_r);
- DECLARE_WRITE8_MEMBER(gmaster_porta_w);
- DECLARE_WRITE8_MEMBER(gmaster_portb_w);
- DECLARE_WRITE8_MEMBER(gmaster_portc_w);
- DECLARE_WRITE8_MEMBER(gmaster_portd_w);
- DECLARE_WRITE8_MEMBER(gmaster_portf_w);
+ uint8_t gmaster_io_r(offs_t offset);
+ void gmaster_io_w(offs_t offset, uint8_t data);
+ uint8_t gmaster_portb_r();
+ uint8_t gmaster_portc_r();
+ uint8_t gmaster_portd_r();
+ uint8_t gmaster_portf_r();
+ void gmaster_porta_w(uint8_t data);
+ void gmaster_portb_w(uint8_t data);
+ void gmaster_portc_w(uint8_t data);
+ void gmaster_portd_w(uint8_t data);
+ void gmaster_portf_w(uint8_t data);
uint32_t screen_update_gmaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void gmaster_mem(address_map &map);
@@ -68,7 +68,7 @@ private:
};
-READ8_MEMBER(gmaster_state::gmaster_io_r)
+uint8_t gmaster_state::gmaster_io_r(offs_t offset)
{
uint8_t data = 0;
@@ -101,7 +101,7 @@ READ8_MEMBER(gmaster_state::gmaster_io_r)
#define BLITTER_Y ((m_ports[2]&4)|(m_video.data[0]&3))
-WRITE8_MEMBER(gmaster_state::gmaster_io_w)
+void gmaster_state::gmaster_io_w(offs_t offset, uint8_t data)
{
if (m_ports[2] & 1)
{
@@ -164,7 +164,7 @@ WRITE8_MEMBER(gmaster_state::gmaster_io_w)
}
-READ8_MEMBER(gmaster_state::gmaster_portb_r)
+uint8_t gmaster_state::gmaster_portb_r()
{
// uint8_t data = m_ports[1];
uint8_t data = 0xff;
@@ -174,7 +174,7 @@ READ8_MEMBER(gmaster_state::gmaster_portb_r)
return data;
}
-READ8_MEMBER(gmaster_state::gmaster_portc_r)
+uint8_t gmaster_state::gmaster_portc_r()
{
// uint8_t data = m_ports[2];
uint8_t data = 0xff;
@@ -184,7 +184,7 @@ READ8_MEMBER(gmaster_state::gmaster_portc_r)
return data;
}
-READ8_MEMBER(gmaster_state::gmaster_portd_r)
+uint8_t gmaster_state::gmaster_portd_r()
{
// uint8_t data = m_ports[3];
uint8_t data = 0xff;
@@ -194,7 +194,7 @@ READ8_MEMBER(gmaster_state::gmaster_portd_r)
return data;
}
-READ8_MEMBER(gmaster_state::gmaster_portf_r)
+uint8_t gmaster_state::gmaster_portf_r()
{
// uint8_t data = m_ports[4];
uint8_t data = 0xff;
@@ -205,19 +205,19 @@ READ8_MEMBER(gmaster_state::gmaster_portf_r)
}
-WRITE8_MEMBER(gmaster_state::gmaster_porta_w)
+void gmaster_state::gmaster_porta_w(uint8_t data)
{
m_ports[0] = data;
logerror("%.4x port A written %.2x\n", m_maincpu->pc(), data);
}
-WRITE8_MEMBER(gmaster_state::gmaster_portb_w)
+void gmaster_state::gmaster_portb_w(uint8_t data)
{
m_ports[1] = data;
logerror("%.4x port B written %.2x\n", m_maincpu->pc(), data);
}
-WRITE8_MEMBER(gmaster_state::gmaster_portc_w)
+void gmaster_state::gmaster_portc_w(uint8_t data)
{
m_ports[2] = data;
logerror("%.4x port C written %.2x\n", m_maincpu->pc(), data);
@@ -226,13 +226,13 @@ WRITE8_MEMBER(gmaster_state::gmaster_portc_w)
m_speaker->level_w(BIT(data, 4));
}
-WRITE8_MEMBER(gmaster_state::gmaster_portd_w)
+void gmaster_state::gmaster_portd_w(uint8_t data)
{
m_ports[3] = data;
logerror("%.4x port D written %.2x\n", m_maincpu->pc(), data);
}
-WRITE8_MEMBER(gmaster_state::gmaster_portf_w)
+void gmaster_state::gmaster_portf_w(uint8_t data)
{
m_ports[4] = data;
logerror("%.4x port F written %.2x\n", m_maincpu->pc(), data);
diff --git a/src/mame/drivers/goldart.cpp b/src/mame/drivers/goldart.cpp
index cd2387a53f0..b7d4601ee19 100644
--- a/src/mame/drivers/goldart.cpp
+++ b/src/mame/drivers/goldart.cpp
@@ -70,8 +70,8 @@ private:
required_device m_palette;
required_region_ptr m_data;
- DECLARE_WRITE8_MEMBER(mcu_port1_w);
- DECLARE_READ8_MEMBER(mcu_port1_r);
+ void mcu_port1_w(uint8_t data);
+ uint8_t mcu_port1_r();
uint32_t screen_update_goldart(screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect);
@@ -87,13 +87,13 @@ private:
DECLARE_WRITE8_MEMBER(hostmem_w);
};
-WRITE8_MEMBER(goldart_state::mcu_port1_w)
+void goldart_state::mcu_port1_w(uint8_t data)
{
logerror("%s: mcu_port1_w %02x\n", machine().describe_context(), data);
m_port1 = data;
}
-READ8_MEMBER(goldart_state::mcu_port1_r)
+uint8_t goldart_state::mcu_port1_r()
{
uint8_t ret = m_port1;
logerror("%s: mcu_port1_r %02x\n", machine().describe_context(), ret);
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 50a9ffe1de9..300d8b799f0 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -1106,7 +1106,7 @@ WRITE8_MEMBER(wingco_state::magodds_outb860_w)
// popmessage("magodds_outb860_w %02x\n", data);
}
-WRITE8_MEMBER(wingco_state::fl7w4_outc802_w)
+void wingco_state::fl7w4_outc802_w(uint8_t data)
{
m_fl7w4_id->write((data >> 6) & 0x01);
}
@@ -8509,19 +8509,19 @@ static GFXDECODE_START( gfx_cm97 )
GFXDECODE_END
-WRITE8_MEMBER(wingco_state::system_outputa_w)
+void wingco_state::system_outputa_w(uint8_t data)
{
//popmessage("system_outputa_w %02x",data);
}
-WRITE8_MEMBER(wingco_state::system_outputb_w)
+void wingco_state::system_outputb_w(uint8_t data)
{
//popmessage("system_outputb_w %02x",data);
}
-WRITE8_MEMBER(wingco_state::system_outputc_w)
+void wingco_state::system_outputc_w(uint8_t data)
{
m_nmi_enable = data & 8;
m_vidreg = data & 2;
@@ -8531,12 +8531,12 @@ WRITE8_MEMBER(wingco_state::system_outputc_w)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-WRITE8_MEMBER(goldstar_state::ay8910_outputa_w)
+void goldstar_state::ay8910_outputa_w(uint8_t data)
{
//popmessage("ay8910_outputa_w %02x",data);
}
-WRITE8_MEMBER(goldstar_state::ay8910_outputb_w)
+void goldstar_state::ay8910_outputb_w(uint8_t data)
{
//popmessage("ay8910_outputb_w %02x",data);
}
@@ -16773,31 +16773,6 @@ ROM_END
ROM_START( cmtetrsa )
ROM_REGION( 0x20000, "maincpu", 0 )
ROM_LOAD( "cm89-tetri-9.u81", 0x10000, 0x10000, CRC(75e0c101) SHA1(6dc4f7c43f0f4e21d621f3c42cb1709d6b730c53) )
-/*
- Need checks and fixes
-
- 3800+ --> 5800+
- 9800+ --> 3800+
-
-*/
-// ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x16000, 0x1000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x14000, 0x2000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x1000 ) /* src-dest-size ok (some calls to high 5xxx appear here, maybe split in 0x800?) */
-// ROM_COPY( "maincpu", 0x15000, 0x4000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x11000, 0x6000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x13000, 0x8000, 0x1000 ) /* src-dest-size ok */
-
-// ROM_COPY( "maincpu", 0x17000, 0x5000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x10000, 0x7000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x18000, 0x9000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x19000, 0xa000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x12000, 0xb000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1b000, 0xc000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1d000, 0xd000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1e000, 0xe000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1f000, 0xf000, 0x1000 ) /* src-dest-size */
-
ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x0800 ) /* src-dest-size */ // #01
ROM_COPY( "maincpu", 0x19800, 0x0800, 0x0800 ) /* src-dest-size */ // #02
ROM_COPY( "maincpu", 0x16000, 0x1000, 0x0800 ) /* src-dest-size */ // #03
@@ -16807,14 +16782,14 @@ ROM_START( cmtetrsa )
ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x0800 ) /* src-dest-size */ // #07
ROM_COPY( "maincpu", 0x18800, 0x3800, 0x0800 ) /* src-dest-size */ // #08
ROM_COPY( "maincpu", 0x10000, 0x4000, 0x0800 ) /* src-dest-size */ // #09
- ROM_COPY( "maincpu", 0x15000, 0x4800, 0x0800 ) /* src-dest-size */ // #10
- ROM_COPY( "maincpu", 0x14800, 0x5000, 0x0800 ) /* src-dest-size */ // #11
+ ROM_COPY( "maincpu", 0x15800, 0x4800, 0x0800 ) /* src-dest-size */ // #10
+ ROM_COPY( "maincpu", 0x13000, 0x5000, 0x0800 ) /* src-dest-size */ // #11
ROM_COPY( "maincpu", 0x1a800, 0x5800, 0x0800 ) /* src-dest-size */ // #12
ROM_COPY( "maincpu", 0x11000, 0x6000, 0x0800 ) /* src-dest-size */ // #13
ROM_COPY( "maincpu", 0x11800, 0x6800, 0x0800 ) /* src-dest-size */ // #14
ROM_COPY( "maincpu", 0x1b000, 0x7000, 0x0800 ) /* src-dest-size */ // #15
- ROM_COPY( "maincpu", 0x1f000, 0x7800, 0x0800 ) /* src-dest-size */ // #16
- ROM_COPY( "maincpu", 0x1f800, 0x8000, 0x0800 ) /* src-dest-size */ // #17
+ ROM_COPY( "maincpu", 0x16800, 0x7800, 0x0800 ) /* src-dest-size */ // #16
+ ROM_COPY( "maincpu", 0x17000, 0x8000, 0x0800 ) /* src-dest-size */ // #17
ROM_COPY( "maincpu", 0x13800, 0x8800, 0x0800 ) /* src-dest-size */ // #18
ROM_COPY( "maincpu", 0x19000, 0x9000, 0x0800 ) /* src-dest-size */ // #19
ROM_COPY( "maincpu", 0x1b800, 0x9800, 0x0800 ) /* src-dest-size */ // #20
@@ -16822,7 +16797,8 @@ ROM_START( cmtetrsa )
ROM_COPY( "maincpu", 0x10800, 0xa800, 0x0800 ) /* src-dest-size */ // #22
ROM_COPY( "maincpu", 0x18000, 0xb000, 0x0800 ) /* src-dest-size */ // #23
ROM_COPY( "maincpu", 0x12800, 0xb800, 0x0800 ) /* src-dest-size */ // #24
- ROM_COPY( "maincpu", 0x13000, 0xc000, 0x0800 ) /* src-dest-size */ // #25
+ ROM_COPY( "maincpu", 0x15000, 0xc000, 0x0800 ) /* src-dest-size */ // #25
+ ROM_COPY( "maincpu", 0x14800, 0xc800, 0x0800 ) /* src-dest-size */ // #26
ROM_REGION( 0x18000, "gfx1", 0 )
ROM_LOAD( "cm89-tetri-7.u16", 0x00000, 0x8000, CRC(2f5c94bd) SHA1(d99bcaa788f8abf5c75b29572d53be109b20c4bb) )
@@ -16838,7 +16814,6 @@ ROM_START( cmtetrsa )
ROM_REGION( 0x10000, "user1", 0 )
ROM_LOAD( "cm89-tetri-8.u53", 0x0000, 0x10000, CRC(e92443d3) SHA1(4b6ca4521841610054165f085ae05510e77af191) )
- /* proms taken from cmv4, probably wrong */
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "82s129.u84", 0x0000, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) )
ROM_LOAD( "82s129.u79", 0x0100, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) )
@@ -16847,7 +16822,6 @@ ROM_START( cmtetrsa )
ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) )
ROM_END
-
/*
Tetris + Cherry Master (+K, Canada Version, encrypted)
stealth game...
@@ -19327,7 +19301,7 @@ GAME( 200?, ss2001, 0, ss2001, cmaster, cmaster_state, empty_init
GAMEL( 198?, cmpacman, 0, cm, cmpacman, cmaster_state, init_cm, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31, set 1)", 0, layout_cmpacman ) // need to press K to switch between games...
GAMEL( 198?, cmpacmana, cmpacman, cm, cmpacman, cmaster_state, init_cm, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31, set 2)", 0, layout_cmpacman ) // need to press K to switch between games...
GAMEL( 198?, cmtetris, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 1)", 0, layout_cmpacman ) // need to press K/L to switch between games...
-GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 2)", MACHINE_NOT_WORKING, layout_cmpacman ) // seems banked...
+GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 2)", 0, layout_cmpacman )
GAMEL( 198?, cmtetrsb, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (+K, Canada Version, encrypted)", MACHINE_NOT_WORKING, layout_cmpacman ) // different Tetris game. press insert to throttle and see the attract running.
GAMEL( 1997, crazybon, 0, crazybon, crazybon, goldstar_state, empty_init, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002 (Ver. 1, set 1)", MACHINE_IMPERFECT_COLORS, layout_crazybon ) // Windows ME desktop... but not found the way to switch it.
GAMEL( 1997, crazybona, crazybon, crazybon, crazybon, goldstar_state, empty_init, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002 (Ver. 1, set 2)", MACHINE_IMPERFECT_COLORS, layout_crazybon )
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index 06aacaae97e..33a3aef3e68 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( gradius3 )
INPUT_PORTS_END
-WRITE8_MEMBER(gradius3_state::volume_callback)
+void gradius3_state::volume_callback(uint8_t data)
{
m_k007232->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/gscpm.cpp b/src/mame/drivers/gscpm.cpp
index 73f27fad0bd..903254d5eb7 100644
--- a/src/mame/drivers/gscpm.cpp
+++ b/src/mame/drivers/gscpm.cpp
@@ -71,12 +71,12 @@ void gscpm_state::gscpm_io(address_map &map)
READ8_MEMBER( gscpm_state::cflash_r )
{
- return m_ide->read_cs0(offset, 0xff);
+ return m_ide->cs0_r(offset, 0xff);
}
WRITE8_MEMBER( gscpm_state::cflash_w )
{
- m_ide->write_cs0(offset, data, 0xff);
+ m_ide->cs0_w(offset, data, 0xff);
}
READ8_MEMBER( gscpm_state::sio_r )
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index 76cafe36e3d..20feb659669 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -98,17 +98,17 @@ private:
DECLARE_READ16_MEMBER(tms34061_r);
uint32_t screen_update_guab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(output1_w);
- DECLARE_WRITE8_MEMBER(output2_w);
- DECLARE_WRITE8_MEMBER(output3_w);
- DECLARE_WRITE8_MEMBER(output4_w);
- DECLARE_WRITE8_MEMBER(output5_w);
- DECLARE_WRITE8_MEMBER(output6_w);
- DECLARE_READ8_MEMBER(sn76489_ready_r);
- DECLARE_WRITE8_MEMBER(sn76489_buffer_w);
- DECLARE_WRITE8_MEMBER(system_w);
- DECLARE_READ8_MEMBER(watchdog_r);
- DECLARE_WRITE8_MEMBER(watchdog_w);
+ void output1_w(uint8_t data);
+ void output2_w(uint8_t data);
+ void output3_w(uint8_t data);
+ void output4_w(uint8_t data);
+ void output5_w(uint8_t data);
+ void output6_w(uint8_t data);
+ uint8_t sn76489_ready_r();
+ void sn76489_buffer_w(uint8_t data);
+ void system_w(uint8_t data);
+ uint8_t watchdog_r();
+ void watchdog_w(uint8_t data);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -313,20 +313,20 @@ void guab_state::machine_start()
m_fdc->set_floppy(m_floppy->get_device());
}
-READ8_MEMBER( guab_state::watchdog_r )
+uint8_t guab_state::watchdog_r()
{
// only read after writing the sequence below
return 0xff;
}
-WRITE8_MEMBER( guab_state::watchdog_w )
+void guab_state::watchdog_w(uint8_t data)
{
// watchdog?
// writes b 3 1 5 d a 2 0 4 0 8 b 3 1 5 d a 2 0 4 0 8
// then later toggles between 0 and f
}
-WRITE8_MEMBER( guab_state::system_w )
+void guab_state::system_w(uint8_t data)
{
// bit 0, sound latch
if (m_sound_latch != bool(BIT(data, 0)))
@@ -363,7 +363,7 @@ INPUT_CHANGED_MEMBER( guab_state::coin_inserted )
}
}
-WRITE8_MEMBER( guab_state::output1_w )
+void guab_state::output1_w(uint8_t data)
{
m_leds[0] = BIT(data, 0); // cash in (ten up: cash in)
m_leds[1] = BIT(data, 1); // cash out (ten up: cash out)
@@ -375,7 +375,7 @@ WRITE8_MEMBER( guab_state::output1_w )
m_leds[7] = BIT(data, 7);
}
-WRITE8_MEMBER( guab_state::output2_w )
+void guab_state::output2_w(uint8_t data)
{
m_leds[8] = BIT(data, 0);
m_leds[9] = BIT(data, 1);
@@ -387,7 +387,7 @@ WRITE8_MEMBER( guab_state::output2_w )
m_leds[15] = BIT(data, 7); // lamp b (ten up: pass)
}
-WRITE8_MEMBER( guab_state::output3_w )
+void guab_state::output3_w(uint8_t data)
{
m_leds[16] = BIT(data, 0); // select (ten up: collect)
m_leds[17] = BIT(data, 1); // (ten up: feature 14)
@@ -399,7 +399,7 @@ WRITE8_MEMBER( guab_state::output3_w )
m_leds[23] = BIT(data, 7);
}
-WRITE8_MEMBER( guab_state::output4_w )
+void guab_state::output4_w(uint8_t data)
{
m_leds[24] = BIT(data, 0); // feature 1 (ten up: feature 1)
m_leds[25] = BIT(data, 1); // feature 2 (ten up: feature 10)
@@ -411,7 +411,7 @@ WRITE8_MEMBER( guab_state::output4_w )
m_leds[31] = BIT(data, 7); // feature 8 (ten up: feature 5)
}
-WRITE8_MEMBER( guab_state::output5_w )
+void guab_state::output5_w(uint8_t data)
{
m_leds[32] = BIT(data, 0);
m_leds[33] = BIT(data, 1);
@@ -423,7 +423,7 @@ WRITE8_MEMBER( guab_state::output5_w )
m_leds[39] = BIT(data, 7); // mech lamp (ten up: mech lamp)
}
-WRITE8_MEMBER( guab_state::output6_w )
+void guab_state::output6_w(uint8_t data)
{
m_leds[40] = BIT(data, 0);
m_leds[41] = BIT(data, 1);
@@ -449,13 +449,13 @@ DEVICE_INPUT_DEFAULTS_END
// AUDIO
//**************************************************************************
-READ8_MEMBER( guab_state::sn76489_ready_r )
+uint8_t guab_state::sn76489_ready_r()
{
// bit 7 connected to sn76489 ready output (0 = ready)
return ~(m_sn->ready_r() << 7);
}
-WRITE8_MEMBER( guab_state::sn76489_buffer_w )
+void guab_state::sn76489_buffer_w(uint8_t data)
{
m_sound_buffer = data;
}
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index 198a7707af5..473281d7ed0 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -111,23 +111,23 @@ static const int gyruss_timer[10] =
0x00, 0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x0a, 0x0d
};
-READ8_MEMBER(gyruss_state::gyruss_portA_r)
+uint8_t gyruss_state::gyruss_portA_r()
{
return gyruss_timer[(m_audiocpu->total_cycles() / 1024) % 10];
}
-WRITE8_MEMBER(gyruss_state::gyruss_dac_w)
+void gyruss_state::gyruss_dac_w(uint8_t data)
{
m_discrete->write(NODE(16), data);
}
-WRITE8_MEMBER(gyruss_state::gyruss_irq_clear_w)
+void gyruss_state::gyruss_irq_clear_w(uint8_t data)
{
m_audiocpu_2->set_input_line(0, CLEAR_LINE);
}
-void gyruss_state::filter_w(address_space &space, int chip, int data )
+void gyruss_state::filter_w(int chip, int data )
{
//printf("chip %d - %02x\n", chip, data);
for (int i = 0; i < 3; i++)
@@ -139,24 +139,24 @@ void gyruss_state::filter_w(address_space &space, int chip, int data )
}
}
-WRITE8_MEMBER(gyruss_state::gyruss_filter0_w)
+void gyruss_state::gyruss_filter0_w(uint8_t data)
{
- filter_w(space, 0, data);
+ filter_w(0, data);
}
-WRITE8_MEMBER(gyruss_state::gyruss_filter1_w)
+void gyruss_state::gyruss_filter1_w(uint8_t data)
{
- filter_w(space, 1, data);
+ filter_w(1, data);
}
-WRITE8_MEMBER(gyruss_state::gyruss_sh_irqtrigger_w)
+void gyruss_state::gyruss_sh_irqtrigger_w(uint8_t data)
{
/* writing to this register triggers IRQ on the sound CPU */
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
-WRITE8_MEMBER(gyruss_state::gyruss_i8039_irq_w)
+void gyruss_state::gyruss_i8039_irq_w(uint8_t data)
{
m_audiocpu_2->set_input_line(0, ASSERT_LINE);
}
@@ -168,7 +168,7 @@ WRITE_LINE_MEMBER(gyruss_state::master_nmi_mask_w)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-WRITE8_MEMBER(gyruss_state::slave_irq_mask_w)
+void gyruss_state::slave_irq_mask_w(uint8_t data)
{
m_slave_irq_mask = data & 1;
if (!m_slave_irq_mask)
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 3798c8fc3c4..61224c0f22d 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -78,7 +78,7 @@ private:
DECLARE_READ8_MEMBER(portf0_r);
DECLARE_WRITE8_MEMBER(portf0_w);
DECLARE_WRITE8_MEMBER(portf1_w);
- DECLARE_WRITE8_MEMBER(h8_status_callback);
+ void h8_status_callback(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(h8_inte_callback);
TIMER_DEVICE_CALLBACK_MEMBER(h8_irq_pulse);
TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
@@ -258,7 +258,7 @@ WRITE_LINE_MEMBER( h8_state::h8_inte_callback )
m_irq_ctl &= 0x7f | ((state) ? 0 : 0x80);
}
-WRITE8_MEMBER( h8_state::h8_status_callback )
+void h8_state::h8_status_callback(uint8_t data)
{
/* This is rather messy, but basically there are 2 D flipflops, one drives the other,
the data is /INTE while the clock is /M1. If the system is in Single Instruction mode,
diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp
index 65097d75925..a0f37eefb02 100644
--- a/src/mame/drivers/hcastle.cpp
+++ b/src/mame/drivers/hcastle.cpp
@@ -158,7 +158,7 @@ GFXDECODE_END
/*****************************************************************************/
-WRITE8_MEMBER(hcastle_state::volume_callback)
+void hcastle_state::volume_callback(uint8_t data)
{
m_k007232->set_volume(0, (data >> 4) * 0x11, 0);
m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11);
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index fa5c8bc14cf..cc0d76738e6 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -115,7 +115,7 @@ WRITE_LINE_MEMBER(hexion_state::nmi_ack_w)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-WRITE8_MEMBER(hexion_state::ccu_int_time_w)
+void hexion_state::ccu_int_time_w(uint8_t data)
{
logerror("ccu_int_time rewritten with value of %02x\n", data);
m_ccu_int_time = data;
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index 0030abd77c2..67778048e8a 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -146,8 +146,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(write_d);
- DECLARE_WRITE16_MEMBER(write_a);
+ void write_d(u8 data);
+ void write_a(u16 data);
DECLARE_WRITE_LINE_MEMBER(write_f);
void speaker_update();
@@ -190,14 +190,14 @@ void wildfire_state::update_display()
m_display->matrix(~m_a, m_d);
}
-WRITE8_MEMBER(wildfire_state::write_d)
+void wildfire_state::write_d(u8 data)
{
// D0-D7: led/7seg data
m_d = bitswap<8>(data,7,0,1,2,3,4,5,6);
update_display();
}
-WRITE16_MEMBER(wildfire_state::write_a)
+void wildfire_state::write_a(u16 data)
{
// A0-A2: digit select
// A3-A11: led select
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index def4ce9a854..db020140c25 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -271,15 +271,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
void bambball(machine_config &config);
};
// handlers
-WRITE8_MEMBER(bambball_state::plate_w)
+void bambball_state::plate_w(offs_t offset, u8 data)
{
// R1x-R3x(,D0-D3): vfd plate
int shift = (offset - 1) * 4;
@@ -290,7 +290,7 @@ WRITE8_MEMBER(bambball_state::plate_w)
m_display->matrix(m_grid, plate);
}
-WRITE16_MEMBER(bambball_state::grid_w)
+void bambball_state::grid_w(u16 data)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
@@ -302,10 +302,10 @@ WRITE16_MEMBER(bambball_state::grid_w)
m_grid = data >> 7 & 0x1ff;
// D0-D3: more plates (update display there)
- plate_w(space, 3 + 1, data & 0xf);
+ plate_w(3 + 1, data & 0xf);
}
-READ8_MEMBER(bambball_state::input_r)
+u8 bambball_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(4);
@@ -396,9 +396,9 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
void bmboxing(machine_config &config);
};
@@ -411,7 +411,7 @@ void bmboxing_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(bmboxing_state::plate_w)
+void bmboxing_state::plate_w(offs_t offset, u8 data)
{
// R1x-R3x: vfd plate
int shift = (offset - 1) * 4;
@@ -419,7 +419,7 @@ WRITE8_MEMBER(bmboxing_state::plate_w)
update_display();
}
-WRITE16_MEMBER(bmboxing_state::grid_w)
+void bmboxing_state::grid_w(u16 data)
{
// D13: speaker out
m_speaker->level_w(data >> 13 & 1);
@@ -432,7 +432,7 @@ WRITE16_MEMBER(bmboxing_state::grid_w)
update_display();
}
-READ8_MEMBER(bmboxing_state::input_r)
+u8 bmboxing_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(4);
@@ -543,8 +543,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int1();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); }
@@ -560,7 +560,7 @@ void bfriskyt_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(bfriskyt_state::plate_w)
+void bfriskyt_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x: vfd plate
int shift = offset * 4;
@@ -568,7 +568,7 @@ WRITE8_MEMBER(bfriskyt_state::plate_w)
update_display();
}
-WRITE16_MEMBER(bfriskyt_state::grid_w)
+void bfriskyt_state::grid_w(u16 data)
{
// D6: speaker out
m_speaker->level_w(data >> 6 & 1);
@@ -677,15 +677,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ16_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u16 input_r();
void packmon(machine_config &config);
};
// handlers
-WRITE8_MEMBER(packmon_state::plate_w)
+void packmon_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0-D3): vfd plate
int shift = offset * 4;
@@ -697,7 +697,7 @@ WRITE8_MEMBER(packmon_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(packmon_state::grid_w)
+void packmon_state::grid_w(u16 data)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
@@ -709,10 +709,10 @@ WRITE16_MEMBER(packmon_state::grid_w)
m_grid = data >> 6 & 0x3ff;
// D0-D3: plate 9-12 (update display there)
- plate_w(space, 4, data & 0xf);
+ plate_w(4, data & 0xf);
}
-READ16_MEMBER(packmon_state::input_r)
+u16 packmon_state::input_r()
{
// D5: multiplexed inputs
return read_inputs(5) & 0x20;
@@ -794,8 +794,8 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int1();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); }
@@ -804,7 +804,7 @@ public:
// handlers
-WRITE8_MEMBER(bzaxxon_state::plate_w)
+void bzaxxon_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0-D2): vfd plate
int shift = offset * 4;
@@ -816,7 +816,7 @@ WRITE8_MEMBER(bzaxxon_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(bzaxxon_state::grid_w)
+void bzaxxon_state::grid_w(u16 data)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
@@ -833,7 +833,7 @@ WRITE16_MEMBER(bzaxxon_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D0-D2: plate 7-9 (update display there)
- plate_w(space, 4, data & 7);
+ plate_w(4, data & 7);
}
void bzaxxon_state::update_int1()
@@ -919,8 +919,8 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int0();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); }
@@ -929,7 +929,7 @@ public:
// handlers
-WRITE8_MEMBER(zackman_state::plate_w)
+void zackman_state::plate_w(offs_t offset, u8 data)
{
// R0x-R6x(,D0,D1): vfd plate
int shift = offset * 4;
@@ -941,7 +941,7 @@ WRITE8_MEMBER(zackman_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(zackman_state::grid_w)
+void zackman_state::grid_w(u16 data)
{
// D2: speaker out
m_speaker->level_w(data >> 2 & 1);
@@ -958,7 +958,7 @@ WRITE16_MEMBER(zackman_state::grid_w)
m_grid = data >> 8 & 0xff;
// D0,D1: plate 12,13 (update display there)
- plate_w(space, 7, data & 3);
+ plate_w(7, data & 3);
}
void zackman_state::update_int0()
@@ -1044,8 +1044,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int0();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); }
@@ -1061,7 +1061,7 @@ void bpengo_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(bpengo_state::plate_w)
+void bpengo_state::plate_w(offs_t offset, u8 data)
{
// R0x-R6x: vfd plate
int shift = offset * 4;
@@ -1069,7 +1069,7 @@ WRITE8_MEMBER(bpengo_state::plate_w)
update_display();
}
-WRITE16_MEMBER(bpengo_state::grid_w)
+void bpengo_state::grid_w(u16 data)
{
// D10: speaker out
m_speaker->level_w(data >> 10 & 1);
@@ -1177,8 +1177,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int0();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); }
@@ -1194,7 +1194,7 @@ void bbtime_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(bbtime_state::plate_w)
+void bbtime_state::plate_w(offs_t offset, u8 data)
{
// R0x-R6x: vfd plate
int shift = offset * 4;
@@ -1202,7 +1202,7 @@ WRITE8_MEMBER(bbtime_state::plate_w)
update_display();
}
-WRITE16_MEMBER(bbtime_state::grid_w)
+void bbtime_state::grid_w(u16 data)
{
// D3: speaker out
m_speaker->level_w(data >> 3 & 1);
@@ -1305,14 +1305,14 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void bdoramon(machine_config &config);
};
// handlers
-WRITE8_MEMBER(bdoramon_state::plate_w)
+void bdoramon_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0-D3): vfd plate
int shift = offset * 4;
@@ -1324,7 +1324,7 @@ WRITE8_MEMBER(bdoramon_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(bdoramon_state::grid_w)
+void bdoramon_state::grid_w(u16 data)
{
// D7: speaker out
m_speaker->level_w(data >> 7 & 1);
@@ -1333,7 +1333,7 @@ WRITE16_MEMBER(bdoramon_state::grid_w)
m_grid = data >> 8 & 0xff;
// D0-D3: plate 15-18 (update display there)
- plate_w(space, 4, data & 0xf);
+ plate_w(4, data & 0xf);
}
// config
@@ -1414,14 +1414,14 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void bultrman(machine_config &config);
};
// handlers
-WRITE8_MEMBER(bultrman_state::plate_w)
+void bultrman_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0-D2): vfd plate
int shift = offset * 4;
@@ -1433,7 +1433,7 @@ WRITE8_MEMBER(bultrman_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(bultrman_state::grid_w)
+void bultrman_state::grid_w(u16 data)
{
// D7: speaker out
m_speaker->level_w(data >> 7 & 1);
@@ -1442,7 +1442,7 @@ WRITE16_MEMBER(bultrman_state::grid_w)
m_grid = data >> 8 & 0xff;
// D0-D2: plate 15-17 (update display there)
- plate_w(space, 4, data & 7);
+ plate_w(4, data & 7);
}
// config
@@ -1516,8 +1516,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void machiman(machine_config &config);
};
@@ -1529,7 +1529,7 @@ void machiman_state::update_display()
m_display->matrix(m_grid, plate);
}
-WRITE8_MEMBER(machiman_state::plate_w)
+void machiman_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x,R6012: vfd plate
int shift = (offset == 6) ? 16 : offset * 4;
@@ -1537,7 +1537,7 @@ WRITE8_MEMBER(machiman_state::plate_w)
update_display();
}
-WRITE16_MEMBER(machiman_state::grid_w)
+void machiman_state::grid_w(u16 data)
{
// D13: speaker out
m_speaker->level_w(data >> 13 & 1);
@@ -1626,13 +1626,13 @@ public:
required_device_array m_soundlatch;
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
- DECLARE_WRITE8_MEMBER(sound_w);
- DECLARE_WRITE8_MEMBER(sound2_w);
- DECLARE_WRITE16_MEMBER(speaker_w);
+ void sound_w(u8 data);
+ void sound2_w(u8 data);
+ void speaker_w(u16 data);
void pairmtch(machine_config &config);
};
@@ -1643,7 +1643,7 @@ void pairmtch_state::update_display()
m_display->matrix(m_grid, m_plate);
}
-WRITE8_MEMBER(pairmtch_state::plate_w)
+void pairmtch_state::plate_w(offs_t offset, u8 data)
{
// R2x,R3x,R6x: vfd plate
int shift = (offset == 6) ? 8 : (offset-2) * 4;
@@ -1651,7 +1651,7 @@ WRITE8_MEMBER(pairmtch_state::plate_w)
update_display();
}
-WRITE16_MEMBER(pairmtch_state::grid_w)
+void pairmtch_state::grid_w(u16 data)
{
// D7: sound reset (to audiocpu reset line)
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
@@ -1667,13 +1667,13 @@ WRITE16_MEMBER(pairmtch_state::grid_w)
update_display();
}
-READ8_MEMBER(pairmtch_state::input_r)
+u8 pairmtch_state::input_r()
{
// R4x: multiplexed inputs
return read_inputs(2);
}
-WRITE8_MEMBER(pairmtch_state::sound_w)
+void pairmtch_state::sound_w(u8 data)
{
// R5x: soundlatch (to audiocpu R2x)
m_soundlatch[0]->write(bitswap<8>(data,7,6,5,4,0,1,2,3));
@@ -1681,13 +1681,13 @@ WRITE8_MEMBER(pairmtch_state::sound_w)
// handlers: audiocpu side
-WRITE8_MEMBER(pairmtch_state::sound2_w)
+void pairmtch_state::sound2_w(u8 data)
{
// R2x: soundlatch (to maincpu R5x)
m_soundlatch[1]->write(bitswap<8>(data,7,6,5,4,0,1,2,3));
}
-WRITE16_MEMBER(pairmtch_state::speaker_w)
+void pairmtch_state::speaker_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -1793,15 +1793,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ16_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u16 input_r();
void alnattck(machine_config &config);
};
// handlers
-WRITE8_MEMBER(alnattck_state::plate_w)
+void alnattck_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0-D3): vfd plate
int shift = offset * 4;
@@ -1812,7 +1812,7 @@ WRITE8_MEMBER(alnattck_state::plate_w)
m_display->matrix(m_grid, plate);
}
-WRITE16_MEMBER(alnattck_state::grid_w)
+void alnattck_state::grid_w(u16 data)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
@@ -1824,10 +1824,10 @@ WRITE16_MEMBER(alnattck_state::grid_w)
m_grid = data >> 6 & 0x3ff;
// D0-D3: plate 16-19 (update display there)
- plate_w(space, 4, data & 0xf);
+ plate_w(4, data & 0xf);
}
-READ16_MEMBER(alnattck_state::input_r)
+u16 alnattck_state::input_r()
{
// D5: multiplexed inputs
return read_inputs(7) & 0x20;
@@ -1917,8 +1917,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void speaker_update();
TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim);
@@ -1962,7 +1962,7 @@ void cdkong_state::update_display()
m_display->matrix(m_grid, plate);
}
-WRITE8_MEMBER(cdkong_state::plate_w)
+void cdkong_state::plate_w(offs_t offset, u8 data)
{
// R13: speaker on
m_r[offset] = data;
@@ -1974,7 +1974,7 @@ WRITE8_MEMBER(cdkong_state::plate_w)
update_display();
}
-WRITE16_MEMBER(cdkong_state::grid_w)
+void cdkong_state::grid_w(u16 data)
{
// D3: speaker out
m_d = data;
@@ -2073,9 +2073,9 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(grid_w);
- DECLARE_WRITE16_MEMBER(plate_w);
- DECLARE_READ8_MEMBER(input_r);
+ void grid_w(offs_t offset, u8 data);
+ void plate_w(u16 data);
+ u8 input_r();
DECLARE_INPUT_CHANGED_MEMBER(player_switch);
void cgalaxn(machine_config &config);
@@ -2097,7 +2097,7 @@ INPUT_CHANGED_MEMBER(cgalaxn_state::player_switch)
update_display();
}
-WRITE8_MEMBER(cgalaxn_state::grid_w)
+void cgalaxn_state::grid_w(offs_t offset, u8 data)
{
// R10,R11: input mux
if (offset == 1)
@@ -2109,7 +2109,7 @@ WRITE8_MEMBER(cgalaxn_state::grid_w)
update_display();
}
-WRITE16_MEMBER(cgalaxn_state::plate_w)
+void cgalaxn_state::plate_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -2121,7 +2121,7 @@ WRITE16_MEMBER(cgalaxn_state::plate_w)
update_display();
}
-READ8_MEMBER(cgalaxn_state::input_r)
+u8 cgalaxn_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(2);
@@ -2215,15 +2215,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
void cpacman(machine_config &config);
};
// handlers
-WRITE8_MEMBER(cpacman_state::plate_w)
+void cpacman_state::plate_w(offs_t offset, u8 data)
{
// R1x-R6x(,D1,D2): vfd plate
int shift = (offset - 1) * 4;
@@ -2235,7 +2235,7 @@ WRITE8_MEMBER(cpacman_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(cpacman_state::grid_w)
+void cpacman_state::grid_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -2247,10 +2247,10 @@ WRITE16_MEMBER(cpacman_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D1,D2: plate 8,14 (update display there)
- plate_w(space, 6 + 1, data >> 1 & 3);
+ plate_w(6 + 1, data >> 1 & 3);
}
-READ8_MEMBER(cpacman_state::input_r)
+u8 cpacman_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(3);
@@ -2351,15 +2351,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
void cmspacmn(machine_config &config);
};
// handlers
-WRITE8_MEMBER(cmspacmn_state::plate_w)
+void cmspacmn_state::plate_w(offs_t offset, u8 data)
{
// R1x-R6x(,D0,D1): vfd plate
int shift = (offset - 1) * 4;
@@ -2371,7 +2371,7 @@ WRITE8_MEMBER(cmspacmn_state::plate_w)
m_display->matrix(grid, u64(BIT(m_plate,15)) << 32 | plate);
}
-WRITE16_MEMBER(cmspacmn_state::grid_w)
+void cmspacmn_state::grid_w(u16 data)
{
// D2: speaker out
m_speaker->level_w(data >> 2 & 1);
@@ -2383,10 +2383,10 @@ WRITE16_MEMBER(cmspacmn_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D0,D1: more plates (update display there)
- plate_w(space, 6 + 1, data & 3);
+ plate_w(6 + 1, data & 3);
}
-READ8_MEMBER(cmspacmn_state::input_r)
+u8 cmspacmn_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(3);
@@ -2476,9 +2476,9 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u8 input_r();
void egalaxn2(machine_config &config);
};
@@ -2491,7 +2491,7 @@ void egalaxn2_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(egalaxn2_state::grid_w)
+void egalaxn2_state::grid_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -2504,7 +2504,7 @@ WRITE16_MEMBER(egalaxn2_state::grid_w)
update_display();
}
-WRITE8_MEMBER(egalaxn2_state::plate_w)
+void egalaxn2_state::plate_w(offs_t offset, u8 data)
{
// R1x-R6x: vfd plate
int shift = (offset - 1) * 4;
@@ -2512,7 +2512,7 @@ WRITE8_MEMBER(egalaxn2_state::plate_w)
update_display();
}
-READ8_MEMBER(egalaxn2_state::input_r)
+u8 egalaxn2_state::input_r()
{
// R0x: multiplexed inputs
return read_inputs(4);
@@ -2702,9 +2702,9 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ16_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u16 input_r();
void einvader2(machine_config &config);
};
@@ -2715,7 +2715,7 @@ void einvader2_state::update_display()
m_display->matrix(m_grid, m_plate);
}
-WRITE8_MEMBER(einvader2_state::plate_w)
+void einvader2_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x: vfd plate
int shift = offset * 4;
@@ -2723,7 +2723,7 @@ WRITE8_MEMBER(einvader2_state::plate_w)
update_display();
}
-WRITE16_MEMBER(einvader2_state::grid_w)
+void einvader2_state::grid_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -2736,7 +2736,7 @@ WRITE16_MEMBER(einvader2_state::grid_w)
update_display();
}
-READ16_MEMBER(einvader2_state::input_r)
+u16 einvader2_state::input_r()
{
// D13-D15: multiplexed inputs
return read_inputs(3) << 13;
@@ -2827,14 +2827,14 @@ public:
required_device m_audiocpu;
virtual void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
u8 m_cop_irq;
DECLARE_WRITE_LINE_MEMBER(speaker_w);
- DECLARE_WRITE8_MEMBER(cop_irq_w);
- DECLARE_READ8_MEMBER(cop_latch_r);
- DECLARE_READ8_MEMBER(cop_ack_r);
+ void cop_irq_w(u8 data);
+ u8 cop_latch_r();
+ u8 cop_ack_r();
void update_int();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int(); }
@@ -2861,7 +2861,7 @@ void eturtles_state::update_display()
m_display->matrix(grid, plate | (grid >> 5 & 8)); // grid 8 also forces plate 3 high
}
-WRITE8_MEMBER(eturtles_state::plate_w)
+void eturtles_state::plate_w(offs_t offset, u8 data)
{
m_r[offset] = data;
@@ -2871,7 +2871,7 @@ WRITE8_MEMBER(eturtles_state::plate_w)
update_display();
}
-WRITE16_MEMBER(eturtles_state::grid_w)
+void eturtles_state::grid_w(u16 data)
{
m_d = data;
@@ -2904,20 +2904,20 @@ WRITE_LINE_MEMBER(eturtles_state::speaker_w)
m_speaker->level_w(!state);
}
-WRITE8_MEMBER(eturtles_state::cop_irq_w)
+void eturtles_state::cop_irq_w(u8 data)
{
// D0: maincpu INT0 (active low)
m_cop_irq = ~data & 1;
update_int();
}
-READ8_MEMBER(eturtles_state::cop_latch_r)
+u8 eturtles_state::cop_latch_r()
{
// L0-L3: soundlatch from maincpu R0x
return m_r[0];
}
-READ8_MEMBER(eturtles_state::cop_ack_r)
+u8 eturtles_state::cop_ack_r()
{
// G0: ack from maincpu D0
return m_d & 1;
@@ -3026,7 +3026,7 @@ public:
{ }
virtual void update_display() override;
- DECLARE_READ8_MEMBER(cop_data_r);
+ u8 cop_data_r();
void estargte(machine_config &config);
};
@@ -3039,7 +3039,7 @@ void estargte_state::update_display()
m_display->matrix(grid, plate);
}
-READ8_MEMBER(estargte_state::cop_data_r)
+u8 estargte_state::cop_data_r()
{
// L0-L3: soundlatch from maincpu R0x
// L7: ack from maincpu D0
@@ -3149,15 +3149,15 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_READ16_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ u16 input_r();
void ghalien(machine_config &config);
};
// handlers
-WRITE8_MEMBER(ghalien_state::plate_w)
+void ghalien_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D10-D13): vfd plate
int shift = offset * 4;
@@ -3169,7 +3169,7 @@ WRITE8_MEMBER(ghalien_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(ghalien_state::grid_w)
+void ghalien_state::grid_w(u16 data)
{
// D14: speaker out
m_speaker->level_w(data >> 14 & 1);
@@ -3181,10 +3181,10 @@ WRITE16_MEMBER(ghalien_state::grid_w)
m_grid = data & 0x3ff;
// D10-D13: more plates (update display there)
- plate_w(space, 4, data >> 10 & 0xf);
+ plate_w(4, data >> 10 & 0xf);
}
-READ16_MEMBER(ghalien_state::input_r)
+u16 ghalien_state::input_r()
{
// D15: multiplexed inputs
return read_inputs(7) & 0x8000;
@@ -3276,8 +3276,8 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int1();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); }
@@ -3286,7 +3286,7 @@ public:
// handlers
-WRITE8_MEMBER(gckong_state::plate_w)
+void gckong_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x(,D0,D1): vfd plate
int shift = offset * 4;
@@ -3298,7 +3298,7 @@ WRITE8_MEMBER(gckong_state::plate_w)
m_display->matrix(grid, plate);
}
-WRITE16_MEMBER(gckong_state::grid_w)
+void gckong_state::grid_w(u16 data)
{
// D2: speaker out
m_speaker->level_w(data >> 2 & 1);
@@ -3315,7 +3315,7 @@ WRITE16_MEMBER(gckong_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D0,D1: more plates (update display there)
- plate_w(space, 4, data & 3);
+ plate_w(4, data & 3);
}
void gckong_state::update_int1()
@@ -3405,8 +3405,8 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int1();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); }
@@ -3415,7 +3415,7 @@ public:
// handlers
-WRITE8_MEMBER(gdigdug_state::plate_w)
+void gdigdug_state::plate_w(offs_t offset, u8 data)
{
// R0x-R6x(,D0-D3): vfd plate
int shift = offset * 4;
@@ -3426,7 +3426,7 @@ WRITE8_MEMBER(gdigdug_state::plate_w)
m_display->matrix(m_grid, plate);
}
-WRITE16_MEMBER(gdigdug_state::grid_w)
+void gdigdug_state::grid_w(u16 data)
{
// D6: speaker out
m_speaker->level_w(data >> 6 & 1);
@@ -3443,7 +3443,7 @@ WRITE16_MEMBER(gdigdug_state::grid_w)
m_grid = data >> 7 & 0x1ff;
// D0-D3: more plates (update display there)
- plate_w(space, 7, data & 0xf);
+ plate_w(7, data & 0xf);
}
void gdigdug_state::update_int1()
@@ -3536,10 +3536,10 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
- DECLARE_WRITE8_MEMBER(speaker_w);
- DECLARE_READ8_MEMBER(input_r);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
+ void speaker_w(u8 data);
+ u8 input_r();
void mwcbaseb(machine_config &config);
};
@@ -3551,7 +3551,7 @@ void mwcbaseb_state::update_display()
m_display->matrix(grid, m_plate);
}
-WRITE8_MEMBER(mwcbaseb_state::plate_w)
+void mwcbaseb_state::plate_w(offs_t offset, u8 data)
{
// R1x-R3x,R6x: vfd plate
int shift = (offset == 6) ? 12 : (offset - 1) * 4;
@@ -3559,7 +3559,7 @@ WRITE8_MEMBER(mwcbaseb_state::plate_w)
update_display();
}
-WRITE16_MEMBER(mwcbaseb_state::grid_w)
+void mwcbaseb_state::grid_w(u16 data)
{
// D9-D15: input mux
m_inp_mux = data >> 9 & 0x7f;
@@ -3569,13 +3569,13 @@ WRITE16_MEMBER(mwcbaseb_state::grid_w)
update_display();
}
-WRITE8_MEMBER(mwcbaseb_state::speaker_w)
+void mwcbaseb_state::speaker_w(u8 data)
{
// R50,R51+R52(tied together): speaker out
m_speaker->level_w(data & 7);
}
-READ8_MEMBER(mwcbaseb_state::input_r)
+u8 mwcbaseb_state::input_r()
{
// R4x: multiplexed inputs
return read_inputs(7);
@@ -3710,8 +3710,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int0();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); }
@@ -3727,7 +3727,7 @@ void msthawk_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(msthawk_state::plate_w)
+void msthawk_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x: vfd plate
int shift = offset * 4;
@@ -3735,7 +3735,7 @@ WRITE8_MEMBER(msthawk_state::plate_w)
update_display();
}
-WRITE16_MEMBER(msthawk_state::grid_w)
+void msthawk_state::grid_w(u16 data)
{
// D5: speaker out
m_speaker->level_w(data >> 5 & 1);
@@ -3842,14 +3842,14 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void pbqbert(machine_config &config);
};
// handlers
-WRITE8_MEMBER(pbqbert_state::plate_w)
+void pbqbert_state::plate_w(offs_t offset, u8 data)
{
// R0x-R6x(,D8): vfd plate
int shift = offset * 4;
@@ -3860,7 +3860,7 @@ WRITE8_MEMBER(pbqbert_state::plate_w)
m_display->matrix(m_grid, plate);
}
-WRITE16_MEMBER(pbqbert_state::grid_w)
+void pbqbert_state::grid_w(u16 data)
{
// D14: speaker out
m_speaker->level_w(data >> 14 & 1);
@@ -3869,7 +3869,7 @@ WRITE16_MEMBER(pbqbert_state::grid_w)
m_grid = data & 0xff;
// D8: plate 25 (update display there)
- plate_w(space, 7, data >> 8 & 1);
+ plate_w(7, data >> 8 & 1);
}
// config
@@ -3942,8 +3942,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int1();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); }
@@ -3959,7 +3959,7 @@ void tmtron_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(tmtron_state::plate_w)
+void tmtron_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x: vfd plate
int shift = offset * 4;
@@ -3967,7 +3967,7 @@ WRITE8_MEMBER(tmtron_state::plate_w)
update_display();
}
-WRITE16_MEMBER(tmtron_state::grid_w)
+void tmtron_state::grid_w(u16 data)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
@@ -4068,8 +4068,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void update_int0();
DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); }
@@ -4085,7 +4085,7 @@ void kingman_state::update_display()
m_display->matrix(grid, plate);
}
-WRITE8_MEMBER(kingman_state::plate_w)
+void kingman_state::plate_w(offs_t offset, u8 data)
{
// R0x-R3x: vfd plate
int shift = offset * 4;
@@ -4093,7 +4093,7 @@ WRITE8_MEMBER(kingman_state::plate_w)
update_display();
}
-WRITE16_MEMBER(kingman_state::grid_w)
+void kingman_state::grid_w(u16 data)
{
// D6: speaker out
m_speaker->level_w(data >> 6 & 1);
@@ -4197,14 +4197,14 @@ public:
hh_hmcs40_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(plate_w);
- DECLARE_WRITE16_MEMBER(grid_w);
+ void plate_w(offs_t offset, u8 data);
+ void grid_w(u16 data);
void vinvader(machine_config &config);
};
// handlers
-WRITE8_MEMBER(vinvader_state::plate_w)
+void vinvader_state::plate_w(offs_t offset, u8 data)
{
// R1x-R3x(,D4-D6): vfd plate
int shift = (offset - 1) * 4;
@@ -4215,7 +4215,7 @@ WRITE8_MEMBER(vinvader_state::plate_w)
m_display->matrix(m_grid, plate);
}
-WRITE16_MEMBER(vinvader_state::grid_w)
+void vinvader_state::grid_w(u16 data)
{
// D0: speaker out
m_speaker->level_w(data & 1);
@@ -4224,7 +4224,7 @@ WRITE16_MEMBER(vinvader_state::grid_w)
m_grid = data >> 7 & 0x1ff;
// D4-D6: more plates (update display there)
- plate_w(space, 3 + 1, data >> 4 & 7);
+ plate_w(3 + 1, data >> 4 & 7);
}
// config
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index a1c763be43f..8fb36a746c4 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -204,9 +204,9 @@ public:
void update_display();
void update_speaker();
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ u8 read_a();
+ void write_b(u8 data);
+ void write_c(u8 data);
void touchme(machine_config &config);
};
@@ -222,13 +222,13 @@ void touchme_state::update_speaker()
m_speaker->level_w((m_b >> 7 & 1) | (m_c >> 6 & 2));
}
-READ8_MEMBER(touchme_state::read_a)
+u8 touchme_state::read_a()
{
// A: multiplexed inputs
return read_inputs(3, 0xf);
}
-WRITE8_MEMBER(touchme_state::write_b)
+void touchme_state::write_b(u8 data)
{
// B0-B2: input mux
m_inp_mux = data & 7;
@@ -242,7 +242,7 @@ WRITE8_MEMBER(touchme_state::write_b)
update_speaker();
}
-WRITE8_MEMBER(touchme_state::write_c)
+void touchme_state::write_c(u8 data)
{
// C0-C6: digit segments
m_c = data;
@@ -327,8 +327,8 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ void write_b(u8 data);
+ void write_c(u8 data);
void pabball(machine_config &config);
};
@@ -345,14 +345,14 @@ void pabball_state::update_display()
m_display->matrix(sel, m_b);
}
-WRITE8_MEMBER(pabball_state::write_b)
+void pabball_state::write_b(u8 data)
{
// B: led data
m_b = ~data;
update_display();
}
-WRITE8_MEMBER(pabball_state::write_c)
+void pabball_state::write_c(u8 data)
{
// C2: RTCC pin
m_maincpu->set_input_line(PIC16C5x_RTCC, data >> 2 & 1);
@@ -433,27 +433,27 @@ public:
hh_pic16_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_READ8_MEMBER(read_c);
- DECLARE_WRITE8_MEMBER(write_c);
+ void write_b(u8 data);
+ u8 read_c();
+ void write_c(u8 data);
void melodym(machine_config &config);
};
// handlers
-WRITE8_MEMBER(melodym_state::write_b)
+void melodym_state::write_b(u8 data)
{
// B2-B6: input mux
m_inp_mux = data >> 2 & 0x1f;
}
-READ8_MEMBER(melodym_state::read_c)
+u8 melodym_state::read_c()
{
// C0-C4: multiplexed inputs
return read_inputs(5, 0x1f) | 0xe0;
}
-WRITE8_MEMBER(melodym_state::write_c)
+void melodym_state::write_c(u8 data)
{
// C6: both lamps
m_display->matrix(1, ~data >> 6 & 1);
@@ -561,8 +561,8 @@ public:
void update_display();
void update_speaker();
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ void write_b(u8 data);
+ void write_c(u8 data);
void maniac(machine_config &config);
};
@@ -580,7 +580,7 @@ void maniac_state::update_speaker()
m_speaker->level_w((m_b >> 7 & 1) | (m_c >> 6 & 2));
}
-WRITE8_MEMBER(maniac_state::write_b)
+void maniac_state::write_b(u8 data)
{
// B0-B6: left 7seg
m_b = data;
@@ -590,7 +590,7 @@ WRITE8_MEMBER(maniac_state::write_b)
update_speaker();
}
-WRITE8_MEMBER(maniac_state::write_c)
+void maniac_state::write_c(u8 data)
{
// C0-C6: right 7seg
m_c = data;
@@ -674,9 +674,9 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_READ8_MEMBER(read_c);
- DECLARE_WRITE8_MEMBER(write_c);
+ void write_b(u8 data);
+ u8 read_c();
+ void write_c(u8 data);
void speaker_decay_reset();
TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim);
@@ -720,7 +720,7 @@ void flash_state::update_display()
m_display->matrix(~m_b >> 4 & 3, (~m_c >> 1 & 0x7f) | (~m_b << 7 & 0x780));
}
-WRITE8_MEMBER(flash_state::write_b)
+void flash_state::write_b(u8 data)
{
// B0-B3: led data
// B4,B5: led select
@@ -733,13 +733,13 @@ WRITE8_MEMBER(flash_state::write_b)
m_speaker->level_w(data >> 7 & 1);
}
-READ8_MEMBER(flash_state::read_c)
+u8 flash_state::read_c()
{
// C1-C7: buttons
return (m_c & 1) ? 0xff : m_inputs[1]->read();
}
-WRITE8_MEMBER(flash_state::write_c)
+void flash_state::write_c(u8 data)
{
// C0: enable buttons
// C1-C7: digit segments
@@ -822,9 +822,9 @@ public:
hh_pic16_state(mconfig, type, tag)
{ }
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
- DECLARE_READ8_MEMBER(read_c);
+ void write_b(u8 data);
+ void write_c(u8 data);
+ u8 read_c();
void set_clock();
DECLARE_INPUT_CHANGED_MEMBER(speed_switch) { set_clock(); }
@@ -849,13 +849,13 @@ void matchme_state::set_clock()
m_maincpu->set_unscaled_clock((m_inputs[4]->read() & 1) ? 1300000 : 1200000);
}
-WRITE8_MEMBER(matchme_state::write_b)
+void matchme_state::write_b(u8 data)
{
// B0-B7: lamps
m_display->matrix(1, data);
}
-READ8_MEMBER(matchme_state::read_c)
+u8 matchme_state::read_c()
{
// C0-C3: multiplexed inputs from C4-C6
m_inp_mux = m_c >> 4 & 7;
@@ -868,7 +868,7 @@ READ8_MEMBER(matchme_state::read_c)
return lo | hi << 4 | 0x80;
}
-WRITE8_MEMBER(matchme_state::write_c)
+void matchme_state::write_c(u8 data)
{
// C0-C6: input mux
m_c = data;
@@ -980,9 +980,9 @@ public:
hh_pic16_state(mconfig, type, tag)
{ }
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ u8 read_a();
+ void write_b(u8 data);
+ void write_c(u8 data);
void speaker_decay_reset();
TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim);
@@ -1019,19 +1019,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(leboom_state::speaker_decay_sim)
m_speaker_volume /= 1.015;
}
-READ8_MEMBER(leboom_state::read_a)
+u8 leboom_state::read_a()
{
// A: multiplexed inputs
return read_inputs(6, 0xf);
}
-WRITE8_MEMBER(leboom_state::write_b)
+void leboom_state::write_b(u8 data)
{
// B0-B5: input mux
m_inp_mux = data & 0x3f;
}
-WRITE8_MEMBER(leboom_state::write_c)
+void leboom_state::write_c(u8 data)
{
// C4: single led
m_display->matrix(1, data >> 4 & 1);
@@ -1133,9 +1133,9 @@ public:
{ }
void update_display();
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ u8 read_a();
+ void write_b(u8 data);
+ void write_c(u8 data);
void tbaskb(machine_config &config);
};
@@ -1146,13 +1146,13 @@ void tbaskb_state::update_display()
m_display->matrix(m_b, m_c);
}
-READ8_MEMBER(tbaskb_state::read_a)
+u8 tbaskb_state::read_a()
{
// A2: skill switch, A3: multiplexed inputs
return m_inputs[5]->read() | read_inputs(5, 8) | 3;
}
-WRITE8_MEMBER(tbaskb_state::write_b)
+void tbaskb_state::write_b(u8 data)
{
// B0: RTCC pin
m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1);
@@ -1166,7 +1166,7 @@ WRITE8_MEMBER(tbaskb_state::write_b)
update_display();
}
-WRITE8_MEMBER(tbaskb_state::write_c)
+void tbaskb_state::write_c(u8 data)
{
// C7: speaker out
m_speaker->level_w(data >> 7 & 1);
@@ -1253,10 +1253,10 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(write_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
- DECLARE_WRITE8_MEMBER(write_d);
+ void write_a(u8 data);
+ void write_b(u8 data);
+ void write_c(u8 data);
+ void write_d(u8 data);
void rockpin(machine_config &config);
};
@@ -1271,7 +1271,7 @@ void rockpin_state::update_display()
m_display->matrix_partial(3, 6, m_d, m_c);
}
-WRITE8_MEMBER(rockpin_state::write_a)
+void rockpin_state::write_a(u8 data)
{
// A3,A4: speaker out
m_speaker->level_w(data >> 3 & 3);
@@ -1281,21 +1281,21 @@ WRITE8_MEMBER(rockpin_state::write_a)
update_display();
}
-WRITE8_MEMBER(rockpin_state::write_b)
+void rockpin_state::write_b(u8 data)
{
// B0-B6: digit segments
m_b = data & 0x7f;
update_display();
}
-WRITE8_MEMBER(rockpin_state::write_c)
+void rockpin_state::write_c(u8 data)
{
// C0-C7: led data
m_c = ~data;
update_display();
}
-WRITE8_MEMBER(rockpin_state::write_d)
+void rockpin_state::write_d(u8 data)
{
// D0-D5: led select
m_d = ~data;
@@ -1372,9 +1372,9 @@ public:
{ }
void update_display();
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ u8 read_a();
+ void write_b(u8 data);
+ void write_c(u8 data);
void hccbaskb(machine_config &config);
};
@@ -1385,13 +1385,13 @@ void hccbaskb_state::update_display()
m_display->matrix(m_b, m_c);
}
-READ8_MEMBER(hccbaskb_state::read_a)
+u8 hccbaskb_state::read_a()
{
// A2: skill switch, A3: multiplexed inputs
return m_inputs[5]->read() | read_inputs(5, 8) | 3;
}
-WRITE8_MEMBER(hccbaskb_state::write_b)
+void hccbaskb_state::write_b(u8 data)
{
// B0: RTCC pin
m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1);
@@ -1408,7 +1408,7 @@ WRITE8_MEMBER(hccbaskb_state::write_b)
update_display();
}
-WRITE8_MEMBER(hccbaskb_state::write_c)
+void hccbaskb_state::write_c(u8 data)
{
// C0-C6: led data
m_c = ~data;
@@ -1496,9 +1496,9 @@ public:
{ }
void update_display();
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
+ u8 read_a();
+ void write_b(u8 data);
+ void write_c(u8 data);
void ttfball(machine_config &config);
};
@@ -1515,13 +1515,13 @@ void ttfball_state::update_display()
m_display->matrix(m_b | (m_c << 1 & 0x100), led_data);
}
-READ8_MEMBER(ttfball_state::read_a)
+u8 ttfball_state::read_a()
{
// A3: multiplexed inputs, A0-A2: other inputs
return m_inputs[5]->read() | read_inputs(5, 8);
}
-WRITE8_MEMBER(ttfball_state::write_b)
+void ttfball_state::write_b(u8 data)
{
// B0: RTCC pin
m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1);
@@ -1534,7 +1534,7 @@ WRITE8_MEMBER(ttfball_state::write_b)
update_display();
}
-WRITE8_MEMBER(ttfball_state::write_c)
+void ttfball_state::write_c(u8 data)
{
// C6: speaker out
m_speaker->level_w(data >> 6 & 1);
@@ -1657,10 +1657,10 @@ public:
{ }
void update_display();
- DECLARE_WRITE8_MEMBER(write_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
- DECLARE_WRITE8_MEMBER(write_d);
+ void write_a(u8 data);
+ void write_b(u8 data);
+ void write_c(u8 data);
+ void write_d(u8 data);
void uspbball(machine_config &config);
};
@@ -1671,27 +1671,27 @@ void uspbball_state::update_display()
m_display->matrix(m_d, m_c << 8 | m_b);
}
-WRITE8_MEMBER(uspbball_state::write_a)
+void uspbball_state::write_a(u8 data)
{
// A0: speaker out
m_speaker->level_w(data & 1);
}
-WRITE8_MEMBER(uspbball_state::write_b)
+void uspbball_state::write_b(u8 data)
{
// B: digit segment data
m_b = bitswap<8>(data,0,1,2,3,4,5,6,7);
update_display();
}
-WRITE8_MEMBER(uspbball_state::write_c)
+void uspbball_state::write_c(u8 data)
{
// C: led data
m_c = ~data;
update_display();
}
-WRITE8_MEMBER(uspbball_state::write_d)
+void uspbball_state::write_d(u8 data)
{
// D0-D2: digit select
// D3-D5: led select
@@ -1775,11 +1775,11 @@ public:
{ }
void update_display();
- DECLARE_READ8_MEMBER(read_a);
- DECLARE_WRITE8_MEMBER(write_a);
- DECLARE_WRITE8_MEMBER(write_b);
- DECLARE_WRITE8_MEMBER(write_c);
- DECLARE_WRITE8_MEMBER(write_d);
+ u8 read_a();
+ void write_a(u8 data);
+ void write_b(u8 data);
+ void write_c(u8 data);
+ void write_d(u8 data);
void us2pfball(machine_config &config);
};
@@ -1790,26 +1790,26 @@ void us2pfball_state::update_display()
m_display->matrix(m_d | (m_a << 6 & 0x300), m_c);
}
-READ8_MEMBER(us2pfball_state::read_a)
+u8 us2pfball_state::read_a()
{
// A0,A1: multiplexed inputs, A4-A7: other inputs
return read_inputs(4, 3) | (m_inputs[4]->read() & 0xf0) | 0x0c;
}
-WRITE8_MEMBER(us2pfball_state::write_a)
+void us2pfball_state::write_a(u8 data)
{
// A2,A3: leds
m_a = data;
update_display();
}
-WRITE8_MEMBER(us2pfball_state::write_b)
+void us2pfball_state::write_b(u8 data)
{
// B0-B3: input mux
m_inp_mux = data & 0xf;
}
-WRITE8_MEMBER(us2pfball_state::write_c)
+void us2pfball_state::write_c(u8 data)
{
// C7: speaker out
m_speaker->level_w(data >> 7 & 1);
@@ -1819,7 +1819,7 @@ WRITE8_MEMBER(us2pfball_state::write_c)
update_display();
}
-WRITE8_MEMBER(us2pfball_state::write_d)
+void us2pfball_state::write_d(u8 data)
{
// D0-D7: digit select
m_d = ~data;
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index d785957e74f..31b837451fd 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -104,7 +104,7 @@ A 12.000MHz
#define MCLK XTAL(12'000'000) // this is on the video board
#define CLK2 XTAL(8'000'000) // near the CPUs
-WRITE8_MEMBER(himesiki_state::himesiki_rombank_w)
+void himesiki_state::himesiki_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(((data & 0x0c) >> 2));
@@ -115,7 +115,7 @@ WRITE8_MEMBER(himesiki_state::himesiki_rombank_w)
logerror("p06_w %02x\n", data);
}
-WRITE8_MEMBER(himesiki_state::himesiki_sound_w)
+void himesiki_state::himesiki_sound_w(uint8_t data)
{
m_soundlatch->write(data);
m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp
index 56cab2e41fa..40f73692962 100644
--- a/src/mame/drivers/hotblock.cpp
+++ b/src/mame/drivers/hotblock.cpp
@@ -1,46 +1,61 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/*
+
HotBlock board
Tetris with naughty bits
- ||||||||||||||||
-+-------++++++++++++++++-------+
-| |
-| YM2149 TESTSW |
-| |
-| 62256 62256 6116 6116 |
-| |
-| 24mhz TPC1020AFN 24c04a |
-| |
-| PAL |
-| P8088-1 IC4 IC5 62256 62256 |
-| |
-+------------------------------+
+ _________________________________________________________________
+ | ___________ ___________ ___________ ___________ |
+ | |_74LS273N_| |MCM2018AN45 |SN74LS245N| |SN74LS245N| |
+ | ___________|
+ __| ___________ |SN74LS245N||
+ |__ |_74LS273N_| ___________ ____ ___________ _______________|
+ |__ |MCM2018AN45 24C02 |_GAL16V8B_| |D43256AC-85L ||
+ |__ ______ ________ |NEC___________||
+ |__ 74HC32P 74LS132N _______________|
+ |__ __________ |D43256AC-85L ||
+ |__ |_74F374N_| _____________ |NEC___________||
+ |__ __________ |IC30 | ________________|
+ |__ TEST SW |_74F374N_| |ACTEL | |IC5 - ROM2 ||
+ |__ ______ _______________ |A1020A | |_______________||
+ |__ |IC17 | |D43256AC-85L | |PL84C 9244 | ________________|
+ |__ Microchip |NEC___________| | | |IC4 - ROM1 ||
+ |__ AY38910A/P _______________ |____________| |_______________||
+ |__ | | |D43256AC-85L | |
+ |__ | | |NEC___________| |
+ |__ | | __________ __________ __________|
+ |__ | | |74LS245N_| ______ |74LS373N_| |74LS245N_||
+ |__ |_____| __________ XTAL __________ __________|
+ | |74LS245N_| 24.000 MHz |74LS373N_| |74LS373N_||
+ | ______ __________ _________________ |
+ | TDA2003 |74LS74AN_| |NEC 070108C V20 | |
+ | |________________| |
+ |________________________________________________________________|
+
+IC30 can be also a TPC1020AFN-084
330ohm resistor packs for colours
-
--
-there are a variety of test modes which can be obtained
-by resetting while holding down player 2 buttons
+There are a variety of test modes which can be obtained
+by resetting while holding down player 2 buttons.
-most sources say this is a game by Nics but I believe Nics
+Most sources say this is a game by Nics but I believe Nics
to be a company from Korea, this game is quite clearly a
Spanish game, we know for a fact that NIX are from Spain
-so it could be by them instead
+so it could be by them instead.
For some reason the game isn't saving scores to the EEPROM. Settings and
statistics are saved however. The option "AUTO SAVE SCORES" doesn't seem
to be honored - the game writes the value to RAM but never reads it.
-
*/
#include "emu.h"
-#include "cpu/i86/i86.h"
+#include "cpu/nec/nec.h"
#include "machine/bankdev.h"
#include "machine/i2cmem.h"
#include "sound/ay8910.h"
@@ -48,7 +63,6 @@ to be honored - the game writes the value to RAM but never reads it.
#include "screen.h"
#include "speaker.h"
-
class hotblock_state : public driver_device
{
public:
@@ -64,16 +78,16 @@ public:
void hotblock(machine_config &config);
private:
- /* devices */
+ // Devices
required_device m_maincpu;
required_device m_palette;
required_device