diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index b1984995b6b..2397b5e01e8 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/hash/bbca_cass.xml b/hash/bbca_cass.xml index a463cf8c40d..a8e593716e3 100644 --- a/hash/bbca_cass.xml +++ b/hash/bbca_cass.xml @@ -61,7 +61,7 @@ - + Beebtrek 1982 diff --git a/hash/cdi.xml b/hash/cdi.xml index 18243f3c8b7..d796e9e6314 100644 --- a/hash/cdi.xml +++ b/hash/cdi.xml @@ -2,9 +2,9 @@ - @@ -10591,7 +10591,7 @@ @@ -10647,7 +10647,7 @@ Origin: Unknown - + --> @@ -10670,7 +10670,7 @@ diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml index b63da2e8367..e637afc8f29 100644 --- a/hash/fmtowns_cd.xml +++ b/hash/fmtowns_cd.xml @@ -6,7 +6,7 @@ Known undumped discs (possibly more exist, and some CDs marked as FMT could actually be for Marty and vice versa), based on Blitzkrieg's researches - + FM-Towns Marty CDs ================== ? 0 Hoshi Uranai Jutsu Dai Rei Gen Feb-90 Victor (CDx1) @@ -100,186 +100,186 @@ High School War Sep-94 I.S.C. (CDx1) Hiouden 2 Mar-94 Telenet Japan (CDx1) If Jun-93 Active (CDx1) - If 2 Nov-93 Active (CDx1) - If 3 Apr-95 Active (CDx1) + If 2 Nov-93 Active (CDx1) + If 3 Apr-95 Active (CDx1) Igo Doujou Shodan Kaigan! Kyuu Karadane no Chousen May-91 Fujitsu (CDx1) Igo Doujou Yaburi Menkyokaiden!! Mezase 7-Kyuu Oct-90 Fujitsu (CDx1) - Inindou: Datou Nobunaga Feb-92 Koei (CDx1) - Introduction to Go Dojo Jun-91 GAM (CDx1) - Intruder: Sakura Yashiki no Tansaku XXX-89 Alice Soft (CDx1) - Irisu-tei Sayokyoku Nov-92 Agumix (CDx1) - Ishin no Arashi Mar-90 Koei (CDx1) - J-League Professional Soccer 1994 Sep-94 Victor (CDx1) - Jinmon Yuugi Aug-95 Fairytale - Red Zone (CDx1) - Joker Towns Jul-92 Birdy Soft (CDx1) - Joshikou Seifuku Monogatari Apr-95 KSS (CDx1) - JYB Apr-93 Cocktail Soft (CDx1) - Kamigami No Daichi: Kojiki Gaiden Oct-93 Koei (CDx1) + Inindou: Datou Nobunaga Feb-92 Koei (CDx1) + Introduction to Go Dojo Jun-91 GAM (CDx1) + Intruder: Sakura Yashiki no Tansaku XXX-89 Alice Soft (CDx1) + Irisu-tei Sayokyoku Nov-92 Agumix (CDx1) + Ishin no Arashi Mar-90 Koei (CDx1) + J-League Professional Soccer 1994 Sep-94 Victor (CDx1) + Jinmon Yuugi Aug-95 Fairytale - Red Zone (CDx1) + Joker Towns Jul-92 Birdy Soft (CDx1) + Joshikou Seifuku Monogatari Apr-95 KSS (CDx1) + JYB Apr-93 Cocktail Soft (CDx1) + Kamigami No Daichi: Kojiki Gaiden Oct-93 Koei (CDx1) Kero Kero Keroppi to Origami no Tabibito Jul-95 Fujitsu (CDx1) - Kikou Shidan 2 Mar-93 Artdink (CDx1) - Kouryuuki Oct-93 Koei (CDx1) - Kousoku Choujin Aug-96 Foster Japan (CDx1) - KU2++ Nov-93 Panther Software (CDx1) - Kusuriyubi no Kyoukasho Apr-96 Active (CDx1) - Kyouko no Ijiwaru! Oct-94 Ponytail Soft (CDx1) - L'Empereur Jan-91 Koei (CDx1) - Leading Company Apr-92 Koei (CDx1) - Lemon Cocktail Collection Mar-93 Cocktail Soft (CDx1) - Lipstick Adventure 3 May-93 Fairytale (CDx1) - Little Big Adventure Dec-95 Electronic Arts (CDx1) - Lord of the Rings 2: The Two Towers Apr-93 Star Craft (CDx1) + Kikou Shidan 2 Mar-93 Artdink (CDx1) + Kouryuuki Oct-93 Koei (CDx1) + Kousoku Choujin Aug-96 Foster Japan (CDx1) + KU2++ Nov-93 Panther Software (CDx1) + Kusuriyubi no Kyoukasho Apr-96 Active (CDx1) + Kyouko no Ijiwaru! Oct-94 Ponytail Soft (CDx1) + L'Empereur Jan-91 Koei (CDx1) + Leading Company Apr-92 Koei (CDx1) + Lemon Cocktail Collection Mar-93 Cocktail Soft (CDx1) + Lipstick Adventure 3 May-93 Fairytale (CDx1) + Little Big Adventure Dec-95 Electronic Arts (CDx1) + Lord of the Rings 2: The Two Towers Apr-93 Star Craft (CDx1) Lord of the Rings: The Fellowship of the Ring Mar-92 Star Craft (CDx1) - Lua Jun-93 Inter Heart (CDx1) - Mahjong Bishoujo Den Rippuru Feb-95 Foresight (CDx1) - Mahjong Fantasia 2 Sep-93 Active (CDx1) - Mahjong Fantasia 3 Nov-95 Active (CDx1) - Mahjong Goku Apr-89 ASCII (CDx1) - Mahjong Musashi XXX-89 Computer Cosmos (CDx1) - Manami no Doko made Iku no May-95 Wendy Magazine (CDx1) + Lua Jun-93 Inter Heart (CDx1) + Mahjong Bishoujo Den Rippuru Feb-95 Foresight (CDx1) + Mahjong Fantasia 2 Sep-93 Active (CDx1) + Mahjong Fantasia 3 Nov-95 Active (CDx1) + Mahjong Goku Apr-89 ASCII (CDx1) + Mahjong Musashi XXX-89 Computer Cosmos (CDx1) + Manami no Doko made Iku no May-95 Wendy Magazine (CDx1) Manami no Doko made Iku no 2: Return of the Kuro Pack May-95 Wendy Magazine (CDx1) - Manami: Ai to Koukan no Hibi XXX-95 Fairytale - Red Zone (CDx1) - Marionette Mind Mar-94 Studio Milk (CDx1) - Mega Lo Mania Mar-93 Imagineer (CDx1) - Meisou Toshi Dec-95 Tiare (CDx1) - Might & Magic: World of Xeen Oct-92 Star Craft (CDx1) - Mirage 2 Dec-94 Discovery (CDx1) - Misato-chan no Yume Nikki Apr-97 Active (CDx1) - Moeru Asoko no Pai Pai Yuugi Dec-93 Illusion (CDx1) - Mokkori Man RPG Jun-94 Illusion (CDx1) - Monoshiri ji Yuugaku Hyakunin Ichishuhen Oct-94 Shinko Human Request (CDx1) - Moonlight Energy Dec-92 Inter Heart (CDx1) - Murder Club DX May-92 Riverhill Soft (CDx1) - Naru Mahjong Apr-95 Libido (CDx1) - Nemurenu Yoru no Chisana Ohanashi Dec-93 Amuse (CDx1) - Never Land Mar-96 Tips (CDx1) - NHK Hitori de Dekiru Mon! Mar-95 Rei (CDx1) - Niko 2 Nov-91 Telenet Japan (CDx1) - Nippon Mukashibanashi Nov-90 Gyosei (CDx1) - Nippon Mukashibanashi 2 Jul-91 Gyosei (CDx1) - Nippon Mukashibanashi 3 Dec-93 Gyosei (CDx1) - Nippon Mukashibanashi 4 Dec-93 Gyosei (CDx1) - Nippon Mukashibanashi 5 Mar-94 Gyosei (CDx1) - Nobunaga no Yabou: Bushou Fuunroku Jul-91 Koei (CDx1) - Nobunaga no Yabou: Sengoku Gunyuu Den Dec-89 Koei (CDx1) - Nostalgia 1907 May-92 Sur de Wave (CDx1) - Obachan no Chiebukuro Nov-91 Gyosei (CDx1) - Oku man Choja 2 Jul-91 Computer Cosmos (CDx1) - Only You: Juliet of the Century Jan-96 Alice Soft (CDx1) - Orient Express Dec-94 Gyosei (CDx1) - Palamedes XXX-91 Ving (CDx1) - Para Para Paradise Dec-95 Family Soft (CDx2) - Phobos Aug-95 Himeya Soft, Inc (CDx1) - Pocky & Ponyon Jun-94 Ponytail Soft (CDx1) - Populous 2 Feb-93 Imagineer (CDx1) - Presence Dec-92 Sur de Wave (CDx1) - Private Slave Aug-93 Raccoon (CDx1) - ProYakyuu Family Stadium '90 Sep-90 Game Arts (CDx1) - Reijou Monogatari Apr-95 Inter Heart (CDx1) - Rinkan Gakkou Feb-96 Foster Japan (CDx1) - Royal Blood May-92 Koei (CDx1) - Ryuutatakaden Jun-94 Fujitsu (CDx1) - Sakura no Mori XXX-95 Active (CDx1) - Sangokushi 2 Jun-90 Koei (CDx1) - Sangokushi 3 Jun-92 Koei (CDx1) - Sargon 5 Nov-92 GAM (CDx1) - Sayonara no Mukougawa Aug-97 Foster Japan (CDx1) - Seikatsu Simulation Watashi no Machi May-95 Cocktail Soft (CDx1) - Sekai no o Hanashi May-92 Gyosei (CDx1) - Sekigahara Apr-92 Artdink (CDx1) - Sensual Angels Jan-94 JHV (CDx1) - Sexy P/K Part 2: World Cup Hen May-95 Birdy Soft (CDx1) - Sexy P/K Part Nihon Apr-95 Birdy Soft (CDx1) - Shanghai Dec-90 ASCII (CDx1) - Shanghai: Great Wall Sep-95 Electronic Arts (CDx1) - Shooting Towns Mar-90 Amorphous (CDx1) - SL o mitai! Uruwashi no Joki Kikan-sha Jul-95 Gyosei (CDx1) - Soft de Hard na Monogatari Apr-89 System Sacom (CDx1) - Soft de Hard na Monogatari 2 Jul-89 System Sacom (CDx1) - Sokoban Perfect Jul-90 Thinking Rabbit (CDx1) - Space Odyssey Galaxy Mar-91 Fujitsu (CDx1) - Space Odyssey Galaxy 2 Apr-92 Fujitsu (CDx1) - Steepia Jun-93 Fujitsu (CDx1) - Steepia Lite Mar-93 Fujitsu (CDx1) - Suikoden: Tenmei no Chikai Feb-90 Koei (CDx1) - Super Real Mahjong P2 & P3 + Mar-93 Ving (CDx1) - Suzaku Oct-92 Wolf Team (CDx1) - Tactical Tank Corps DX Feb-95 GAM (CDx1) - Tamashi no Mon: Dante Shinkyoku Yori Jun-93 Koei (CDx1) - Tania Nov-96 Tips (CDx1) - Teito Taisen Dec-89 Supersonic (CDx1) - Teitoku no Ketsudan Apr-90 Koei (CDx1) - Tenshi-Tachi no Gogo Collection 2 Nov-95 Jast (CDx1) - Tenshin Ranma May-92 Elf (CDx1) - Teo: Another Earth Sep-95 Fujitsu (CDx1) - Teo: Another Earth 2 Jul-96 Fujitsu (CDx1) - The Playroom Feb-95 Fujitsu (CDx1) - The Queen of Duellist Alpha Mar-94 Agumix (CDx1) - The Queen of Duellist Alpha Light Apr-94 Agumix (CDx1) - Theme Park Sep-95 Electronic Arts (CDx1) - Time Stripper Mako-chan Jan-96 Foster Japan (CDx1) - Tokyo Sexy Ave. Jul-94 HOP (CDx1) - Tokyo-to Dai 24-Ku Dec-92 Artdink (CDx1) - Tom Snyder's Puppy Love Jul-89 Fujitsu (CDx1) - Tom Snyder's Puppy Love 2 Mar-93 Fujitsu (CDx1) - Toushin Toshi Apr-95 Alice Soft (CDx1) - Trigger Jun-94 ZyX (CDx1) - Trigger 2 Sep-95 ZyX (CDx1) - Vampire High School Jun-93 Inter Heart (CDx1) - Vanishing Point XXX-95 Tiare (CDx1) - Viper GTS Nov-95 Sogna (CDx1) - Viper V12 Dec-95 Sogna (CDx1) - Viper V8 Turbo RS Jun-95 Sogna (CDx1) - Winning Post May-93 Koei (CDx1) - Yayo 1-2-3 Jul-93 Hado (CDx1) - Yayo 4 Feb-93 Hado (CDx1) - Yes! HG Dec-95 Himeya Soft, Inc (CDx1) - Youjuu Senki 2 Reimei no Senshi Feb-94 D.O. (CDx1) - Youjuu Senki: Sajin no Mokushiroku Feb-94 D.O. (CDx1) - Yume Utsutsu: Dreamy May-92 Megami (CDx1) - Zan 3 Apr-94 Telenet Japan (CDx1) - Zenith Feb-95 Himeya Soft, Inc 1 + Manami: Ai to Koukan no Hibi XXX-95 Fairytale - Red Zone (CDx1) + Marionette Mind Mar-94 Studio Milk (CDx1) + Mega Lo Mania Mar-93 Imagineer (CDx1) + Meisou Toshi Dec-95 Tiare (CDx1) + Might & Magic: World of Xeen Oct-92 Star Craft (CDx1) + Mirage 2 Dec-94 Discovery (CDx1) + Misato-chan no Yume Nikki Apr-97 Active (CDx1) + Moeru Asoko no Pai Pai Yuugi Dec-93 Illusion (CDx1) + Mokkori Man RPG Jun-94 Illusion (CDx1) + Monoshiri ji Yuugaku Hyakunin Ichishuhen Oct-94 Shinko Human Request (CDx1) + Moonlight Energy Dec-92 Inter Heart (CDx1) + Murder Club DX May-92 Riverhill Soft (CDx1) + Naru Mahjong Apr-95 Libido (CDx1) + Nemurenu Yoru no Chisana Ohanashi Dec-93 Amuse (CDx1) + Never Land Mar-96 Tips (CDx1) + NHK Hitori de Dekiru Mon! Mar-95 Rei (CDx1) + Niko 2 Nov-91 Telenet Japan (CDx1) + Nippon Mukashibanashi Nov-90 Gyosei (CDx1) + Nippon Mukashibanashi 2 Jul-91 Gyosei (CDx1) + Nippon Mukashibanashi 3 Dec-93 Gyosei (CDx1) + Nippon Mukashibanashi 4 Dec-93 Gyosei (CDx1) + Nippon Mukashibanashi 5 Mar-94 Gyosei (CDx1) + Nobunaga no Yabou: Bushou Fuunroku Jul-91 Koei (CDx1) + Nobunaga no Yabou: Sengoku Gunyuu Den Dec-89 Koei (CDx1) + Nostalgia 1907 May-92 Sur de Wave (CDx1) + Obachan no Chiebukuro Nov-91 Gyosei (CDx1) + Oku man Choja 2 Jul-91 Computer Cosmos (CDx1) + Only You: Juliet of the Century Jan-96 Alice Soft (CDx1) + Orient Express Dec-94 Gyosei (CDx1) + Palamedes XXX-91 Ving (CDx1) + Para Para Paradise Dec-95 Family Soft (CDx2) + Phobos Aug-95 Himeya Soft, Inc (CDx1) + Pocky & Ponyon Jun-94 Ponytail Soft (CDx1) + Populous 2 Feb-93 Imagineer (CDx1) + Presence Dec-92 Sur de Wave (CDx1) + Private Slave Aug-93 Raccoon (CDx1) + ProYakyuu Family Stadium '90 Sep-90 Game Arts (CDx1) + Reijou Monogatari Apr-95 Inter Heart (CDx1) + Rinkan Gakkou Feb-96 Foster Japan (CDx1) + Royal Blood May-92 Koei (CDx1) + Ryuutatakaden Jun-94 Fujitsu (CDx1) + Sakura no Mori XXX-95 Active (CDx1) + Sangokushi 2 Jun-90 Koei (CDx1) + Sangokushi 3 Jun-92 Koei (CDx1) + Sargon 5 Nov-92 GAM (CDx1) + Sayonara no Mukougawa Aug-97 Foster Japan (CDx1) + Seikatsu Simulation Watashi no Machi May-95 Cocktail Soft (CDx1) + Sekai no o Hanashi May-92 Gyosei (CDx1) + Sekigahara Apr-92 Artdink (CDx1) + Sensual Angels Jan-94 JHV (CDx1) + Sexy P/K Part 2: World Cup Hen May-95 Birdy Soft (CDx1) + Sexy P/K Part Nihon Apr-95 Birdy Soft (CDx1) + Shanghai Dec-90 ASCII (CDx1) + Shanghai: Great Wall Sep-95 Electronic Arts (CDx1) + Shooting Towns Mar-90 Amorphous (CDx1) + SL o mitai! Uruwashi no Joki Kikan-sha Jul-95 Gyosei (CDx1) + Soft de Hard na Monogatari Apr-89 System Sacom (CDx1) + Soft de Hard na Monogatari 2 Jul-89 System Sacom (CDx1) + Sokoban Perfect Jul-90 Thinking Rabbit (CDx1) + Space Odyssey Galaxy Mar-91 Fujitsu (CDx1) + Space Odyssey Galaxy 2 Apr-92 Fujitsu (CDx1) + Steepia Jun-93 Fujitsu (CDx1) + Steepia Lite Mar-93 Fujitsu (CDx1) + Suikoden: Tenmei no Chikai Feb-90 Koei (CDx1) + Super Real Mahjong P2 & P3 + Mar-93 Ving (CDx1) + Suzaku Oct-92 Wolf Team (CDx1) + Tactical Tank Corps DX Feb-95 GAM (CDx1) + Tamashi no Mon: Dante Shinkyoku Yori Jun-93 Koei (CDx1) + Tania Nov-96 Tips (CDx1) + Teito Taisen Dec-89 Supersonic (CDx1) + Teitoku no Ketsudan Apr-90 Koei (CDx1) + Tenshi-Tachi no Gogo Collection 2 Nov-95 Jast (CDx1) + Tenshin Ranma May-92 Elf (CDx1) + Teo: Another Earth Sep-95 Fujitsu (CDx1) + Teo: Another Earth 2 Jul-96 Fujitsu (CDx1) + The Playroom Feb-95 Fujitsu (CDx1) + The Queen of Duellist Alpha Mar-94 Agumix (CDx1) + The Queen of Duellist Alpha Light Apr-94 Agumix (CDx1) + Theme Park Sep-95 Electronic Arts (CDx1) + Time Stripper Mako-chan Jan-96 Foster Japan (CDx1) + Tokyo Sexy Ave. Jul-94 HOP (CDx1) + Tokyo-to Dai 24-Ku Dec-92 Artdink (CDx1) + Tom Snyder's Puppy Love Jul-89 Fujitsu (CDx1) + Tom Snyder's Puppy Love 2 Mar-93 Fujitsu (CDx1) + Toushin Toshi Apr-95 Alice Soft (CDx1) + Trigger Jun-94 ZyX (CDx1) + Trigger 2 Sep-95 ZyX (CDx1) + Vampire High School Jun-93 Inter Heart (CDx1) + Vanishing Point XXX-95 Tiare (CDx1) + Viper GTS Nov-95 Sogna (CDx1) + Viper V12 Dec-95 Sogna (CDx1) + Viper V8 Turbo RS Jun-95 Sogna (CDx1) + Winning Post May-93 Koei (CDx1) + Yayo 1-2-3 Jul-93 Hado (CDx1) + Yayo 4 Feb-93 Hado (CDx1) + Yes! HG Dec-95 Himeya Soft, Inc (CDx1) + Youjuu Senki 2 Reimei no Senshi Feb-94 D.O. (CDx1) + Youjuu Senki: Sajin no Mokushiroku Feb-94 D.O. (CDx1) + Yume Utsutsu: Dreamy May-92 Megami (CDx1) + Zan 3 Apr-94 Telenet Japan (CDx1) + Zenith Feb-95 Himeya Soft, Inc 1 FM-Towns Marty CDs ================== - 4D Boxing Jul-93 Electronic Arts (CDx1) - 4D Driving Jul-93 Electronic Arts (CDx1) - Psychic Detective Vol.1: Invitation Nov-93 Data West (CDx1) - Psychic Detective Vol.2: Memories Apr-94 Data West (CDx1) - Psychic Detective Vol.3: Aya Jul-94 Data West (CDx1) - Psychic Detective Vol.4: Orgel Dec-94 Data West (CDx1) - Psychic Detective Vol.5: Nightmare Apr-95 Data West (CDx1) - Bible Master 2 Jan-95 Glodia (CDx1) - Custom Mate Dec-94 Cocktail Soft (CDx1) - Demon City Mar-94 Cocktail Soft (CDx1) - Dengeki Nurse 2: More Sexy Dec-94 Cocktail Soft (CDx1) - Doki Doki Vacation Mar-95 Cocktail Soft (CDx1) - DOR Best Collection Chapter 1 Apr-93 D.O. (CDx2) - DOR Best Collection Chapter 2 May-93 D.O. (CDx2) - Dracula Hakushaku Mar-93 Fairytale (CDx1) - Emit Vol.1 Mar-94 Koei (CDx1) - Emit Vol.2 Jul-94 Koei (CDx1) - Emit Vol.3 Sep-94 Koei (CDx1) - Fujitsu Habitat 2 May-94 Fujitsu (CDx1) - Gokko Vol.1: Doctor Nov-94 Mink (CDx1) - Gokko Vol.2: School Gals Dec-94 Mink (CDx1) - Gokko Vol.3: Etcetera Dec-94 Mink (CDx1) - Gokuraku Mandala Feb-94 Fairytale (CDx1) - Joshikousei Shoujo Densetsu Apr-94 Byakuya Shobou (CDx1) - Ms. Detective XXX-93 Data West (CDx1) - Nijiiro Denshoku Musume Aug-94 I.S.C. (CDx1) - Noushuku Angel 120% Apr-95 Cocktail Soft (CDx1) - Record of Lodoss War 2 Jun-94 MAC (CDx1) - Sangokushi 4 Jun-94 Koei (CDx1) - Shamhat: The Holy Circlet Apr-93 Data West (CDx1) - Shinjuku Labyrinth ==== Tokuma Shoten (CDx1) - Teitoku no Ketsudan 2 Jun-94 Koei (CDx1) - Tokyo Labyrinth Dec-94 Tokuma Shoten (CDx1) - True Heart Feb-95 Cocktail Soft (CDx1) - Two Shot Diary Oct-94 Mink 1 - URM Dec-94 JHV (CDx1) - Virtuacall 2 Dec-95 Fairytale (CDx1) - Wonpara Wars Feb-95 Mink (CDx1) - Wonpara Wars 2 Apr-95 Mink (CDx1) + 4D Boxing Jul-93 Electronic Arts (CDx1) + 4D Driving Jul-93 Electronic Arts (CDx1) + Psychic Detective Vol.1: Invitation Nov-93 Data West (CDx1) + Psychic Detective Vol.2: Memories Apr-94 Data West (CDx1) + Psychic Detective Vol.3: Aya Jul-94 Data West (CDx1) + Psychic Detective Vol.4: Orgel Dec-94 Data West (CDx1) + Psychic Detective Vol.5: Nightmare Apr-95 Data West (CDx1) + Bible Master 2 Jan-95 Glodia (CDx1) + Custom Mate Dec-94 Cocktail Soft (CDx1) + Demon City Mar-94 Cocktail Soft (CDx1) + Dengeki Nurse 2: More Sexy Dec-94 Cocktail Soft (CDx1) + Doki Doki Vacation Mar-95 Cocktail Soft (CDx1) + DOR Best Collection Chapter 1 Apr-93 D.O. (CDx2) + DOR Best Collection Chapter 2 May-93 D.O. (CDx2) + Dracula Hakushaku Mar-93 Fairytale (CDx1) + Emit Vol.1 Mar-94 Koei (CDx1) + Emit Vol.2 Jul-94 Koei (CDx1) + Emit Vol.3 Sep-94 Koei (CDx1) + Fujitsu Habitat 2 May-94 Fujitsu (CDx1) + Gokko Vol.1: Doctor Nov-94 Mink (CDx1) + Gokko Vol.2: School Gals Dec-94 Mink (CDx1) + Gokko Vol.3: Etcetera Dec-94 Mink (CDx1) + Gokuraku Mandala Feb-94 Fairytale (CDx1) + Joshikousei Shoujo Densetsu Apr-94 Byakuya Shobou (CDx1) + Ms. Detective XXX-93 Data West (CDx1) + Nijiiro Denshoku Musume Aug-94 I.S.C. (CDx1) + Noushuku Angel 120% Apr-95 Cocktail Soft (CDx1) + Record of Lodoss War 2 Jun-94 MAC (CDx1) + Sangokushi 4 Jun-94 Koei (CDx1) + Shamhat: The Holy Circlet Apr-93 Data West (CDx1) + Shinjuku Labyrinth ==== Tokuma Shoten (CDx1) + Teitoku no Ketsudan 2 Jun-94 Koei (CDx1) + Tokyo Labyrinth Dec-94 Tokuma Shoten (CDx1) + True Heart Feb-95 Cocktail Soft (CDx1) + Two Shot Diary Oct-94 Mink 1 + URM Dec-94 JHV (CDx1) + Virtuacall 2 Dec-95 Fairytale (CDx1) + Wonpara Wars Feb-95 Mink (CDx1) + Wonpara Wars 2 Apr-95 Mink (CDx1) --> @@ -326,7 +326,7 @@ User/save disks that can be created from the game itself are not included. - + - - + + diff --git a/hash/gba.xml b/hash/gba.xml index a28a781dd93..c75e18f84c7 100644 --- a/hash/gba.xml +++ b/hash/gba.xml @@ -12327,7 +12327,7 @@ - + Game Boy Advance Video - Shark Tale (USA, Rev. 6) 2004? @@ -12340,7 +12340,7 @@ - + Game Boy Advance Video - Shark Tale (USA, Rev. 5) 2004? @@ -12379,7 +12379,7 @@ - + Game Boy Advance Video - Shrek + Shark Tale (USA) 2004? @@ -30364,7 +30364,7 @@ Infogrames - + @@ -32407,7 +32407,7 @@ The cart also contained a non-empty SRAM save which we currently include in the Nintendo - + diff --git a/hash/intv.xml b/hash/intv.xml index 5156c513b6b..7eb10395850 100644 --- a/hash/intv.xml +++ b/hash/intv.xml @@ -958,7 +958,7 @@ - + Ms. Pac-Man 1986 diff --git a/hash/leapster.xml b/hash/leapster.xml index fcbe2c23210..9716b87bc51 100644 --- a/hash/leapster.xml +++ b/hash/leapster.xml @@ -188,7 +188,7 @@ - + Disney Princess - Worlds of Enchantment (USA) 2007? @@ -212,7 +212,7 @@ - + Finding Nemo (USA) 2005? @@ -260,7 +260,7 @@ - + Go Diego Go! - Animal Rescuer (USA) 2007? @@ -320,7 +320,7 @@ - + Lernst du Malen & Schreiben - Mit Bruno Bleistift (Ger) 2004? @@ -440,7 +440,7 @@ - + Spider-Man - The Case of the Sinister Speller (USA) 2003 @@ -488,7 +488,7 @@ - + Toy Story 3 (USA) 2010? diff --git a/hash/megadriv.xml b/hash/megadriv.xml index c0ac8aac745..1d9703a2736 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -9761,7 +9761,7 @@ but dumps still have to be confirmed. - + Shi Liu Zhang Ma Jiang II 199? @@ -13806,7 +13806,7 @@ but dumps still have to be confirmed. - + Death Duel (USA, Prototype 19920506) 1992 @@ -16602,7 +16602,7 @@ but dumps still have to be confirmed. - + Home Alone 2 - Lost in New York (USA, Prototype 19930929) @@ -21462,7 +21462,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Paperboy (USA, Prototype 19911028) 1992 @@ -22861,7 +22861,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Stimpy's Invention Starring Starring Ren Hoëk & Stimpy (Euro, Prototype 19931209) @@ -23248,7 +23248,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + RoadBlasters (USA, Prototype 19910627) 1992 @@ -25222,7 +25222,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Speedball 2 - Brutal Deluxe (USA, Prototype 19910607) 1991 @@ -26377,7 +26377,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Tommy Lasorda Baseball (USA, Prototype 19890430) 1989 @@ -27537,7 +27537,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Toe Jam & Earl in Panic on Funkotron (Prototype 19930911) @@ -30378,7 +30378,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Xin Qi Gai Wang Zi (Chi, Alt) 1996 @@ -31285,7 +31285,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Chaoji Majiang Club (Tw) 1995 @@ -31360,7 +31360,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i - + Ju Ji Ma Jiang II 199? diff --git a/hash/n64.xml b/hash/n64.xml index 97c620f58dc..79bfc6a0bfe 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -2510,7 +2510,7 @@ patched out (+ a fix for internal checksum) - @@ -5745,7 +5745,7 @@ This cart features a RTC, currently unemulated - @@ -6281,7 +6281,7 @@ This cart features two SmartMedia slots to import pictures to manipulate in the - @@ -9874,7 +9874,7 @@ patched out (+ a fix for internal checksum) - + @@ -10211,9 +10211,9 @@ patched out (+ a fix for internal checksum) - diff --git a/hash/pc98.xml b/hash/pc98.xml index 77d64bcb512..22b43270c4d 100644 --- a/hash/pc98.xml +++ b/hash/pc98.xml @@ -27836,7 +27836,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?) - + New 3D Golf Simulation - Harukanaru Augusta (Alt Format) @@ -27872,7 +27872,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?) - + New 3D Golf Simulation - Eight Lakes G.C. (Alt Format) @@ -27917,7 +27917,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?) - + New 3D Golf Simulation - Waialae no Kiseki (Alt Format) diff --git a/hash/pc98_cd.xml b/hash/pc98_cd.xml index d98f8e69456..ad359b9d292 100644 --- a/hash/pc98_cd.xml +++ b/hash/pc98_cd.xml @@ -2,15 +2,15 @@ - @@ -20,9 +20,9 @@ Windows 2000 Professional (Upgrade, W2PCCP) 2000 @@ -38,7 +38,7 @@ @@ -56,7 +56,7 @@ @@ -74,7 +74,7 @@ @@ -92,7 +92,7 @@ @@ -110,7 +110,7 @@ @@ -128,7 +128,7 @@ @@ -148,7 +148,7 @@ Origin: Unknown - + CUE files used for conversion: @@ -172,7 +172,7 @@ @@ -191,7 +191,7 @@ @@ -309,7 +309,7 @@ - + Appare-den - Fukuryuu no Shou @@ -422,9 +422,9 @@ Brandish Campaign-ban 1996 @@ -473,9 +473,9 @@ Brandish 3 - Spirit of Balcan - Campaign-ban 1996 @@ -548,9 +548,9 @@ Bishoujo Pasocom Soft Taizen - Digi-para - Digital Paradise - Vol. 1 1996 @@ -644,7 +644,7 @@ - + @@ -866,7 +866,7 @@ - + Ponytail Anthology Vol. 1 1996 @@ -1180,9 +1180,9 @@ Ponytail Anthology Vol. 2 1996 @@ -1199,9 +1199,9 @@ Ponytail Anthology Vol. 3 1996 @@ -1221,11 +1221,11 @@ - + The original CUE indicates MODE1/2352 for the data track, but this seems to be wrong, as all the data sectors in track 1 are actually mode 2, and MS-DOS doesn't recognize the file system. To avoid this, the CHD was converted through a modified CUE with MODE2/2352. - + --> Professional Baseball 1996 @@ -1332,9 +1332,9 @@ Ryouki no Ori 1995 @@ -1352,9 +1352,9 @@ Ryouki no Ori Dai-2-Shou 1996 @@ -1488,12 +1488,12 @@ - + @@ -1556,7 +1556,7 @@ - + @@ -1595,7 +1595,7 @@ - + Zai Metajo 1996 diff --git a/hash/pce_tourvision.xml b/hash/pce_tourvision.xml index 1900535d47e..6c3d736309c 100644 --- a/hash/pce_tourvision.xml +++ b/hash/pce_tourvision.xml @@ -553,7 +553,7 @@ Notes: - + Override (Tourvision PCE bootleg) diff --git a/hash/pippin.xml b/hash/pippin.xml index 1f32db3bcb8..80b13e46ad2 100644 --- a/hash/pippin.xml +++ b/hash/pippin.xml @@ -106,7 +106,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1995.1.17 Hanshin Daishinsai (Jpn) 1996 - Keikakudo + Keikakudo @@ -236,7 +236,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Chisato Moritaka CD-Rom Watarase Bashi (Jpn) 1996 - Oracion + Oracion @@ -249,7 +249,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Circus! (Jpn) 1996 - Voyager + Voyager @@ -274,7 +274,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Dazzeloids (Jpn) 1996 - Voyager + Voyager @@ -336,7 +336,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Funky Funny Aliens (Jpn) 1996 - Amuse + Amuse @@ -349,7 +349,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Gadget (Jpn) 1996 - Synergy Ikunangaku + Synergy Ikunangaku @@ -361,7 +361,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Gakko no Kowai Uwasa - Hanako-san ga Kita!! (Jpn) 1996 - Amuse + Amuse @@ -425,7 +425,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Kids Box (Jpn) 1996 - Ask Kodansha + Ask Kodansha @@ -475,7 +475,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) L-Zone (Jpn) 1996 - Synergy Ikunangaku + Synergy Ikunangaku @@ -561,7 +561,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Music Island Vol. 1 (Prokofiev Peter & the Wolf) (Jpn) 1996 - Oracion + Oracion @@ -574,7 +574,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Music Island Vol. 2 (Tchaikovsky The Nutcracker) (Jpn) 1996 - Oracion + Oracion @@ -587,7 +587,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Music Island Vol. 3 (Vivaldi The Four Seasons) (Jpn) 1996 - Oracion + Oracion @@ -600,7 +600,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Music Island Vol. 4 (Saint-Saens Carnival of the Animals) (Jpn) 1996 - Oracion + Oracion @@ -613,7 +613,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Nemurenu Yoru no Chiisana Ohanashi (Jpn) 1996 - Amuse + Amuse @@ -809,7 +809,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) SeesawC 1 - My favorite things - Sukinamonodake Eitango 120 (Jpn) 1996 - Aigaareba Daijoubu + Aigaareba Daijoubu @@ -822,7 +822,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) SeesawC 2 - My favorite places - Sukinatokorode Eitango 400 (Jpn) 1996 - Aigaareba Daijoubu + Aigaareba Daijoubu @@ -835,7 +835,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Shichisokusen (Jpn) 1996 - Media Five + Media Five @@ -885,7 +885,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) T-Break (Jpn) 1996 - Infocity + Infocity @@ -912,7 +912,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Tropic Island (Jpn) 1996 - Momoderazu Brand + Momoderazu Brand @@ -1069,7 +1069,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellow Brick Road I (Jpn) 1996 - Synergy Ikunangaku + Synergy Ikunangaku @@ -1082,7 +1082,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellow Brick Road II - Glinda to Nishi no Majo (Jpn) 1996 - Synergy Ikunangaku + Synergy Ikunangaku @@ -1102,7 +1102,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellows - Akira Gomi Photographs (Jpn) 1996 - Digitalogue + Digitalogue @@ -1114,7 +1114,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellows 2.0 - Tokyo 1993 Akira Gomi Photographs (Jpn) 1996 - Digitalogue + Digitalogue @@ -1127,7 +1127,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yoku Mite Goran! (Jpn) 1996 - Voyager + Voyager diff --git a/hash/pofo.xml b/hash/pofo.xml index 3255a1aaaba..e12a0b04cdc 100644 --- a/hash/pofo.xml +++ b/hash/pofo.xml @@ -21,8 +21,8 @@ Undumped 3rd party cartridges: - Adcalc AAC-1000 - Alpha Paging Interface SAMpage + Adcalc AAC-1000 + Alpha Paging Interface SAMpage Business Contacts and Information Manager BCIM Checkwriter Colossal Cave Adventure diff --git a/hash/snes.xml b/hash/snes.xml index 8f4b5efaafd..056e738dd60 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -1357,7 +1357,7 @@ Beyond that last category are the roms waiting to be classified. - + @@ -34238,7 +34238,7 @@ List of unclassified roms - + Arabian Nights - Sabaku no Seirei Ou (Jpn, Prototype) 1996 @@ -37664,7 +37664,7 @@ List of unclassified roms - + Down the World - Mervil's Ambition (Jpn, Rolling Demo) 1994 @@ -40283,7 +40283,7 @@ List of unclassified roms - + Ganpuru - Gunman's Proof (Jpn, Prototype) 1997 @@ -61015,7 +61015,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 - + Touge Densetsu - Saisoku Battle (Jpn, Prototype) 1996 @@ -61911,7 +61911,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 - + Umizuri Meijin - Suzuki Hen (Jpn, Prototype) 1994 diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index a5d13ac1ac3..fea4e6a5dda 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -901,7 +901,7 @@ V.Baby (NOT V.Smile Baby) - + Cinderella - Cinderella's Magic Wishes (USA, Alt) 200? @@ -912,7 +912,7 @@ V.Baby (NOT V.Smile Baby) - + Cendrillon - Le Rêve Enchanté de Cendrillon (Fra) 200? @@ -1056,7 +1056,7 @@ V.Baby (NOT V.Smile Baby) - + Kleine Einsteins (Ger) 200? @@ -1122,7 +1122,7 @@ V.Baby (NOT V.Smile Baby) - + Disney's Mickey Mouse - Mickey's Magical Adventure (USA) 200? @@ -1342,7 +1342,7 @@ V.Baby (NOT V.Smile Baby) - + Shrek - Le Rhume de Dragonne (Fra) 200? @@ -1463,7 +1463,7 @@ V.Baby (NOT V.Smile Baby) - + Tingeling (Swe) 200? @@ -1474,7 +1474,7 @@ V.Baby (NOT V.Smile Baby) - + Toy Story 2 - Operation: Rescue Woody! (USA) 2005 @@ -1540,7 +1540,7 @@ V.Baby (NOT V.Smile Baby) - + My Friends Tigger & Pooh - Die Honigjagd (Ger) 200? @@ -1617,7 +1617,7 @@ V.Baby (NOT V.Smile Baby) - + Zayzoo - My Alien Classmate (USA) 200? @@ -1665,7 +1665,7 @@ V.Baby (NOT V.Smile Baby) - + Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) 2007 @@ -1713,7 +1713,7 @@ V.Baby (NOT V.Smile Baby) - + Kleine Einsteins (Ger) (V.Smile Motion) 200? diff --git a/hash/vsmile_cd.xml b/hash/vsmile_cd.xml index e079d2b8543..adc7d683f47 100644 --- a/hash/vsmile_cd.xml +++ b/hash/vsmile_cd.xml @@ -117,7 +117,7 @@ Language: - + @@ -148,7 +148,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -320,11 +320,11 @@ - + - + @@ -376,7 +376,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -436,7 +436,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -452,7 +452,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -468,7 +468,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -500,7 +500,7 @@ - + @@ -508,7 +508,7 @@ - + diff --git a/src/mame/machine/atarixga.h b/src/mame/machine/atarixga.h index 710aedb22c2..8d6980a3ac3 100644 --- a/src/mame/machine/atarixga.h +++ b/src/mame/machine/atarixga.h @@ -3,7 +3,7 @@ /************************************************************************* atarixga.h - + Atari XGA encryption FPGA *************************************************************************/ @@ -16,38 +16,38 @@ extern const device_type ATARI_XGA; class atari_xga_device : public device_t { public: - // construction/destruction - atari_xga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - DECLARE_WRITE32_MEMBER(write); - DECLARE_READ32_MEMBER(read); - -protected: - virtual void device_start() override; - virtual void device_reset() override; - -private: - static const size_t RAM_WORDS = 2048; - - enum fpga_mode - { - FPGA_RESET, - FPGA_SETKEY, - FPGA_DECIPHER - }; - - UINT16 powers2(UINT8 k, UINT16 x); - UINT16 lfsr2(UINT16 x); - UINT16 lfsr1(UINT16 x); - UINT16 parity(UINT16 x); - size_t popcount(UINT16 x); - UINT16 ctz(UINT16 x); - UINT16 decipher(UINT8 k, UINT16 c); + // construction/destruction + atari_xga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - fpga_mode m_mode; - UINT16 m_address; // last written address - UINT16 m_ciphertext; // last written ciphertext - std::unique_ptr m_ram; // CY7C185-45PC, only 16-Kbit used + DECLARE_WRITE32_MEMBER(write); + DECLARE_READ32_MEMBER(read); + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: + static const size_t RAM_WORDS = 2048; + + enum fpga_mode + { + FPGA_RESET, + FPGA_SETKEY, + FPGA_DECIPHER + }; + + UINT16 powers2(UINT8 k, UINT16 x); + UINT16 lfsr2(UINT16 x); + UINT16 lfsr1(UINT16 x); + UINT16 parity(UINT16 x); + size_t popcount(UINT16 x); + UINT16 ctz(UINT16 x); + UINT16 decipher(UINT8 k, UINT16 c); + + fpga_mode m_mode; + UINT16 m_address; // last written address + UINT16 m_ciphertext; // last written ciphertext + std::unique_ptr m_ram; // CY7C185-45PC, only 16-Kbit used }; diff --git a/src/mame/machine/dccons.cpp b/src/mame/machine/dccons.cpp index 776e6d8ead2..0a0792c14d6 100644 --- a/src/mame/machine/dccons.cpp +++ b/src/mame/machine/dccons.cpp @@ -126,12 +126,12 @@ READ32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_r ) case SB_GDLEND: //machine().debug_break(); return atapi_xferlen; // TODO: check me - case SB_SECUR_EADR: // always read 0xFF on hardware + case SB_SECUR_EADR: // always read 0xFF on hardware return 0x000000ff; - case SB_SECUR_STATE: // state of BIOS checksum security system (R/O): + case SB_SECUR_STATE: // state of BIOS checksum security system (R/O): // 3 - check passed OK, G1 ATA (5F70xx) registers area accessible - // 2 - check failed, G1 ATA area blocked (read FFFFFFFFh) - // 0 - check in progress, BIOS data summed, G1 ATA area blocked (read FFFFFFFFh) + // 2 - check failed, G1 ATA area blocked (read FFFFFFFFh) + // 0 - check in progress, BIOS data summed, G1 ATA area blocked (read FFFFFFFFh) return 3; default: printf("G1CTRL: Unmapped read %08x\n", 0x5f7400+offset*4); @@ -185,10 +185,10 @@ WRITE32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_w ) if values doesn't match - security system switch to state 2 (check fail): - G1 ATA locked - - can be switched to state 0 by write to SB_SECUR_EADR register, however passing valid data block through security system set it back to state 2 + - can be switched to state 0 by write to SB_SECUR_EADR register, however passing valid data block through security system set it back to state 2 - the only exit from this state - power off/on or reset; - current state can be read from SB_SECUR_STATE register + current state can be read from SB_SECUR_STATE register actual checksum algorithm is unknown, but its supposed to be simple and weak, known few modded BIOSes which succesfully passes this CRC check, because of good luck diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index 353856f928c..0ba3d6a0fdc 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -3,7 +3,7 @@ /* DEC LK-201 keyboard Emulation by R. Belmont & M. Burke -with contributions by Cracyc and Karl-Ludwig Deisenhofer (2016) +with contributions by Cracyc and Karl-Ludwig Deisenhofer (2016) This is the later "cost-reduced" 6805 version with green LEDs; there's also an 8048 version. The LK-201 mechanical elements are described in US Patent 4,467,150 @@ -181,10 +181,10 @@ const device_type LK201 = &device_creator; ROM_START( lk201 ) ROM_REGION(0x2000, LK201_CPU_TAG, 0) -// 23-001s9-00.bin is for the newer LK201 version (green LEDs, Motorola 6805) +// 23-001s9-00.bin is for the newer LK201 version (green LEDs, Motorola 6805) ROM_LOAD( "23-001s9-00.bin", 0x0000, 0x2000, CRC(be293c51) SHA1(a11ae004d2d6055d7279da3560c3e56610a19fdb) ) -// 23-004M1 or 23-004M2 are in the older LK201 keyboard with red LEDs (8051) +// 23-004M1 or 23-004M2 are in the older LK201 keyboard with red LEDs (8051) ROM_END @@ -541,10 +541,10 @@ void lk201_device::device_timer(emu_timer &timer, device_timer_id id, int param, { switch (id) { - case 1: - m_timer.tsr |= TSR_OCFL; + case 1: + m_timer.tsr |= TSR_OCFL; - if ((m_timer.tcr & TCR_OCIE) && (m_timer.tsr & TSR_OCFL)) + if ((m_timer.tcr & TCR_OCIE) && (m_timer.tsr & TSR_OCFL)) m_maincpu->set_input_line(M68HC05EG_INT_TIMER, ASSERT_LINE); break; @@ -567,7 +567,7 @@ void lk201_device::rcv_complete() int data = get_received_char(); m_kbd_state = data; -// printf("\nlk201 got %02x\n", m_kbd_state); +// printf("\nlk201 got %02x\n", m_kbd_state); } void lk201_device::tra_complete() @@ -602,7 +602,7 @@ READ8_MEMBER( lk201_device::timer_r ) switch (offset) { case 8: // ACRH (high value is stored and reused when reading low) - count = (m_maincpu->total_cycles() / 4) & 0x0000ffff; + count = (m_maincpu->total_cycles() / 4) & 0x0000ffff; ret = count >> 8; break; case 9: // ACRL @@ -637,7 +637,7 @@ WRITE8_MEMBER( lk201_device::timer_w ) count |= m_timer.ocrl; m_timer.ocrh = count >> 8; - m_timer.tsr = save_tsr; // restore flags + m_timer.tsr = save_tsr; // restore flags break; } } @@ -675,7 +675,7 @@ WRITE8_MEMBER( lk201_device::ports_w ) UINT8 olddata = ports[offset]; ports[offset] = data; // "port writes are independent of DDRC" send_port(space, offset, olddata & ddrs[offset]); -// printf("\nPORT %c write %02x (OLD = %02x) (DDR = %02x) (PC=%x)\n", 'A' + offset, data, olddata, ddrs[offset], m_maincpu->pc()); +// printf("\nPORT %c write %02x (OLD = %02x) (DDR = %02x) (PC=%x)\n", 'A' + offset, data, olddata, ddrs[offset], m_maincpu->pc()); } void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) @@ -719,8 +719,8 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) // Check for LED update strobe if (((portc & 0x80) == 0) && (olddata & 0x80)) { - if(ddrs[2] != 0x00) - { // Lower nibble contains the LED values (1 = on, 0 = off) + if(ddrs[2] != 0x00) + { // Lower nibble contains the LED values (1 = on, 0 = off) machine().output().set_value("led_wait" , (led_data & 0x1) == 1); machine().output().set_value("led_compose", (led_data & 0x2) == 2); machine().output().set_value("led_lock" , (led_data & 0x4) == 4); @@ -731,11 +731,11 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) m_speaker->set_state(1); // Beeps < 20 ms are clipped. A key click on a LK201 lasts 2 ms... if(m_kbd_state == LK_CMD_BELL) - m_beeper->adjust(attotime::from_msec(125)); - else + m_beeper->adjust(attotime::from_msec(125)); + else m_beeper->adjust(attotime::from_msec(25)); // see note } - // Upper 4 bits of LED_DATA contain encoded volume info + // Upper 4 bits of LED_DATA contain encoded volume info switch (led_data & 0xf0) { case 0xf0: // 8 - (see TABLE 4 in 68HC05xx ROM) @@ -765,10 +765,10 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) default: ; } // switch (volume) - + } // if (update_strobe) - - } // outer switch + + } // outer switch } READ8_MEMBER( lk201_device::sci_r ) diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h index 1df36577b7b..3185a0a139f 100644 --- a/src/mame/machine/dec_lk201.h +++ b/src/mame/machine/dec_lk201.h @@ -24,12 +24,12 @@ #define LK_CMD_ENB_BELL 0x23 /* enable the bell - 1st param: volume */ #define LK_CMD_BELL 0xa7 /* emit a bell - 1st param: volume */ -// TCR - Timer Compare Register +// TCR - Timer Compare Register #define TCR_OCIE 0x40 // Bit 6 (output compare IRQ enable) -#define TCR_OLVL 0x01 // Bit 1 (output level) +#define TCR_OLVL 0x01 // Bit 1 (output level) -// TSR - Timer Status Register -#define TSR_OCFL 0x40 // TSR (68HC05 output compare flag) +// TSR - Timer Status Register +#define TSR_OCFL 0x40 // TSR (68HC05 output compare flag) //************************************************************************** // INTERFACE CONFIGURATION MACROS diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp index ed358b97cc2..4a37174d306 100644 --- a/src/mame/machine/fd1094.cpp +++ b/src/mame/machine/fd1094.cpp @@ -816,7 +816,7 @@ UINT16 fd1094_device::decrypt_one(offs_t address, UINT16 val, const UINT8 *main_ val = BITSWAP16(val, 15, 9,10,13, 3,12, 0,14, 6, 5, 2,11, 8, 1, 4, 7); if (!global_xor1) if (~val & 0x0800) val ^= 0x3002; // 1,12,13 - if (true) if (~val & 0x0020) val ^= 0x0044; // 2,6 + if (true) if (~val & 0x0020) val ^= 0x0044; // 2,6 if (!key_1b) if (~val & 0x0400) val ^= 0x0890; // 4,7,11 if (!global_swap2) if (!key_0c) val ^= 0x0308; // 3,8,9 val ^= 0x6561; diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp index ee863a303d7..0815db16863 100644 --- a/src/mame/machine/kaneko_toybox.cpp +++ b/src/mame/machine/kaneko_toybox.cpp @@ -192,7 +192,7 @@ void kaneko_toybox_device::mcu_run() case 0x42: // Write to NVRAM { - eeprom_serial_93cxx_device *eeprom = machine().device(":eeprom"); + eeprom_serial_93cxx_device *eeprom = machine().device(":eeprom"); UINT8* nvdat = (UINT8*)&m_mcuram[mcu_offset]; for (int i=0;i<0x80;i++) { diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 4b3f4dbe3c3..92756c75806 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -328,7 +328,7 @@ void m2comm_device::comm_init() { // TODO - check EPR-16726 on Daytona USA and Sega Rally Championship // EPR-18643(A) - these are accessed by VirtuaON and Sega Touring Car Championship - + // frameSize - 0xe00 m_shared[0x12] = 0x00; m_shared[0x13] = 0x0e; @@ -343,10 +343,10 @@ void m2comm_device::comm_tick() if (m_linkenable == 0x01) { m_zfg ^= 1; - + int frameSize = m_shared[0x13] << 8 | m_shared[0x12]; int frameOffset = m_shared[0x15] << 8 | m_shared[0x14]; - + int dataSize = frameSize + 1; int togo = 0; int recv = 0; diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index dc8c34c8645..4e49a755686 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -79,7 +79,7 @@ void namcos2_shared_state::namco_tilemap_init( int gfxbank, void *maskBaseAddr, mTilemapInfo.tmap[i]->set_scrolldx( -dx, 288+dx ); mTilemapInfo.tmap[i]->set_scrolldy( -24, 224+24 ); } - + save_item(NAME(mTilemapInfo.control)); save_pointer(NAME(mTilemapInfo.videoram.get()), 0x10000); } /* namco_tilemap_init */ @@ -822,7 +822,7 @@ void namcos2_shared_state::c355_obj_init(int gfxbank, int pal_xor, c355_obj_code memset(m_c355_obj_ram, 0, sizeof(m_c355_obj_ram)); // needed for Nebulas Ray memset(m_c355_obj_position, 0, sizeof(m_c355_obj_position)); - + save_item(NAME(m_c355_obj_position)); save_item(NAME(m_c355_obj_ram)); save_item(NAME(m_player_mux)); diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index 732b044768f..c4318f80230 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -33,7 +33,7 @@ public: virtual UINT8 joy_read(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_huc6260; - + private: UINT8 m_io_port_options; /*driver-specific options for the PCE*/ int m_joystick_port_select; /* internal index of joystick ports */ diff --git a/src/mame/machine/seibucop/seibucop.cpp b/src/mame/machine/seibucop/seibucop.cpp index 1490ef5cd81..06f093a0d0d 100644 --- a/src/mame/machine/seibucop/seibucop.cpp +++ b/src/mame/machine/seibucop/seibucop.cpp @@ -2,63 +2,63 @@ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina /*************************************************************************** - Seibu Cop (Co-Processor) device emulation - a.k.a. known as Toshiba gate array TC25SC rebadged as: - SEI300 - Legionnaire PCB - [...] - There's also a ROM labeled COP-Dx, which is probably used for some in-game maths: - COP-D1 - Seibu Cup Soccer PCBs - COP-D2 - legionna.cpp and raiden2.cpp, latter might use another component too - COP-D3 - New Zero Team / Raiden 2 V33 HWs - Raiden 2 first boss arms is known to behave strangely without this ROM on a real PCB + Seibu Cop (Co-Processor) device emulation + a.k.a. known as Toshiba gate array TC25SC rebadged as: + SEI300 - Legionnaire PCB + [...] + There's also a ROM labeled COP-Dx, which is probably used for some in-game maths: + COP-D1 - Seibu Cup Soccer PCBs + COP-D2 - legionna.cpp and raiden2.cpp, latter might use another component too + COP-D3 - New Zero Team / Raiden 2 V33 HWs + Raiden 2 first boss arms is known to behave strangely without this ROM on a real PCB - TODO: - - improve documentation, ffs! - - split into files, still needed: - - BCD; - - collision detection; - - command parser -> to cmd file; - - sd gundam sprite dma -> to dma file; - - convert to internal memory map, remove trampolines along the way. - - DMA mode needs to be cleaned up; - - improve class OO public/protected/private; - - nuke legacy command implementations; - - assert for something that needs actual playtesting is bad. - - add better debug facilities in a new sub-class, including but not limited to: - - disable collision detection; - - printing facilities; - - debugger break on pre-setted commands; - - ... - - per-game TODO: - Legionnaire - - (fixed) player walks on spot on stage clear; - - several if not all enemies definitely wants some sort of "axis aligned bounding box" in order to stop from going out of range - (when i.e. first boss goes to bottom of the screen and become unreachable) - - (btanb) Throw is made by quickly double jumping (!) - Heated Barrel - - gives random value to hi-score if you continue (only the first time, not a bug?); - - (fixed?) throws random address exceptions at level 3 and above, a RAM address arrives corrupt in the snippet at 0x136a; - - (fixed?) some corrupt sprites, probably a non-fatal version of the one above; - - stage 2 boss attacks only in vertical (regressed with the 130e / 3b30 / 42c2 command merge); - - (fixed) level 3+ boss movements looks wrong; - - stage 3 "homing" missiles doesn't seem to like our 6200 hookup here, except it's NOT 6200!? - - barrels seen in later levels seems to fail an axis aligned bounding box, not unlike Legionnaire. - SD Gundam - - stage 3 mid-boss still has the sprite garbage bug; - - stage 4: has sprite stuck on bottom-left of screen; - - palette dims too much on attract / continue screen. + TODO: + - improve documentation, ffs! + - split into files, still needed: + - BCD; + - collision detection; + - command parser -> to cmd file; + - sd gundam sprite dma -> to dma file; + - convert to internal memory map, remove trampolines along the way. + - DMA mode needs to be cleaned up; + - improve class OO public/protected/private; + - nuke legacy command implementations; + - assert for something that needs actual playtesting is bad. + - add better debug facilities in a new sub-class, including but not limited to: + - disable collision detection; + - printing facilities; + - debugger break on pre-setted commands; + - ... + + per-game TODO: + Legionnaire + - (fixed) player walks on spot on stage clear; + - several if not all enemies definitely wants some sort of "axis aligned bounding box" in order to stop from going out of range + (when i.e. first boss goes to bottom of the screen and become unreachable) + - (btanb) Throw is made by quickly double jumping (!) + Heated Barrel + - gives random value to hi-score if you continue (only the first time, not a bug?); + - (fixed?) throws random address exceptions at level 3 and above, a RAM address arrives corrupt in the snippet at 0x136a; + - (fixed?) some corrupt sprites, probably a non-fatal version of the one above; + - stage 2 boss attacks only in vertical (regressed with the 130e / 3b30 / 42c2 command merge); + - (fixed) level 3+ boss movements looks wrong; + - stage 3 "homing" missiles doesn't seem to like our 6200 hookup here, except it's NOT 6200!? + - barrels seen in later levels seems to fail an axis aligned bounding box, not unlike Legionnaire. + SD Gundam + - stage 3 mid-boss still has the sprite garbage bug; + - stage 4: has sprite stuck on bottom-left of screen; + - palette dims too much on attract / continue screen. It's known that the DMA data arrangement gives same results on a real Legionnaire board, so shrug? - - Tech notes (to move into mainpage): - ----------- - [0x6fc] DMA mode bit scheme: - ---1 ---1 ---- ---- fill op if true, else transfer - ---- ---- x--- ---- palette brightness - ---- ---- ---x ---- internal buffer selector - ---- ---- ---- x--- size modifier? Bus transfer size actually? - ---- ---- ---- -xxx select channel - + + Tech notes (to move into mainpage): + ----------- + [0x6fc] DMA mode bit scheme: + ---1 ---1 ---- ---- fill op if true, else transfer + ---- ---- x--- ---- palette brightness + ---- ---- ---x ---- internal buffer selector + ---- ---- ---- x--- size modifier? Bus transfer size actually? + ---- ---- ---- -xxx select channel + ***************************************************************************/ #include "emu.h" @@ -242,7 +242,7 @@ void raiden2cop_device::device_start() m_host_cpu = machine().device("maincpu"); m_host_space = &m_host_cpu->space(AS_PROGRAM); m_host_endian = m_host_space->endianness() == ENDIANNESS_BIG; // m_cpu_is_68k - + m_byte_endian_val = m_host_endian ? 3 : 0; m_word_endian_val = m_host_endian ? 2 : 0; } @@ -708,11 +708,11 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) switch (cop_dma_mode) { case 0x14: - { + { dma_tilemap_buffer(); break; } - + case 0x15: { dma_palette_buffer(); @@ -727,10 +727,10 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) case 0x85: case 0x86: case 0x87: - { dma_palette_brightness(); + { dma_palette_brightness(); break; } - + /********************************************************************************************************************/ case 0x09: { UINT32 src, dst, size; @@ -795,7 +795,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) case 0x11c: case 0x11d: case 0x11e: - case 0x11f: + case 0x11f: { dma_fill(); break; @@ -843,7 +843,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_itoa_low_w) WRITE16_MEMBER(raiden2cop_device::cop_itoa_high_w) { cop_itoa = (cop_itoa & ~(mem_mask << 16)) | ((data & mem_mask) << 16); - + // Godzilla cares, otherwise you get 2p score overflow in 1p vs 2p, TODO: might actually be HW endianness dependant? bcd_update(); } @@ -1553,7 +1553,7 @@ WRITE16_MEMBER(raiden2cop_device::LEGACY_cop_cmd_w) { if(data == 0xf105) // cupsoc transition from presentation to kick off return; - + printf("did not execute %04x\n", data); // cup soccer triggers this a lot (and others) } } diff --git a/src/mame/machine/seibucop/seibucop.h b/src/mame/machine/seibucop/seibucop.h index 1e6e2c4c9fa..fbf8ecced76 100644 --- a/src/mame/machine/seibucop/seibucop.h +++ b/src/mame/machine/seibucop/seibucop.h @@ -10,9 +10,9 @@ #ifndef RAIDEN2COP_H #define RAIDEN2COP_H -#define LOG_Commands 0 -#define LOG_Phytagoras 0 -#define LOG_Division 0 +#define LOG_Commands 0 +#define LOG_Phytagoras 0 +#define LOG_Division 0 #define LOG_Move0205 0 #define LOG_Move0905 0 @@ -211,14 +211,14 @@ private: // internal state devcb_write16 m_videoramout_cb; required_device m_palette; - - cpu_device *m_host_cpu; /**< reference to the host cpu */ - address_space *m_host_space; /**< reference to the host cpu space */ - bool m_host_endian; /**< reference to the host cpu endianness, some commands cares! */ - UINT8 m_byte_endian_val; /**< 2 if m_host_endian is big (68k) else 0 */ - UINT8 m_word_endian_val; /**< 3 if m_host_endian is big (68k) else 0 */ - + cpu_device *m_host_cpu; /**< reference to the host cpu */ + address_space *m_host_space; /**< reference to the host cpu space */ + bool m_host_endian; /**< reference to the host cpu endianness, some commands cares! */ + UINT8 m_byte_endian_val; /**< 2 if m_host_endian is big (68k) else 0 */ + UINT8 m_word_endian_val; /**< 3 if m_host_endian is big (68k) else 0 */ + + void cop_collision_read_pos(int slot, UINT32 spradr, bool allow_swap); // commands, TODO: needs commenting! @@ -257,15 +257,15 @@ private: void LEGACY_execute_d104(int offset, UINT16 data); void LEGACY_execute_6980(int offset, UINT16 data); void LEGACY_execute_c480(int offset, UINT16 data); - + void cop_collision_update_hitbox(UINT16 data, int slot, UINT32 hitadr); void bcd_update(); - + UINT16 cop_read_word(int address); UINT8 cop_read_byte(int address); void cop_write_word(int address, UINT16 data); void cop_write_byte(int address, UINT8 data); - + void dma_tilemap_buffer(); void dma_palette_buffer(); void dma_fill(); diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index 8941b2513f2..2a1f57da928 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -800,7 +800,7 @@ WRITE8_MEMBER(sms_state::sms_mem_control_w) READ8_MEMBER(sms_state::sg1000m3_peripheral_r) { bool joy_ports_disabled = m_sgexpslot->is_readable(offset); - + if (joy_ports_disabled) { return m_sgexpslot->read(space, offset); @@ -818,7 +818,7 @@ READ8_MEMBER(sms_state::sg1000m3_peripheral_r) WRITE8_MEMBER(sms_state::sg1000m3_peripheral_w) { bool joy_ports_disabled = m_sgexpslot->is_writeable(offset); - + if (joy_ports_disabled) { m_sgexpslot->write(space, offset, data); diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index e4cdcee007b..35654e90b42 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -2362,17 +2362,17 @@ int xbox_base_state::smbus_cx25871(int command, int rw, int data) // let's try to fake the missing eeprom, make sure its ntsc static int dummyeeprom[256] = { - 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, - 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, - 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, - 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, + 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, + 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, + 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; int smbus_callback_eeprom(xbox_base_state &chs, int command, int rw, int data) { diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 559fd730b5e..4a723c60b12 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -9204,8 +9204,8 @@ dking // Crazy Kong Bootleg guzzler // (c) 1983 Tehkan guzzlers // (c) 1983 Tehkan (Swimmer Conversion) monkeyd // bootleg -rpatrol // (c) 1981.01 Orca -rpatrola // bootleg +rpatrol // (c) 1981.01 Orca +rpatrola // bootleg rpatrolb // bootleg silvland // Falcon swimmer // (c) 1982 Tehkan @@ -14198,7 +14198,7 @@ mjkinjas // (c) 1991 Home Data mjkojink // (c) 1989 Home Data mjprivat // (c) 1991 Matoba mjyougo // (c) 1989 Home Data -mjjoship // (c) 1988 Home Data +mjjoship // (c) 1988 Home Data mrokumei // (c) 1988 Home Data reikaids // (c) 1988 Home Data vitaminc // (c) 1989 Home Data diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/chihiro.cpp index 7ce95c67ff9..48cca5d119c 100644 --- a/src/mame/video/chihiro.cpp +++ b/src/mame/video/chihiro.cpp @@ -4617,7 +4617,7 @@ WRITE32_MEMBER(nv2a_renderer::geforce_w) //printf("dmaget %08X dmaput %08X\n\r",*dmaget,*dmaput); if (((*dmaput == 0x048cf000) && (*dmaget == 0x07f4d000)) || // only for outr2 ((*dmaput == 0x07dca000) && (*dmaget == 0x07f4d000))) // only for crtaxihr - { + { *dmaget = *dmaput; puller_waiting = 0; puller_timer->enable(false); diff --git a/src/mame/video/divebomb.cpp b/src/mame/video/divebomb.cpp index 275ef64e173..1da5769aa31 100644 --- a/src/mame/video/divebomb.cpp +++ b/src/mame/video/divebomb.cpp @@ -20,13 +20,13 @@ TILE_GET_INFO_MEMBER(divebomb_state::get_fg_tile_info) { - UINT32 code = m_fgram[tile_index + 0x000]; - UINT32 attr = m_fgram[tile_index + 0x400]; - UINT32 colour = attr >> 4; + UINT32 code = m_fgram[tile_index + 0x000]; + UINT32 attr = m_fgram[tile_index + 0x400]; + UINT32 colour = attr >> 4; - code |= (attr & 0x3) << 8; + code |= (attr & 0x3) << 8; - SET_TILE_INFO_MEMBER(0, code, colour, 0); + SET_TILE_INFO_MEMBER(0, code, colour, 0); } @@ -39,15 +39,15 @@ TILE_GET_INFO_MEMBER(divebomb_state::get_fg_tile_info) K051316_CB_MEMBER(divebomb_state::zoom_callback_1) { - *code |= (*color & 0x03) << 8; - *color = 0 + ((roz_pal >> 4) & 3); + *code |= (*color & 0x03) << 8; + *color = 0 + ((roz_pal >> 4) & 3); } K051316_CB_MEMBER(divebomb_state::zoom_callback_2) { - *code |= (*color & 0x03) << 8; - *color = 4 + (roz_pal & 3); + *code |= (*color & 0x03) << 8; + *color = 4 + (roz_pal & 3); } @@ -60,47 +60,47 @@ K051316_CB_MEMBER(divebomb_state::zoom_callback_2) WRITE8_MEMBER(divebomb_state::fgram_w) { - m_fgram[offset] = data; - m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); + m_fgram[offset] = data; + m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_MEMBER(divebomb_state::rozcpu_wrap1_enable_w) { - roz1_wrap = !(data & 1); + roz1_wrap = !(data & 1); } WRITE8_MEMBER(divebomb_state::rozcpu_enable1_w) { - roz1_enable = !(data & 1); + roz1_enable = !(data & 1); } WRITE8_MEMBER(divebomb_state::rozcpu_enable2_w) { - roz2_enable = !(data & 1); + roz2_enable = !(data & 1); } WRITE8_MEMBER(divebomb_state::rozcpu_wrap2_enable_w) { - roz2_wrap = !(data & 1); + roz2_wrap = !(data & 1); } WRITE8_MEMBER(divebomb_state::rozcpu_pal_w) { - //.... ..xx K051316 1 palette select - //..xx .... K051316 2 palette select + //.... ..xx K051316 1 palette select + //..xx .... K051316 2 palette select - roz_pal = data; - - m_k051316_2->mark_tmap_dirty(); - m_k051316_1->mark_tmap_dirty(); - - if (data & 0xcc) - logerror("rozcpu_port50_w %02x\n", data); + roz_pal = data; + + m_k051316_2->mark_tmap_dirty(); + m_k051316_1->mark_tmap_dirty(); + + if (data & 0xcc) + logerror("rozcpu_port50_w %02x\n", data); } @@ -113,50 +113,50 @@ WRITE8_MEMBER(divebomb_state::rozcpu_pal_w) void divebomb_state::decode_proms(const UINT8 * rgn, int size, int index, bool inv) { - static const int resistances[4] = { 2000, 1000, 470, 220 }; + static const int resistances[4] = { 2000, 1000, 470, 220 }; - double rweights[4], gweights[4], bweights[4]; - - /* compute the color output resistor weights */ - compute_resistor_weights(0, 255, -1.0, - 4, resistances, rweights, 0, 0, - 4, resistances, gweights, 0, 0, - 4, resistances, bweights, 0, 0); - - /* create a lookup table for the palette */ - for (UINT32 i = 0; i < size; ++i) - { - UINT32 rdata = rgn[i + size*2] & 0x0f; - UINT32 r = combine_4_weights(rweights, BIT(rdata, 0), BIT(rdata, 1), BIT(rdata, 2), BIT(rdata, 3)); - - UINT32 gdata = rgn[i + size] & 0x0f; - UINT32 g = combine_4_weights(gweights, BIT(gdata, 0), BIT(gdata, 1), BIT(gdata, 2), BIT(gdata, 3)); - - UINT32 bdata = rgn[i] & 0x0f; - UINT32 b = combine_4_weights(bweights, BIT(bdata, 0), BIT(bdata, 1), BIT(bdata, 2), BIT(bdata, 3)); - - if (!inv) - m_palette->set_pen_color(index + i, rgb_t(r, g, b)); - else - m_palette->set_pen_color(index + (i ^ 0xff), rgb_t(r, g, b)); - } + double rweights[4], gweights[4], bweights[4]; + + /* compute the color output resistor weights */ + compute_resistor_weights(0, 255, -1.0, + 4, resistances, rweights, 0, 0, + 4, resistances, gweights, 0, 0, + 4, resistances, bweights, 0, 0); + + /* create a lookup table for the palette */ + for (UINT32 i = 0; i < size; ++i) + { + UINT32 rdata = rgn[i + size*2] & 0x0f; + UINT32 r = combine_4_weights(rweights, BIT(rdata, 0), BIT(rdata, 1), BIT(rdata, 2), BIT(rdata, 3)); + + UINT32 gdata = rgn[i + size] & 0x0f; + UINT32 g = combine_4_weights(gweights, BIT(gdata, 0), BIT(gdata, 1), BIT(gdata, 2), BIT(gdata, 3)); + + UINT32 bdata = rgn[i] & 0x0f; + UINT32 b = combine_4_weights(bweights, BIT(bdata, 0), BIT(bdata, 1), BIT(bdata, 2), BIT(bdata, 3)); + + if (!inv) + m_palette->set_pen_color(index + i, rgb_t(r, g, b)); + else + m_palette->set_pen_color(index + (i ^ 0xff), rgb_t(r, g, b)); + } } PALETTE_INIT_MEMBER(divebomb_state, divebomb) { - decode_proms(memregion("spr_proms")->base(), 0x100, 0x400 + 0x400 + 0x400, false); - decode_proms(memregion("fg_proms")->base(), 0x400, 0x400 + 0x400, false); - decode_proms(memregion("k051316_1_pr")->base(), 0x400, 0, true); - decode_proms(memregion("k051316_2_pr")->base(), 0x400, 0x400, true); + decode_proms(memregion("spr_proms")->base(), 0x100, 0x400 + 0x400 + 0x400, false); + decode_proms(memregion("fg_proms")->base(), 0x400, 0x400 + 0x400, false); + decode_proms(memregion("k051316_1_pr")->base(), 0x400, 0, true); + decode_proms(memregion("k051316_2_pr")->base(), 0x400, 0x400, true); } VIDEO_START_MEMBER(divebomb_state,divebomb) { - m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(divebomb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap->set_transparent_pen(0); - m_fg_tilemap->set_scrolly(0, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(divebomb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap->set_transparent_pen(0); + m_fg_tilemap->set_scrolly(0, 16); } @@ -169,41 +169,41 @@ VIDEO_START_MEMBER(divebomb_state,divebomb) void divebomb_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { - const UINT8 *spriteram = m_spriteram; - - for (UINT32 i = 0; i < m_spriteram.bytes(); i += 4) - { - UINT32 sy = spriteram[i + 3]; - UINT32 sx = spriteram[i + 0]; - UINT32 code = spriteram[i + 2]; - UINT32 attr = spriteram[i + 1]; - - code += (attr & 0x0f) << 8; - - UINT32 colour = attr >> 4; + const UINT8 *spriteram = m_spriteram; - m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, colour, 0, 0, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, colour, 0, 0, sx, sy-256, 0); - } + for (UINT32 i = 0; i < m_spriteram.bytes(); i += 4) + { + UINT32 sy = spriteram[i + 3]; + UINT32 sx = spriteram[i + 0]; + UINT32 code = spriteram[i + 2]; + UINT32 attr = spriteram[i + 1]; + + code += (attr & 0x0f) << 8; + + UINT32 colour = attr >> 4; + + m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, colour, 0, 0, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, colour, 0, 0, sx, sy-256, 0); + } } UINT32 divebomb_state::screen_update_divebomb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_k051316_1->wraparound_enable(roz1_wrap); - m_k051316_2->wraparound_enable(roz2_wrap); + m_k051316_1->wraparound_enable(roz1_wrap); + m_k051316_2->wraparound_enable(roz2_wrap); - bitmap.fill(m_palette->black_pen(), cliprect); + bitmap.fill(m_palette->black_pen(), cliprect); - if (roz2_enable) - m_k051316_2->zoom_draw(screen, bitmap, cliprect, 0, 0); - - if (roz1_enable) - m_k051316_1->zoom_draw(screen, bitmap, cliprect, 0, 0); + if (roz2_enable) + m_k051316_2->zoom_draw(screen, bitmap, cliprect, 0, 0); - draw_sprites(bitmap, cliprect); + if (roz1_enable) + m_k051316_1->zoom_draw(screen, bitmap, cliprect, 0, 0); - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + draw_sprites(bitmap, cliprect); - return 0; + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + + return 0; } diff --git a/src/mame/video/exerion.cpp b/src/mame/video/exerion.cpp index c2d30a8daac..df90f829362 100644 --- a/src/mame/video/exerion.cpp +++ b/src/mame/video/exerion.cpp @@ -389,11 +389,11 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16 code &= ~0x10, code2 |= 0x10; gfx->transmask(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), - m_palette->transpen_mask(*gfx, color, 0x10)); + m_palette->transpen_mask(*gfx, color, 0x10)); } gfx->transmask(bitmap,cliprect, code, color, xflip, yflip, x, y, - m_palette->transpen_mask(*gfx, color, 0x10)); + m_palette->transpen_mask(*gfx, color, 0x10)); if (doubled) i += 4; } diff --git a/src/mame/video/gotya.cpp b/src/mame/video/gotya.cpp index ca2070a70f1..54f549f8513 100644 --- a/src/mame/video/gotya.cpp +++ b/src/mame/video/gotya.cpp @@ -153,9 +153,9 @@ void gotya_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, - code, color, - flip_screen_x(), flip_screen_y(), - sx, sy, 0); + code, color, + flip_screen_x(), flip_screen_y(), + sx, sy, 0); } } diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp index 355cf3411c7..a77e534e821 100644 --- a/src/mame/video/homedata.cpp +++ b/src/mame/video/homedata.cpp @@ -949,7 +949,7 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1 246 = 96 17 ef db (mjjoship) 35*8 = bc 0b ef f0 51*8 = a6 07 ef db (mjikaga) - 414 = b7 10 ef db (mjjoship, db becomes e8 after first loss) + 414 = b7 10 ef db (mjjoship, db becomes e8 after first loss) 54*8 = bc 07 ef e8 but in mjkinjas it's @@ -987,17 +987,17 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1 } else { - if (m_vreg[0x3] == 0xa6) + if (m_vreg[0x3] == 0xa6) { screen.set_visible_area(0*8, 51*8-1, 2*8, 30*8-1); scroll_low = 7 - (m_vreg[0x4] & 0x0f); } - else if (m_vreg[0x3] == 0xb7) + else if (m_vreg[0x3] == 0xb7) { screen.set_visible_area(0*8, 52*8-3, 2*8, 30*8-1); - scroll_low = 0; + scroll_low = 0; } - else + else { screen.set_visible_area(0*8, 54*8-1, 2*8, 30*8-1); scroll_low = 7 - (m_vreg[0x4] & 0x0f); diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index 35d9f95cc3e..0d422feb0f4 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -447,7 +447,7 @@ WRITE16_MEMBER(megasys1_state::megasys1_vregs_A_w) break; case 0x308/2 : if (!m_hardware_type_z) - { + { m_soundlatch->write(space,0,new_data,0xffff); m_audiocpu->set_input_line(4, HOLD_LINE); } diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp index 28b3a5efe11..0113e5dadcc 100644 --- a/src/mame/video/model3.cpp +++ b/src/mame/video/model3.cpp @@ -711,20 +711,20 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw - Color table (is this featured in Model 3?) 0x00: xxxxxxxx xxxxxxxx xxxxxx-- -------- Viewport number - -------- -------- ------xx -------- Viewport select 0-3 - -------- -------- -------- x------- Display select - -------- -------- -------- -x------ Fix point centroid - -------- -------- -------- --x----- Viewport off + -------- -------- ------xx -------- Viewport select 0-3 + -------- -------- -------- x------- Display select + -------- -------- -------- -x------ Fix point centroid + -------- -------- -------- --x----- Viewport off -------- -------- -------- ---xx--- Viewport priority - -------- -------- -------- -----x-- "clr_xlator_tbl_sel" - -------- -------- -------- ------xx Node type + -------- -------- -------- -----x-- "clr_xlator_tbl_sel" + -------- -------- -------- ------xx Node type 0x01: -------x -------- -------- -------- Sibling null - -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer + -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer 0x02: -----x-- -------- -------- -------- Child is sibling table - -------x -------- -------- -------- Leaf node - -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer + -------x -------- -------- -------- Leaf node + -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer 0x03: "cota" (float) Affected by frustum angles and viewport size 0x04: Sun light vector X-component (float) @@ -763,7 +763,7 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw 0x1b: Copy of word 0x00 0x1c: xxxxxxxx xxxxxxxx -------- -------- "lj" - -------- -------- xxxxxxxx xxxxxxxx "li" + -------- -------- xxxxxxxx xxxxxxxx "li" 0x1d: -------- xxxxxxxx -------- -------- Spotlight Y size -------- -------- xxxxxxxx xxxxxxxx Spotlight Y position (13.3 fixed-point?) @@ -775,7 +775,7 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw 0x20: xxxxxxxx -------- -------- -------- ? -------- xxxxxxxx -------- -------- ? - -------- -------- -x------ -------- Parallel projection + -------- -------- -x------ -------- Parallel projection -------- -------- --xxx--- -------- Light RGB (RGB111?) -------- -------- -----xxx -------- Light RGB Fog (RGB111?) -------- -------- -------- xxxxxxxx Scroll Fog (0.8 fixed-point?) What is this??? @@ -789,15 +789,15 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw -------- -------- -------- xxxxxxxx Scroll attenuation (0.8 fixed-point) What is this??? 0x25: -------- xxxxxxxx -------- -------- Ambient fog - -------- -------- xxxxxxxx xxxxxxxx Fog offset + -------- -------- xxxxxxxx xxxxxxxx Fog offset 0x26: xxxxxxxx xxxxxxxx xxxxxxxx -------- Spot light - -------- -------- -------- x------- Clear viewport - -------- -------- -------- -x------ New sun parameters + -------- -------- -------- x------- Clear viewport + -------- -------- -------- -x------ New sun parameters 0x27: x------- -------- -------- -------- Valid spot light - -x------ -------- -------- -------- Pro 1000 dummy - -------- --xxxxxx xxxxxxxx xxxxxxxx "upgrade_wd_10" + -x------ -------- -------- -------- Pro 1000 dummy + -------- --xxxxxx xxxxxxxx xxxxxxxx "upgrade_wd_10" 0x28: Fog layer altitude (float) @@ -806,7 +806,7 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw 0x2a: Bottom fog density (float) 0x2b: Near clipping plane (float) - + 0x2c: Far clipping plane (float) 0x2d: Pfog offset top @@ -851,22 +851,22 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw Instance Node? 0x00: x------- -------- -------- -------- Is UF ref - -x------ -------- -------- -------- Is 3D model - --x----- -------- -------- -------- Is point - ---x---- -------- -------- -------- Is point ref - ----x--- -------- -------- -------- Is animation - -----x-- -------- -------- -------- Is billboard - ------x- -------- -------- -------- Child is billboard - -------x -------- -------- -------- Extra child pointer needed - -------- -----xxx xxxxxx-- -------- Node ID + -x------ -------- -------- -------- Is 3D model + --x----- -------- -------- -------- Is point + ---x---- -------- -------- -------- Is point ref + ----x--- -------- -------- -------- Is animation + -----x-- -------- -------- -------- Is billboard + ------x- -------- -------- -------- Child is billboard + -------x -------- -------- -------- Extra child pointer needed + -------- -----xxx xxxxxx-- -------- Node ID - -------- -------- -------- x------- Reset matrix - -------- -------- -------- -x------ Use child pointer - -------- -------- -------- --x----- Use sibling pointer - -------- -------- -------- ---x---- No matrix - -------- -------- -------- ----x--- Indirect child - -------- -------- -------- -----x-- Valid color table - -------- -------- -------- ------xx Node type (0 = viewport, 1 = root node, 2 = culling node) + -------- -------- -------- x------- Reset matrix + -------- -------- -------- -x------ Use child pointer + -------- -------- -------- --x----- Use sibling pointer + -------- -------- -------- ---x---- No matrix + -------- -------- -------- ----x--- Indirect child + -------- -------- -------- -----x-- Valid color table + -------- -------- -------- ------xx Node type (0 = viewport, 1 = root node, 2 = culling node) 0x01,0x02 only present on Step 2+ @@ -885,14 +885,14 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw 0x06: Translation Z coordinate 0x07: xxxx---- -------- -------- -------- Color table address 2 - -----x-- -------- -------- -------- Sibling table - ------x- -------- -------- -------- Point - -------x -------- -------- -------- Leaf node - -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer - - 0x08: xxxxxxx- -------- -------- -------- Color table address 3 - -------x -------- -------- -------- Null sibling - -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer + -----x-- -------- -------- -------- Sibling table + ------x- -------- -------- -------- Point + -------x -------- -------- -------- Leaf node + -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer + + 0x08: xxxxxxx- -------- -------- -------- Color table address 3 + -------x -------- -------- -------- Null sibling + -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer 0x09: xxxxxxxx xxxxxxxx -------- -------- Blend radius -------- -------- xxxxxxxx xxxxxxxx Culling radius diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp index 20e6a501a08..b18246ec376 100644 --- a/src/mame/video/namconb1.cpp +++ b/src/mame/video/namconb1.cpp @@ -130,7 +130,7 @@ VIDEO_START_MEMBER(namconb1_state,namconb1) { namco_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), NB1TilemapCB ); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(FUNC(namconb1_state::NB1objcode2tile), this)); - + save_item(NAME(m_tilemap_tile_bank)); } /* namconb1 */ @@ -189,6 +189,6 @@ VIDEO_START_MEMBER(namconb1_state,namconb2) namco_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), NB2TilemapCB ); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(FUNC(namconb1_state::NB2objcode2tile), this)); c169_roz_init(NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION); - + save_item(NAME(m_tilemap_tile_bank)); } /* namconb2_vh_start */ diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp index 21e1979caf0..89986aea6fe 100644 --- a/src/mame/video/namcos2.cpp +++ b/src/mame/video/namcos2.cpp @@ -294,7 +294,7 @@ WRITE16_MEMBER( namcos2_state::rozram_word_w ) m_tilemap_roz->mark_tile_dirty(offset); //if( space.machine().input().code_pressed(KEYCODE_Q) ) //{ - // machine().debug_break(); + // machine().debug_break(); //} } diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index b2f05d94069..8e512a0f7e1 100644 --- a/src/mame/video/powervr2.cpp +++ b/src/mame/video/powervr2.cpp @@ -1024,7 +1024,7 @@ WRITE32_MEMBER( powervr2_device::startrender_w ) } // printf("ISP START %d %d\n",sanitycount,m_screen->vpos()); /* Fire ISP irq after a set amount of time TODO: timing of this */ - endofrender_timer_isp->adjust(state->m_maincpu->cycles_to_attotime(sanitycount*25 + 500000)); // hacky end of render delay for Capcom games, otherwise they works at ~1/10 speed + endofrender_timer_isp->adjust(state->m_maincpu->cycles_to_attotime(sanitycount*25 + 500000)); // hacky end of render delay for Capcom games, otherwise they works at ~1/10 speed break; } } diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp index 511f3046ebf..99200dae945 100644 --- a/src/mame/video/seibu_crtc.cpp +++ b/src/mame/video/seibu_crtc.cpp @@ -21,7 +21,7 @@ Raiden later rev (probably the first game to use it) TODO: - Most registers are still a mystery; -- Get the proper Seibu chip ID number. +- Get the proper Seibu chip ID number. Kold found that a Raiden alt set has irq request pin from a chip named SEI0160, which might be our man. preliminary memory map: diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index cea29595dc2..1356efc70ca 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -249,15 +249,15 @@ WRITE8_MEMBER(vt100_video_device::dc012_w) printf("MHFU ___ENABLED___ %05x \n", space.device().safe_pc()); MHFU_FLAG = true; - MHFU_counter = 0; + MHFU_counter = 0; } if (!(data & 0x08)) { if (!(data & 0x04)) { - m_scroll_latch_valid = false; - m_scroll_latch = data & 0x03; // LSB is written first. + m_scroll_latch_valid = false; + m_scroll_latch = data & 0x03; // LSB is written first. } else // set MSB of scroll_latch { diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp index b4cead4938c..0c4f16919f9 100644 --- a/src/osd/modules/debugger/debugimgui.cpp +++ b/src/osd/modules/debugger/debugimgui.cpp @@ -504,7 +504,7 @@ int debug_imgui::history_set(ImGuiTextEditCallbackData* data) data->CursorPos = data->BufTextLen = (int)snprintf(data->Buf, (size_t)data->BufSize, "%s", ""); else data->CursorPos = data->BufTextLen = (int)snprintf(data->Buf, (size_t)data->BufSize, "%s", view_main_console->console_history[history_pos].c_str()); - + data->BufDirty = true; return 0; } @@ -613,7 +613,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) drawlist->AddRect(ImVec2(view_ptr->ofs_x,view_ptr->ofs_y + ImGui::GetScrollY()), ImVec2(view_ptr->ofs_x + view_ptr->view_width,view_ptr->ofs_y + ImGui::GetScrollY() + view_ptr->view_height),col); } - + // if the vertical scroll bar is at the end, then force it to the maximum value in case of an update if(view_ptr->scroll_end) ImGui::SetScrollY(ImGui::GetScrollMaxY()); @@ -622,7 +622,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) if(view_ptr->scroll_follow) if(ImGui::GetScrollY() == ImGui::GetScrollMaxY() || ImGui::GetScrollMaxY() < 0) view_ptr->scroll_end = true; - + ImGui::PopStyleVar(2); } @@ -882,7 +882,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened) ImGui::End(); } else - view_ptr->is_collapsed = true; + view_ptr->is_collapsed = true; } void debug_imgui::add_memory(int id) @@ -1002,7 +1002,7 @@ void debug_imgui::draw_console() draw_view(view_main_console,false); ImGui::EndChild(); ImGui::Separator(); - + ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackHistory; if(m_running) flags |= ImGuiInputTextFlags_ReadOnly; diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 70e290240c2..60707f2baad 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -185,7 +185,7 @@ stack_walker::stack_walker() m_sym_function_table_access_64 = m_dbghelp_dll->bind("SymFunctionTableAccess64"); m_sym_get_module_base_64 = m_dbghelp_dll->bind("SymGetModuleBase64"); m_rtl_capture_context = m_kernel32_dll->bind("RtlCaptureContext"); - + // initialize the symbols if (!s_initialized && m_sym_initialize && m_stack_walk_64 && m_sym_function_table_access_64 && m_sym_get_module_base_64) { diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp index 161ea62c404..ea3218584d7 100644 --- a/src/osd/modules/file/posixdir.cpp +++ b/src/osd/modules/file/posixdir.cpp @@ -99,12 +99,12 @@ public: bool open_impl(std::string const &dirname); private: - typedef std::unique_ptr dir_ptr; + typedef std::unique_ptr dir_ptr; - entry m_entry; - sdl_dirent *m_data; - dir_ptr m_fd; - std::string m_path; + entry m_entry; + sdl_dirent *m_data; + dir_ptr m_fd; + std::string m_path; }; diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp index ad463f2d337..3ecd2412910 100644 --- a/src/osd/modules/file/windir.cpp +++ b/src/osd/modules/file/windir.cpp @@ -45,7 +45,7 @@ public: private: HANDLE m_find; // handle to the finder bool m_is_first; // true if this is the first entry - entry m_entry; // current entry's data + entry m_entry; // current entry's data WIN32_FIND_DATA m_data; // current raw data }; diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp index 599a562de2b..725c8b9bc81 100644 --- a/src/osd/modules/font/font_dwrite.cpp +++ b/src/osd/modules/font/font_dwrite.cpp @@ -149,7 +149,7 @@ HRESULT SaveBitmap(IWICBitmap* bitmap, GUID pixelFormat, const WCHAR *filename) HR_RETHR(frameEncode->Commit()); HR_RETHR(encoder->Commit()); - + return S_OK; } diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index a60746ca3fa..f0bd112116f 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -513,7 +513,7 @@ public: sdl_input_module::input_init(machine); static int event_types[] = { - static_cast(SDL_KEYDOWN), + static_cast(SDL_KEYDOWN), static_cast(SDL_KEYUP), static_cast(SDL_TEXTINPUT) }; diff --git a/src/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp index 4455a77c991..88a82b8b877 100644 --- a/src/osd/modules/input/input_windows.cpp +++ b/src/osd/modules/input/input_windows.cpp @@ -24,10 +24,10 @@ bool windows_osd_interface::should_hide_mouse() const { bool hidemouse = false; wininput_module* mod; - + mod = dynamic_cast(m_keyboard_input); if (mod) hidemouse |= mod->should_hide_mouse(); - + mod = dynamic_cast(m_mouse_input); if (mod) hidemouse |= mod->should_hide_mouse(); diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index 2d01b702bd8..d1dcfd8b023 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -44,7 +44,7 @@ int xinput_api_helper::initialize() XInputGetState = m_xinput_dll->bind("XInputGetState"); XInputGetCapabilities = m_xinput_dll->bind("XInputGetCapabilities"); - + if (!XInputGetState || !XInputGetCapabilities) { osd_printf_verbose("Could not find XInput. Please try to reinstall DirectX runtime package.\n"); diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h index 64bd556cd3c..17f341b8934 100644 --- a/src/osd/modules/lib/osdlib.h +++ b/src/osd/modules/lib/osdlib.h @@ -78,7 +78,6 @@ char *osd_get_clipboard_text(void); -----------------------------------------------------------------------------*/ namespace osd { - class dynamic_module { public: diff --git a/src/osd/modules/lib/osdlib_macosx.cpp b/src/osd/modules/lib/osdlib_macosx.cpp index b3a7ed642e3..770078a254f 100644 --- a/src/osd/modules/lib/osdlib_macosx.cpp +++ b/src/osd/modules/lib/osdlib_macosx.cpp @@ -227,7 +227,6 @@ char *osd_get_clipboard_text(void) //============================================================ namespace osd { - class dynamic_module_posix_impl : public dynamic_module { public: @@ -265,7 +264,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -274,7 +273,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index 81d9967ff64..3f3bbb00269 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -172,7 +172,6 @@ char *osd_get_clipboard_text(void) //============================================================ namespace osd { - class dynamic_module_posix_impl : public dynamic_module { public: @@ -210,7 +209,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -219,7 +218,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp index e65509cc436..06a979a7a77 100644 --- a/src/osd/modules/lib/osdlib_win32.cpp +++ b/src/osd/modules/lib/osdlib_win32.cpp @@ -330,7 +330,6 @@ char *osd_get_clipboard_text(void) #endif namespace osd { - class dynamic_module_win32_impl : public dynamic_module { public: @@ -374,7 +373,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -383,7 +382,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp index 91ff840473b..f5e01d8ea98 100644 --- a/src/osd/modules/netdev/pcap.cpp +++ b/src/osd/modules/netdev/pcap.cpp @@ -13,7 +13,7 @@ #define WIN32_LEAN_AND_MEAN #include #undef interface -#define LIB_NAME "wpcap.dll" +#define LIB_NAME "wpcap.dll" #elif defined(SDLMAME_MACOSX) #include diff --git a/src/osd/modules/output/output_module.h b/src/osd/modules/output/output_module.h index f3461d3e1f6..83b9a464f07 100644 --- a/src/osd/modules/output/output_module.h +++ b/src/osd/modules/output/output_module.h @@ -25,7 +25,7 @@ public: virtual ~output_module() { } virtual void notify(const char *outname, INT32 value) = 0; - + void set_machine(running_machine *machine) { m_machine = machine; }; running_machine &machine() const { return *m_machine; } private: diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp index 4ba069d18a4..5806c3ce042 100644 --- a/src/osd/modules/render/bgfx/chain.cpp +++ b/src/osd/modules/render/bgfx/chain.cpp @@ -34,11 +34,11 @@ bgfx_chain::bgfx_chain(std::string name, std::string author, bool transform, tar , m_current_time(0) , m_screen_index(screen_index) { - for (bgfx_target* target : m_target_list) - { - m_target_map[target->name()] = target; - m_target_names.push_back(target->name()); - } + for (bgfx_target* target : m_target_list) + { + m_target_map[target->name()] = target; + m_target_names.push_back(target->name()); + } } bgfx_chain::~bgfx_chain() @@ -63,13 +63,13 @@ bgfx_chain::~bgfx_chain() void bgfx_chain::repopulate_targets() { - for (size_t i = 0; i < m_target_names.size(); i++) - { - bgfx_target* target = m_targets.target(m_screen_index, m_target_names[i]); - if (target != nullptr) { - m_target_list[i] = target; - } - } + for (size_t i = 0; i < m_target_names.size(); i++) + { + bgfx_target* target = m_targets.target(m_screen_index, m_target_names[i]); + if (target != nullptr) { + m_target_list[i] = target; + } + } } void bgfx_chain::process(render_primitive* prim, int view, int screen, texture_manager& textures, osd_window& window, uint64_t blend) @@ -87,19 +87,19 @@ void bgfx_chain::process(render_primitive* prim, int view, int screen, texture_m bool orientation_swap_xy = (window.machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY; bool rotation_swap_xy = (window.target()->orientation() & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY; bool swap_xy = orientation_swap_xy ^ rotation_swap_xy; - - float screen_scale_x = 1.0f; - float screen_scale_y = 1.0f; - float screen_offset_x = 0.0f; - float screen_offset_y = 0.0f; - if (screen_device != nullptr) - { - render_container &screen_container = screen_device->container(); - screen_scale_x = 1.0f / screen_container.xscale(); - screen_scale_y = 1.0f / screen_container.yscale(); - screen_offset_x = -screen_container.xoffset(); - screen_offset_y = -screen_container.yoffset(); - } + + float screen_scale_x = 1.0f; + float screen_scale_y = 1.0f; + float screen_offset_x = 0.0f; + float screen_offset_y = 0.0f; + if (screen_device != nullptr) + { + render_container &screen_container = screen_device->container(); + screen_scale_x = 1.0f / screen_container.xscale(); + screen_scale_y = 1.0f / screen_container.yscale(); + screen_offset_x = -screen_container.xoffset(); + screen_offset_y = -screen_container.yoffset(); + } for (bgfx_chain_entry* entry : m_entries) { diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h index bddec2c9bc3..157f92173cf 100644 --- a/src/osd/modules/render/bgfx/chain.h +++ b/src/osd/modules/render/bgfx/chain.h @@ -32,7 +32,7 @@ public: ~bgfx_chain(); void process(render_primitive* prim, int view, int screen, texture_manager& textures, osd_window &window, uint64_t blend = 0L); - void repopulate_targets(); + void repopulate_targets(); // Getters std::vector& sliders() { return m_sliders; } @@ -49,8 +49,8 @@ private: std::vector m_params; std::vector m_entries; std::vector m_target_list; - std::vector m_target_names; - std::map m_target_map; + std::vector m_target_names; + std::map m_target_map; int64_t m_current_time; uint32_t m_screen_index; }; diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp index d4c59f9bb6a..2116322f19a 100644 --- a/src/osd/modules/render/bgfx/chainmanager.cpp +++ b/src/osd/modules/render/bgfx/chainmanager.cpp @@ -293,17 +293,17 @@ void chain_manager::process_screen_quad(uint32_t view, uint32_t screen, render_p bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem, BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP | BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT); m_textures.add_provider(full_name, texture); - const bool any_targets_rebuilt = m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST); + const bool any_targets_rebuilt = m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST); if (any_targets_rebuilt) - { - for (bgfx_chain* chain : m_screen_chains) - { - if (chain != nullptr) - { - chain->repopulate_targets(); - } - } - } + { + for (bgfx_chain* chain : m_screen_chains) + { + if (chain != nullptr) + { + chain->repopulate_targets(); + } + } + } bgfx_chain* chain = screen_chain(screen); chain->process(prim, view, screen, m_textures, window, bgfx_util::get_blend_state(PRIMFLAG_GET_BLENDMODE(prim->flags))); @@ -441,19 +441,19 @@ uint32_t chain_manager::handle_screen_chains(uint32_t view, render_primitive *st std::swap(screen_width, screen_height); } - const bool any_targets_rebuilt = m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE); - if (any_targets_rebuilt) - { - for (bgfx_chain* chain : m_screen_chains) - { - if (chain != nullptr) - { - chain->repopulate_targets(); - } - } - } + const bool any_targets_rebuilt = m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE); + if (any_targets_rebuilt) + { + for (bgfx_chain* chain : m_screen_chains) + { + if (chain != nullptr) + { + chain->repopulate_targets(); + } + } + } - process_screen_quad(view + used_views, screen_index, prim, window); + process_screen_quad(view + used_views, screen_index, prim, window); used_views += screen_chain(screen_index)->applicable_passes(); screen_index++; diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp index 7e8577b95b3..dfc1678ee34 100644 --- a/src/osd/modules/render/bgfx/targetmanager.cpp +++ b/src/osd/modules/render/bgfx/targetmanager.cpp @@ -102,10 +102,10 @@ bool target_manager::update_target_sizes(uint32_t screen, uint16_t width, uint16 { sizes[screen] = osd_dim(width, height); rebuild_targets(screen, style); - return true; + return true; } - return false; + return false; } void target_manager::rebuild_targets(uint32_t screen, uint32_t style) diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index feb88dc0add..38f23bb2afc 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -47,7 +47,7 @@ shaders::shaders() : shadow_texture(nullptr), options(nullptr), avi_output_file(nullptr), avi_frame(0), avi_copy_surface(nullptr), avi_copy_texture(nullptr), avi_final_target(nullptr), avi_final_texture(nullptr), black_surface(nullptr), black_texture(nullptr), render_snap(false), snap_rendered(false), snap_copy_target(nullptr), snap_copy_texture(nullptr), snap_target(nullptr), snap_texture(nullptr), snap_width(0), snap_height(0), lines_pending(false), initialized(false), backbuffer(nullptr), curr_effect(nullptr), default_effect(nullptr), prescale_effect(nullptr), post_effect(nullptr), - distortion_effect(nullptr), focus_effect(nullptr), phosphor_effect(nullptr), deconverge_effect(nullptr), color_effect(nullptr), ntsc_effect(nullptr), bloom_effect(nullptr), + distortion_effect(nullptr), focus_effect(nullptr), phosphor_effect(nullptr), deconverge_effect(nullptr), color_effect(nullptr), ntsc_effect(nullptr), bloom_effect(nullptr), downsample_effect(nullptr), vector_effect(nullptr), fsfx_vertices(nullptr), curr_texture(nullptr), curr_render_target(nullptr), curr_poly(nullptr), targethead(nullptr), cachehead(nullptr) { } diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index ce024866319..a29b747bbe1 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -565,7 +565,7 @@ int renderer_d3d9::pre_window_draw_check() m_shaders->toggle(); m_sliders_dirty = true; - // re-create resources + // re-create resources if (device_create_resources()) { osd_printf_verbose("Direct3D: failed to recreate resources for device; failing permanently\n"); @@ -834,8 +834,8 @@ int renderer_d3d9::device_create(HWND device_hwnd) try_again: // try for XRGB first m_screen_format = D3DFMT_X8R8G8B8; - HRESULT result = d3dintf->d3dobj->CheckDeviceFormat(m_adapter, D3DDEVTYPE_HAL, m_pixformat, - m_texture_manager->is_dynamic_supported() + HRESULT result = d3dintf->d3dobj->CheckDeviceFormat(m_adapter, D3DDEVTYPE_HAL, m_pixformat, + m_texture_manager->is_dynamic_supported() ? D3DUSAGE_DYNAMIC : 0, D3DRTYPE_TEXTURE, m_screen_format); @@ -865,7 +865,7 @@ try_again: // create the D3D device result = d3dintf->d3dobj->CreateDevice( - m_adapter, D3DDEVTYPE_HAL, device_hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &m_presentation, &m_device); + m_adapter, D3DDEVTYPE_HAL, device_hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &m_presentation, &m_device); if (FAILED(result)) { // if we got a "DEVICELOST" error, it may be transitory; count it and only fail if @@ -923,7 +923,7 @@ int renderer_d3d9::device_create_resources() HRESULT result = m_device->CreateVertexBuffer( sizeof(vertex) * VERTEX_BUFFER_SIZE, D3DUSAGE_DYNAMIC | D3DUSAGE_SOFTWAREPROCESSING | D3DUSAGE_WRITEONLY, - VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) + VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) ? D3DFVF_XYZW : D3DFVF_XYZRHW), D3DPOOL_DEFAULT, &m_vertexbuf, nullptr); @@ -935,8 +935,8 @@ int renderer_d3d9::device_create_resources() // set the vertex format result = m_device->SetFVF( - (D3DFORMAT)(VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) - ? D3DFVF_XYZW + (D3DFORMAT)(VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) + ? D3DFVF_XYZW : D3DFVF_XYZRHW))); if (FAILED(result)) { @@ -993,9 +993,9 @@ renderer_d3d9::~renderer_d3d9() // todo: throws error when switching from full screen to window mode //if (m_shaders != nullptr) //{ - // // delete the HLSL interface - // global_free(m_shaders); - // m_shaders = nullptr; + // // delete the HLSL interface + // global_free(m_shaders); + // m_shaders = nullptr; //} } @@ -1686,7 +1686,7 @@ void renderer_d3d9::draw_line(const render_primitive &prim) } // now add a polygon entry - m_poly[m_numpolys].init(D3DPT_TRIANGLESTRIP, 2, 4, prim.flags, nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, 0.0f, 0.0f); + m_poly[m_numpolys].init(D3DPT_TRIANGLESTRIP, 2, 4, prim.flags, nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, 0.0f, 0.0f); m_numpolys++; } diff --git a/src/osd/modules/render/winglcontext.h b/src/osd/modules/render/winglcontext.h index ec63b11ff72..f0cb1b6af77 100644 --- a/src/osd/modules/render/winglcontext.h +++ b/src/osd/modules/render/winglcontext.h @@ -156,7 +156,7 @@ private: { if (pfn_wglGetExtensionsStringEXT == nullptr) return false; - + // printf("%s\n", pfn_wglGetExtensionsStringEXT()); if (strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != nullptr) diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index 0f6ec2b5297..bb45626a6c6 100755 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -287,7 +287,7 @@ int sound_xaudio2::init(osd_options const &options) // Make sure our XAudio2Create entrypoint is bound if (!XAudio2Create) { - osd_printf_error("Could not find XAudio2. Please try to reinstall DirectX runtime package.\n"); + osd_printf_error("Could not find XAudio2. Please try to reinstall DirectX runtime package.\n"); return 1; } @@ -342,7 +342,7 @@ void sound_xaudio2::exit() SetEvent(m_hEventExiting); m_hEventExiting = nullptr; } - + if (m_audioThread.joinable()) m_audioThread.join(); diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index 141f3db55d9..a224fb7059c 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -319,21 +319,21 @@ namespace osd OTHER }; - const char * name; // name of the entry - entry_type type; // type of the entry - std::uint64_t size; // size of the entry - std::chrono::system_clock::time_point last_modified; // last modified time + const char * name; // name of the entry + entry_type type; // type of the entry + std::uint64_t size; // size of the entry + std::chrono::system_clock::time_point last_modified; // last modified time }; // ----------------------------------------------------------------------------- // osd::directory::open: open a directory for iteration - // + // // Parameters: - // + // // dirname - path to the directory in question - // + // // Return value: - // + // // upon success, this function should return an directory pointer // which contains opaque data necessary to traverse the directory; on // failure, this function should return nullptr @@ -347,9 +347,9 @@ namespace osd // ----------------------------------------------------------------------------- // osd::directory::read: return information about the next entry in the directory - // + // // Return value: - // + // // a constant pointer to an entry representing the current item // in the directory, or nullptr, indicating that no more entries are // present diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h index 098c1823b50..9f6b42790b3 100644 --- a/src/osd/sdl/window.h +++ b/src/osd/sdl/window.h @@ -111,8 +111,8 @@ private: // monitor info osd_monitor_info * m_monitor; int m_fullscreen; - bool m_mouse_captured; - bool m_mouse_hidden; + bool m_mouse_captured; + bool m_mouse_hidden; void measure_fps(int update); diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp index 418c6c6c8f8..fce936a2440 100644 --- a/src/osd/windows/window.cpp +++ b/src/osd/windows/window.cpp @@ -1096,7 +1096,7 @@ int win_window_info::complete_create() SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this); // skip the positioning stuff for -video none */ - if (video_config.mode == VIDEO_MODE_NONE) + if (video_config.mode == VIDEO_MODE_NONE) { set_renderer(osd_renderer::make_for_type(video_config.mode, shared_from_this())); renderer().create();