From 353b7bb60777c2dae29b57f666cc8fb513aedd4e Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Sat, 24 Oct 2020 19:23:50 +0200 Subject: [PATCH 1/2] Add map attribute to MRAs --- .../Capcom SonSon Hardware/meta/SonSon.mra | 8 +- .../IremM62 Hardware/meta/Battle Road.mra | 168 +++++++++--------- Arcade_MiST/IremM62 Hardware/meta/Horizon.mra | 96 +++++----- .../IremM62 Hardware/meta/Kid Niki.mra | 72 ++++---- .../IremM62 Hardware/meta/Kung Fu Master.mra | 144 +++++++-------- .../IremM62 Hardware/meta/Lode Runner 2.mra | 144 +++++++-------- .../IremM62 Hardware/meta/Lode Runner 3.mra | 72 ++++---- .../IremM62 Hardware/meta/Lode Runner 4.mra | 72 ++++---- .../IremM62 Hardware/meta/Lode Runner.mra | 144 +++++++-------- Arcade_MiST/IremM62 Hardware/meta/Lot Lot.mra | 56 +++--- .../IremM62 Hardware/meta/Spelunker 2.mra | 72 ++++---- .../IremM62 Hardware/meta/Spelunker.mra | 84 ++++----- .../IremM62 Hardware/meta/Youjyudn.mra | 72 ++++---- .../meta/4-D Warriors.mra | 26 +-- .../Sega System 1 Hardware/meta/Flicky.mra | 24 +-- .../Sega System 1 Hardware/meta/I'm Sorry.mra | 24 +-- .../meta/Mister Viking.mra | 24 +-- .../Sega System 1 Hardware/meta/My Hero.mra | 24 +-- .../Sega System 1 Hardware/meta/Rafflesia.mra | 24 +-- .../Sega System 1 Hardware/meta/Regulus.mra | 24 +-- .../meta/Sega Ninja.mra | 24 +-- .../Sega System 1 Hardware/meta/Spatter.mra | 26 +-- .../meta/TeddyBoy Blues.mra | 24 +-- .../Sega System 1 Hardware/meta/Up'n Down.mra | 24 +-- .../meta/Wonder Boy.mra | 24 +-- .../meta/buggy/Pitfall II.mra | 24 +-- .../meta/buggy/Starjacker.mra | 24 +-- 27 files changed, 772 insertions(+), 772 deletions(-) diff --git a/Arcade_MiST/Capcom SonSon Hardware/meta/SonSon.mra b/Arcade_MiST/Capcom SonSon Hardware/meta/SonSon.mra index 2bebb5dc..0aca615a 100644 --- a/Arcade_MiST/Capcom SonSon Hardware/meta/SonSon.mra +++ b/Arcade_MiST/Capcom SonSon Hardware/meta/SonSon.mra @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Battle Road.mra b/Arcade_MiST/IremM62 Hardware/meta/Battle Road.mra index e0d6edd6..d22bc982 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Battle Road.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Battle Road.mra @@ -34,94 +34,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Horizon.mra b/Arcade_MiST/IremM62 Hardware/meta/Horizon.mra index 1bb386bd..b3355128 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Horizon.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Horizon.mra @@ -29,57 +29,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Kid Niki.mra b/Arcade_MiST/IremM62 Hardware/meta/Kid Niki.mra index 682dd16c..d605465f 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Kid Niki.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Kid Niki.mra @@ -25,46 +25,46 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Kung Fu Master.mra b/Arcade_MiST/IremM62 Hardware/meta/Kung Fu Master.mra index 41e0ab5c..f71ef8b7 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Kung Fu Master.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Kung Fu Master.mra @@ -29,80 +29,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 2.mra b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 2.mra index 13000754..bef9c9ab 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 2.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 2.mra @@ -39,80 +39,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 3.mra b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 3.mra index 02b1d9d7..070c3a6d 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 3.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 3.mra @@ -30,44 +30,44 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 4.mra b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 4.mra index 4d05bfcb..80d94528 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 4.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner 4.mra @@ -30,44 +30,44 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner.mra b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner.mra index 875959b6..7bf81290 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Lode Runner.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Lode Runner.mra @@ -40,80 +40,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FF diff --git a/Arcade_MiST/IremM62 Hardware/meta/Lot Lot.mra b/Arcade_MiST/IremM62 Hardware/meta/Lot Lot.mra index 04ba8456..e7ade266 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Lot Lot.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Lot Lot.mra @@ -20,94 +20,94 @@ - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Spelunker 2.mra b/Arcade_MiST/IremM62 Hardware/meta/Spelunker 2.mra index 2dce2b3d..11ff9a69 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Spelunker 2.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Spelunker 2.mra @@ -27,46 +27,46 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Spelunker.mra b/Arcade_MiST/IremM62 Hardware/meta/Spelunker.mra index f10b9127..b84ca863 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Spelunker.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Spelunker.mra @@ -25,52 +25,52 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/IremM62 Hardware/meta/Youjyudn.mra b/Arcade_MiST/IremM62 Hardware/meta/Youjyudn.mra index 7ef87bef..d967474c 100644 --- a/Arcade_MiST/IremM62 Hardware/meta/Youjyudn.mra +++ b/Arcade_MiST/IremM62 Hardware/meta/Youjyudn.mra @@ -24,46 +24,46 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/4-D Warriors.mra b/Arcade_MiST/Sega System 1 Hardware/meta/4-D Warriors.mra index 485c6bf0..6fe176fc 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/4-D Warriors.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/4-D Warriors.mra @@ -7,7 +7,7 @@ Sega Shmup segasys1 - + @@ -26,19 +26,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Flicky.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Flicky.mra index 99c43992..07e5f027 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Flicky.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Flicky.mra @@ -30,19 +30,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/I'm Sorry.mra b/Arcade_MiST/Sega System 1 Hardware/meta/I'm Sorry.mra index 8032a5d0..bc1bebe6 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/I'm Sorry.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/I'm Sorry.mra @@ -26,19 +26,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Mister Viking.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Mister Viking.mra index f7ab1713..03def992 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Mister Viking.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Mister Viking.mra @@ -31,18 +31,18 @@ FF - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/My Hero.mra b/Arcade_MiST/Sega System 1 Hardware/meta/My Hero.mra index cfc5d832..83afb56e 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/My Hero.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/My Hero.mra @@ -27,19 +27,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Rafflesia.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Rafflesia.mra index 86248e51..d7c643fc 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Rafflesia.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Rafflesia.mra @@ -26,19 +26,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Regulus.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Regulus.mra index 99fbb7e9..bde38073 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Regulus.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Regulus.mra @@ -29,19 +29,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + 28 08 a8 88 88 80 08 00 28 08 a8 88 28 a8 08 88 diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Sega Ninja.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Sega Ninja.mra index bb3ea9e7..15968bf5 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Sega Ninja.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Sega Ninja.mra @@ -28,18 +28,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Spatter.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Spatter.mra index 557e9b8c..89daab68 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Spatter.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Spatter.mra @@ -12,7 +12,7 @@ - + 04 @@ -27,20 +27,20 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/TeddyBoy Blues.mra b/Arcade_MiST/Sega System 1 Hardware/meta/TeddyBoy Blues.mra index 18fbe648..b4c337e8 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/TeddyBoy Blues.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/TeddyBoy Blues.mra @@ -27,18 +27,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Up'n Down.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Up'n Down.mra index 837aad48..6ecc27ed 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Up'n Down.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Up'n Down.mra @@ -29,19 +29,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Wonder Boy.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Wonder Boy.mra index 129adb87..4c3d8d2b 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/Wonder Boy.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/Wonder Boy.mra @@ -27,18 +27,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra b/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra index 058da6b2..762a69e7 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra @@ -28,19 +28,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra b/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra index 46e7c718..09ccf3f9 100644 --- a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra +++ b/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra @@ -31,19 +31,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + From c1210c4fc80df8c2652c62243c48fc9e63b39e0b Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Sat, 24 Oct 2020 21:14:04 +0200 Subject: [PATCH 2/2] YM2149: choose between IO port handling modes --- common/Sound/ym2149/YM2149.vhd | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/Sound/ym2149/YM2149.vhd b/common/Sound/ym2149/YM2149.vhd index ae14e63e..be2b3432 100644 --- a/common/Sound/ym2149/YM2149.vhd +++ b/common/Sound/ym2149/YM2149.vhd @@ -62,7 +62,8 @@ library ieee; entity YM2149 is generic ( - MIXER_VOLTABLE : std_logic := '0' + MIXER_VOLTABLE : std_logic := '0'; + IO_OUT_READ_IN : std_logic := '1' ); port ( -- data bus @@ -246,15 +247,15 @@ begin when x"B" => O_DA <= reg(11); when x"C" => O_DA <= reg(12); when x"D" => O_DA <= "0000" & reg(13)(3 downto 0); - when x"E" => if (reg(7)(6) = '0') then -- input + when x"E" => if reg(7)(6) = '0' or IO_OUT_READ_IN = '1' then -- input O_DA <= ioa_inreg; else - O_DA <= reg(14) and ioa_inreg; -- read output reg + O_DA <= reg(14); -- read output reg end if; - when x"F" => if (Reg(7)(7) = '0') then + when x"F" => if Reg(7)(7) = '0' or IO_OUT_READ_IN = '1' then O_DA <= iob_inreg; else - O_DA <= reg(15) and iob_inreg; + O_DA <= reg(15); end if; when others => null; end case;