diff options
160 files changed, 3025 insertions, 3025 deletions
diff --git a/hash/snes.xml b/hash/snes.xml index 6ff4c5c0843..a152a415707 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -33286,7 +33286,7 @@ Alternate board (XL-1) </dataarea> </part> </software> - + <software name="lostvik"> <description>The Lost Vikings (Euro)</description> <year>1993</year> diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 59a1d0a4eba..a37a099505d 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -516,1408 +516,1408 @@ Game cartridges <softwarelist name="vsmile_cart" description="VTech V.Smile cartridges"> - <software name="aladdin" supported="no"> - <description>Disneys Aladdin - Aladdins Welt der Wunder (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092204(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92204.u1" size="8388608" crc="dfa7b720" sha1="c4f7bcbe95c7eb5dfd0dd97f5d496db6ac158ea6" offset="0" /> - </dataarea> - </part> - </software> - - <software name="redhood" supported="no"> - <description>Entdecke die Welt von Rotkäppchen (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092024(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92024.u1" size="8388608" crc="cdeb71f9" sha1="21d2ecf5bc22fa94a1015de6f670415b6d42a3b1" offset="0" /> - </dataarea> - </part> - </software> - - <software name="alphaprk" supported="no"> - <description>Alphabet Park Adventure (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092000(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-A" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92000.u1" size="8388608" crc="69ef24ff" sha1="82b89bdc5e9050e4152866fc774d3996f9836d65" offset="0" /> - </dataarea> - </part> - </software> - - <software name="ariel" supported="no"> - <description>Disneys Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Rev. 3?)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092124(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92124(3).u1" size="8388608" crc="fc2d6d64" sha1="3747eb33304bb49a8f9ff912c0e3e07611e078dd" offset="0" /> - </dataarea> - </part> - </software> - - <software name="ariel1" cloneof="ariel" supported="no"> - <description>Disneys Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092124(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-A" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92124.u1" size="8388608" crc="ce21b7ba" sha1="e992b113f014614db34b81bb22357847cef79a16" offset="0" /> - </dataarea> - </part> - </software> - - <software name="arielf" cloneof="ariel" supported="no"> - <description>Disney La Petite Sirene - Ariel devient une princesse (Fra)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092125(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92125.u1" size="8388608" crc="341b2f6c" sha1="a9f6a30037dc814b6cf8e8485ee9778038a20c23" offset="0" /> - </dataarea> - </part> - </software> - - <software name="arieldk" cloneof="ariel" supported="no"> - <description>Disney Den Lille Havfrue - Ariels majestætiske rejse! (Den)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092133(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92133.u1" size="8388608" crc="182b5973" sha1="7f356a9890c7ea20c81db94f81037355b8cfb2c9" offset="0" /> - </dataarea> - </part> - </software> - - <software name="arielsw" cloneof="ariel" supported="no"> - <description>Disneys Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092134(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-E" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92134.u1" size="8388608" crc="e567db85" sha1="ca52eaca6cf1b361fd4b1ae2b2380095c612668d" offset="0" /> - </dataarea> - </part> - </software> - - <software name="barney" supported="no"> - <description>Barney - Erlebnis-Reise (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092384(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="7061238A" /> - <feature name="pcb_model" value="7061238A-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92384.u1" size="8388608" crc="a73855fa" sha1="dcc61ecf05bb41779a78196145136c1e9cbfa415" offset="0" /> - </dataarea> - </part> - </software> - - <!-- loads if mapped as Batman TV --> - <software name="bobbday" supported="no"> - <description>Bob the Builder - Bob's Busy Day (USA)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092300(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="7061238A" /> - <feature name="pcb_model" value="7061238A-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92300.u1" size="8388608" crc="6aea957b" sha1="947008c882733a8284a000c9c4d379e2c213526e" offset="0" /> - </dataarea> - </part> - </software> - - <software name="bobbdayg" cloneof="bobbday" supported="no"> - <description>Bob der Baumeister - Bobs spannender Arbeitstag (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092304(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92304.u1" size="8388608" crc="70c83b25" sha1="bebe311cfbeb25e01892b7636f4427ae0e0e4c9e" offset="0" /> - </dataarea> - </part> - </software> - - <software name="bobbdaydk" cloneof="bobbday" supported="no"> - <description>Byggemand Bob - Bobs travle dag (Den)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092313(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92313.u1" size="8388608" crc="37498231" sha1="2966ba75fc4430ee5d9dc7003d7f7e54e5546382" offset="0" /> - </dataarea> - </part> - </software> - - <software name="bobbdaysw" cloneof="bobbday" supported="no"> - <description>Byggare Bob - Bobs stressiga dag (Swe)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092314(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92314-100.u1" size="8388608" crc="ac343df7" sha1="77dafa48ca0e015728c5ead844dd729e87eb6182" offset="0" /> - </dataarea> - </part> - </software> - - <!-- loads if mapped as Batman TV --> - <software name="cars" supported="no"> - <description>Disney/Pixar Cars - Rev It Up in Radiator Springs (USA)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092660(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092660.u1" size="8388608" crc="ff65d967" sha1="27b229b6e308dfc0cea7e594c7b006f27961c05f" offset="0" /> - </dataarea> - </part> - </software> - - <software name="carsg" cloneof="cars" supported="no"> - <description>Disney/Pixar Cars - Vollgas in Radiator Springs (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092664(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92664(2).u1" size="8388608" crc="6f4c150d" sha1="f6fc136ca18025511a9b12c577860116fdc66c8c" offset="0" /> - </dataarea> - </part> - </software> - - <software name="carsf" cloneof="cars" supported="no"> - <description>Disney/Pixar Cars - Quatre Roues (Fra)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092665(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092665.u1" size="8388608" crc="c1f63c2e" sha1="3a6726a0a5dd5543d632dfbf57144da780994ba5" offset="0" /> - </dataarea> - </part> - </software> - - <software name="carsdk" cloneof="cars" supported="no"> - <description>Disney/Pixar Biler - Ræs i Kølerkildekøbing (Den)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092673(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92673.u1" size="8388608" crc="380d5655" sha1="fa70dcfd2793b5ba7bede3b365e245c8fde935d7" offset="0" /> - </dataarea> - </part> - </software> - - <software name="carssw" cloneof="cars" supported="no"> - <description>Disney/Pixar Bilar - Kör ikapp i Kylarköping (Swe)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092674(SE)" /> - <info name="alt_title" value="Biler - Kör ikapp i Kylarköping (Misprinted cart)"/> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-7" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="C92674-1.u1" size="8388608" crc="69b535f2" sha1="7785e4e92a0edbb90fd0e0a4f2de3afafae5e957" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderla" supported="no"> - <description>Disney Princess Cinderella - Cinderella's Magic Wishes (USA)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092240(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92240.u1" size="8388608" crc="2723728c" sha1="32fd6a5b9718ccc7e10e64046d7ac320cfa47362" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderlaa" cloneof="cinderla" supported="no"> - <description>Disney Princess Cinderella - Cinderella's Magic Wishes (USA, Alt)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092240(US)" /> - <part name="cart" interface="vsmile_cart"> - <dataarea name="rom" size="8388608"> - <rom name="52-92240(us).bin" size="8388608" crc="0a89723c" sha1="15082b565f6f71a0f993c2734cb807f37611eb17" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderlaf" cloneof="cinderla" supported="no"> - <description>Disney Princesses Cendrillon - Le rêve enchanté de Cendrillon (Fra)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092245(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92245.u1" size="8388608" crc="7c63221f" sha1="227e1d3b63714e6bf8d0fc0897bab9ffc1721ff5" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderladk" cloneof="cinderla" supported="no"> - <description>Disney Princess Cinderella - Askepots magiske ønsker (Den)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092253(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092253.u1" size="8388608" crc="81edbee0" sha1="cf4bca5a1f28049a40060eead7f10c940574107f" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderlag" cloneof="cinderla" supported="no"> - <description>Disney Princess Cinderella - Lernen im Märchenland (Ger, Rev. 1)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092244-104(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92244-1.u1" size="8388608" crc="7dbe47a2" sha1="d74d24d1d87a456f11a98f822b8c59d155734cea" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderlag1" cloneof="cinderla" supported="no"> - <description>Disney Princess Cinderella - Lernen im Märchenland (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092244(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92244.u1" size="8388608" crc="b08a50f3" sha1="a8e6b8b427115d01d35c27b41385ac5d430484c3" offset="0" /> - </dataarea> - </part> - </software> - - <software name="cinderlasw" cloneof="cinderla" supported="no"> - <description>Disney Princess Cinderella - Askungens magiska önskningar (Swe)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092254(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92254.u1" size="8388608" crc="946472af" sha1="9009a81689be949f9a5fbf91a6a1d2398f7e8d90" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mickymag" supported="no"> - <description>Disney's Mickey Mouse - Mickey's Magical Adventure (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092080(US)" /> - <part name="cart" interface="vsmile_cart"> - <dataarea name="rom" size="8388608"> - <rom name="52-092080(us).bin" size="8388608" crc="997a8a07" sha1="cd70c7249e25a37aeb3a3b85f56bd2b39dbf3d73" offset="0" /> - </dataarea> - </part> - </software> - - <!-- loads if mapped as Batman TV --> - <software name="dora" supported="no"> - <description>Nick Jr Dora the Explorer - Dora's Fix-it Adventure (USA)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092280(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92280.u1" size="8388608" crc="225c3133" sha1="97610c09834251d1960dbc67da18dad91e832dba" offset="0" /> - </dataarea> - </part> - </software> - - <software name="doraf" cloneof="dora" supported="no"> - <description>Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (Fra)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092285(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="7061238A" /> - <feature name="pcb_model" value="7061238A-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92285.u1" size="8388608" crc="5f47e1d5" sha1="046b5ce7669755e8d8a9be9be2684828b1f1dd9d" offset="0" /> - </dataarea> - </part> - </software> - - <software name="dorag" cloneof="dora" supported="no"> - <description>Nick Jr Dora - Doras Reparatur-Abenteuer (Ger, Rev. 1)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092284-104(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092284-1.u1" size="8388608" crc="070a72dc" sha1="3ca4820f2b54040d1d111b5ac41003c6e53b9164" offset="0" /> - </dataarea> - </part> - </software> - - <software name="elmo" supported="no"> - <description>Elmos großes Abenteuer (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092264(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92264.u1" size="8388608" crc="906b6496" sha1="8932008fef144d2ad3d056fd24f64264825af8ce" offset="0" /> - </dataarea> - </part> - </software> - - <software name="footschl" supported="no"> - <description>V.Smile Fußball Schule (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092824(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92824.u1" size="8388608" crc="620b9ebb" sha1="e22ff87a03c6cac3186613a9e804dd6d4e3a3dc4" offset="0" /> - </dataarea> - </part> - </software> - - <software name="findnemo" supported="no"> - <description>Disney/Pixar Finding Nemo - Nemo's Ocean Discoveries (USA)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092420(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92420.u1" size="8388608" crc="e40e46dc" sha1="ac78178cff76ed264589113b73211b1f4cfe6dbf" offset="0" /> - </dataarea> - </part> - </software> - - <software name="fred" supported="no"> - <description>Freds Zahlen Rallye (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092044(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-A" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92044.u1" size="8388608" crc="24988ef6" sha1="7f5d647dc8edf780ea86a43e08e8d2169b19a0ae" offset="0" /> - </dataarea> - </part> - </software> - - <software name="appilote" cloneof="fred" supported="no"> - <description>Apprenti' pilote (Fra)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092045(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-A" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92045.u1" size="8388608" crc="c4819e95" sha1="b625a7fb1d078349aee1c4cc18ee6f3917aaa816" offset="0" /> - </dataarea> - </part> - </software> - - <software name="kleinstn" supported="no"> - <description>Kleine Einsteins (Ger, Rev. 3?)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092984(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-6" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92984-3.u1" size="8388608" crc="8f671aa7" sha1="a6a0a5cd5c5bf14c1b546354bfe9209820955975" offset="0" /> - </dataarea> - </part> - </software> - - <software name="lionking" supported="no"> - <description>Disney's The Lion King - Simba's Big Adventure (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092100(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92100.u1" size="8388608" crc="08af3249" sha1="193d824625040ae9e30d8f5b7b74d7348bf3b7cd" offset="0" /> - </dataarea> - </part> - </software> - - <software name="lionkingdk" cloneof="lionking" supported="no"> - <description>Disney Løvernes Konge - Simbas store eventyr (Den)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092113(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-E" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92113.u1" size="8388608" crc="924efa89" sha1="fd111f99ef101d318a66a728927d379559dc0106" offset="0" /> - </dataarea> - </part> - </software> - - <software name="lionkingsw" cloneof="lionking" supported="no"> - <description>Disney Lejonkungen - Simbas stora äventyr (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092114(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-E" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92114.u1" size="8388608" crc="e1123089" sha1="058c60342c49844b4855d11ce1219879bfd2b6be" offset="0" /> - </dataarea> - </part> - </software> - - <software name="manny" supported="no"> - <description>Meister Manny's Werkzeugkiste (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090024(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="90024 OK.u1" size="8388608" crc="8358af57" sha1="f7886adb508413584df1abfc8bde68c830b3e487" offset="0" /> - </dataarea> - </part> - </software> - - <software name="melodil"> - <description>Nickelodeon Les Mélodilous - Les explorateurs vikings (Fra)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092585(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092585.u1" size="8388608" crc="99d3d704" sha1="5ba4489849a4e49a22a5083750b4e41a565a4cd6" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mickymagg" cloneof="mickymag" supported="no"> - <description>Disneys Micky - Mickys magisches Abenteuer (Ger)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092084(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92084.u1" size="8388608" crc="e50692f3" sha1="5c5a338e0186fdd643441455c778780ef5936042" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mickymagsw" cloneof="mickymag" supported="no"> - <description>Disneys Musse Pigg - Musses magiska äventyr (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092094(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92094.u1" size="8388608" crc="9ec8d52f" sha1="0f6f6cc4a34aacfa4ad97a73f4c5ad04e7bcec40" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mickeywh" supported="no"> - <description>Micky Maus Wunderhaus (Ger, Rev. 3?)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092944(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92944-3.u1" size="8388608" crc="11695793" sha1="ea58234636d544dbf6d3f65508fcf5263355636f" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mickeychsw" cloneof="mickeywh" supported="no"> - <description>Mickey Mouse Clubhouse (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092954(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-7" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92954.u1" size="8388608" crc="6d8a99d2" sha1="f929e5c3a2aff21dcf38bbbb6441a95eed744256" offset="0" /> - </dataarea> - </part> - </software> - - <software name="monstaln" supported="no"> - <description>DreamWorks Monsters vs Aliens (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090164(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="90164 OK.u1" size="8388608" crc="bf531c68" sha1="00c3a04282f3d1eb517fc6eb8c4af413bcb9587b" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mypuppy" supported="no"> - <description>Mein erster Hund (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090144(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="90144 OK.u1" size="8388608" crc="501a4c33" sha1="ebd3e8acd9e1e53409544b847cf508d75a8a0012" offset="0" /> - </dataarea> - </part> - </software> - - <software name="mypuppysw" cloneof="mypuppy" supported="no"> - <description>Min hundvalp (Swe)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090154(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-6" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="A90154.u1" size="8388608" crc="b1cf55cf" sha1="654b104e2ad8414a29db70bb9e07873b8eca8645" offset="0" /> - </dataarea> - </part> - </software> - - <software name="noddy" supported="no"> - <description>Noddy - Detektiv für einen Tag (Ger, Rev. 3?)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092544-104(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92544-3.u1" size="8388608" crc="2402b5b4" sha1="98dd09522b3d897dd8db070e08e66fcaebb192a2" offset="0" /> - </dataarea> - </part> - </software> - - <software name="oben" supported="no"> - <description>Disney/Pixar Oben (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090004-004(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="90004 ok.u1" size="8388608" crc="e1b9c194" sha1="a5547757e566a854c5dc1173565c7de47e4877f2" offset="0" /> - </dataarea> - </part> - </software> - - <software name="partyprk" supported="no"> - <description>Cranium Partyland Park - A Carnival of Play-and-Learn Fun (USA)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092920(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92920(2).u1" size="8388608" crc="bb8271ad" sha1="e59a8da24c08d596e1ef60b6cceb769bdb689ece" offset="0" /> - </dataarea> - </part> - </software> - - <software name="ratat" supported="no"> - <description>Disney/Pixar Ratatouille - Remys neue Rezepte (Ger)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092884(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92884.u1" size="8388608" crc="d8e36793" sha1="e8d7078726b077d1bf0a13b715de4a03fd93189c" offset="0" /> - </dataarea> - </part> - </software> - - <software name="scoobydo" supported="no"> - <description>Scooby-Doo! - Funland Frenzy (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092160(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92160.u1" size="8388608" crc="161ef602" sha1="d4020599c83a64b9f1f972b0b8ebc4c3fcc85970" offset="0" /> - </dataarea> - </part> - </software> - - <software name="scoobydof" cloneof="scoobydo" supported="no"> - <description>Scooby-Doo - Panique à Funland (Fra)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092165(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92165.u1" size="8388608" crc="ba35c0ac" sha1="9c1525f0da65deeadeef5aa6e43477775804da88" offset="0" /> - </dataarea> - </part> - </software> - - <software name="scoobydog" cloneof="scoobydo" supported="no"> - <description>Scooby-Doo! - Im Lernpark (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092164(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-E" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92164.u1" size="8388608" crc="97576369" sha1="81d84286a09068d54a4d1051040187a1b89c9d42" offset="0" /> - </dataarea> - </part> - </software> - - <software name="scoobydodk" cloneof="scoobydo" supported="no"> - <description>Scooby-Doo! - Sjov i forlystelsesparken (Den)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092173(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092173.u1" size="8388608" crc="d24dd55a" sha1="85850a6ec0215442f99d1554ee6af62773c93426" offset="0" /> - </dataarea> - </part> - </software> - - <software name="scoobydosw" cloneof="scoobydo" supported="no"> - <description>Scooby-Doo! - Tivoli-tokerier (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092174(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092174.u1" size="8388608" crc="ecec53de" sha1="ad021dae6a8633b66172e3b0ef357b2dd52b021e" offset="0" /> - </dataarea> - </part> - </software> - - <software name="erniebrt" supported="no"> - <description>Ernies & Berts Fantastisches Abenteuer (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092464(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92464.u1" size="8388608" crc="064c620c" sha1="d44e8a5507f18e544de707cae4b9a7d309c56fdf" offset="0" /> - </dataarea> - </part> - </software> - - <software name="shrek3" supported="no"> - <description>DreamWorks Shrek the Third - Arthur's School Day Adventure (USA)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092860(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92860.u1" size="8388608" crc="eb84fc96" sha1="20ac2101fd0679e888f31ee38b1ba1358b0932a8" offset="0" /> - </dataarea> - </part> - </software> - - <software name="shrek" supported="no"> - <description>DreamWorks Shrek - Die Geschichte des Drachen (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092604(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092604.u1" size="8388608" crc="0abbb98b" sha1="7b23e7a5a1f1b5f3a39427b563e06340268db272" offset="0" /> - </dataarea> - </part> - </software> - - <software name="shrekf" cloneof="shrek" supported="no"> - <description>DreamWorks Shrek - Le rhume de Dragonne (Fra)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092605(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092605.u1" size="8388608" crc="31334442" sha1="09022c94ac69e362979148bec9380f36fb6b88be" offset="0" /> - </dataarea> - </part> - </software> - - <software name="spidermn" supported="no"> - <description>Spider-Man & ses amis - Missions secrètes (Fra)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092145(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92145.u1" size="8388608" crc="906b0ab6" sha1="da5435366a439afd70ff210c0e655839f66fbef3" offset="0" /> - </dataarea> - </part> - </software> - - <software name="spiderm2" supported="no"> - <description>Spider-Man & Freunde - Wettkampf im Space-Labor (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092524(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92524.u1" size="8388608" crc="eb9e2303" sha1="07ee3fba4e850487c365fd883ac1fb53a25d0028" offset="0" /> - </dataarea> - </part> - </software> - - <software name="spongeb" supported="no"> - <description>Nickelodeon Spongebob Squarepants - A Day in the Life of a Sponge (USA)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092440(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92440.u1" size="8388608" crc="92afd10b" sha1="22ac256853201a5feaf86dc709ff05ad748d217c" offset="0" /> - </dataarea> - </part> - </software> - - <software name="spongebg" cloneof="spongeb" supported="no"> - <description>Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092444(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92444.u1" size="8388608" crc="49e1dc61" sha1="e55822fa9b2ae0cfba63b7a897aadbee23af5f4d" offset="0" /> - </dataarea> - </part> - </software> - - <software name="spongebg1" cloneof="spongeb" supported="no"> - <description>Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092444(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92444.u1" size="8388608" crc="1bc67f49" sha1="817aa0f13d3934bf3993baaac0185ef49ac825ba" offset="0" /> - </dataarea> - </part> - </software> - - <software name="superman" supported="no"> - <description>Superman - Der Superheld (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092644(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92644.u1" size="8388608" crc="4b28aca5" sha1="5ce55940a2357de0df0dcf5d77a69cd9e03a9146" offset="0" /> - </dataarea> - </part> - </software> - - <software name="supermanf" cloneof="superman" supported="no"> - <description>Superman - À la rescousse ! (Fra)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092645(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092645.u1" size="8388608" crc="0e42dee7" sha1="2aa140b000e702d253ca72e5e54c9087608fe199" offset="0" /> - </dataarea> - </part> - </software> - - <software name="thomas" supported="no"> - <description>Thomas & seine Freunde - Freunde Halten Zusammen (Ger, Rev. 1)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092344-104(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="092344-1.u1" size="8388608" crc="9e9fc42c" sha1="27f7e98c180ee3b51cc2ce4fc19e3f3f5777887a" offset="0" /> - </dataarea> - </part> - </software> - - <software name="thomas1" cloneof="thomas" supported="no"> - <description>Thomas & seine Freunde - Freunde Halten Zusammen (Ger)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092344(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92344-1(3).u1" size="8388608" crc="f0a73961" sha1="2e043e131073ad27ca7cebc28c237ecd8c1271e8" offset="0" /> - </dataarea> - </part> - </software> - - <software name="thomassw" cloneof="thomas" supported="no"> - <description>Thomas & Friends - Tågen hjälps åt (Swe)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092354(SE)" /> <!-- 494096(SE) on cart --> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92354.u1" size="8388608" crc="d3dfc103" sha1="fbb4a460504797253a47945ae3bea4e7eda4a388" offset="0" /> - </dataarea> - </part> - </software> - - <software name="tingelng" supported="no"> - <description>Tingeling (Swe)</description> - <year>2010?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-090274(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-7" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="90274.u1" size="8388608" crc="5ae6dced" sha1="3298bf1fb43173e1c4c2200ddc5a1a6af57d4323" offset="0" /> - </dataarea> - </part> - </software> - - <software name="toystor2" supported="no"> - <description>Disney/Pixar Toy Story 2 - Operation: Rescue Woody! (USA)</description> - <year>2005</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092220(US)" /> - <part name="cart" interface="vsmile_cart"> - <dataarea name="rom" size="8388608"> - <rom name="52-92220(us).bin" size="8388608" crc="6335b0e1" sha1="ddb4bcc5f9b155041bf4ffce236f57cfae3fdec2" offset="0" /> - </dataarea> - </part> - </software> - - <software name="toystor2g" cloneof="toystor2" supported="no"> - <description>Disney/Pixar Toy Story 2 - Woodys Spannende Rettung (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092224(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92224-105.u1" size="8388608" crc="c6fbdb94" sha1="887f1d2acadc6902d386488577654a6786d802a9" offset="0" /> - </dataarea> - </part> - </software> - - <software name="toystor2sw" cloneof="toystor2" supported="no"> - <description>Disney/Pixar Toy Story 2 - Operation: Rädda Woody! (Swe)</description> - <year>2005?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092234(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92234.u1" size="8388608" crc="a6aa6d6b" sha1="ca576d994441ffaac96e015f5a9309e0326280e1" offset="0" /> - </dataarea> - </part> - </software> - - <software name="walle" supported="no"> - <description>Disney/Pixar Wall-E (Ger)</description> - <year>2008?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092844(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92844-3.u1" size="8388608" crc="f4be4391" sha1="5e43c9dd4759218578d1a8364540db8bc6bc6416" offset="0" /> - </dataarea> - </part> - </software> - - <software name="wallesw" cloneof="walle" supported="no"> - <description>Disney/Pixar Wall-E (Swe)</description> - <year>2008?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092854(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708106" /> - <feature name="pcb_model" value="708106-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92854.u1" size="8388608" crc="860194d2" sha1="3d5f40a0f523c9b090a826fef45a6bc63a58d519" offset="0" /> - </dataarea> - </part> - </software> - - <software name="pooh" supported="no"> - <description>Disneys Winnie Puuh - Die Honigjagd (Ger)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092064(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92064.u1" size="8388608" crc="38a17e7e" sha1="434849ba8867d0bfb16b0fb5abfec86286390c07" offset="0" /> - </dataarea> - </part> - </software> - - <software name="pooh1" cloneof="pooh" supported="no"> - <description>My Friends Tigger & Pooh - Die Honigjagd (Ger)</description> - <year>2008?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092064-104(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-3" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92064-204(2).u1" size="8388608" crc="081e414d" sha1="e612aee1f62ca260bc0b011a512fd8c207eeb833" offset="0" /> - </dataarea> - </part> - </software> - - <software name="poohf" cloneof="pooh" supported="no"> - <description>Disney Winnie l'Ourson - La Chasse au miel de Winnie (Fra)</description> - <year>2004?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092065(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708894" /> - <feature name="pcb_model" value="708894-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92065.u1" size="8388608" crc="7b0bd06c" sha1="0767e07e767a64c0fe56dac7b3cb478bab34b864" offset="0" /> - </dataarea> - </part> - </software> - - <software name="poohdk" cloneof="pooh" supported="no"> - <description>Disney Peter Plys - Honningjagten (Den)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092073(DK)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92073.u1" size="8388608" crc="f2cf8e50" sha1="9ef7e8a3f03c252970348f2eabc53010c1ee588b" offset="0" /> - </dataarea> - </part> - </software> - - <software name="poohsw" cloneof="pooh" supported="no"> - <description>Disney Nalle Puh - Honungsjakten (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092074(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92074.u1" size="8388608" crc="70bde4da" sha1="788a8b471ef97106fbcaeb053cd6aa19c6ac299a" offset="0" /> - </dataarea> - </part> - </software> - - <software name="lerntanz" supported="no"> - <description>V.Smile - Lern- und Tanzmatte (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-091324(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="707180" /> - <feature name="pcb_model" value="707180-2" /> - <feature name="cart_type" value="yellow" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="91324.u1" size="8388608" crc="db81c1e1" sha1="fbe3f9ee65b7a692c568dde8986df7a2bba8b133" offset="0" /> - </dataarea> - </part> - </software> - - <software name="techart" supported="no"> - <description>V.Smile Zeichenatelier (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-067004(GER)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="67000C" /> - <feature name="pcb_model" value="67000C-5" /> - <feature name="cart_type" value="yellow" /> - <feature name="u2" value="U2" /> <!-- SRAM --> - <feature name="u3" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="4194304"> - <rom name="GER-509.u3" size="4194304" crc="ae5f4fe2" sha1="1c5428da7464182e6ee0585d1ebc211f91667238" offset="0" /> - </dataarea> - <dataarea name="vram" size="131072"> - </dataarea> - </part> - </software> - - <software name="techartsw" cloneof="techart" supported="no"> - <description>V.Smile Tecknarstudio (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-067021(SE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="67000C" /> - <feature name="pcb_model" value="67000C-2" /> - <feature name="cart_type" value="yellow" /> - <feature name="u2" value="U2" /> <!-- SRAM --> - <feature name="u3" value="U3" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="4194304"> - <rom name="52-67021.u3" size="4194304" crc="27449e15" sha1="5c13865dffb04c98c69f3422c965d76a9aa36c33" offset="0" /> - </dataarea> - <dataarea name="vram" size="131072"> - </dataarea> - </part> - </software> - - <software name="zayzmac" cloneof="zayzaea" supported="no"> - <description>Zayzoo - My Alien Classmate (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092360(US)" /> - <part name="cart" interface="vsmile_cart"> - <dataarea name="rom" size="8388608"> - <rom name="52-92360(us).bin" size="8388608" crc="76ff9718" sha1="be783c1abe96f785564f5b5b6b4ea089b799c1d4" offset="0" /> - </dataarea> - </part> - </software> - - <software name="zayzaea" supported="no"> - <description>Zayzoo: An Earth Adventure (USA)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092360-101(US)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92360-201(4).u1" size="8388608" crc="0b1f8225" sha1="7c2e39428faf40cff2007ae1a3e2f2ae565e5db4" offset="0" /> - </dataarea> - </part> - </software> - - <software name="zayzmacg" cloneof="zayzaea" supported="no"> - <description>Zayzoos Lernall (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092364(GE)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92364.u1" size="8388608" crc="93e9dcf3" sha1="5889e46806d1fa70ac92ec6b2158a339126a26d2" offset="0" /> - </dataarea> - </part> - </software> - - <software name="zezou" cloneof="zayzaea" supported="no"> - <description>Zézou - Notre Ami Venu d'Ailleurs (Fra)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-092365(FR)" /> - <part name="cart" interface="vsmile_cart"> - <feature name="pcb" value="706714" /> - <feature name="pcb_model" value="706714-1" /> - <feature name="cart_type" value="lilac" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="92365.u1" size="8388608" crc="e965565e" sha1="9cabefa6a2dc0cd2df9d07bb0e11ae0b2dd4d5f8" offset="0" /> - </dataarea> - </part> - </software> + <software name="aladdin" supported="no"> + <description>Disneys Aladdin - Aladdins Welt der Wunder (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092204(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92204.u1" size="8388608" crc="dfa7b720" sha1="c4f7bcbe95c7eb5dfd0dd97f5d496db6ac158ea6" offset="0" /> + </dataarea> + </part> + </software> + + <software name="redhood" supported="no"> + <description>Entdecke die Welt von Rotkäppchen (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092024(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92024.u1" size="8388608" crc="cdeb71f9" sha1="21d2ecf5bc22fa94a1015de6f670415b6d42a3b1" offset="0" /> + </dataarea> + </part> + </software> + + <software name="alphaprk" supported="no"> + <description>Alphabet Park Adventure (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092000(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-A" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92000.u1" size="8388608" crc="69ef24ff" sha1="82b89bdc5e9050e4152866fc774d3996f9836d65" offset="0" /> + </dataarea> + </part> + </software> + + <software name="ariel" supported="no"> + <description>Disneys Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Rev. 3?)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092124(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92124(3).u1" size="8388608" crc="fc2d6d64" sha1="3747eb33304bb49a8f9ff912c0e3e07611e078dd" offset="0" /> + </dataarea> + </part> + </software> + + <software name="ariel1" cloneof="ariel" supported="no"> + <description>Disneys Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092124(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-A" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92124.u1" size="8388608" crc="ce21b7ba" sha1="e992b113f014614db34b81bb22357847cef79a16" offset="0" /> + </dataarea> + </part> + </software> + + <software name="arielf" cloneof="ariel" supported="no"> + <description>Disney La Petite Sirene - Ariel devient une princesse (Fra)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092125(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92125.u1" size="8388608" crc="341b2f6c" sha1="a9f6a30037dc814b6cf8e8485ee9778038a20c23" offset="0" /> + </dataarea> + </part> + </software> + + <software name="arieldk" cloneof="ariel" supported="no"> + <description>Disney Den Lille Havfrue - Ariels majestætiske rejse! (Den)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092133(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92133.u1" size="8388608" crc="182b5973" sha1="7f356a9890c7ea20c81db94f81037355b8cfb2c9" offset="0" /> + </dataarea> + </part> + </software> + + <software name="arielsw" cloneof="ariel" supported="no"> + <description>Disneys Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092134(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-E" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92134.u1" size="8388608" crc="e567db85" sha1="ca52eaca6cf1b361fd4b1ae2b2380095c612668d" offset="0" /> + </dataarea> + </part> + </software> + + <software name="barney" supported="no"> + <description>Barney - Erlebnis-Reise (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092384(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="7061238A" /> + <feature name="pcb_model" value="7061238A-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92384.u1" size="8388608" crc="a73855fa" sha1="dcc61ecf05bb41779a78196145136c1e9cbfa415" offset="0" /> + </dataarea> + </part> + </software> + + <!-- loads if mapped as Batman TV --> + <software name="bobbday" supported="no"> + <description>Bob the Builder - Bob's Busy Day (USA)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092300(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="7061238A" /> + <feature name="pcb_model" value="7061238A-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92300.u1" size="8388608" crc="6aea957b" sha1="947008c882733a8284a000c9c4d379e2c213526e" offset="0" /> + </dataarea> + </part> + </software> + + <software name="bobbdayg" cloneof="bobbday" supported="no"> + <description>Bob der Baumeister - Bobs spannender Arbeitstag (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092304(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92304.u1" size="8388608" crc="70c83b25" sha1="bebe311cfbeb25e01892b7636f4427ae0e0e4c9e" offset="0" /> + </dataarea> + </part> + </software> + + <software name="bobbdaydk" cloneof="bobbday" supported="no"> + <description>Byggemand Bob - Bobs travle dag (Den)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092313(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92313.u1" size="8388608" crc="37498231" sha1="2966ba75fc4430ee5d9dc7003d7f7e54e5546382" offset="0" /> + </dataarea> + </part> + </software> + + <software name="bobbdaysw" cloneof="bobbday" supported="no"> + <description>Byggare Bob - Bobs stressiga dag (Swe)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092314(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92314-100.u1" size="8388608" crc="ac343df7" sha1="77dafa48ca0e015728c5ead844dd729e87eb6182" offset="0" /> + </dataarea> + </part> + </software> + + <!-- loads if mapped as Batman TV --> + <software name="cars" supported="no"> + <description>Disney/Pixar Cars - Rev It Up in Radiator Springs (USA)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092660(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092660.u1" size="8388608" crc="ff65d967" sha1="27b229b6e308dfc0cea7e594c7b006f27961c05f" offset="0" /> + </dataarea> + </part> + </software> + + <software name="carsg" cloneof="cars" supported="no"> + <description>Disney/Pixar Cars - Vollgas in Radiator Springs (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092664(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92664(2).u1" size="8388608" crc="6f4c150d" sha1="f6fc136ca18025511a9b12c577860116fdc66c8c" offset="0" /> + </dataarea> + </part> + </software> + + <software name="carsf" cloneof="cars" supported="no"> + <description>Disney/Pixar Cars - Quatre Roues (Fra)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092665(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092665.u1" size="8388608" crc="c1f63c2e" sha1="3a6726a0a5dd5543d632dfbf57144da780994ba5" offset="0" /> + </dataarea> + </part> + </software> + + <software name="carsdk" cloneof="cars" supported="no"> + <description>Disney/Pixar Biler - Ræs i Kølerkildekøbing (Den)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092673(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92673.u1" size="8388608" crc="380d5655" sha1="fa70dcfd2793b5ba7bede3b365e245c8fde935d7" offset="0" /> + </dataarea> + </part> + </software> + + <software name="carssw" cloneof="cars" supported="no"> + <description>Disney/Pixar Bilar - Kör ikapp i Kylarköping (Swe)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092674(SE)" /> + <info name="alt_title" value="Biler - Kör ikapp i Kylarköping (Misprinted cart)"/> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-7" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="C92674-1.u1" size="8388608" crc="69b535f2" sha1="7785e4e92a0edbb90fd0e0a4f2de3afafae5e957" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderla" supported="no"> + <description>Disney Princess Cinderella - Cinderella's Magic Wishes (USA)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092240(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92240.u1" size="8388608" crc="2723728c" sha1="32fd6a5b9718ccc7e10e64046d7ac320cfa47362" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderlaa" cloneof="cinderla" supported="no"> + <description>Disney Princess Cinderella - Cinderella's Magic Wishes (USA, Alt)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092240(US)" /> + <part name="cart" interface="vsmile_cart"> + <dataarea name="rom" size="8388608"> + <rom name="52-92240(us).bin" size="8388608" crc="0a89723c" sha1="15082b565f6f71a0f993c2734cb807f37611eb17" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderlaf" cloneof="cinderla" supported="no"> + <description>Disney Princesses Cendrillon - Le rêve enchanté de Cendrillon (Fra)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092245(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92245.u1" size="8388608" crc="7c63221f" sha1="227e1d3b63714e6bf8d0fc0897bab9ffc1721ff5" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderladk" cloneof="cinderla" supported="no"> + <description>Disney Princess Cinderella - Askepots magiske ønsker (Den)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092253(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092253.u1" size="8388608" crc="81edbee0" sha1="cf4bca5a1f28049a40060eead7f10c940574107f" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderlag" cloneof="cinderla" supported="no"> + <description>Disney Princess Cinderella - Lernen im Märchenland (Ger, Rev. 1)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092244-104(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92244-1.u1" size="8388608" crc="7dbe47a2" sha1="d74d24d1d87a456f11a98f822b8c59d155734cea" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderlag1" cloneof="cinderla" supported="no"> + <description>Disney Princess Cinderella - Lernen im Märchenland (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092244(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92244.u1" size="8388608" crc="b08a50f3" sha1="a8e6b8b427115d01d35c27b41385ac5d430484c3" offset="0" /> + </dataarea> + </part> + </software> + + <software name="cinderlasw" cloneof="cinderla" supported="no"> + <description>Disney Princess Cinderella - Askungens magiska önskningar (Swe)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092254(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92254.u1" size="8388608" crc="946472af" sha1="9009a81689be949f9a5fbf91a6a1d2398f7e8d90" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mickymag" supported="no"> + <description>Disney's Mickey Mouse - Mickey's Magical Adventure (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092080(US)" /> + <part name="cart" interface="vsmile_cart"> + <dataarea name="rom" size="8388608"> + <rom name="52-092080(us).bin" size="8388608" crc="997a8a07" sha1="cd70c7249e25a37aeb3a3b85f56bd2b39dbf3d73" offset="0" /> + </dataarea> + </part> + </software> + + <!-- loads if mapped as Batman TV --> + <software name="dora" supported="no"> + <description>Nick Jr Dora the Explorer - Dora's Fix-it Adventure (USA)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092280(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92280.u1" size="8388608" crc="225c3133" sha1="97610c09834251d1960dbc67da18dad91e832dba" offset="0" /> + </dataarea> + </part> + </software> + + <software name="doraf" cloneof="dora" supported="no"> + <description>Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (Fra)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092285(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="7061238A" /> + <feature name="pcb_model" value="7061238A-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92285.u1" size="8388608" crc="5f47e1d5" sha1="046b5ce7669755e8d8a9be9be2684828b1f1dd9d" offset="0" /> + </dataarea> + </part> + </software> + + <software name="dorag" cloneof="dora" supported="no"> + <description>Nick Jr Dora - Doras Reparatur-Abenteuer (Ger, Rev. 1)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092284-104(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092284-1.u1" size="8388608" crc="070a72dc" sha1="3ca4820f2b54040d1d111b5ac41003c6e53b9164" offset="0" /> + </dataarea> + </part> + </software> + + <software name="elmo" supported="no"> + <description>Elmos großes Abenteuer (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092264(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92264.u1" size="8388608" crc="906b6496" sha1="8932008fef144d2ad3d056fd24f64264825af8ce" offset="0" /> + </dataarea> + </part> + </software> + + <software name="footschl" supported="no"> + <description>V.Smile Fußball Schule (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092824(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92824.u1" size="8388608" crc="620b9ebb" sha1="e22ff87a03c6cac3186613a9e804dd6d4e3a3dc4" offset="0" /> + </dataarea> + </part> + </software> + + <software name="findnemo" supported="no"> + <description>Disney/Pixar Finding Nemo - Nemo's Ocean Discoveries (USA)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092420(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92420.u1" size="8388608" crc="e40e46dc" sha1="ac78178cff76ed264589113b73211b1f4cfe6dbf" offset="0" /> + </dataarea> + </part> + </software> + + <software name="fred" supported="no"> + <description>Freds Zahlen Rallye (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092044(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-A" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92044.u1" size="8388608" crc="24988ef6" sha1="7f5d647dc8edf780ea86a43e08e8d2169b19a0ae" offset="0" /> + </dataarea> + </part> + </software> + + <software name="appilote" cloneof="fred" supported="no"> + <description>Apprenti' pilote (Fra)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092045(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-A" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92045.u1" size="8388608" crc="c4819e95" sha1="b625a7fb1d078349aee1c4cc18ee6f3917aaa816" offset="0" /> + </dataarea> + </part> + </software> + + <software name="kleinstn" supported="no"> + <description>Kleine Einsteins (Ger, Rev. 3?)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092984(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-6" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92984-3.u1" size="8388608" crc="8f671aa7" sha1="a6a0a5cd5c5bf14c1b546354bfe9209820955975" offset="0" /> + </dataarea> + </part> + </software> + + <software name="lionking" supported="no"> + <description>Disney's The Lion King - Simba's Big Adventure (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092100(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92100.u1" size="8388608" crc="08af3249" sha1="193d824625040ae9e30d8f5b7b74d7348bf3b7cd" offset="0" /> + </dataarea> + </part> + </software> + + <software name="lionkingdk" cloneof="lionking" supported="no"> + <description>Disney Løvernes Konge - Simbas store eventyr (Den)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092113(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-E" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92113.u1" size="8388608" crc="924efa89" sha1="fd111f99ef101d318a66a728927d379559dc0106" offset="0" /> + </dataarea> + </part> + </software> + + <software name="lionkingsw" cloneof="lionking" supported="no"> + <description>Disney Lejonkungen - Simbas stora äventyr (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092114(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-E" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92114.u1" size="8388608" crc="e1123089" sha1="058c60342c49844b4855d11ce1219879bfd2b6be" offset="0" /> + </dataarea> + </part> + </software> + + <software name="manny" supported="no"> + <description>Meister Manny's Werkzeugkiste (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090024(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="90024 OK.u1" size="8388608" crc="8358af57" sha1="f7886adb508413584df1abfc8bde68c830b3e487" offset="0" /> + </dataarea> + </part> + </software> + + <software name="melodil"> + <description>Nickelodeon Les Mélodilous - Les explorateurs vikings (Fra)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092585(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092585.u1" size="8388608" crc="99d3d704" sha1="5ba4489849a4e49a22a5083750b4e41a565a4cd6" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mickymagg" cloneof="mickymag" supported="no"> + <description>Disneys Micky - Mickys magisches Abenteuer (Ger)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092084(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92084.u1" size="8388608" crc="e50692f3" sha1="5c5a338e0186fdd643441455c778780ef5936042" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mickymagsw" cloneof="mickymag" supported="no"> + <description>Disneys Musse Pigg - Musses magiska äventyr (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092094(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92094.u1" size="8388608" crc="9ec8d52f" sha1="0f6f6cc4a34aacfa4ad97a73f4c5ad04e7bcec40" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mickeywh" supported="no"> + <description>Micky Maus Wunderhaus (Ger, Rev. 3?)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092944(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92944-3.u1" size="8388608" crc="11695793" sha1="ea58234636d544dbf6d3f65508fcf5263355636f" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mickeychsw" cloneof="mickeywh" supported="no"> + <description>Mickey Mouse Clubhouse (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092954(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-7" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92954.u1" size="8388608" crc="6d8a99d2" sha1="f929e5c3a2aff21dcf38bbbb6441a95eed744256" offset="0" /> + </dataarea> + </part> + </software> + + <software name="monstaln" supported="no"> + <description>DreamWorks Monsters vs Aliens (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090164(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="90164 OK.u1" size="8388608" crc="bf531c68" sha1="00c3a04282f3d1eb517fc6eb8c4af413bcb9587b" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mypuppy" supported="no"> + <description>Mein erster Hund (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090144(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="90144 OK.u1" size="8388608" crc="501a4c33" sha1="ebd3e8acd9e1e53409544b847cf508d75a8a0012" offset="0" /> + </dataarea> + </part> + </software> + + <software name="mypuppysw" cloneof="mypuppy" supported="no"> + <description>Min hundvalp (Swe)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090154(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-6" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="A90154.u1" size="8388608" crc="b1cf55cf" sha1="654b104e2ad8414a29db70bb9e07873b8eca8645" offset="0" /> + </dataarea> + </part> + </software> + + <software name="noddy" supported="no"> + <description>Noddy - Detektiv für einen Tag (Ger, Rev. 3?)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092544-104(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92544-3.u1" size="8388608" crc="2402b5b4" sha1="98dd09522b3d897dd8db070e08e66fcaebb192a2" offset="0" /> + </dataarea> + </part> + </software> + + <software name="oben" supported="no"> + <description>Disney/Pixar Oben (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090004-004(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="90004 ok.u1" size="8388608" crc="e1b9c194" sha1="a5547757e566a854c5dc1173565c7de47e4877f2" offset="0" /> + </dataarea> + </part> + </software> + + <software name="partyprk" supported="no"> + <description>Cranium Partyland Park - A Carnival of Play-and-Learn Fun (USA)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092920(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92920(2).u1" size="8388608" crc="bb8271ad" sha1="e59a8da24c08d596e1ef60b6cceb769bdb689ece" offset="0" /> + </dataarea> + </part> + </software> + + <software name="ratat" supported="no"> + <description>Disney/Pixar Ratatouille - Remys neue Rezepte (Ger)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092884(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92884.u1" size="8388608" crc="d8e36793" sha1="e8d7078726b077d1bf0a13b715de4a03fd93189c" offset="0" /> + </dataarea> + </part> + </software> + + <software name="scoobydo" supported="no"> + <description>Scooby-Doo! - Funland Frenzy (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092160(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92160.u1" size="8388608" crc="161ef602" sha1="d4020599c83a64b9f1f972b0b8ebc4c3fcc85970" offset="0" /> + </dataarea> + </part> + </software> + + <software name="scoobydof" cloneof="scoobydo" supported="no"> + <description>Scooby-Doo - Panique à Funland (Fra)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092165(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92165.u1" size="8388608" crc="ba35c0ac" sha1="9c1525f0da65deeadeef5aa6e43477775804da88" offset="0" /> + </dataarea> + </part> + </software> + + <software name="scoobydog" cloneof="scoobydo" supported="no"> + <description>Scooby-Doo! - Im Lernpark (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092164(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-E" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92164.u1" size="8388608" crc="97576369" sha1="81d84286a09068d54a4d1051040187a1b89c9d42" offset="0" /> + </dataarea> + </part> + </software> + + <software name="scoobydodk" cloneof="scoobydo" supported="no"> + <description>Scooby-Doo! - Sjov i forlystelsesparken (Den)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092173(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092173.u1" size="8388608" crc="d24dd55a" sha1="85850a6ec0215442f99d1554ee6af62773c93426" offset="0" /> + </dataarea> + </part> + </software> + + <software name="scoobydosw" cloneof="scoobydo" supported="no"> + <description>Scooby-Doo! - Tivoli-tokerier (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092174(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092174.u1" size="8388608" crc="ecec53de" sha1="ad021dae6a8633b66172e3b0ef357b2dd52b021e" offset="0" /> + </dataarea> + </part> + </software> + + <software name="erniebrt" supported="no"> + <description>Ernies & Berts Fantastisches Abenteuer (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092464(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92464.u1" size="8388608" crc="064c620c" sha1="d44e8a5507f18e544de707cae4b9a7d309c56fdf" offset="0" /> + </dataarea> + </part> + </software> + + <software name="shrek3" supported="no"> + <description>DreamWorks Shrek the Third - Arthur's School Day Adventure (USA)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092860(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92860.u1" size="8388608" crc="eb84fc96" sha1="20ac2101fd0679e888f31ee38b1ba1358b0932a8" offset="0" /> + </dataarea> + </part> + </software> + + <software name="shrek" supported="no"> + <description>DreamWorks Shrek - Die Geschichte des Drachen (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092604(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092604.u1" size="8388608" crc="0abbb98b" sha1="7b23e7a5a1f1b5f3a39427b563e06340268db272" offset="0" /> + </dataarea> + </part> + </software> + + <software name="shrekf" cloneof="shrek" supported="no"> + <description>DreamWorks Shrek - Le rhume de Dragonne (Fra)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092605(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092605.u1" size="8388608" crc="31334442" sha1="09022c94ac69e362979148bec9380f36fb6b88be" offset="0" /> + </dataarea> + </part> + </software> + + <software name="spidermn" supported="no"> + <description>Spider-Man & ses amis - Missions secrètes (Fra)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092145(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92145.u1" size="8388608" crc="906b0ab6" sha1="da5435366a439afd70ff210c0e655839f66fbef3" offset="0" /> + </dataarea> + </part> + </software> + + <software name="spiderm2" supported="no"> + <description>Spider-Man & Freunde - Wettkampf im Space-Labor (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092524(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92524.u1" size="8388608" crc="eb9e2303" sha1="07ee3fba4e850487c365fd883ac1fb53a25d0028" offset="0" /> + </dataarea> + </part> + </software> + + <software name="spongeb" supported="no"> + <description>Nickelodeon Spongebob Squarepants - A Day in the Life of a Sponge (USA)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092440(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92440.u1" size="8388608" crc="92afd10b" sha1="22ac256853201a5feaf86dc709ff05ad748d217c" offset="0" /> + </dataarea> + </part> + </software> + + <software name="spongebg" cloneof="spongeb" supported="no"> + <description>Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092444(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92444.u1" size="8388608" crc="49e1dc61" sha1="e55822fa9b2ae0cfba63b7a897aadbee23af5f4d" offset="0" /> + </dataarea> + </part> + </software> + + <software name="spongebg1" cloneof="spongeb" supported="no"> + <description>Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092444(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92444.u1" size="8388608" crc="1bc67f49" sha1="817aa0f13d3934bf3993baaac0185ef49ac825ba" offset="0" /> + </dataarea> + </part> + </software> + + <software name="superman" supported="no"> + <description>Superman - Der Superheld (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092644(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92644.u1" size="8388608" crc="4b28aca5" sha1="5ce55940a2357de0df0dcf5d77a69cd9e03a9146" offset="0" /> + </dataarea> + </part> + </software> + + <software name="supermanf" cloneof="superman" supported="no"> + <description>Superman - À la rescousse ! (Fra)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092645(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092645.u1" size="8388608" crc="0e42dee7" sha1="2aa140b000e702d253ca72e5e54c9087608fe199" offset="0" /> + </dataarea> + </part> + </software> + + <software name="thomas" supported="no"> + <description>Thomas & seine Freunde - Freunde Halten Zusammen (Ger, Rev. 1)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092344-104(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="092344-1.u1" size="8388608" crc="9e9fc42c" sha1="27f7e98c180ee3b51cc2ce4fc19e3f3f5777887a" offset="0" /> + </dataarea> + </part> + </software> + + <software name="thomas1" cloneof="thomas" supported="no"> + <description>Thomas & seine Freunde - Freunde Halten Zusammen (Ger)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092344(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92344-1(3).u1" size="8388608" crc="f0a73961" sha1="2e043e131073ad27ca7cebc28c237ecd8c1271e8" offset="0" /> + </dataarea> + </part> + </software> + + <software name="thomassw" cloneof="thomas" supported="no"> + <description>Thomas & Friends - Tågen hjälps åt (Swe)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092354(SE)" /> <!-- 494096(SE) on cart --> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92354.u1" size="8388608" crc="d3dfc103" sha1="fbb4a460504797253a47945ae3bea4e7eda4a388" offset="0" /> + </dataarea> + </part> + </software> + + <software name="tingelng" supported="no"> + <description>Tingeling (Swe)</description> + <year>2010?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-090274(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-7" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="90274.u1" size="8388608" crc="5ae6dced" sha1="3298bf1fb43173e1c4c2200ddc5a1a6af57d4323" offset="0" /> + </dataarea> + </part> + </software> + + <software name="toystor2" supported="no"> + <description>Disney/Pixar Toy Story 2 - Operation: Rescue Woody! (USA)</description> + <year>2005</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092220(US)" /> + <part name="cart" interface="vsmile_cart"> + <dataarea name="rom" size="8388608"> + <rom name="52-92220(us).bin" size="8388608" crc="6335b0e1" sha1="ddb4bcc5f9b155041bf4ffce236f57cfae3fdec2" offset="0" /> + </dataarea> + </part> + </software> + + <software name="toystor2g" cloneof="toystor2" supported="no"> + <description>Disney/Pixar Toy Story 2 - Woodys Spannende Rettung (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092224(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92224-105.u1" size="8388608" crc="c6fbdb94" sha1="887f1d2acadc6902d386488577654a6786d802a9" offset="0" /> + </dataarea> + </part> + </software> + + <software name="toystor2sw" cloneof="toystor2" supported="no"> + <description>Disney/Pixar Toy Story 2 - Operation: Rädda Woody! (Swe)</description> + <year>2005?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092234(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92234.u1" size="8388608" crc="a6aa6d6b" sha1="ca576d994441ffaac96e015f5a9309e0326280e1" offset="0" /> + </dataarea> + </part> + </software> + + <software name="walle" supported="no"> + <description>Disney/Pixar Wall-E (Ger)</description> + <year>2008?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092844(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92844-3.u1" size="8388608" crc="f4be4391" sha1="5e43c9dd4759218578d1a8364540db8bc6bc6416" offset="0" /> + </dataarea> + </part> + </software> + + <software name="wallesw" cloneof="walle" supported="no"> + <description>Disney/Pixar Wall-E (Swe)</description> + <year>2008?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092854(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708106" /> + <feature name="pcb_model" value="708106-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92854.u1" size="8388608" crc="860194d2" sha1="3d5f40a0f523c9b090a826fef45a6bc63a58d519" offset="0" /> + </dataarea> + </part> + </software> + + <software name="pooh" supported="no"> + <description>Disneys Winnie Puuh - Die Honigjagd (Ger)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092064(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92064.u1" size="8388608" crc="38a17e7e" sha1="434849ba8867d0bfb16b0fb5abfec86286390c07" offset="0" /> + </dataarea> + </part> + </software> + + <software name="pooh1" cloneof="pooh" supported="no"> + <description>My Friends Tigger & Pooh - Die Honigjagd (Ger)</description> + <year>2008?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092064-104(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-3" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92064-204(2).u1" size="8388608" crc="081e414d" sha1="e612aee1f62ca260bc0b011a512fd8c207eeb833" offset="0" /> + </dataarea> + </part> + </software> + + <software name="poohf" cloneof="pooh" supported="no"> + <description>Disney Winnie l'Ourson - La Chasse au miel de Winnie (Fra)</description> + <year>2004?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092065(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708894" /> + <feature name="pcb_model" value="708894-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="U1" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92065.u1" size="8388608" crc="7b0bd06c" sha1="0767e07e767a64c0fe56dac7b3cb478bab34b864" offset="0" /> + </dataarea> + </part> + </software> + + <software name="poohdk" cloneof="pooh" supported="no"> + <description>Disney Peter Plys - Honningjagten (Den)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092073(DK)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92073.u1" size="8388608" crc="f2cf8e50" sha1="9ef7e8a3f03c252970348f2eabc53010c1ee588b" offset="0" /> + </dataarea> + </part> + </software> + + <software name="poohsw" cloneof="pooh" supported="no"> + <description>Disney Nalle Puh - Honungsjakten (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092074(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92074.u1" size="8388608" crc="70bde4da" sha1="788a8b471ef97106fbcaeb053cd6aa19c6ac299a" offset="0" /> + </dataarea> + </part> + </software> + + <software name="lerntanz" supported="no"> + <description>V.Smile - Lern- und Tanzmatte (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-091324(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="707180" /> + <feature name="pcb_model" value="707180-2" /> + <feature name="cart_type" value="yellow" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="91324.u1" size="8388608" crc="db81c1e1" sha1="fbe3f9ee65b7a692c568dde8986df7a2bba8b133" offset="0" /> + </dataarea> + </part> + </software> + + <software name="techart" supported="no"> + <description>V.Smile Zeichenatelier (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-067004(GER)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="67000C" /> + <feature name="pcb_model" value="67000C-5" /> + <feature name="cart_type" value="yellow" /> + <feature name="u2" value="U2" /> <!-- SRAM --> + <feature name="u3" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="4194304"> + <rom name="GER-509.u3" size="4194304" crc="ae5f4fe2" sha1="1c5428da7464182e6ee0585d1ebc211f91667238" offset="0" /> + </dataarea> + <dataarea name="vram" size="131072"> + </dataarea> + </part> + </software> + + <software name="techartsw" cloneof="techart" supported="no"> + <description>V.Smile Tecknarstudio (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-067021(SE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="67000C" /> + <feature name="pcb_model" value="67000C-2" /> + <feature name="cart_type" value="yellow" /> + <feature name="u2" value="U2" /> <!-- SRAM --> + <feature name="u3" value="U3" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="4194304"> + <rom name="52-67021.u3" size="4194304" crc="27449e15" sha1="5c13865dffb04c98c69f3422c965d76a9aa36c33" offset="0" /> + </dataarea> + <dataarea name="vram" size="131072"> + </dataarea> + </part> + </software> + + <software name="zayzmac" cloneof="zayzaea" supported="no"> + <description>Zayzoo - My Alien Classmate (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092360(US)" /> + <part name="cart" interface="vsmile_cart"> + <dataarea name="rom" size="8388608"> + <rom name="52-92360(us).bin" size="8388608" crc="76ff9718" sha1="be783c1abe96f785564f5b5b6b4ea089b799c1d4" offset="0" /> + </dataarea> + </part> + </software> + + <software name="zayzaea" supported="no"> + <description>Zayzoo: An Earth Adventure (USA)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092360-101(US)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92360-201(4).u1" size="8388608" crc="0b1f8225" sha1="7c2e39428faf40cff2007ae1a3e2f2ae565e5db4" offset="0" /> + </dataarea> + </part> + </software> + + <software name="zayzmacg" cloneof="zayzaea" supported="no"> + <description>Zayzoos Lernall (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092364(GE)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92364.u1" size="8388608" crc="93e9dcf3" sha1="5889e46806d1fa70ac92ec6b2158a339126a26d2" offset="0" /> + </dataarea> + </part> + </software> + + <software name="zezou" cloneof="zayzaea" supported="no"> + <description>Zézou - Notre Ami Venu d'Ailleurs (Fra)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-092365(FR)" /> + <part name="cart" interface="vsmile_cart"> + <feature name="pcb" value="706714" /> + <feature name="pcb_model" value="706714-1" /> + <feature name="cart_type" value="lilac" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="92365.u1" size="8388608" crc="e965565e" sha1="9cabefa6a2dc0cd2df9d07bb0e11ae0b2dd4d5f8" offset="0" /> + </dataarea> + </part> + </software> </softwarelist> diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml index 1eaa6635fd0..658923cce36 100644 --- a/hash/vsmileb_cart.xml +++ b/hash/vsmileb_cart.xml @@ -99,83 +99,83 @@ The V.Baby currently have no dumps available, hence the carts are temporarily li <softwarelist name="vsmileb_cart" description="VTech V.Smile Baby cartridges"> - <software name="mktierf" supported="no"> - <description>Meine kleinen Tierfreunde (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099004(GE)" /> - <part name="cart" interface="vsmileb_cart"> - <feature name="pcb" value="707154" /> - <feature name="pcb_model" value="707154-3" /> - <feature name="u4" value="U4" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="99004.u4" size="8388608" crc="7b48544b" sha1="a736ef1313762c493a366990406c3a7393457b6e" offset="0" /> - </dataarea> - </part> - </software> + <software name="mktierf" supported="no"> + <description>Meine kleinen Tierfreunde (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099004(GE)" /> + <part name="cart" interface="vsmileb_cart"> + <feature name="pcb" value="707154" /> + <feature name="pcb_model" value="707154-3" /> + <feature name="u4" value="U4" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="99004.u4" size="8388608" crc="7b48544b" sha1="a736ef1313762c493a366990406c3a7393457b6e" offset="0" /> + </dataarea> + </part> + </software> - <software name="bauernhf" supported="no"> - <description>Mein erster Bauernhof (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099064(GE)" /> - <part name="cart" interface="vsmileb_cart"> - <feature name="pcb" value="707154" /> - <feature name="pcb_model" value="707154-3" /> - <feature name="u4" value="U4" /> <!-- ROM --> - <dataarea name="rom" size="8388608"> - <rom name="27-08788-000.u4" size="8388608" crc="581e16f9" sha1="330b309644db9f017d275b9df0ffe7530ed5bcef" offset="0" /> - </dataarea> - </part> - </software> + <software name="bauernhf" supported="no"> + <description>Mein erster Bauernhof (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099064(GE)" /> + <part name="cart" interface="vsmileb_cart"> + <feature name="pcb" value="707154" /> + <feature name="pcb_model" value="707154-3" /> + <feature name="u4" value="U4" /> <!-- ROM --> + <dataarea name="rom" size="8388608"> + <rom name="27-08788-000.u4" size="8388608" crc="581e16f9" sha1="330b309644db9f017d275b9df0ffe7530ed5bcef" offset="0" /> + </dataarea> + </part> + </software> - <software name="poohhawa" supported="no"> - <description>Pooh's Hundred Acre Wood Adventure (USA)</description> - <year>2007</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099020(US)" /> - <part name="cart" interface="vsmileb_cart"> - <dataarea name="rom" size="8388608"> - <rom name="099020.bin" size="8388608" crc="a3ac4cd4" sha1="3562c632e0a1e70cb9e382ebb823449757afed67" offset="0" /> - </dataarea> - </part> - </software> + <software name="poohhawa" supported="no"> + <description>Pooh's Hundred Acre Wood Adventure (USA)</description> + <year>2007</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099020(US)" /> + <part name="cart" interface="vsmileb_cart"> + <dataarea name="rom" size="8388608"> + <rom name="099020.bin" size="8388608" crc="a3ac4cd4" sha1="3562c632e0a1e70cb9e382ebb823449757afed67" offset="0" /> + </dataarea> + </part> + </software> - <software name="poohhawag" cloneof="poohhawa" supported="no"> - <description>Puuhs Hundert-Morgen-Wald (Ger)</description> - <year>2006?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099024(GE)" /> - <part name="cart" interface="vsmileb_cart"> - <feature name="pcb" value="707155" /> - <feature name="pcb_model" value="707155-2" /> - </part> - </software> + <software name="poohhawag" cloneof="poohhawa" supported="no"> + <description>Puuhs Hundert-Morgen-Wald (Ger)</description> + <year>2006?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099024(GE)" /> + <part name="cart" interface="vsmileb_cart"> + <feature name="pcb" value="707155" /> + <feature name="pcb_model" value="707155-2" /> + </part> + </software> - <software name="poohhawasw" cloneof="poohhawa" supported="no"> - <description>Nalle Puhs Äventyr i Sjumilaskogen (Swe)</description> - <year>2007?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099034(SE)" /> - <part name="cart" interface="vsmileb_cart"> - <feature name="pcb" value="707154" /> - <feature name="pcb_model" value="707154-4" /> - <feature name="u4" value="U4" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="99034.u4" size="8388608" crc="5dbe1c20" sha1="51f56cedbe99fc7438429a4c02c08f65d2313790" offset="0" /> - </dataarea> - </part> - </software> + <software name="poohhawasw" cloneof="poohhawa" supported="no"> + <description>Nalle Puhs Äventyr i Sjumilaskogen (Swe)</description> + <year>2007?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099034(SE)" /> + <part name="cart" interface="vsmileb_cart"> + <feature name="pcb" value="707154" /> + <feature name="pcb_model" value="707154-4" /> + <feature name="u4" value="U4" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="99034.u4" size="8388608" crc="5dbe1c20" sha1="51f56cedbe99fc7438429a4c02c08f65d2313790" offset="0" /> + </dataarea> + </part> + </software> - <software name="lupptack" cloneof="mktierf" supported="no"> - <description>Lär och upptäck (Swe)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-099014(SE)" /> - <part name="cart" interface="vsmileb_cart"> - <feature name="pcb" value="707155" /> - <feature name="pcb_model" value="707155-2" /> - </part> - </software> + <software name="lupptack" cloneof="mktierf" supported="no"> + <description>Lär och upptäck (Swe)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-099014(SE)" /> + <part name="cart" interface="vsmileb_cart"> + <feature name="pcb" value="707155" /> + <feature name="pcb_model" value="707155-2" /> + </part> + </software> -</softwarelist>
\ No newline at end of file +</softwarelist> diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index ac1bbb32628..f3adb276d9d 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -241,91 +241,91 @@ Smartbooks currently have no dumps available, hence they are temporarily listed <softwarelist name="vsmilem_cart" description="VTech V.Smile Motion cartridges"> - <software name="cinderla" supported="no"> - <description>Disney Princess Cinderella - Lernen im Märchenland (Ger)</description> - <year>2010?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084604(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-7" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="C84604.u1" size="8388608" crc="0229cf3a" sha1="9c08e6370ecf08992924f067b64dd1950e3a2c6c" offset="0" /> - </dataarea> - </part> - </software> + <software name="cinderla" supported="no"> + <description>Disney Princess Cinderella - Lernen im Märchenland (Ger)</description> + <year>2010?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084604(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-7" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="C84604.u1" size="8388608" crc="0229cf3a" sha1="9c08e6370ecf08992924f067b64dd1950e3a2c6c" offset="0" /> + </dataarea> + </part> + </software> - <software name="kfpanda" supported="no"> - <description>DreamWorks Kung Fu Panda - Der Weg des Panda (Ger)</description> - <year>2008?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084124(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="84124 OK.u1" size="8388608" crc="16493095" sha1="07c75e46c294901ee9309d98c925a39dc1b5e384" offset="0" /> - </dataarea> - </part> - </software> + <software name="kfpanda" supported="no"> + <description>DreamWorks Kung Fu Panda - Der Weg des Panda (Ger)</description> + <year>2008?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084124(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="84124 OK.u1" size="8388608" crc="16493095" sha1="07c75e46c294901ee9309d98c925a39dc1b5e384" offset="0" /> + </dataarea> + </part> + </software> - <software name="dora" supported="no"> - <description>Nick Dora - Doras Reparatur-Abenteuer (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084024(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="84024 OK.u1" size="8388608" crc="6769cb8b" sha1="615177d959983cdb67acdb8f3be063b3d09cb5db" offset="0" /> - </dataarea> - </part> - </software> + <software name="dora" supported="no"> + <description>Nick Dora - Doras Reparatur-Abenteuer (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084024(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="84024 OK.u1" size="8388608" crc="6769cb8b" sha1="615177d959983cdb67acdb8f3be063b3d09cb5db" offset="0" /> + </dataarea> + </part> + </software> - <software name="kleinstn" supported="no"> - <description>Kleine Einsteins (Ger)</description> - <year>200?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084164(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <dataarea name="rom" size="8388608"> - <rom name="80-084164.bin" size="8388608" crc="b0ec807e" sha1="e947c84efd3f061cbf10f73e412d4cfdd474bade" offset="0" /> - </dataarea> - </part> - </software> + <software name="kleinstn" supported="no"> + <description>Kleine Einsteins (Ger)</description> + <year>200?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084164(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <dataarea name="rom" size="8388608"> + <rom name="80-084164.bin" size="8388608" crc="b0ec807e" sha1="e947c84efd3f061cbf10f73e412d4cfdd474bade" offset="0" /> + </dataarea> + </part> + </software> - <software name="tinker" supported="no"> - <description>TinkerBell (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084324(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-7" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="C84324.u1" size="8388608" crc="9e207566" sha1="bb3e180a2c69306b56f08909a05dc83309be0f09" offset="0" /> - </dataarea> - </part> - </software> + <software name="tinker" supported="no"> + <description>TinkerBell (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084324(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-7" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="C84324.u1" size="8388608" crc="9e207566" sha1="bb3e180a2c69306b56f08909a05dc83309be0f09" offset="0" /> + </dataarea> + </part> + </software> - <software name="pooh" supported="no"> - <description>Winnie Puuh - Die Honigjagd (Ger)</description> - <year>2009?</year> - <publisher>VTech</publisher> - <info name="serial" value="80-084384(GE)" /> - <part name="cart" interface="vsmilem_cart"> - <feature name="pcb" value="708201" /> - <feature name="pcb_model" value="708201-4" /> - <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> - <dataarea name="rom" size="8388608"> - <rom name="84384.u1" size="8388608" crc="60649955" sha1="2eda79cbf138e25ffb33281987cc885ec98e9b04" offset="0" /> - </dataarea> - </part> - </software> + <software name="pooh" supported="no"> + <description>Winnie Puuh - Die Honigjagd (Ger)</description> + <year>2009?</year> + <publisher>VTech</publisher> + <info name="serial" value="80-084384(GE)" /> + <part name="cart" interface="vsmilem_cart"> + <feature name="pcb" value="708201" /> + <feature name="pcb_model" value="708201-4" /> + <feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> + <dataarea name="rom" size="8388608"> + <rom name="84384.u1" size="8388608" crc="60649955" sha1="2eda79cbf138e25ffb33281987cc885ec98e9b04" offset="0" /> + </dataarea> + </part> + </software> -</softwarelist>
\ No newline at end of file +</softwarelist> diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 13904e80377..2cb7a145b91 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1608,9 +1608,9 @@ project "utf8proc" kind "StaticLib" defines { - "UTF8PROC_DLLEXPORT=" + "UTF8PROC_DLLEXPORT=" } - + configuration "Debug" defines { "verbose=-1", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index ed1659351df..0bd7f2b5954 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1493,18 +1493,18 @@ end if (BUSES["VME"]~=null) then files { - MAME_DIR .. "src/devices/bus/vme/vme.cpp", - MAME_DIR .. "src/devices/bus/vme/vme.h", - MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h", - MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h", - MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.h", - MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h", - MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h", + MAME_DIR .. "src/devices/bus/vme/vme.cpp", + MAME_DIR .. "src/devices/bus/vme/vme.h", + MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h", + MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h", + MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.h", + MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h", + MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h", } end diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index c8e93d49660..2fa85e9196b 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -28,28 +28,28 @@ project "netlist" } files { - MAME_DIR .. "src/lib/netlist/nl_base.cpp", - MAME_DIR .. "src/lib/netlist/nl_base.h", + MAME_DIR .. "src/lib/netlist/nl_base.cpp", + MAME_DIR .. "src/lib/netlist/nl_base.h", MAME_DIR .. "src/lib/netlist/nl_config.h", - MAME_DIR .. "src/lib/netlist/nl_errstr.h", + MAME_DIR .. "src/lib/netlist/nl_errstr.h", MAME_DIR .. "src/lib/netlist/nl_dice_compat.h", - MAME_DIR .. "src/lib/netlist/nl_factory.cpp", - MAME_DIR .. "src/lib/netlist/nl_factory.h", + MAME_DIR .. "src/lib/netlist/nl_factory.cpp", + MAME_DIR .. "src/lib/netlist/nl_factory.h", MAME_DIR .. "src/lib/netlist/nl_lists.h", MAME_DIR .. "src/lib/netlist/nl_parser.cpp", MAME_DIR .. "src/lib/netlist/nl_parser.h", MAME_DIR .. "src/lib/netlist/nl_setup.cpp", MAME_DIR .. "src/lib/netlist/nl_setup.h", - MAME_DIR .. "src/lib/netlist/nl_time.h", + MAME_DIR .. "src/lib/netlist/nl_time.h", MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/palloc.cpp", MAME_DIR .. "src/lib/netlist/plib/palloc.h", MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp", MAME_DIR .. "src/lib/netlist/plib/pchrono.h", - MAME_DIR .. "src/lib/netlist/plib/pexception.cpp", - MAME_DIR .. "src/lib/netlist/plib/pexception.h", - MAME_DIR .. "src/lib/netlist/plib/pfunction.cpp", - MAME_DIR .. "src/lib/netlist/plib/pfunction.h", + MAME_DIR .. "src/lib/netlist/plib/pexception.cpp", + MAME_DIR .. "src/lib/netlist/plib/pexception.h", + MAME_DIR .. "src/lib/netlist/plib/pfunction.cpp", + MAME_DIR .. "src/lib/netlist/plib/pfunction.h", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h", MAME_DIR .. "src/lib/netlist/plib/plists.h", @@ -84,7 +84,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", - MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", @@ -193,10 +193,10 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h", MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", - MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp", - MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h", - MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp", - MAME_DIR .. "src/lib/netlist/macro/nlm_base.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp", + MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h", + MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp", + MAME_DIR .. "src/lib/netlist/macro/nlm_base.h", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h", MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp", diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index b969ac9bcbb..b067c5b8d50 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -46,7 +46,7 @@ #define LOG_GENERAL 0x01 #define LOG_SETUP 0x02 #define LOG_PRINTF 0x04 -#define LOG_PIA 0x08 +#define LOG_PIA 0x08 #define VERBOSE 0 //(LOG_PIA | LOG_PRINTF | LOG_SETUP | LOG_GENERAL) @@ -225,8 +225,8 @@ WRITE8_MEMBER(coco_t4426_device::write) /*---------------------------------------------------- pia_A_w - PIA port A write - The T4426 cartridge PIA Port A is connected to - the CE* input of each 2764 ROM and used for banking + The T4426 cartridge PIA Port A is connected to + the CE* input of each 2764 ROM and used for banking in the correct BASIC module at C000-DFFF The main cartridge ROM at E000-FF00 is fixed however -----------------------------------------------------*/ diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index e5b1f6de2ec..be874511939 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -2,12 +2,12 @@ // copyright-holders: F. Ulivi /********************************************************************* - hp9895.cpp + hp9895.cpp - HP9895 floppy disk drive + HP9895 floppy disk drive - Reference manual: - HP 09895-90030, feb 81, 9895A Flexible Disc Memory Service Manual + Reference manual: + HP 09895-90030, feb 81, 9895A Flexible Disc Memory Service Manual *********************************************************************/ diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h index d7591d684be..c1403c73c1e 100644 --- a/src/devices/bus/ieee488/hp9895.h +++ b/src/devices/bus/ieee488/hp9895.h @@ -2,9 +2,9 @@ // copyright-holders: F. Ulivi /********************************************************************* - hp9895.h + hp9895.h - HP9895 floppy disk drive + HP9895 floppy disk drive *********************************************************************/ diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index 79e6d5a8687..4d6b35a4c80 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -6,64 +6,64 @@ * The Versabus-E was standardized as the VME bus by VITA 1981 for Europe * in the single or double Euroboard form factor. Several standard revs has * been approved since then up until recently and the VME64 revision. - * - * This bus driver starts with Versabus and VME rev C. + * + * This bus driver starts with Versabus and VME rev C. * http://bitsavers.informatik.uni-stuttgart.de/pdf/motorola/versabus/M68KVBS_VERSAbus_Specification_Manual_Jul81.pdf * * Acronymes from the specification * --------------------------------- - * BACKPLANE - A printed circuit board which provides the interconnection path - between other printed circuit cards. - SLOT - A single position at which a card may be inserted into the backplane. + * BACKPLANE - A printed circuit board which provides the interconnection path + between other printed circuit cards. + SLOT - A single position at which a card may be inserted into the backplane. One slot may consist of more than one edge connector. - BOARD/CARD - Interchangeable terms representing one printed circuit board capable - of being inserted into the backplane and containing a collection of + BOARD/CARD - Interchangeable terms representing one printed circuit board capable + of being inserted into the backplane and containing a collection of electronic components. - MODULE - A collection of electronic components with a single functional - purpose. More than one module may exist on the same card, but one - module should never be spread over multiple cards. - MASTER - A functional module capable of initiating data bus transfers. - REQUESTER - A functional module capable of requesting control of the data - transfer bus. - INTERRUPT - A functional module capable of detecting interrupt requests + MODULE - A collection of electronic components with a single functional + purpose. More than one module may exist on the same card, but one + module should never be spread over multiple cards. + MASTER - A functional module capable of initiating data bus transfers. + REQUESTER - A functional module capable of requesting control of the data + transfer bus. + INTERRUPT - A functional module capable of detecting interrupt requests HANDLER and initiating appropriate responses. - MASTER - The combination of a MASTER, REQUESTER, INTERRUPT HANDLER, and - SUB-SYSTEM (optionally) an INTERRUPTER, which function together and which + MASTER - The combination of a MASTER, REQUESTER, INTERRUPT HANDLER, and + SUB-SYSTEM (optionally) an INTERRUPTER, which function together and which must be on the same card. - NOTE! All MASTERS, REQUESTERS, and INTERRUPT HANDLERS must be pieces of a - MASTER SUB-SYSTEM. - - SLAVE - A functional module capable of responding to data transfer - operations generated by a MASTER. - INTERRUPTER - A functional module capable of requesting service from a MASTER - SUB-SYSTEM by generating an interrupt request. - SLAVE - The combination of a SLAVE and INTERRUPTER which function together - SUB-SYSTEM and which must be on the same card. - - NOTE! All INTERRUPTERS must be part of either SLAVE SUB-SYSTEMS or MASTER - SUB-SYSTEMS. However, SLAVES may exist as stand-alone elements. - Such SLAVES will never be called SLAVE SUB-SYSTEMS. - - CONTROLLER - The combination of modules used to provide utility and emergency - SUB-SYSTEM signals for the VERSAbus. There will always be one and only one - CONTROLLER SUB-SYSTEM. It can contain the following functional - modules: - - a. Data Transfer Bus ARBITER - b. Emergency Data Transfer Bus REQUESTER - c. Power up/power down MASTER - d. System clock driver - e. System reset driver - f. System test controller - g. Power monitor (for AC clock and AC fail driver) - - In any VERSAbus system, only one each of the above functional modules will exist. - The slot numbered Al is designated as the controller sub-system slot because the - user will typically provide modules a through d on the board residing in this - slot. System reset and the system test controller are typically connected to - an operator control panel and may be located elsewhere. The power monitor is - interfaced to the incoming AC power source and may also be located remotely. + NOTE! All MASTERS, REQUESTERS, and INTERRUPT HANDLERS must be pieces of a + MASTER SUB-SYSTEM. + + SLAVE - A functional module capable of responding to data transfer + operations generated by a MASTER. + INTERRUPTER - A functional module capable of requesting service from a MASTER + SUB-SYSTEM by generating an interrupt request. + SLAVE - The combination of a SLAVE and INTERRUPTER which function together + SUB-SYSTEM and which must be on the same card. + + NOTE! All INTERRUPTERS must be part of either SLAVE SUB-SYSTEMS or MASTER + SUB-SYSTEMS. However, SLAVES may exist as stand-alone elements. + Such SLAVES will never be called SLAVE SUB-SYSTEMS. + + CONTROLLER - The combination of modules used to provide utility and emergency + SUB-SYSTEM signals for the VERSAbus. There will always be one and only one + CONTROLLER SUB-SYSTEM. It can contain the following functional + modules: + + a. Data Transfer Bus ARBITER + b. Emergency Data Transfer Bus REQUESTER + c. Power up/power down MASTER + d. System clock driver + e. System reset driver + f. System test controller + g. Power monitor (for AC clock and AC fail driver) + + In any VERSAbus system, only one each of the above functional modules will exist. + The slot numbered Al is designated as the controller sub-system slot because the + user will typically provide modules a through d on the board residing in this + slot. System reset and the system test controller are typically connected to + an operator control panel and may be located elsewhere. The power monitor is + interfaced to the incoming AC power source and may also be located remotely. */ #include "emu.h" @@ -139,12 +139,12 @@ void vme_slot_device::device_start() { device_vme_card_interface *dev = dynamic_cast<device_vme_card_interface *>(get_card_device()); LOG("%s %s - %s:%s\n", tag(), FUNCNAME, m_vme_tag, m_vme_slottag); - if (dev) + if (dev) { device_vme_card_interface::static_set_vme_tag(*dev, m_vme_tag, m_vme_slottag); } - // m_card = dynamic_cast<device_vme_card_interface *>(get_card_device()); + // m_card = dynamic_cast<device_vme_card_interface *>(get_card_device()); } //------------------------------------------------- @@ -164,8 +164,8 @@ READ8_MEMBER(vme_slot_device::read8) { uint16_t result = 0x00; LOG("%s %s\n", tag(), FUNCNAME); - // printf("%s %s\n", tag(), FUNCNAME); - // if (m_card) result = m_card->read8(space, offset); + // printf("%s %s\n", tag(), FUNCNAME); + // if (m_card) result = m_card->read8(space, offset); return result; } @@ -175,8 +175,8 @@ READ8_MEMBER(vme_slot_device::read8) WRITE8_MEMBER(vme_slot_device::write8) { LOG("%s %s\n", tag(), FUNCNAME); - // printf("%s %s\n", tag(), FUNCNAME); - // if (m_card) m_card->write8(space, offset, data); + // printf("%s %s\n", tag(), FUNCNAME); + // if (m_card) m_card->write8(space, offset, data); } #if 0 // Disabled until we know how to make a board driver also a slot device @@ -184,7 +184,7 @@ WRITE8_MEMBER(vme_slot_device::write8) /* Usually a VME firmware supports only a few boards so it will have its own slot collection defined */ // Controller capable boards that can go into slot1 ( or has an embedded VME bus ) SLOT_INTERFACE_START( vme_slot1 ) -// SLOT_INTERFACE("mzr8105", VME_MZR8105) +// SLOT_INTERFACE("mzr8105", VME_MZR8105) SLOT_INTERFACE_END #endif @@ -232,7 +232,7 @@ void vme_device::add_vme_card(device_vme_card_interface *card) void vme_device::install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask) { - cpu_device *m_maincpu = machine().device<cpu_device>("maincpu"); + cpu_device *m_maincpu = machine().device<cpu_device>("maincpu"); int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width; LOG("%s width:%d\n", FUNCNAME, buswidth); @@ -325,7 +325,7 @@ void device_vme_card_interface::set_vme_device() { LOG("%s %s\n", m_device->tag(), FUNCNAME); m_vme = dynamic_cast<vme_device *>(device().machine().device(m_vme_tag)); - // printf("*** %s %sfound\n", m_vme_tag, m_vme ? "" : "not "); + // printf("*** %s %sfound\n", m_vme_tag, m_vme ? "" : "not "); if (m_vme) m_vme->add_vme_card(this); } @@ -352,7 +352,7 @@ a number of variants that has been more or less standardized: an almost compatible variant was developed by Motorola called MVMX32bus. - VSBbus replaced VMX and MVMX32and was approved by IEEE in 1988 - SCSA is a P2 standardization for telephony voice and facsimile applications -- SkyChannel is packet switched P2 architecture from Sky Computers and standardized +- SkyChannel is packet switched P2 architecture from Sky Computers and standardized through VITA/VSO. - RACEway is a 40Mhz P2 bus allowing 480MBps throughput from Mercusry Computers and standardized through VITA/VSO. diff --git a/src/devices/bus/vme/vme.h b/src/devices/bus/vme/vme.h index 6103379a4ac..c2aa6e2b666 100644 --- a/src/devices/bus/vme/vme.h +++ b/src/devices/bus/vme/vme.h @@ -53,7 +53,7 @@ #include "emu.h" //************************************************************************** -// CONSTANTS +// CONSTANTS //************************************************************************** #define VME_BUS_TAG "vme" @@ -78,7 +78,7 @@ public: DS0, DS1, BERR, - DTACK, + DTACK, WRITE }; @@ -152,7 +152,7 @@ public: void set_vme_device(); virtual DECLARE_READ8_MEMBER(read8); - virtual DECLARE_WRITE8_MEMBER(write8); + virtual DECLARE_WRITE8_MEMBER(write8); device_t *m_device; // inline configuration @@ -175,7 +175,7 @@ public: Short addressing AM codes indicate that address lines A02-A15 are being used to select a BYTE(0-3) group. Standard addressing AM codes ,indicate that address lines A02-A23 are being used to select a BYTE(0-3) group. Extended addressing AM codes indicate that address lines A02-A31 are being used to select a BYTE(0-3) group.*/ - enum + enum { // Defined and User Defined Address Modifier Values, The rest us Reserved between 0x00 and 0x3F AMOD_EXTENDED_NON_PRIV_DATA = 0x09, AMOD_EXTENDED_NON_PRIV_PRG = 0x0A, @@ -196,7 +196,7 @@ public: }; }; -#define MCFG_VME_SLOT_ADD(_tag, _slot_tag, _slot_intf,_def_slot) \ +#define MCFG_VME_SLOT_ADD(_tag, _slot_tag, _slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_slot_tag, VME_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ vme_slot_device::static_set_vme_slot(*device, _tag, _slot_tag); diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index c8a1a0b98dc..6f9798fcbbb 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -186,7 +186,7 @@ #define LOG_GENERAL 0x01 #define LOG_SETUP 0x02 #define LOG_PRINTF 0x04 -#define LOG_INT 0x08 +#define LOG_INT 0x08 #define VERBOSE 0 //(LOG_PRINTF | LOG_SETUP | LOG_GENERAL) @@ -208,7 +208,7 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_FCCPU20 = &device_creator<vme_fccpu20_card_device>; @@ -225,10 +225,10 @@ static ADDRESS_MAP_START (cpu20_mem, AS_PROGRAM, 32, vme_fccpu20_card_device) AM_RANGE (0xff000000, 0xff00ffff) AM_ROM AM_REGION("roms", 0x0000) AM_RANGE (0xff800000, 0xff80001f) AM_DEVREADWRITE8("mpcc", mpcc68561_device, read, write, 0xffffffff) AM_RANGE (0xff800200, 0xff80021f) AM_DEVREADWRITE8("mpcc2", mpcc68561_device, read, write, 0xffffffff) -// AM_RANGE (0xff800200, 0xff8003ff) AM_DEVREADWRITE8("pit2", pit68230_device, read, write, 0xff00ff00) +// AM_RANGE (0xff800200, 0xff8003ff) AM_DEVREADWRITE8("pit2", pit68230_device, read, write, 0xff00ff00) AM_RANGE (0xff800600, 0xff80061f) AM_DEVREADWRITE8("mpcc3", mpcc68561_device, read, write, 0xffffffff) AM_RANGE (0xff800800, 0xff80080f) AM_DEVREADWRITE8("bim", bim68153_device, read, write, 0xff00ff00) -// AM_RANGE (0xff800a00, 0xff800a0f) AM_DEVREADWRITE8("rtc", rtc_device, read, write, 0x00ff00ff) +// AM_RANGE (0xff800a00, 0xff800a0f) AM_DEVREADWRITE8("rtc", rtc_device, read, write, 0x00ff00ff) AM_RANGE (0xff800c00, 0xff800dff) AM_DEVREADWRITE8("pit", pit68230_device, read, write, 0xffffffff) ADDRESS_MAP_END @@ -483,8 +483,8 @@ const tiny_rom_entry *vme_fccpu20_card_device::device_rom_region() const * :pit Reg 13 <- 00 - CPRH * :pit Reg 10 <- e1 - TCR - PC3 used as TOUT and PC7 used as I/O pin, Interrupts enabled - PC2 used as I/O pin,CLK and x32 prescaler are used - - Timer reload the preload values when reaching 0 (zero) - - Timer is enabled + - Timer reload the preload values when reaching 0 (zero) + - Timer is enabled * MPCC setup * : Reg 19 <- 1e - PSR2: Byte mode, 1 Stop bit, 8 bit data, ASYNC mode * : Reg 1c <- 8a - BRDR1: Baud Rate Divider 1 diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h index 7e75139986c..7804b174138 100644 --- a/src/devices/bus/vme/vme_fccpu20.h +++ b/src/devices/bus/vme/vme_fccpu20.h @@ -13,7 +13,7 @@ extern const device_type VME_FCCPU20; -class vme_fccpu20_card_device : +class vme_fccpu20_card_device : public device_t ,public device_vme_card_interface { diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp index 5845603f108..75d325f2c81 100644 --- a/src/devices/bus/vme/vme_fcisio.cpp +++ b/src/devices/bus/vme/vme_fcisio.cpp @@ -94,7 +94,7 @@ * * VME side A24 address map - Dual ported RAM * ---------------------------------------------------------- - * Offset Range Description + * Offset Range Description * ---------------------------------------------------------- * 000000 - 0007FF BIM * 000800 - 000FFF Status registers @@ -158,7 +158,7 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_FCISIO1 = &device_creator<vme_fcisio1_card_device>; @@ -195,7 +195,7 @@ static MACHINE_CONFIG_FRAGMENT (fcisio1) MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, rxa_w)) MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, ctsa_w)) -// MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", fcisio_terminal) +// MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", fcisio_terminal) MCFG_DUSCC68562_ADD("duscc1", DUSCC_CLOCK, 0, 0, 0, 0 ) MCFG_DUSCC68562_ADD("duscc2", DUSCC_CLOCK, 0, 0, 0, 0 ) diff --git a/src/devices/bus/vme/vme_fcisio.h b/src/devices/bus/vme/vme_fcisio.h index 1152589e314..fc668cc276a 100644 --- a/src/devices/bus/vme/vme_fcisio.h +++ b/src/devices/bus/vme/vme_fcisio.h @@ -11,7 +11,7 @@ extern const device_type VME_FCISIO1; -class vme_fcisio1_card_device : +class vme_fcisio1_card_device : public device_t ,public device_vme_card_interface { diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index 3dcf7c17117..96e8548a86f 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -72,10 +72,10 @@ * - 68010 CPU for local control (10MHz) * - 68450 DMA Controller for local transfers (10MHz) * - Dual Ported l28Kbyte 0 wait state static RAM between the VMEbus and the local CPU - * - SCSlbus interface built with the NCR 5386S SCSlbus controller. + * - SCSlbus interface built with the NCR 5386S SCSlbus controller. * o Programmable as an initiator or target * o Transfer rate up to 1.5Mbyte/s - * - SHUGART compatible floppy interface with the WD1772 FDC. Up to 4 floppy drives can be + * - SHUGART compatible floppy interface with the WD1772 FDC. Up to 4 floppy drives can be * controlled independent of the SCSlbus * - All I/O signals available on P2 connector 4 different interrupt request signals to the VMEbus. Each * channel contains a software programmable IRQ level (1 to 7) and vector @@ -102,7 +102,7 @@ * * VME side A24 address map - Dual ported RAM * ---------------------------------------------------------- - * Default Range Description + * Default Range Description * ---------------------------------------------------------- * A00000 - A00000 Status word Bits 8:RESET 9:HALT 10:WD * A00001 - A0000F BIM - See below @@ -176,7 +176,7 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_FCSCSI1 = &device_creator<vme_fcscsi1_card_device>; diff --git a/src/devices/bus/vme/vme_fcscsi.h b/src/devices/bus/vme/vme_fcscsi.h index 719f12df5b6..91b65a91552 100644 --- a/src/devices/bus/vme/vme_fcscsi.h +++ b/src/devices/bus/vme/vme_fcscsi.h @@ -11,7 +11,7 @@ extern const device_type VME_FCSCSI1; -class vme_fcscsi1_card_device : +class vme_fcscsi1_card_device : public device_t ,public device_vme_card_interface { diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp index 69afff9490a..b4caeb65ab9 100644 --- a/src/devices/bus/vme/vme_mvme350.cpp +++ b/src/devices/bus/vme/vme_mvme350.cpp @@ -155,7 +155,7 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_MVME350 = &device_creator<vme_mvme350_card_device>; @@ -178,8 +178,8 @@ static ADDRESS_MAP_START( mvme350_mem, AS_PROGRAM, 16, vme_mvme350_card_device ) ADDRESS_MAP_END //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// machine_config_additions - device-specific +// machine configurations //------------------------------------------------- MACHINE_CONFIG_FRAGMENT( mvme350 ) @@ -236,10 +236,10 @@ void vme_mvme350_card_device::device_start() /* From MVME166 Single Board Computer Installation Guide: Controller Type First board Second board - CLUN Address CLUN Address + CLUN Address CLUN Address --------------------------------------------------- MVME350 - Streaming $04 $FFFF5000 $05 $FFFF5100 - Tape Controller + Tape Controller --------------------------------------------------- */ uint32_t base = 0xFFFF5000; diff --git a/src/devices/bus/vme/vme_mvme350.h b/src/devices/bus/vme/vme_mvme350.h index 5d79fa3d306..54aecc1ec82 100644 --- a/src/devices/bus/vme/vme_mvme350.h +++ b/src/devices/bus/vme/vme_mvme350.h @@ -8,7 +8,7 @@ extern const device_type VME_MVME350; -class vme_mvme350_card_device : +class vme_mvme350_card_device : public device_t ,public device_vme_card_interface { @@ -21,8 +21,8 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; // Shared memory methods to be exported to the VME bus -// virtual DECLARE_READ16_MEMBER (read16) override; -// virtual DECLARE_WRITE16_MEMBER (write16) override; +// virtual DECLARE_READ16_MEMBER (read16) override; +// virtual DECLARE_WRITE16_MEMBER (write16) override; protected: virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp index 8239c0992f1..9b3813ee488 100644 --- a/src/devices/bus/vme/vme_mzr8105.cpp +++ b/src/devices/bus/vme/vme_mzr8105.cpp @@ -27,14 +27,14 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_MZR8105 = &device_creator<vme_mzr8105_card_device>; //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// machine_config_additions - device-specific +// machine configurations //------------------------------------------------- MACHINE_CONFIG_EXTERN( mzr8105 ); diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index 04ddd02636e..550cf2f3c2d 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -6,15 +6,15 @@ * * 23/09/2015 * - * This device was drycoded based on OS9 boot strap code on a Mizar mz8105 board + * This device was drycoded based on OS9 boot strap code on a Mizar mz8105 board * which expects to find a SIO on the VME bus + photos of a Mizar 8300 board on Ebay * I have found no formal documents for this board so far, so needs verification. - * - * || - * || - * || - * || - * ||____________________________________________________________ ___ + * + * || + * || + * || + * || + * ||____________________________________________________________ ___ * \+++====|| U2|AM26LS32| | NEC | |74LS04N||74LS645 ||_| | * \=/- o|| +--------+ | D7201C | ++-----+++----------+| | | * | | || +-------+ +--------------------+ | | |SN74LS374N|| | | @@ -32,14 +32,14 @@ * /=\- o||J1 K1 U4| xxx | xxx | 74LS164| K6 |AM25LS2521|| | | * /+++====|| J2 +-------+--------+--------+--------+ +----------+|_| | * ||Rev G U3| MC1488| MC1488 | 74LS161| 74F85 | K8 | |___| - * ||-----------+-------+----------------------------------------- - * || - * || + * ||-----------+-------+----------------------------------------- + * || + * || * * - * Misc links about this board: + * Misc links about this board: * http://www.ebay.com/itm/MIZAR-INC-8300-0-01-REV-J-INTERFACE-CONTROL-BOARD-W-RIBBON-AND-PLATE-/231508658429?hash=item35e6fdc8fd - * + * * Description * ------------ * The Mizar mz8300 is a Quad Serial board. @@ -52,8 +52,8 @@ * -------------------------------------------------------------------------- * Local VME Decscription * ------------------------------------------------------------------------- - * n/a 0xff0000 0xff0003 mzr8105.c Bootstrap expects to find a - * UPD7201 serial device here - configurable! + * n/a 0xff0000 0xff0003 mzr8105.c Bootstrap expects to find a + * UPD7201 serial device here - configurable! * -------------------------------------------------------------------------- * * Interrupt sources MVME @@ -61,15 +61,15 @@ * Description Device Lvl IRQ VME board * /Board Vector Address * ---------------------------------------------------------- - * On board Sources - * + * On board Sources + * * Off board Sources (other VME boards) * * ---------------------------------------------------------- * * DMAC Channel Assignments * ---------------------------------------------------------- - * Channel + * Channel * ---------------------------------------------------------- * * TODO: @@ -110,7 +110,7 @@ #endif //************************************************************************** -// GLOBAL VARIABLES +// GLOBAL VARIABLES //************************************************************************** const device_type VME_MZR8300 = &device_creator<vme_mzr8300_card_device>; @@ -135,8 +135,8 @@ MACHINE_CONFIG_FRAGMENT( mzr8300 ) MACHINE_CONFIG_END //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// machine_config_additions - device-specific +// machine configurations //------------------------------------------------- diff --git a/src/devices/bus/vme/vme_mzr8300.h b/src/devices/bus/vme/vme_mzr8300.h index 73482cb5b77..b7145037073 100644 --- a/src/devices/bus/vme/vme_mzr8300.h +++ b/src/devices/bus/vme/vme_mzr8300.h @@ -8,7 +8,7 @@ extern const device_type VME_MZR8300; -class vme_mzr8300_card_device : +class vme_mzr8300_card_device : public device_t ,public device_vme_card_interface { @@ -19,8 +19,8 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; -// virtual DECLARE_READ8_MEMBER (read8) override; -// virtual DECLARE_WRITE8_MEMBER (write8) override; +// virtual DECLARE_READ8_MEMBER (read8) override; +// virtual DECLARE_WRITE8_MEMBER (write8) override; protected: virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index 9f5d7f7ae47..28394aa88f8 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -10,28 +10,28 @@ Type ROM RAM G D IN - COP410 512x8 32x4 N/A - COP411 512x8 32x4 0-2 0-1 N/A + COP410 512x8 32x4 N/A + COP411 512x8 32x4 0-2 0-1 N/A COP413 512x8 32x4 N/A N/A - COP401 N/A 32x4 N/A + COP401 N/A 32x4 N/A COP420 1024x8 64x4 - COP421 1024x8 64x4 N/A - COP422 1024x8 64x4 2-3 2-3 N/A + COP421 1024x8 64x4 N/A + COP422 1024x8 64x4 2-3 2-3 N/A COP402 N/A 64x4 COP444L 2048x8 128x4 - COP445L 2048x8 128x4 N/A + COP445L 2048x8 128x4 N/A COP404L N/A 128x4 COP424C 1024x8 64x4 - COP425C 1024x8 64x4 N/A + COP425C 1024x8 64x4 N/A COP426C 1024x8 64x4 2-3 2-3 - + COP444C 2048x8 128x4 - COP445C 2048x8 128x4 N/A + COP445C 2048x8 128x4 N/A COP446C 2048x8 128x4 2-3 2-3 - COP404C N/A 128x4 + COP404C N/A 128x4 **************************************************************************** @@ -47,7 +47,7 @@ TODO: - - COP410L/COP410C + - COP410L/COP410C - save internal RAM when CKO is RAM power supply pin - COP404L opcode map switching, dual timer, microbus enable diff --git a/src/devices/cpu/cop400/cop400op.hxx b/src/devices/cpu/cop400/cop400op.hxx index 17d72956828..3242973af3d 100644 --- a/src/devices/cpu/cop400/cop400op.hxx +++ b/src/devices/cpu/cop400/cop400op.hxx @@ -267,7 +267,7 @@ INSTRUCTION( casc ) INSTRUCTION( jid ) { PC = (PC & 0x700) | (A << 4) | RAM_R(B); - uint8_t operand = fetch(); + uint8_t operand = fetch(); PC = (PC & 0x700) | operand; } @@ -287,7 +287,7 @@ INSTRUCTION( jid ) INSTRUCTION( jmp ) { - uint8_t operand = fetch(); + uint8_t operand = fetch(); PC = ((opcode & 0x07) << 8) | operand; } @@ -351,9 +351,9 @@ INSTRUCTION( jp ) INSTRUCTION( jsr ) { - uint8_t operand = fetch(); + uint8_t operand = fetch(); PUSH(PC); - PC = ((opcode & 0x07) << 8) | operand; + PC = ((opcode & 0x07) << 8) | operand; } /* @@ -553,7 +553,7 @@ INSTRUCTION( lqid ) { PUSH(PC); PC = (PC & 0x700) | (A << 4) | RAM_R(B); - uint8_t operand = fetch(); + uint8_t operand = fetch(); WRITE_Q(operand); POP(); } diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 1fb5ecbbeed..d41db038d3e 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -70,7 +70,7 @@ const m6805_base_device::op_handler_func m6805_base_device::m_hmos_ops[256] = OP_IX(lsl), OP_IX(rol), OP_IX(dec), OP(illegal), OP_IX(inc), OP_IX(tst), OP(illegal), OP_IX(clr), /* 8 */ OP(rti), OP(rts), OP(illegal), OP(swi), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), - /* 9 */ OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(tax), + /* 9 */ OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(illegal), OP(tax), OP(clc), OP(sec), OP(cli), OP(sei), OP(rsp), OP(nop), OP(illegal), OP(txa), /* A */ OP_IM(suba), OP_IM(cmpa), OP_IM(sbca), OP_IM(cpx), OP_IM(anda), OP_IM(bita), OP_IM(lda), OP(illegal), OP_IM(eora), OP_IM(adca), OP_IM(ora), OP_IM(adda), OP(illegal), OP(bsr), OP_IM(ldx), OP(illegal), diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp index a5ee8d17542..d7e4fc0f375 100644 --- a/src/devices/machine/68153bim.cpp +++ b/src/devices/machine/68153bim.cpp @@ -2,13 +2,13 @@ // copyright-holders: Joakim Larsson Edstrom /*************************************************************************** - 68153 BIM Bus Interrupter Module + 68153 BIM Bus Interrupter Module - The Bus Interrupter Module (BIM) provides an interface between interrupting devices and a system bus such as - the VMEbus or VERSAbus™. It generates a maximum of 7 bus interrupts on the IRQ1-IRQ7 outputs and responds to - interrupt acknowledge cycles for up to 4 independent slaves. The BIM can also supply an interrupt vector - during an interrupt acknowledge cycle. Moreover, it sits in the interrupt acknowledge daisychain which allows - for multiple interrupts on the level acknowledged. + The Bus Interrupter Module (BIM) provides an interface between interrupting devices and a system bus such as + the VMEbus or VERSAbus™. It generates a maximum of 7 bus interrupts on the IRQ1-IRQ7 outputs and responds to + interrupt acknowledge cycles for up to 4 independent slaves. The BIM can also supply an interrupt vector + during an interrupt acknowledge cycle. Moreover, it sits in the interrupt acknowledge daisychain which allows + for multiple interrupts on the level acknowledged. ----- Features ---------------------------------------------------------- x 4 channels @@ -19,7 +19,7 @@ Full functionality is implemented ------------------------------------------------------------------------- - Level of implementation: x = done p = partial + Level of implementation: x = done p = partial ------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ //************************************************************************** // device type definition const device_type MC68153_CHANNEL = &device_creator<bim68153_channel>; -const device_type MC68153 = &device_creator<bim68153_device>; +const device_type MC68153 = &device_creator<bim68153_device>; const device_type EI68C153 = &device_creator<ei68c153_device>; //------------------------------------------------- @@ -185,14 +185,14 @@ IRQ_CALLBACK_MEMBER(bim68153_device::iack) { int vec = M68K_INT_ACK_AUTOVECTOR; int found = 0; - // int level = 0; + // int level = 0; int ch = -1; LOGIACK("%s %s()\n", tag(), FUNCNAME); - /* 1. No further action required — This occurs if IACKIN is not asserted. Asserting IACKN only starts the BIM activity. - * If the daisy chain signal never reaches the BIM (IACKIN is not asserted), another interrupter has responded to the - * IACK cycle. The cycle will end, the IACK is negated, and no additional action is required. */ + /* 1. No further action required — This occurs if IACKIN is not asserted. Asserting IACKN only starts the BIM activity. + * If the daisy chain signal never reaches the BIM (IACKIN is not asserted), another interrupter has responded to the + * IACK cycle. The cycle will end, the IACK is negated, and no additional action is required. */ if (m_iackin == CLEAR_LINE) { m_out_iackout_cb(CLEAR_LINE); @@ -205,15 +205,15 @@ IRQ_CALLBACK_MEMBER(bim68153_device::iack) if (elem->m_int_state == bim68153_channel::PENDING && elem->m_control & bim68153_channel::REG_CNTRL_INT_ENABLE) { // and the level matches if ((elem->m_control & bim68153_channel::REG_CNTRL_INT_LVL_MSK) == irqline) - { // then remember it + { // then remember it ch = get_channel_index(elem); } found = 1; } } - /* 2. Pass on the interrupt daisy chain — For this case, IACKIN input is asserted by the preceding daisy chain interrupter, - * and IACKOUT output is in turn asserted. The daisy chain signal is passed on when no interrupts are pending on a matching - * level or when any possible interrupts are disabled. The Interrupt Enable (IRE) bit of a control register can disable any + /* 2. Pass on the interrupt daisy chain — For this case, IACKIN input is asserted by the preceding daisy chain interrupter, + * and IACKOUT output is in turn asserted. The daisy chain signal is passed on when no interrupts are pending on a matching + * level or when any possible interrupts are disabled. The Interrupt Enable (IRE) bit of a control register can disable any * interrupt requests, and in turn, any possible matches */ if (found == 0) { @@ -226,10 +226,10 @@ IRQ_CALLBACK_MEMBER(bim68153_device::iack) if ((m_chn[ch]->m_control & bim68153_channel::REG_CNTRL_INT_EXT) == 0) { - /* 3. Respond internally - For this case, IACKIN is asserted and a match is found. The BIM completes the IACK cycle by - * supplying an interrupt vector from the proper vector register followed by a DTACK signal asserted because the interrupt - * acknowledge cycle is completed by this device. For the BIM to respond in this mode of operation, the EXTERNAL/INTERNAl - * control register bit (X/IN) must be zero. For each source of interrupt request, the associated control register determines + /* 3. Respond internally - For this case, IACKIN is asserted and a match is found. The BIM completes the IACK cycle by + * supplying an interrupt vector from the proper vector register followed by a DTACK signal asserted because the interrupt + * acknowledge cycle is completed by this device. For the BIM to respond in this mode of operation, the EXTERNAL/INTERNAl + * control register bit (X/IN) must be zero. For each source of interrupt request, the associated control register determines * the BIM response to an IACK cycle, and the X/IN bit sets this response either internally (X/IN = 0 ) or externally (X/IN = 1). */ vec = m_chn[ch]->m_vector; // Internal vector @@ -237,8 +237,8 @@ IRQ_CALLBACK_MEMBER(bim68153_device::iack) else { /* 4. Respond externally — For the final case, IACKIN is also asserted, a match is found and the associated control register has - * X/IN bit set to one. The BIM does not assert IACKOUT and does assert INTAE low.INTAE signals that the requesting device must - * complete the IACK cycle (supplying a vector and DTACK) and that the 2-bit code contained on outputs INTALO and INTAL1 shows + * X/IN bit set to one. The BIM does not assert IACKOUT and does assert INTAE low.INTAE signals that the requesting device must + * complete the IACK cycle (supplying a vector and DTACK) and that the 2-bit code contained on outputs INTALO and INTAL1 shows * which interrupt source is being acknowledged*/ vec = m_chn[ch]->m_out_iack_cb(); // External vector @@ -255,7 +255,7 @@ IRQ_CALLBACK_MEMBER(bim68153_device::iack) m_chn[ch]->m_control &= ~bim68153_channel::REG_CNTRL_INT_ENABLE; } - // This is not explicitly said in the 68153 datasheet but what would a flag be used for otherwise? + // This is not explicitly said in the 68153 datasheet but what would a flag be used for otherwise? m_chn[ch]->m_control &= ~bim68153_channel::REG_CNTRL_INT_FLAG; m_out_iackout_cb(CLEAR_LINE); @@ -291,7 +291,7 @@ void bim68153_device::trigger_interrupt(int ch) m_out_iackout_cb(ASSERT_LINE); // Set flag - // This is not explicitly said in the 68153 datasheet but what would a flag be used for otherwise? + // This is not explicitly said in the 68153 datasheet but what would a flag be used for otherwise? m_chn[ch]->m_control |= bim68153_channel::REG_CNTRL_INT_FLAG; // assert interrupt @@ -306,7 +306,7 @@ READ8_MEMBER( bim68153_device::read ) int vc = offset & REG_VECTOR; int ch = offset & CHN_MSK; - LOGR(" * %s %d Reg %s -> %02x \n", m_owner->tag(), ch, vc ? "vector" : "control", + LOGR(" * %s %d Reg %s -> %02x \n", m_owner->tag(), ch, vc ? "vector" : "control", vc ? m_chn[ch]->do_bimreg_vector_r() : m_chn[ch]->do_bimreg_control_r()); return vc ? m_chn[ch]->do_bimreg_vector_r() : m_chn[ch]->do_bimreg_control_r(); @@ -404,10 +404,10 @@ void bim68153_channel::do_bimreg_control_w(uint8_t data) LOG("%s ch %d set control to %02x\n", FUNCNAME, m_index, data); LOGSETUP(" - Lev:%d Auto Disable:%d Int Enable:%d Vector:%d Auto Clear:%d Flag:%d\n", data & REG_CNTRL_INT_LVL_MSK, - data & REG_CNTRL_INT_AUT_DIS ? 1 : 0, - data & REG_CNTRL_INT_ENABLE ? 1 : 0, - data & REG_CNTRL_INT_EXT ? 1 : 0, - data & REG_CNTRL_INT_AUT_CLR ? 1 : 0, + data & REG_CNTRL_INT_AUT_DIS ? 1 : 0, + data & REG_CNTRL_INT_ENABLE ? 1 : 0, + data & REG_CNTRL_INT_EXT ? 1 : 0, + data & REG_CNTRL_INT_AUT_CLR ? 1 : 0, data & REG_CNTRL_INT_FLAG ? 1 : 0); m_control = data; diff --git a/src/devices/machine/68153bim.h b/src/devices/machine/68153bim.h index 414abebf1b6..f9df8a1b1e1 100644 --- a/src/devices/machine/68153bim.h +++ b/src/devices/machine/68153bim.h @@ -10,11 +10,11 @@ * CS* 3 | | 38 A1 * DTACK* 4 | | 37 D7 * IACK* 5 | | 36 D6 -* IACKIN* 6 | | 35 D5 -* IACKOUT* 7 | | 34 D4 -* IRQ1* 8 | | 33 D3 -* GND 9 | | 32 D2 -* GND 10 | | 31 GND +* IACKIN* 6 | | 35 D5 +* IACKOUT* 7 | | 34 D4 +* IRQ1* 8 | | 33 D3 +* GND 9 | | 32 D2 +* GND 10 | | 31 GND * Vcc 11 | | 30 VCC * IRQ2* 12 | MC68153 | 29 D1 * IRQ3* 13 | EI68C153 | 28 D0 @@ -206,7 +206,7 @@ protected: devcb_write_line m_out_intal1_cb; // Daisy chain signals - devcb_read8 m_out_iackout_cb; + devcb_read8 m_out_iackout_cb; int m_iackin; int m_irq_level; }; diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 41d205870cf..ab71db7bfa6 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -16,7 +16,7 @@ #define LOG_GENERAL 0x01 #define LOG_SETUP 0x02 #define LOG_PRINTF 0x04 -#define LOG_CA1 0x08 +#define LOG_CA1 0x08 #define VERBOSE 0 //(LOG_PRINTF | LOG_SETUP | LOG_GENERAL) diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index 9f7f71e6028..32b79ccc5a9 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -911,7 +911,7 @@ uint8_t pit68230_device::rr_pitreg_pcdr() { m_pcdr |= (m_pcil & ~m_pcddr); } - + if (m_pcdr != 0) { LOGDR("%s %s <- %02x\n",tag(), FUNCNAME, m_pcdr); } return m_pcdr; diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index c07216fd640..ff4c1bb1882 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -7,10 +7,10 @@ The variants in the MPCC family are as follows: - - 68560 with an 8 bit data bus - - 68560A with an 8 bit data bus and some enhancements - - 68561 with a 16 bit data bus - - 68561A with a 16 bit data bus and some enhancements + - 68560 with an 8 bit data bus + - 68560A with an 8 bit data bus and some enhancements + - 68561 with a 16 bit data bus + - 68561A with a 16 bit data bus and some enhancements FEATURES ------------------------------------------------------------------ @@ -255,26 +255,26 @@ void mpcc_device::device_reset() transmit_register_reset(); // Device reset values - m_rsr = 0x00; - m_rcr = 0x01; + m_rsr = 0x00; + m_rcr = 0x01; m_rivnr = 0x0f; - m_rier = 0x00; - m_tsr = 0x80; - m_tcr = 0x01; + m_rier = 0x00; + m_tsr = 0x80; + m_tcr = 0x01; m_tivnr = 0x0f; - m_tier = 0x00; - m_sisr = 0x00; - m_sicr = 0x00; + m_tier = 0x00; + m_sisr = 0x00; + m_sicr = 0x00; m_sivnr = 0x0f; - m_sier = 0x00; - m_psr1 = 0x00; - m_psr2 = 0x00; - m_ar1 = 0x00; - m_ar2 = 0x00; + m_sier = 0x00; + m_psr1 = 0x00; + m_psr2 = 0x00; + m_ar1 = 0x00; + m_ar2 = 0x00; m_brdr1 = 0x01; m_brdr2 = 0x00; - m_ccr = 0x00; - m_ecr = 0x04; + m_ccr = 0x00; + m_ecr = 0x04; // Clear fifos m_tx_data_fifo.clear(); @@ -599,7 +599,7 @@ void mpcc_device::tra_complete() { // check if transmitter is enabled and we are not sending BREAK level if ((m_tcr & REG_TCR_TEN) && !(m_tcr & REG_TCR_TICS)) - { // check if there are more data in the fifo + { // check if there are more data in the fifo if (!m_tx_data_fifo.empty()) { transmit_register_setup(m_tx_data_fifo.dequeue()); // Reload the shift register @@ -653,7 +653,7 @@ void mpcc_device::rcv_complete() data = get_received_char(); LOGRX("%s %02x [%c]\n", FUNCNAME, isascii(data) ? data : ' ', data); - // receive_data(data); + // receive_data(data); if (m_rx_data_fifo.full()) { // receive overrun error detected, new data is lost @@ -928,7 +928,7 @@ void mpcc_device::do_tdr(uint8_t data) } else // ..there is still room { - m_tx_data_fifo.enqueue(data); + m_tx_data_fifo.enqueue(data); if (m_tx_data_fifo.full()) { m_tsr &= ~REG_TSR_TDRA; // Mark fifo as full diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h index a2c06dbaaf5..2a3b654a50b 100644 --- a/src/devices/machine/68561mpcc.h +++ b/src/devices/machine/68561mpcc.h @@ -157,32 +157,32 @@ protected: void trigger_interrupt(int source); enum { - INT_TX_TDRA, // Tx char available - INT_TX_TFC, // Tx frame complete - INT_TX_TUNRN, // Tx underrun detected - INT_TX_TFERR, // Tx frame error detected - INT_RX_RDA, // Rx interrupt on Receiver Data Available - INT_RX_EOF, // Rx interrupt on End of frame - INT_RX_CPERR, // Rx interrupt on CRC or Parity error - INT_RX_FRERR, // Rx interrupt on Frame error - INT_RX_ROVRN, // Rx interrupt on Receiver overrun - INT_RX_RAB, // Rx interrupt on Abort/Break - INT_SR_CTS, // Serial interface interrupt on CTS asserted - INT_SR_DSR, // Serial interface interrupt on DSR asserted - INT_SR_DCD, // Serial interface interrupt on DCD asserted + INT_TX_TDRA, // Tx char available + INT_TX_TFC, // Tx frame complete + INT_TX_TUNRN, // Tx underrun detected + INT_TX_TFERR, // Tx frame error detected + INT_RX_RDA, // Rx interrupt on Receiver Data Available + INT_RX_EOF, // Rx interrupt on End of frame + INT_RX_CPERR, // Rx interrupt on CRC or Parity error + INT_RX_FRERR, // Rx interrupt on Frame error + INT_RX_ROVRN, // Rx interrupt on Receiver overrun + INT_RX_RAB, // Rx interrupt on Abort/Break + INT_SR_CTS, // Serial interface interrupt on CTS asserted + INT_SR_DSR, // Serial interface interrupt on DSR asserted + INT_SR_DCD, // Serial interface interrupt on DCD asserted }; enum { - RX_INT_PRIO = 0x00, // Highest interrupt priority + RX_INT_PRIO = 0x00, // Highest interrupt priority TX_INT_PRIO = 0x01, - SR_INT_PRIO = 0x02 // Lowest interrupt priority + SR_INT_PRIO = 0x02 // Lowest interrupt priority }; enum { - INT_REQ = 0x01, // Interrupt requested - INT_ACK = 0x02 // Interrupt acknowledged + INT_REQ = 0x01, // Interrupt requested + INT_ACK = 0x02 // Interrupt acknowledged }; // Variants in the MPCC family @@ -217,22 +217,22 @@ protected: devcb_write_line m_out_int_cb; /* - * Register handling - */ + * Register handling + */ // RSR - Rx Status Register uint8_t m_rsr; uint8_t do_rsr(); void do_rsr(uint8_t data); enum { - REG_RSR_RDA = 0x80, // Rx Data available - REG_RSR_EOF = 0x40, // End of frame detected (BOP and BSC modes) - REG_RSR_RHW = 0x20, // Odd number of frame data bytes reeived in 16 bit mode. - REG_RSR_CPERR = 0x10, // CRC or parity error detected - REG_RSR_FRERR = 0x08, // Frame error detected - REG_RSR_ROVRN = 0x04, // Rx overrun detected - REG_RSR_RAB = 0x02, // Rx Abort break detected - REG_RSR_RIDLE = 0x01, // Rx idle detcted (15+ high consecutive bits accounted for) + REG_RSR_RDA = 0x80, // Rx Data available + REG_RSR_EOF = 0x40, // End of frame detected (BOP and BSC modes) + REG_RSR_RHW = 0x20, // Odd number of frame data bytes reeived in 16 bit mode. + REG_RSR_CPERR = 0x10, // CRC or parity error detected + REG_RSR_FRERR = 0x08, // Frame error detected + REG_RSR_ROVRN = 0x04, // Rx overrun detected + REG_RSR_RAB = 0x02, // Rx Abort break detected + REG_RSR_RIDLE = 0x01, // Rx idle detcted (15+ high consecutive bits accounted for) }; // RCR - Rx Control Register @@ -261,12 +261,12 @@ protected: uint8_t do_rier(); void do_rier(uint8_t data); enum { - REG_RIER_RDA = 0x80, // Rx interrupt on Receiver Data Available - REG_RIER_EOF = 0x40, // Rx interrupt on End of frame - REG_RIER_CPERR = 0x10, // Rx interrupt on CRC or Parity error - REG_RIER_FRERR = 0x08, // Rx interrupt on Frame error - REG_RIER_ROVRN = 0x04, // Rx interrupt on Receiver overrun - REG_RIER_RAB = 0x02, // Rx interrupt on Abort/Break + REG_RIER_RDA = 0x80, // Rx interrupt on Receiver Data Available + REG_RIER_EOF = 0x40, // Rx interrupt on End of frame + REG_RIER_CPERR = 0x10, // Rx interrupt on CRC or Parity error + REG_RIER_FRERR = 0x08, // Rx interrupt on Frame error + REG_RIER_ROVRN = 0x04, // Rx interrupt on Receiver overrun + REG_RIER_RAB = 0x02, // Rx interrupt on Abort/Break }; // TSR - Tx Status Register @@ -287,14 +287,14 @@ protected: void do_tcr(uint8_t data); enum { - REG_TCR_TEN = 0x80, // Tx enable - REG_TCR_TDSREN = 0x40, // DMA enable - REG_TCR_TICS = 0x20, // Tx Idle Char Select, 'A' variant differs - REG_TCR_THW = 0x10, // Indicates that last 16 bit word has only 8 bits, in 16 bits mode only - REG_TCR_TLAST = 0x08, // Indicates the last byte to be written in to TDR (BOP, BCS or COP) - REG_TCR_TSYN = 0x04, // SYN enable (BCS or COP) - REG_TCR_TABT = 0x02, // Abort command (BOP) - REG_TCR_TRES = 0x01, // Tx Reset command + REG_TCR_TEN = 0x80, // Tx enable + REG_TCR_TDSREN = 0x40, // DMA enable + REG_TCR_TICS = 0x20, // Tx Idle Char Select, 'A' variant differs + REG_TCR_THW = 0x10, // Indicates that last 16 bit word has only 8 bits, in 16 bits mode only + REG_TCR_TLAST = 0x08, // Indicates the last byte to be written in to TDR (BOP, BCS or COP) + REG_TCR_TSYN = 0x04, // SYN enable (BCS or COP) + REG_TCR_TABT = 0x02, // Abort command (BOP) + REG_TCR_TRES = 0x01, // Tx Reset command }; // TDR - Tx Data Register (write only) @@ -314,10 +314,10 @@ protected: void do_tier(uint8_t data); enum { - REG_TIER_TDRA = 0x80, // TX Character available interrupt - REG_TIER_TFC = 0x40, // TX Frame complete interrupt - REG_TIER_TUNRN = 0x04, // TX Underrun interrupt - REG_TIER_TFERR = 0x02, // TX Frame error interrupt + REG_TIER_TDRA = 0x80, // TX Character available interrupt + REG_TIER_TFC = 0x40, // TX Frame complete interrupt + REG_TIER_TUNRN = 0x04, // TX Underrun interrupt + REG_TIER_TFERR = 0x02, // TX Frame error interrupt }; // SISR - Serial Interface Status Register @@ -326,12 +326,12 @@ protected: void do_sisr(uint8_t data); enum { - REG_SISR_CTST = 0x80, // Clear To Send Transition Status - REG_SISR_DSRT = 0x40, // Data Set Ready Transition Status - REG_SISR_DCDT = 0x20, // Data Carrier Detect Transition Status - REG_SISR_CTSLVL = 0x10, // Clear To Send Level - REG_SISR_DSRLVL = 0x08, // Data Set Ready Level - REG_SISR_DCDLVL = 0x04, // Data Carrier Detect Level + REG_SISR_CTST = 0x80, // Clear To Send Transition Status + REG_SISR_DSRT = 0x40, // Data Set Ready Transition Status + REG_SISR_DCDT = 0x20, // Data Carrier Detect Transition Status + REG_SISR_CTSLVL = 0x10, // Clear To Send Level + REG_SISR_DSRLVL = 0x08, // Data Set Ready Level + REG_SISR_DCDLVL = 0x04, // Data Carrier Detect Level }; // SICR - Serial Interface Control Register @@ -340,10 +340,10 @@ protected: void do_sicr(uint8_t data); enum { - REG_SICR_RTSLVL = 0x80, // RTS level - REG_SICR_DTRLVL = 0x40, // DTR level - REG_SICR_ECHO = 0x04, // Echo Mode - REG_SICR_TEST = 0x02, // Test Mode + REG_SICR_RTSLVL = 0x80, // RTS level + REG_SICR_DTRLVL = 0x40, // DTR level + REG_SICR_ECHO = 0x04, // Echo Mode + REG_SICR_TEST = 0x02, // Test Mode }; uint8_t m_sivnr; @@ -354,9 +354,9 @@ protected: void do_sier(uint8_t data); enum { - REG_SIER_CTS = 0x80, - REG_SIER_DSR = 0x40, - REG_SIER_DCD = 0x20, + REG_SIER_CTS = 0x80, + REG_SIER_DSR = 0x40, + REG_SIER_DCD = 0x20, }; // PSR1 Protocol Selection Register 1 @@ -365,10 +365,10 @@ protected: void do_psr1(uint8_t data); enum { - REG_PSR1_ADRZ = 0x08, // Zero adress option (BOP) (A models only) - REG_PSR1_IPARS = 0x04, // IPARS option (COP) - REG_PSR1_CTLEX = 0x02, // Control field width 8/16 bit (BOP) (A models only) - REG_PSR1_ADDEX = 0x01, // Address extend option (BOP) (A models only) + REG_PSR1_ADRZ = 0x08, // Zero adress option (BOP) (A models only) + REG_PSR1_IPARS = 0x04, // IPARS option (COP) + REG_PSR1_CTLEX = 0x02, // Control field width 8/16 bit (BOP) (A models only) + REG_PSR1_ADDEX = 0x01, // Address extend option (BOP) (A models only) }; // PSR2 Protocol Selection Register 2 @@ -377,25 +377,25 @@ protected: void do_psr2(uint8_t data); enum { - REG_PSR2_WDBYT = 0x80, // 8/16 bit data bus selector - REG_PSR2_STP_MSK = 0x60, // Stop bits selection field - REG_PSR2_STP_1 = 0x00, // 1 Stop bits - REG_PSR2_STP_1_5 = 0x20, // 1.5 Stop bits - REG_PSR2_STP_2 = 0x40, // 2 Stop bits - REG_PSR2_CHLN_MSK = 0x18, // char len selection field - REG_PSR2_CHLN_5 = 0x00, // 5 bit char len - REG_PSR2_CHLN_6 = 0x08, // 6 bit char len - REG_PSR2_CHLN_7 = 0x10, // 7 bit char len - REG_PSR2_CHLN_8 = 0x18, // 8 bit char len - REG_PSR2_PSEL_MSK = 0x07, // Protocol selection field - REG_PSR2_PSEL_BOPP = 0x00, // Protocol selection BOP Primary - REG_PSR2_PSEL_BOPS = 0x01, // Protocol selection BOP Secondary - REG_PSR2_PSEL_RSV = 0x02, // Protocol selection Reserved - REG_PSR2_PSEL_COP = 0x03, // Protocol selection COP - REG_PSR2_PSEL_BCSE = 0x04, // Protocol selection BCS EBCDIC - REG_PSR2_PSEL_BCSA = 0x05, // Protocol selection BCS ASCII - REG_PSR2_PSEL_ASCII = 0x06, // Protocol selection ASYNC - REG_PSR2_PSEL_ISOC = 0x07, // Protocol selection ISOC + REG_PSR2_WDBYT = 0x80, // 8/16 bit data bus selector + REG_PSR2_STP_MSK = 0x60, // Stop bits selection field + REG_PSR2_STP_1 = 0x00, // 1 Stop bits + REG_PSR2_STP_1_5 = 0x20, // 1.5 Stop bits + REG_PSR2_STP_2 = 0x40, // 2 Stop bits + REG_PSR2_CHLN_MSK = 0x18, // char len selection field + REG_PSR2_CHLN_5 = 0x00, // 5 bit char len + REG_PSR2_CHLN_6 = 0x08, // 6 bit char len + REG_PSR2_CHLN_7 = 0x10, // 7 bit char len + REG_PSR2_CHLN_8 = 0x18, // 8 bit char len + REG_PSR2_PSEL_MSK = 0x07, // Protocol selection field + REG_PSR2_PSEL_BOPP = 0x00, // Protocol selection BOP Primary + REG_PSR2_PSEL_BOPS = 0x01, // Protocol selection BOP Secondary + REG_PSR2_PSEL_RSV = 0x02, // Protocol selection Reserved + REG_PSR2_PSEL_COP = 0x03, // Protocol selection COP + REG_PSR2_PSEL_BCSE = 0x04, // Protocol selection BCS EBCDIC + REG_PSR2_PSEL_BCSA = 0x05, // Protocol selection BCS ASCII + REG_PSR2_PSEL_ASCII = 0x06, // Protocol selection ASYNC + REG_PSR2_PSEL_ISOC = 0x07, // Protocol selection ISOC }; uint8_t m_ar1; @@ -412,20 +412,20 @@ protected: uint8_t do_brdr2(); void do_brdr2(uint8_t data); - // CCR - Clock Control Register + // CCR - Clock Control Register uint8_t m_ccr; uint8_t do_ccr(); void do_ccr(uint8_t data); enum { - REG_CCR_PSCDIV = 0x10, // Internal prescaler Divider x2 or x3 - REG_CCR_TCLO = 0x08, // TxC input/output selection - REG_CCR_RCLKIN = 0x04, // RxC from internal/external source selection - REG_CCR_CLKDIV_MSK = 0x03, // External RxC prescaler Divider - REG_CCR_CLKDIV_X1 = 0x00, // x1 - ISOC only - REG_CCR_CLKDIV_X16 = 0x01, // x16 - ASYNC only - REG_CCR_CLKDIV_X32 = 0x02, // x32 - ASYNC only - REG_CCR_CLKDIV_X64 = 0x03, // x64 - ASYNC only + REG_CCR_PSCDIV = 0x10, // Internal prescaler Divider x2 or x3 + REG_CCR_TCLO = 0x08, // TxC input/output selection + REG_CCR_RCLKIN = 0x04, // RxC from internal/external source selection + REG_CCR_CLKDIV_MSK = 0x03, // External RxC prescaler Divider + REG_CCR_CLKDIV_X1 = 0x00, // x1 - ISOC only + REG_CCR_CLKDIV_X16 = 0x01, // x16 - ASYNC only + REG_CCR_CLKDIV_X32 = 0x02, // x32 - ASYNC only + REG_CCR_CLKDIV_X64 = 0x03, // x64 - ASYNC only }; // ECR - Error Control Regsiter @@ -434,14 +434,14 @@ protected: void do_ecr(uint8_t data); enum { - REG_ECR_PAREN = 0x80, // Parity Enable - REG_ECR_ODDPAR = 0x40, // Odd/Even Parity - REG_ECR_CFCRC = 0x08, // CRC Enable - REG_ECR_CRCPRE = 0x04, // CRC Preset 0 (BSC) or 1 (BOP) - REG_ECR_CRCSEL_MSK = 0x03, // CRC Polynominal Selection Mask - REG_ECR_CRCSEL_V41 = 0x00, // CCITT V.41 (BOP) CRC Polynomial - REG_ECR_CRCSEL_C16 = 0x01, // CRC-16 (BSC) CRC Polynomial - REG_ECR_CRCSEL_VRC = 0x02, // VRC/LRC (BSC, ASCII, non-transp) CRC Polynomial + REG_ECR_PAREN = 0x80, // Parity Enable + REG_ECR_ODDPAR = 0x40, // Odd/Even Parity + REG_ECR_CFCRC = 0x08, // CRC Enable + REG_ECR_CRCPRE = 0x04, // CRC Preset 0 (BSC) or 1 (BOP) + REG_ECR_CRCSEL_MSK = 0x03, // CRC Polynominal Selection Mask + REG_ECR_CRCSEL_V41 = 0x00, // CCITT V.41 (BOP) CRC Polynomial + REG_ECR_CRCSEL_C16 = 0x01, // CRC-16 (BSC) CRC Polynomial + REG_ECR_CRCSEL_VRC = 0x02, // VRC/LRC (BSC, ASCII, non-transp) CRC Polynomial }; }; diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h index 210dbc967fd..a61a8e141ef 100644 --- a/src/devices/machine/gen_latch.h +++ b/src/devices/machine/gen_latch.h @@ -63,7 +63,7 @@ protected: private: bool m_latch_written; - devcb_write_line m_data_pending_cb; + devcb_write_line m_data_pending_cb; }; diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index 2f79b82da1b..7428929ab3c 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mariusz Wojcieszek, R. Belmont /* - 2681 DUART + 2681 DUART 68681 DUART 28C94 QUART @@ -52,8 +52,8 @@ static const int baud_rate_ACR_1[] = { 75, 110, 134, 150, 300, 600, 1200, 2000, #define CHANA_TAG "cha" #define CHANB_TAG "chb" -#define CHANC_TAG "chc" -#define CHAND_TAG "chd" +#define CHANC_TAG "chc" +#define CHAND_TAG "chd" // device type definition const device_type MC68681 = &device_creator<mc68681_device>; @@ -357,12 +357,12 @@ READ8_MEMBER( sc28c94_device::read ) { uint8_t r = 0; offset &= 0x1f; - + if (offset < 0x10) { return mc68681_base_device::read(space, offset, mem_mask); } - + switch (offset) { case 0x10: /* MR1A/MR2C */ @@ -370,14 +370,14 @@ READ8_MEMBER( sc28c94_device::read ) case 0x13: /* Rx Holding Register C */ r = m_chanC->read_chan_reg(offset & 3); break; - + case 0x18: /* MR1D/MR2D */ case 0x19: /* SRD */ case 0x1b: /* RHRD */ r = m_chanD->read_chan_reg(offset & 3); break; } - + return r; } @@ -488,12 +488,12 @@ READ8_MEMBER( mc68681_base_device::read ) WRITE8_MEMBER( sc28c94_device::write ) { offset &= 0x1f; - + if (offset < 0x10) { mc68681_base_device::write(space, offset, data, mem_mask); } - + switch(offset) { case 0x10: /* MRC */ @@ -502,7 +502,7 @@ WRITE8_MEMBER( sc28c94_device::write ) case 0x13: /* THRC */ m_chanC->write_chan_reg(offset&3, data); break; - + case 0x18: /* MRC */ case 0x19: /* CSRC */ case 0x1a: /* CRC */ @@ -882,7 +882,7 @@ void mc68681_channel::tra_callback() if ((MR2&0xC0) != 0x80) { int bit = transmit_register_get_data_bit(); - //printf("%s ch %d transmit %d\n", tag(), m_ch, bit); + //printf("%s ch %d transmit %d\n", tag(), m_ch, bit); if (m_ch == 0) { m_uart->write_a_tx(bit); @@ -1254,7 +1254,7 @@ void mc68681_channel::write_TX(uint8_t data) printf("Write %02x to TX when TX not ready!\n", data); }*/ - //printf("%s ch %d Tx %02x\n", tag(), m_ch, data); + //printf("%s ch %d Tx %02x\n", tag(), m_ch, data); tx_ready = 0; SR &= ~STATUS_TRANSMITTER_READY; diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h index b502a33db12..208a6b9f032 100644 --- a/src/devices/machine/mc68681.h +++ b/src/devices/machine/mc68681.h @@ -32,7 +32,7 @@ // SC28C94 specific callbacks #define MCFG_SC28C94_ADD(_tag, _clock) \ MCFG_DEVICE_ADD(_tag, SC28C94, _clock) - + #define MCFG_SC28C94_C_TX_CALLBACK(_cb) \ devcb = &sc28c94_device::set_c_tx_cb(*device, DEVCB_##_cb); @@ -182,9 +182,9 @@ private: void set_ISR_bits(int mask); void update_interrupts(); - int get_ch(mc68681_channel *ch) - { - if (ch == m_chanA) + int get_ch(mc68681_channel *ch) + { + if (ch == m_chanA) { return 0; } @@ -196,10 +196,10 @@ private: { return 2; } - + return 3; } - + mc68681_channel *get_channel(int chan); }; @@ -213,7 +213,7 @@ class sc28c94_device : public mc68681_base_device { public: sc28c94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - + template<class _Object> static devcb_base &set_c_tx_cb(device_t &device, _Object object) { return downcast<mc68681_base_device &>(device).write_c_tx.set_callback(object); } template<class _Object> static devcb_base &set_d_tx_cb(device_t &device, _Object object) { return downcast<mc68681_base_device &>(device).write_d_tx.set_callback(object); } @@ -222,10 +222,10 @@ public: virtual DECLARE_READ8_MEMBER(read) override; virtual DECLARE_WRITE8_MEMBER(write) override; - + protected: virtual machine_config_constructor device_mconfig_additions() const override; - + private: }; diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index d4b9ef7336c..10bc304eb98 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -248,7 +248,7 @@ void netlist_mame_rom_t::custom_netlist_additions(netlist::setup_t &setup) if (memregion(m_region_tag) == nullptr) fatalerror("device %s region %s not found\n", basetag(), m_region_tag); setup.register_source(plib::make_unique_base<netlist::source_t, netlist_data_memregion_t>(setup, - m_name, memregion(m_region_tag)->base() + m_offset, m_size)); + m_name, memregion(m_region_tag)->base() + m_offset, m_size)); } void netlist_mame_rom_t::device_start() diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index f5b91929d9a..88f6f20a42a 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -2,28 +2,28 @@ // copyright-holders:F. Ulivi /********************************************************************* - phi.h + phi.h - HP PHI (Processor-to-Hpib-Interface) (1AA6-6x04) + HP PHI (Processor-to-Hpib-Interface) (1AA6-6x04) - PHI supports these features of HP-IB: - * SH1 - * AH1 - * T1/TE1 - * L1/LE1 - * SR1 - * RL2 - * PP1 - * DC1 - * DT1 - * C1,C2,C3,C4,C5 - * HP non-standard IDENTIFY sequence + PHI supports these features of HP-IB: + * SH1 + * AH1 + * T1/TE1 + * L1/LE1 + * SR1 + * RL2 + * PP1 + * DC1 + * DT1 + * C1,C2,C3,C4,C5 + * HP non-standard IDENTIFY sequence - Fun fact: PHI has no clock input, its FSMs are driven only by - changes in input signals and by a few internal monostables + Fun fact: PHI has no clock input, its FSMs are driven only by + changes in input signals and by a few internal monostables - Main reference for this ASIC: - HP 12009-90001, sep 82, HP12009A HP-IB Interface Reference Manual + Main reference for this ASIC: + HP 12009-90001, sep 82, HP12009A HP-IB Interface Reference Manual *********************************************************************/ @@ -47,122 +47,122 @@ enum { // Register addresses enum { - REG_R_INT_COND = 0, // R 0: Interrupting conditions - REG_W_INT_COND = 0, // W 0: Interrupting conditions - REG_R_INT_MASK = 1, // R 1: Interrupt mask - REG_W_INT_MASK = 1, // W 1: Interrupt mask - REG_R_INBOUND_FIFO = 2, // R 2: Inbound FIFO + REG_R_INT_COND = 0, // R 0: Interrupting conditions + REG_W_INT_COND = 0, // W 0: Interrupting conditions + REG_R_INT_MASK = 1, // R 1: Interrupt mask + REG_W_INT_MASK = 1, // W 1: Interrupt mask + REG_R_INBOUND_FIFO = 2, // R 2: Inbound FIFO REG_W_OUTBOUND_FIFO = 2,// W 2: Outbound FIFO - REG_R_STATUS = 3, // R 3: Status - REG_W_STATUS = 3, // W 3: Status - REG_R_CONTROL = 4, // R 4: Control - REG_W_CONTROL = 4, // W 4: Control - REG_R_ADDRESS = 5, // R 5: HPIB address - REG_W_ADDRESS = 5, // W 5: HPIB address - REG_R_1ST_ID = 6, // R 6: 1st ID byte - REG_W_1ST_ID = 6, // W 6: 1st ID byte - REG_R_2ND_ID = 7, // R 7: 2nd ID byte - REG_W_2ND_ID = 7 // W 7: 2nd ID byte + REG_R_STATUS = 3, // R 3: Status + REG_W_STATUS = 3, // W 3: Status + REG_R_CONTROL = 4, // R 4: Control + REG_W_CONTROL = 4, // W 4: Control + REG_R_ADDRESS = 5, // R 5: HPIB address + REG_W_ADDRESS = 5, // W 5: HPIB address + REG_R_1ST_ID = 6, // R 6: 1st ID byte + REG_W_1ST_ID = 6, // W 6: 1st ID byte + REG_R_2ND_ID = 7, // R 7: 2nd ID byte + REG_W_2ND_ID = 7 // W 7: 2nd ID byte }; // All valid bits in registers -#define REG_ALL_MASK 0xc0ff +#define REG_ALL_MASK 0xc0ff // D0 & D1 bits -#define REG_D0D1_MASK 0xc000 // Mask of D0/D1 bits -#define REG_D0D1_SHIFT 14 // Position of D0/D1 bits +#define REG_D0D1_MASK 0xc000 // Mask of D0/D1 bits +#define REG_D0D1_SHIFT 14 // Position of D0/D1 bits // D8-D15 bits -#define REG_D08D15_MASK 0xff // Mask of D8:D15 bits +#define REG_D08D15_MASK 0xff // Mask of D8:D15 bits // Bits in INT_COND & INT_MASK -#define REG_INT_DEV_CLEAR_BIT 0 // Device clear -#define REG_INT_FIFO_IDLE_BIT 1 // FIFO idle -#define REG_INT_FIFO_AV_BIT 2 // FIFO bytes available -#define REG_INT_FIFO_ROOM_BIT 3 // FIFO room available -#define REG_INT_SRQ_BIT 4 // Service request -#define REG_INT_PP_RESPONSE_BIT 5 // PP response -#define REG_INT_PROC_ABORT_BIT 6 // Processor handshake abort -#define REG_INT_STATUS_CH_BIT 7 // Status change -#define REG_INT_PARITY_ERR_BIT 14 // Parity error -#define REG_INT_PENDING_BIT 15 // Interrupt pending -#define REG_INT_CLEARABLE_MASK 0x40c1 // Mask of clearable bits -#define REG_INT_STATE_MASK 0x803e // Mask of "state" bits +#define REG_INT_DEV_CLEAR_BIT 0 // Device clear +#define REG_INT_FIFO_IDLE_BIT 1 // FIFO idle +#define REG_INT_FIFO_AV_BIT 2 // FIFO bytes available +#define REG_INT_FIFO_ROOM_BIT 3 // FIFO room available +#define REG_INT_SRQ_BIT 4 // Service request +#define REG_INT_PP_RESPONSE_BIT 5 // PP response +#define REG_INT_PROC_ABORT_BIT 6 // Processor handshake abort +#define REG_INT_STATUS_CH_BIT 7 // Status change +#define REG_INT_PARITY_ERR_BIT 14 // Parity error +#define REG_INT_PENDING_BIT 15 // Interrupt pending +#define REG_INT_CLEARABLE_MASK 0x40c1 // Mask of clearable bits +#define REG_INT_STATE_MASK 0x803e // Mask of "state" bits // Bits in inbound FIFO -#define REG_IFIFO_NORMAL_MASK 0x0000 // Mask of D0/D1 bits for "normal" bytes -#define REG_IFIFO_CNT_EXP_MASK 0x8000 // Mask for a byte that caused byte count to expire -#define REG_IFIFO_LAST_MASK 0xc000 // Mask for last byte in a record -#define REG_IFIFO_2_ADDR_MASK 0x4000 // Mask for secondary addresses -#define REG_IFIFO_TALK_BIT 5 // Bit of "talk" flag +#define REG_IFIFO_NORMAL_MASK 0x0000 // Mask of D0/D1 bits for "normal" bytes +#define REG_IFIFO_CNT_EXP_MASK 0x8000 // Mask for a byte that caused byte count to expire +#define REG_IFIFO_LAST_MASK 0xc000 // Mask for last byte in a record +#define REG_IFIFO_2_ADDR_MASK 0x4000 // Mask for secondary addresses +#define REG_IFIFO_TALK_BIT 5 // Bit of "talk" flag // Bits in outbound FIFO -#define REG_OFIFO_SPECIAL_BIT 14 // Bit to discriminate between normal bytes and the rest -#define REG_OFIFO_END_BIT 15 // Bit of EOI -#define REG_OFIFO_IFCMD_MASK 0x4000 // Mask of interface commands -#define REG_OFIFO_UNCNT_MASK 0xc000 // Mask of uncounted transfer enable -#define REG_OFIFO_XFER_EN_MASK 0x0000 // Mask of byte transfer enable -#define REG_OFIFO_LF_INH_BIT 15 // Bit of LF detection inhibit +#define REG_OFIFO_SPECIAL_BIT 14 // Bit to discriminate between normal bytes and the rest +#define REG_OFIFO_END_BIT 15 // Bit of EOI +#define REG_OFIFO_IFCMD_MASK 0x4000 // Mask of interface commands +#define REG_OFIFO_UNCNT_MASK 0xc000 // Mask of uncounted transfer enable +#define REG_OFIFO_XFER_EN_MASK 0x0000 // Mask of byte transfer enable +#define REG_OFIFO_LF_INH_BIT 15 // Bit of LF detection inhibit // Bits in status register -#define REG_STATUS_DATA_FREEZE_BIT 0 // Outbound data freeze -#define REG_STATUS_LISTEN_BIT 1 // Addressed to listen -#define REG_STATUS_TALK_BIT 2 // Addressed to talk or identify -#define REG_STATUS_SYS_CTRL_BIT 3 // System controller -#define REG_STATUS_CONTROLLER_BIT 4 // Current controller -#define REG_STATUS_REMOTE_BIT 5 // Remote state -#define REG_STATUS_D0D1_BIT 6 // D0/D1 bit access -#define REG_STATUS_STATE_MASK 0x3e // Mask of "state" bits +#define REG_STATUS_DATA_FREEZE_BIT 0 // Outbound data freeze +#define REG_STATUS_LISTEN_BIT 1 // Addressed to listen +#define REG_STATUS_TALK_BIT 2 // Addressed to talk or identify +#define REG_STATUS_SYS_CTRL_BIT 3 // System controller +#define REG_STATUS_CONTROLLER_BIT 4 // Current controller +#define REG_STATUS_REMOTE_BIT 5 // Remote state +#define REG_STATUS_D0D1_BIT 6 // D0/D1 bit access +#define REG_STATUS_STATE_MASK 0x3e // Mask of "state" bits // Bits in control register -#define REG_CTRL_INIT_OFIFO_BIT 0 // Initialize outbound FIFO -#define REG_CTRL_DMA_FIFO_BIT 1 // DMA FIFO selection -#define REG_CTRL_SERVICE_REQ_BIT 2 // Request service -#define REG_CTRL_PP_RESPONSE_BIT 3 // Respond to PP -#define REG_CTRL_IFC_BIT 4 // IFC value -#define REG_CTRL_REN_BIT 5 // REN value -#define REG_CTRL_PAR_FREEZE_BIT 6 // Parity freeze -#define REG_CTRL_8BIT_PROC_BIT 7 // 8-bit processor +#define REG_CTRL_INIT_OFIFO_BIT 0 // Initialize outbound FIFO +#define REG_CTRL_DMA_FIFO_BIT 1 // DMA FIFO selection +#define REG_CTRL_SERVICE_REQ_BIT 2 // Request service +#define REG_CTRL_PP_RESPONSE_BIT 3 // Respond to PP +#define REG_CTRL_IFC_BIT 4 // IFC value +#define REG_CTRL_REN_BIT 5 // REN value +#define REG_CTRL_PAR_FREEZE_BIT 6 // Parity freeze +#define REG_CTRL_8BIT_PROC_BIT 7 // 8-bit processor // Bits in address register -#define REG_ADDR_HPIB_ADDR_BIT 0 // HPIB address -#define REG_ADDR_LA_BIT 5 // Listen always -#define REG_ADDR_TA_BIT 6 // Talk always -#define REG_ADDR_ONLINE_BIT 7 // Online +#define REG_ADDR_HPIB_ADDR_BIT 0 // HPIB address +#define REG_ADDR_LA_BIT 5 // Listen always +#define REG_ADDR_TA_BIT 6 // Talk always +#define REG_ADDR_ONLINE_BIT 7 // Online // Interface commands -#define IFCMD_MASK 0x7f // Mask of interface commands -#define IFCMD_DCL 0x14 // Device clear -#define IFCMD_GET 0x08 // Group execute trigger -#define IFCMD_GTL 0x01 // Go to local -#define IFCMD_LLO 0x11 // Local lock-out -#define IFCMD_AG_MASK 0x60 // Mask of bits identifying address group commands -#define IFCMD_ADDR_MASK 0x1f // Mask of address in AG commands -#define IFCMD_LAG_VALUE 0x20 // Value of LAG commands -#define IFCMD_TAG_VALUE 0x40 // Value of TAG commands -#define IFCMD_SCG_VALUE 0x60 // Value of SCG commands -#define IFCMD_PPC 0x05 // Parallel poll configure -#define IFCMD_PPX_MASK 0x70 // Mask of PPE/PPD commands -#define IFCMD_PPE_VALUE 0x60 // Parallel poll enable -#define IFCMD_PPE_S_BIT 3 // Position of "S" bit in PPE -#define IFCMD_PPE_PPR_MASK 7 // Mask in PPE of PPR msg no. -#define IFCMD_PPD_VALUE 0x70 // Parallel poll disable -#define IFCMD_PPU 0x15 // Parallel poll unconfigure -#define IFCMD_SDC 0x04 // Selected device clear -#define IFCMD_SPD 0x19 // Serial poll disable -#define IFCMD_SPE 0x18 // Serial poll enable -#define IFCMD_TCT 0x09 // Take control -#define IFCMD_UNL 0x3f // Unlisten -#define IFCMD_UNT 0x5f // Untalk +#define IFCMD_MASK 0x7f // Mask of interface commands +#define IFCMD_DCL 0x14 // Device clear +#define IFCMD_GET 0x08 // Group execute trigger +#define IFCMD_GTL 0x01 // Go to local +#define IFCMD_LLO 0x11 // Local lock-out +#define IFCMD_AG_MASK 0x60 // Mask of bits identifying address group commands +#define IFCMD_ADDR_MASK 0x1f // Mask of address in AG commands +#define IFCMD_LAG_VALUE 0x20 // Value of LAG commands +#define IFCMD_TAG_VALUE 0x40 // Value of TAG commands +#define IFCMD_SCG_VALUE 0x60 // Value of SCG commands +#define IFCMD_PPC 0x05 // Parallel poll configure +#define IFCMD_PPX_MASK 0x70 // Mask of PPE/PPD commands +#define IFCMD_PPE_VALUE 0x60 // Parallel poll enable +#define IFCMD_PPE_S_BIT 3 // Position of "S" bit in PPE +#define IFCMD_PPE_PPR_MASK 7 // Mask in PPE of PPR msg no. +#define IFCMD_PPD_VALUE 0x70 // Parallel poll disable +#define IFCMD_PPU 0x15 // Parallel poll unconfigure +#define IFCMD_SDC 0x04 // Selected device clear +#define IFCMD_SPD 0x19 // Serial poll disable +#define IFCMD_SPE 0x18 // Serial poll enable +#define IFCMD_TCT 0x09 // Take control +#define IFCMD_UNL 0x3f // Unlisten +#define IFCMD_UNT 0x5f // Untalk // Delays -#define DELAY_T1 2000 // T1: 2 us -#define DELAY_T7 500 // T7: 0.5 us -#define DELAY_T9 1500 // T9: 1.5 us -#define DELAY_T10 1500 // T10: 1.5 us +#define DELAY_T1 2000 // T1: 2 us +#define DELAY_T7 500 // T7: 0.5 us +#define DELAY_T9 1500 // T9: 1.5 us +#define DELAY_T10 1500 // T10: 1.5 us // Controller address -#define CONTROLLER_ADDR 0x1e // PHI always has this address when it's a controller +#define CONTROLLER_ADDR 0x1e // PHI always has this address when it's a controller // Device type definition const device_type PHI = &device_creator<phi_device>; @@ -705,7 +705,7 @@ void phi_device::update_fsm(void) } // rdy is always true // } else if (!get_signal(PHI_488_ATN) && !rdy_msg()) { - // m_ah_state = PHI_AH_ANRS; + // m_ah_state = PHI_AH_ANRS; // } break; @@ -913,11 +913,11 @@ void phi_device::update_fsm(void) m_sh_state != PHI_SH_STRS && m_sh_state != PHI_SH_SDYS) { if (!m_fifo_out.empty()) { // Possible cases - // D0/D1 Meaning of 1st word of OFIFO + // D0/D1 Meaning of 1st word of OFIFO // ===================================== - // x0 Counted transfer enable or byte to be sent - // 11 Uncounted transfer enable - // 01 Send interface command (already caught by nba_msg) + // x0 Counted transfer enable or byte to be sent + // 11 Uncounted transfer enable + // 01 Send interface command (already caught by nba_msg) m_c_state = PHI_C_CSBS; m_be_counter = 0; } else if (rpp_msg()) { diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h index 84955d290af..23a9d224108 100644 --- a/src/devices/machine/phi.h +++ b/src/devices/machine/phi.h @@ -2,9 +2,9 @@ // copyright-holders:F. Ulivi /********************************************************************* - phi.h + phi.h - HP PHI (Processor-to-Hpib-Interface) (1AA6-6x04) + HP PHI (Processor-to-Hpib-Interface) (1AA6-6x04) *********************************************************************/ @@ -12,45 +12,45 @@ #define _PHI_H_ // Set read and write callbacks to access DIO bus on IEEE-488 -#define MCFG_PHI_DIO_READWRITE_CB(_read , _write) \ - phi_device::set_dio_read_cb(*device , DEVCB_##_read); \ +#define MCFG_PHI_DIO_READWRITE_CB(_read , _write) \ + phi_device::set_dio_read_cb(*device , DEVCB_##_read); \ phi_device::set_dio_write_cb(*device , DEVCB_##_write); // Set write callbacks to access uniline signals on IEEE-488 -#define MCFG_PHI_EOI_WRITE_CB(_write) \ +#define MCFG_PHI_EOI_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_EOI , DEVCB_##_write); -#define MCFG_PHI_DAV_WRITE_CB(_write) \ +#define MCFG_PHI_DAV_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_DAV , DEVCB_##_write); -#define MCFG_PHI_NRFD_WRITE_CB(_write) \ +#define MCFG_PHI_NRFD_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_NRFD , DEVCB_##_write); -#define MCFG_PHI_NDAC_WRITE_CB(_write) \ +#define MCFG_PHI_NDAC_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_NDAC , DEVCB_##_write); -#define MCFG_PHI_IFC_WRITE_CB(_write) \ +#define MCFG_PHI_IFC_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_IFC , DEVCB_##_write); -#define MCFG_PHI_SRQ_WRITE_CB(_write) \ +#define MCFG_PHI_SRQ_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_SRQ , DEVCB_##_write); -#define MCFG_PHI_ATN_WRITE_CB(_write) \ +#define MCFG_PHI_ATN_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_ATN , DEVCB_##_write); -#define MCFG_PHI_REN_WRITE_CB(_write) \ +#define MCFG_PHI_REN_WRITE_CB(_write) \ phi_device::set_488_signal_write_cb(*device , phi_device::PHI_488_REN , DEVCB_##_write); // Set write callback for INT signal -#define MCFG_PHI_INT_WRITE_CB(_write) \ +#define MCFG_PHI_INT_WRITE_CB(_write) \ phi_device::set_int_write_cb(*device , DEVCB_##_write); // Set write callback for DMARQ signal -#define MCFG_PHI_DMARQ_WRITE_CB(_write) \ +#define MCFG_PHI_DMARQ_WRITE_CB(_write) \ phi_device::set_dmarq_write_cb(*device , DEVCB_##_write); // Depth of inbound/outbound FIFOs -#define PHI_FIFO_SIZE 8 +#define PHI_FIFO_SIZE 8 class phi_device : public device_t { @@ -102,22 +102,22 @@ public: // Mapping of PHI register bits: // Reg. bit PHI bit // ================= - // 15 0 - // 14 1 - // 13 =0= - // 12 =0= - // 11 =0= - // 10 =0= - // 9 =0= - // 8 =0= - // 7 8 - // 6 9 - // 5 10 - // 4 11 - // 3 12 - // 2 13 - // 1 14 - // 0 15 + // 15 0 + // 14 1 + // 13 =0= + // 12 =0= + // 11 =0= + // 10 =0= + // 9 =0= + // 8 =0= + // 7 8 + // 6 9 + // 5 10 + // 4 11 + // 3 12 + // 2 13 + // 1 14 + // 0 15 DECLARE_WRITE16_MEMBER(reg16_w); DECLARE_READ16_MEMBER(reg16_r); DECLARE_WRITE8_MEMBER(reg8_w); @@ -153,8 +153,8 @@ private: // SH (Source Handshake) states enum { - PHI_SH_SIDS, // & SIWS - PHI_SH_SGNS, // & SWNS + PHI_SH_SIDS, // & SIWS + PHI_SH_SGNS, // & SWNS PHI_SH_SDYS, PHI_SH_STRS }; @@ -167,7 +167,7 @@ private: PHI_AH_ANRS, PHI_AH_ACRS, PHI_AH_ACDS, - PHI_AH_ACDS_FROZEN, // Non-standard state: IF CMD rejected because of even parity + PHI_AH_ACDS_FROZEN, // Non-standard state: IF CMD rejected because of even parity PHI_AH_AWNS }; @@ -180,16 +180,16 @@ private: PHI_T_SPAS, PHI_T_TACS, // The following are non-standard states for IDENTIFY sequencing - PHI_T_ID1, // Untalked - PHI_T_ID2, // Addressed by secondary address - PHI_T_ID3, // Sending 1st byte - PHI_T_ID4, // Waiting to send 2nd byte - PHI_T_ID5, // Sending 2nd byte - PHI_T_ID6 // 2nd byte sent, end of sequence + PHI_T_ID1, // Untalked + PHI_T_ID2, // Addressed by secondary address + PHI_T_ID3, // Sending 1st byte + PHI_T_ID4, // Waiting to send 2nd byte + PHI_T_ID5, // Sending 2nd byte + PHI_T_ID6 // 2nd byte sent, end of sequence }; int m_t_state; - bool m_t_spms; // False: SPIS, true: SPMS + bool m_t_spms; // False: SPIS, true: SPMS // L (Listener) states enum { diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index 9da63ed2484..4120754a599 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -130,7 +130,7 @@ public: void tc_w(bool val) override; void ready_w(bool val); - DECLARE_WRITE_LINE_MEMBER(tc_line_w) { tc_w(state == ASSERT_LINE); } + DECLARE_WRITE_LINE_MEMBER(tc_line_w) { tc_w(state == ASSERT_LINE); } void set_rate(int rate); // rate in bps, to be used when the fdc is externally frequency-controlled diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp index c4bc1b048ab..052c3ba4933 100644 --- a/src/devices/video/hlcd0515.cpp +++ b/src/devices/video/hlcd0515.cpp @@ -99,7 +99,7 @@ void hlcd0515_device::device_timer(emu_timer &timer, device_timer_id id, int par { if (m_rowout > m_rowmax) m_rowout = 0; - + // write to COL/ROW pins m_write_cols(m_rowout, m_blank ? m_ram[m_rowout] : 0, 0xffffffff); m_rowout++; @@ -114,7 +114,7 @@ void hlcd0515_device::device_timer(emu_timer &timer, device_timer_id id, int par WRITE_LINE_MEMBER(hlcd0515_device::write_cs) { state = (state) ? 1 : 0; - + // start serial sequence on falling edge if (!state && m_cs) { @@ -128,7 +128,7 @@ WRITE_LINE_MEMBER(hlcd0515_device::write_cs) WRITE_LINE_MEMBER(hlcd0515_device::write_clock) { state = (state) ? 1 : 0; - + // clock/shift data on falling edge if (!m_cs && m_count < 30 && !state && m_clock) { @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER(hlcd0515_device::write_clock) m_ram[m_rowsel] = (m_ram[m_rowsel] & ~mask) | (m_data ? mask : 0); } } - + m_count++; } diff --git a/src/devices/video/hlcd0515.h b/src/devices/video/hlcd0515.h index 815e49e0c08..622a68e7126 100644 --- a/src/devices/video/hlcd0515.h +++ b/src/devices/video/hlcd0515.h @@ -75,12 +75,12 @@ protected: int m_data; // " int m_count; u8 m_control; - bool m_blank; // display blank/visible + bool m_blank; // display blank/visible u8 m_rowmax; // number of rows output by lcd (max 8) u8 m_rowout; // current row for lcd output u8 m_rowsel; // current row for data in/out u32 m_ram[8]; // 8x25bit ram - + emu_timer *m_lcd_timer; // callbacks diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index 2f77efb875a..b0553642316 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -214,7 +214,7 @@ WRITE8_MEMBER( tms9927_device::write ) case 0x0d: /* LOAD CURSOR ROW ADDRESS */ osd_printf_debug("Cursor address changed\n"); m_reg[offset - 0x0c + 7] = data; - /* Recomputing parameters here will break the scrollup on the Attachè + /* Recomputing parameters here will break the scrollup on the Attachè and probably other machines due to m_start_datarow being reset ! */ //recompute_parameters(false); break; diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp index aca1d3449bb..f77412c5846 100644 --- a/src/devices/video/zeus2.cpp +++ b/src/devices/video/zeus2.cpp @@ -1859,7 +1859,7 @@ void zeus2_renderer::render_poly_8bit(int32_t scanline, const extent_t& extent, int v1 = (v0 + 1); uint8_t texel0 = object.get_texel(texbase, v0, u0, texwidth); //if (texel0 == transcolor) - // continue; + // continue; uint8_t texel1 = object.get_texel(texbase, v0, u1, texwidth); uint8_t texel2 = object.get_texel(texbase, v1, u0, texwidth); uint8_t texel3 = object.get_texel(texbase, v1, u1, texwidth); @@ -1951,20 +1951,20 @@ std::string zeus2_device::tex_info(void) std::string retVal; switch (zeus_texbase) { // crusnexo - case 0x01fc00: retVal = "credits / insert coin"; break; - case 0x1dc000: retVal = "copywrite text"; break; - case 0x0e7400: retVal = "tire"; break; - case 0x0e8800: retVal = "star behind tire"; break; - case 0x0e6800: retVal = "crusn exotica text"; break; - case 0x02a400: retVal = "Yellow Letters / Numbers"; break; - case 0x1fd000: retVal = "Star burst in license plate screen"; break; - case 0x1e9800: retVal = "Red Letter in license plate screen"; break; - case 0x0c1c00: retVal = "Car parts"; break; - case 0x0006f000: retVal = "license plate background"; break; - case 0x0006f400: retVal = "blue on white license plate names"; break; - case 0x00047800: retVal = "baby body"; break; - case 0x000e7000: retVal = "crusn exotica yellow glow"; break; - case 0x0002b000: retVal = "blue crusn stencil behind leader list"; break; + case 0x01fc00: retVal = "credits / insert coin"; break; + case 0x1dc000: retVal = "copywrite text"; break; + case 0x0e7400: retVal = "tire"; break; + case 0x0e8800: retVal = "star behind tire"; break; + case 0x0e6800: retVal = "crusn exotica text"; break; + case 0x02a400: retVal = "Yellow Letters / Numbers"; break; + case 0x1fd000: retVal = "Star burst in license plate screen"; break; + case 0x1e9800: retVal = "Red Letter in license plate screen"; break; + case 0x0c1c00: retVal = "Car parts"; break; + case 0x0006f000: retVal = "license plate background"; break; + case 0x0006f400: retVal = "blue on white license plate names"; break; + case 0x00047800: retVal = "baby body"; break; + case 0x000e7000: retVal = "crusn exotica yellow glow"; break; + case 0x0002b000: retVal = "blue crusn stencil behind leader list"; break; case 0x001f4800: retVal = "number keypad"; break; case 0x001e7800: retVal = "register now logo"; break; case 0x001e5000: retVal = "blue start game / enter code / earn miles"; break; @@ -1995,43 +1995,43 @@ std::string zeus2_device::tex_info(void) // mwskinsa case 0x1fdf00: retVal = "Skins Tip Box, s=256"; break; - case 0x07f540: retVal = "Left main intro"; break; - case 0x081580: retVal = "Right main intro"; break; - case 0x14db00: retVal = "silver letter b, s=64"; break; - case 0x14d880: retVal = "letter a"; break; - case 0x14e000: retVal = "letter d"; break; - case 0x0014dd80: retVal = "silver letter c, s=64"; break; - case 0x0014fb80: retVal = "silver letter o, s=64"; break; - case 0x0014ec80: retVal = "silver letter i, s=64"; break; - case 0x0014f900: retVal = "silver letter n, s=64"; break; - case 0x00150580: retVal = "silver letter s, s=64"; break; - case 0x00150800: retVal = "silver letter t, s=64"; break; - case 0x00150300: retVal = "silver letter r, s=64"; break; - case 0x0014e780: retVal = "silver letter g, s=64"; break; - case 0x00153280: retVal = "silver letter C, s=64"; break; - case 0x0014e280: retVal = "silver letter e, s=64"; break; - case 0x0014b800: retVal = "silver letter O, s=64"; break; - case 0x00152d80: retVal = "silver letter A, s=64"; break; - case 0x0014f680: retVal = "silver letter m, s=64"; break; - case 0x00142b40: retVal = "black screen?"; break; - case 0x00004740: retVal = "picture bridge over water, s=256"; break; - case 0x00005c80: retVal = "picture water shore, s=256"; break; - case 0x000030c0: retVal = "left leaderboard background graphics, s=256"; break; - case 0x00003c00: retVal = "right leaderboard background graphics, s=256"; break; - case 0x00040bc0: retVal = "extreme mode, s=256"; break; - case 0x00091630: retVal = "photo wild eye guy, s=64"; break; - case 0x00159d80: retVal = "white M s=32, t=4"; break; - case 0x0015a080: retVal = "white 9 s=32, t=4"; break; - case 0x00159f00: retVal = "white P s=32, t=4"; break; - case 0x00145a40: retVal = "white crossbar? s=32, t=4"; break; - case 0x00145c40: retVal = "white crossbar2? s=32, t=4"; break; - case 0x00159300: retVal = "white _ s=32, t=4"; break; - case 0x00158d00: retVal = "white 1 s=32, t=4"; break; - case 0x00158e80: retVal = "white 4 s=32, t=4"; break; - case 0x0001c080: retVal = "maybe checkboard"; break; + case 0x07f540: retVal = "Left main intro"; break; + case 0x081580: retVal = "Right main intro"; break; + case 0x14db00: retVal = "silver letter b, s=64"; break; + case 0x14d880: retVal = "letter a"; break; + case 0x14e000: retVal = "letter d"; break; + case 0x0014dd80: retVal = "silver letter c, s=64"; break; + case 0x0014fb80: retVal = "silver letter o, s=64"; break; + case 0x0014ec80: retVal = "silver letter i, s=64"; break; + case 0x0014f900: retVal = "silver letter n, s=64"; break; + case 0x00150580: retVal = "silver letter s, s=64"; break; + case 0x00150800: retVal = "silver letter t, s=64"; break; + case 0x00150300: retVal = "silver letter r, s=64"; break; + case 0x0014e780: retVal = "silver letter g, s=64"; break; + case 0x00153280: retVal = "silver letter C, s=64"; break; + case 0x0014e280: retVal = "silver letter e, s=64"; break; + case 0x0014b800: retVal = "silver letter O, s=64"; break; + case 0x00152d80: retVal = "silver letter A, s=64"; break; + case 0x0014f680: retVal = "silver letter m, s=64"; break; + case 0x00142b40: retVal = "black screen?"; break; + case 0x00004740: retVal = "picture bridge over water, s=256"; break; + case 0x00005c80: retVal = "picture water shore, s=256"; break; + case 0x000030c0: retVal = "left leaderboard background graphics, s=256"; break; + case 0x00003c00: retVal = "right leaderboard background graphics, s=256"; break; + case 0x00040bc0: retVal = "extreme mode, s=256"; break; + case 0x00091630: retVal = "photo wild eye guy, s=64"; break; + case 0x00159d80: retVal = "white M s=32, t=4"; break; + case 0x0015a080: retVal = "white 9 s=32, t=4"; break; + case 0x00159f00: retVal = "white P s=32, t=4"; break; + case 0x00145a40: retVal = "white crossbar? s=32, t=4"; break; + case 0x00145c40: retVal = "white crossbar2? s=32, t=4"; break; + case 0x00159300: retVal = "white _ s=32, t=4"; break; + case 0x00158d00: retVal = "white 1 s=32, t=4"; break; + case 0x00158e80: retVal = "white 4 s=32, t=4"; break; + case 0x0001c080: retVal = "maybe checkboard"; break; // thegrid - //case 0x0001c080: retVal = "maybe checkboard"; break; + //case 0x0001c080: retVal = "maybe checkboard"; break; default: retVal = "Unknown"; break; } return retVal; diff --git a/src/devices/video/zeus2.h b/src/devices/video/zeus2.h index fc18b602e9d..35bb4f02f21 100644 --- a/src/devices/video/zeus2.h +++ b/src/devices/video/zeus2.h @@ -22,7 +22,7 @@ #define DUMP_WAVE_RAM 0 #define TRACK_REG_USAGE 0 -#define PRINT_TEX_INFO 0 +#define PRINT_TEX_INFO 0 #define WAVERAM0_WIDTH 1024 #define WAVERAM0_HEIGHT 2048 diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index cc6738ee9f6..611912d4bae 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -726,7 +726,7 @@ void debugger_commands::execute_tracelog(int ref, int params, const char *param[ /*------------------------------------------------- - execute_tracesym - execute the tracesym command + execute_tracesym - execute the tracesym command -------------------------------------------------*/ void debugger_commands::execute_tracesym(int ref, int params, const char *param[]) diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 178f4cf7f32..5a36ecadfee 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -3462,4 +3462,4 @@ void device_debug::errorlog_write_line(const char *line) { if (m_trace && m_trace->logerror()) trace_printf("%s", line); -}
\ No newline at end of file +} diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h index 383940c21cb..04cb6ac27e9 100644 --- a/src/emu/debug/debugcpu.h +++ b/src/emu/debug/debugcpu.h @@ -353,7 +353,7 @@ private: std::string m_action; // action to perform during a trace offs_t m_history[TRACE_LOOPS]; // history of recent PCs bool m_detect_loops; // whether or not we should detect loops - bool m_logerror; // whether or not we should collect logerror output + bool m_logerror; // whether or not we should collect logerror output int m_loops; // number of instructions in a loop int m_nextdex; // next index bool m_trace_over; // true if we're tracing over diff --git a/src/emu/debug/express.h b/src/emu/debug/express.h index 2627d198115..e255ae7b0e2 100644 --- a/src/emu/debug/express.h +++ b/src/emu/debug/express.h @@ -139,7 +139,7 @@ protected: symbol_table & m_table; // pointer back to the owning table symbol_type m_type; // type of symbol std::string m_name; // name of the symbol - std::string m_format; // format of symbol (or empty if unspecified) + std::string m_format; // format of symbol (or empty if unspecified) void * m_ref; // internal reference }; diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index b6463a99f9d..d74d6278eb4 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -205,9 +205,9 @@ const options_entry emu_options::s_option_entries[] = { OPTION_LANGUAGE ";lang", "English", OPTION_STRING, "display language" }, { nullptr, nullptr, OPTION_HEADER, "HTTP SERVER OPTIONS" }, - { OPTION_HTTP, "0", OPTION_BOOLEAN, "HTTP server enable" }, - { OPTION_HTTP_PORT, "8080", OPTION_INTEGER, "HTTP server port" }, - { OPTION_HTTP_ROOT, "web", OPTION_STRING, "HTTP server document root" }, + { OPTION_HTTP, "0", OPTION_BOOLEAN, "HTTP server enable" }, + { OPTION_HTTP_PORT, "8080", OPTION_INTEGER, "HTTP server port" }, + { OPTION_HTTP_ROOT, "web", OPTION_STRING, "HTTP server document root" }, { nullptr } }; diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 99b5463f540..c1114748900 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -190,7 +190,7 @@ #define OPTION_LANGUAGE "language" -#define OPTION_HTTP "http" +#define OPTION_HTTP "http" #define OPTION_HTTP_PORT "http_port" #define OPTION_HTTP_ROOT "http_root" diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index d528d9afd40..b32d94582b8 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -1184,7 +1184,7 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac void running_machine::export_http_api() { if (!options().http()) return; - + m_manager.http_server()->on_get("/api/machine", [this](auto response, auto request) { rapidjson::StringBuffer s; @@ -1195,7 +1195,7 @@ void running_machine::export_http_api() writer.Key("devices"); writer.StartArray(); - + device_iterator iter(this->root_device()); for (device_t &device : iter) writer.String(device.tag()); diff --git a/src/emu/main.cpp b/src/emu/main.cpp index ea77d976b00..54890c5dff0 100644 --- a/src/emu/main.cpp +++ b/src/emu/main.cpp @@ -109,10 +109,10 @@ static std::string extension_to_type(const std::string& extension) return "text/plain"; } -machine_manager::machine_manager(emu_options& options, osd_interface& osd) - : m_osd(osd), - m_options(options), - m_machine(nullptr), +machine_manager::machine_manager(emu_options& options, osd_interface& osd) + : m_osd(osd), + m_options(options), + m_machine(nullptr), m_io_context(std::make_shared<asio::io_context>()) { } @@ -184,7 +184,7 @@ void machine_manager::start_http_server() *send_stream << "update_machine"; m_wsserver->send(connection, send_stream); }; - + m_server->on_upgrade = [this](auto socket, auto request) { auto connection = std::make_shared<webpp::ws_server::Connection>(socket); connection->method = std::move(request->method); diff --git a/src/emu/main.h b/src/emu/main.h index 3a5f5a5c689..9d6f0e01459 100644 --- a/src/emu/main.h +++ b/src/emu/main.h @@ -108,7 +108,7 @@ protected: std::shared_ptr<asio::io_context> m_io_context; std::unique_ptr<webpp::http_server> m_server; std::unique_ptr<webpp::ws_server> m_wsserver; - std::thread m_server_thread; + std::thread m_server_thread; }; diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp index fe40f47eeba..a207e07aae3 100644 --- a/src/lib/netlist/analog/nld_bjt.cpp +++ b/src/lib/netlist/analog/nld_bjt.cpp @@ -166,11 +166,11 @@ NETLIB_UPDATE_TERMINALS(QBJT_EB) const nl_double Ic = (sIc - gce * m_gD_BE.Vd() + gcc * m_gD_BC.Vd()) * polarity; m_D_EB.set_mat( gee, gec - gee, -Ie, - gce - gee, gee - gec, Ie); + gce - gee, gee - gec, Ie); m_D_CB.set_mat( gcc, gce - gcc, -Ic, - gec - gcc, gcc - gce, Ic); + gec - gcc, gcc - gce, Ic); m_D_EC.set_mat( 0, -gec, 0, - -gce, 0, 0); + -gce, 0, 0); } diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h index 6b8436fa9b0..f7cfcf6f06e 100644 --- a/src/lib/netlist/analog/nld_bjt.h +++ b/src/lib/netlist/analog/nld_bjt.h @@ -67,8 +67,8 @@ namespace netlist * | |MJE |B-E junction exponential factor |- |0.33|0.33| | * | |TF |ideal forward transit time |sec |0|0.1ns | | * | |XTF|coefficient for bias dependence of TF |- |0| | | - * | |VTF |voltage describing VBC dependence of TF |V |infinite | | | - * | |ITF |high-current parameter for effect on TF |A |0| |* | + * | |VTF |voltage describing VBC dependence of TF |V |infinite | | | + * | |ITF |high-current parameter for effect on TF |A |0| |* | * | |PTF |excess phase at freq=1.0/(TF*2PI) Hz |deg |0| | | * | |CJC |B-C zero-bias depletion capacitance |F |0|2pF |* | * | |VJC |B-C built-in potential |V |0.75|0.5| | @@ -83,7 +83,7 @@ namespace netlist * | |XTI|temperature exponent for effect on IS |- |3| | | * | |KF |flicker-noise coefficient |- |0| | | * | |AF |flicker-noise exponent |- |1| | | - * | |FC |coefficient for forward-bias depletion capacitance formula |- |0.5| | | + * | |FC |coefficient for forward-bias depletion capacitance formula |- |0.5| | | * | |TNOM |Parameter measurement temperature |C |27|50| | */ @@ -102,7 +102,7 @@ namespace netlist value_t m_IS; //!< transport saturation current value_t m_BF; //!< ideal maximum forward beta value_t m_NF; //!< forward current emission coefficient - value_t m_BR; //!< ideal maximum reverse beta + value_t m_BR; //!< ideal maximum reverse beta value_t m_NR; //!< reverse current emission coefficient }; diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h index 0218649b542..eb74eaa5cb9 100644 --- a/src/lib/netlist/analog/nld_opamps.h +++ b/src/lib/netlist/analog/nld_opamps.h @@ -55,7 +55,7 @@ namespace netlist * | 3 |TYPE |Model Type, 1 and 3 are supported | | | | * |1,3 |FPF |frequency of first pole |Hz | |100 | * | 3 |SLEW |unity gain slew rate |V/s | | 1| - * |1,3 |RI |input resistance |Ohm | |1M | + * |1,3 |RI |input resistance |Ohm | |1M | * |1,3 |RO |output resistance |Ohm | |50 | * |1,3 |UGF |unity gain frequency (transition frequency) |Hz | |1000 | * | 3 |VLL |low output swing minus low supply rail |V | |1.5 | diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h index c02cfd29a76..9494ad26520 100644 --- a/src/lib/netlist/analog/nld_twoterm.h +++ b/src/lib/netlist/analog/nld_twoterm.h @@ -143,7 +143,7 @@ public: } void set_mat(const nl_double a11, const nl_double a12, const nl_double r1, - const nl_double a21, const nl_double a22, const nl_double r2) + const nl_double a21, const nl_double a22, const nl_double r2) { /* GO, GT, I */ m_P.set(-a12, a11, r1); diff --git a/src/lib/netlist/devices/nld_74194.h b/src/lib/netlist/devices/nld_74194.h index 944d9537754..8d07b685e55 100644 --- a/src/lib/netlist/devices/nld_74194.h +++ b/src/lib/netlist/devices/nld_74194.h @@ -28,17 +28,17 @@ #include "nl_setup.h" -#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ - NET_REGISTER_DEV(TTL_74194, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, S0, cS0) \ - NET_CONNECT(name, S1, cS1) \ - NET_CONNECT(name, SRIN, cSRIN) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, SLIN, cSLIN) \ +#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ + NET_REGISTER_DEV(TTL_74194, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, S0, cS0) \ + NET_CONNECT(name, S1, cS1) \ + NET_CONNECT(name, SRIN, cSRIN) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, SLIN, cSLIN) \ NET_CONNECT(name, CLRQ, cCLRQ) #define TTL_74194_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_82S115.h b/src/lib/netlist/devices/nld_82S115.h index 0c900e4dad7..1ceb22dc1b1 100644 --- a/src/lib/netlist/devices/nld_82S115.h +++ b/src/lib/netlist/devices/nld_82S115.h @@ -30,19 +30,19 @@ #include "nl_setup.h" -#define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ - NET_REGISTER_DEV(PROM_82S115, name) \ - NET_CONNECT(name, CE1Q, cCE1Q) \ - NET_CONNECT(name, CE2, cCE2) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ - NET_CONNECT(name, A6, cA6) \ - NET_CONNECT(name, A7, cA7) \ - NET_CONNECT(name, A8, cA8) \ +#define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ + NET_REGISTER_DEV(PROM_82S115, name) \ + NET_CONNECT(name, CE1Q, cCE1Q) \ + NET_CONNECT(name, CE2, cCE2) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ + NET_CONNECT(name, A6, cA6) \ + NET_CONNECT(name, A7, cA7) \ + NET_CONNECT(name, A8, cA8) \ NET_CONNECT(name, STROBE, cSTROBE) #define PROM_82S115_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_9312.h b/src/lib/netlist/devices/nld_9312.h index 98cc0d115c8..c85d86d2773 100644 --- a/src/lib/netlist/devices/nld_9312.h +++ b/src/lib/netlist/devices/nld_9312.h @@ -39,19 +39,19 @@ #include "nl_setup.h" -#define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ - NET_REGISTER_DEV(TTL_9312, name) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D0, cD0) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, D3, cD3) \ - NET_CONNECT(name, D4, cD4) \ - NET_CONNECT(name, D5, cD5) \ - NET_CONNECT(name, D6, cD6) \ - NET_CONNECT(name, D7, cD7) \ +#define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ + NET_REGISTER_DEV(TTL_9312, name) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D0, cD0) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, D2, cD2) \ + NET_CONNECT(name, D3, cD3) \ + NET_CONNECT(name, D4, cD4) \ + NET_CONNECT(name, D5, cD5) \ + NET_CONNECT(name, D6, cD6) \ + NET_CONNECT(name, D7, cD7) \ NET_CONNECT(name, G, cSTROBE) #define TTL_9312_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp index 52ba817ebc4..1e786805eda 100644 --- a/src/lib/netlist/devices/nld_truthtable.cpp +++ b/src/lib/netlist/devices/nld_truthtable.cpp @@ -275,7 +275,7 @@ netlist_base_factory_truthtable_t::~netlist_base_factory_truthtable_t() ret = new xtype(desc.name, desc.classname, desc.def_param, s); } break #define ENTRY(n, s) ENTRYY(n, 1, s); ENTRYY(n, 2, s); ENTRYY(n, 3, s); \ - ENTRYY(n, 4, s); ENTRYY(n, 5, s); ENTRYY(n, 6, s) + ENTRYY(n, 4, s); ENTRYY(n, 5, s); ENTRYY(n, 6, s) void tt_factory_create(setup_t &setup, tt_desc &desc, const pstring &sourcefile) { diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index 93c22a9a67f..6128200fe9a 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -285,16 +285,16 @@ void netlist_t::register_dev(plib::owned_ptr<core_device_t> dev) void netlist_t::remove_dev(core_device_t *dev) { - m_devices.erase( - std::remove_if( - m_devices.begin(), + m_devices.erase( + std::remove_if( + m_devices.begin(), m_devices.end(), - [&] (plib::owned_ptr<core_device_t> const& p) - { - return p.get() == dev; - }), + [&] (plib::owned_ptr<core_device_t> const& p) + { + return p.get() == dev; + }), m_devices.end() - ); + ); } diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index bb2dcb375e2..57d1e197378 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -97,7 +97,7 @@ class NETLIB_NAME(name) : public device_t public: virtual bool is_dynamic() const override { return expr; } /*! Add this to a device definition to mark the device as a time-stepping device. - * + * * You have to implement NETLIB_TIMESTEP in this case as well. Currently, only * the capacitor and inductor devices uses this. * @@ -256,7 +256,7 @@ namespace netlist double R_low() const { return m_R_low; } double R_high() const { return m_R_high; } - double m_fixed_V; //!< For variable voltage families, specify 0. For TTL this would be 5. */ + double m_fixed_V; //!< For variable voltage families, specify 0. For TTL this would be 5. */ double m_low_thresh_PCNT; //!< low input threshhold offset. If the input voltage is below this value times supply voltage, a "0" input is signalled double m_high_thresh_PCNT; //!< high input threshhold offset. If the input voltage is above the value times supply voltage, a "0" input is signalled double m_low_VO; //!< low output voltage offset. This voltage is output if the ouput is "0" diff --git a/src/lib/netlist/nl_errstr.h b/src/lib/netlist/nl_errstr.h index 47311183127..baae69d15b4 100644 --- a/src/lib/netlist/nl_errstr.h +++ b/src/lib/netlist/nl_errstr.h @@ -11,91 +11,91 @@ // nl_base.cpp -#define MF_1_DUPLICATE_NAME_DEVICE_LIST "Error adding {1} to device list. Duplicate name." -#define MF_1_UNKNOWN_TYPE_FOR_OBJECT "Unknown type for object {1} " -#define MF_2_NET_1_DUPLICATE_TERMINAL_2 "net {1}: duplicate terminal {2}" -#define MF_2_REMOVE_TERMINAL_1_FROM_NET_2 "Can not remove terminal {1} from net {2}." -#define MF_1_UNKNOWN_PARAM_TYPE "Can not determine param_type for {1}" -#define MF_2_ERROR_CONNECTING_1_TO_2 "Error connecting {1} to {2}" -#define MF_0_NO_SOLVER "No solver found for this netlist although analog elements are present" +#define MF_1_DUPLICATE_NAME_DEVICE_LIST "Error adding {1} to device list. Duplicate name." +#define MF_1_UNKNOWN_TYPE_FOR_OBJECT "Unknown type for object {1} " +#define MF_2_NET_1_DUPLICATE_TERMINAL_2 "net {1}: duplicate terminal {2}" +#define MF_2_REMOVE_TERMINAL_1_FROM_NET_2 "Can not remove terminal {1} from net {2}." +#define MF_1_UNKNOWN_PARAM_TYPE "Can not determine param_type for {1}" +#define MF_2_ERROR_CONNECTING_1_TO_2 "Error connecting {1} to {2}" +#define MF_0_NO_SOLVER "No solver found for this netlist although analog elements are present" // nl_factory.cpp -#define MF_1_FACTORY_ALREADY_CONTAINS_1 "factory already contains {1}" +#define MF_1_FACTORY_ALREADY_CONTAINS_1 "factory already contains {1}" #define MF_1_CLASS_1_NOT_FOUND "Class <{1}> not found!" // nld_opamps.cpp -#define MF_1_UNKNOWN_OPAMP_TYPE "Unknown opamp type: {1}" +#define MF_1_UNKNOWN_OPAMP_TYPE "Unknown opamp type: {1}" // nld_matrix_solver.cpp -#define MF_1_UNHANDLED_ELEMENT_1_FOUND "setup_base:unhandled element <{1}> found" -#define MF_1_FOUND_TERM_WITH_MISSING_OTHERNET "found term with missing othernet {1}" +#define MF_1_UNHANDLED_ELEMENT_1_FOUND "setup_base:unhandled element <{1}> found" +#define MF_1_FOUND_TERM_WITH_MISSING_OTHERNET "found term with missing othernet {1}" -#define MW_1_NEWTON_LOOPS_EXCEEDED_ON_NET_1 "NEWTON_LOOPS exceeded on net {1}... reschedule" +#define MW_1_NEWTON_LOOPS_EXCEEDED_ON_NET_1 "NEWTON_LOOPS exceeded on net {1}... reschedule" // nld_solver.cpp -#define MF_1_UNKNOWN_SOLVER_TYPE "Unknown solver type: {1}" -#define MF_1_NETGROUP_SIZE_EXCEEDED_1 "Encountered netgroup with > {1} nets" +#define MF_1_UNKNOWN_SOLVER_TYPE "Unknown solver type: {1}" +#define MF_1_NETGROUP_SIZE_EXCEEDED_1 "Encountered netgroup with > {1} nets" -#define MW_1_NO_SPECIFIC_SOLVER "No specific solver found for netlist of size {1}" +#define MW_1_NO_SPECIFIC_SOLVER "No specific solver found for netlist of size {1}" // nl_base.cpp #define MF_1_MODEL_1_CAN_NOT_BE_CHANGED_AT_RUNTIME "Model {1} can not be changed at runtime" -#define MF_1_MORE_THAN_ONE_1_DEVICE_FOUND "more than one {1} device found" +#define MF_1_MORE_THAN_ONE_1_DEVICE_FOUND "more than one {1} device found" // nl_parser.cpp #define MF_0_UNEXPECTED_NETLIST_END "Unexpected NETLIST_END" -#define MF_0_UNEXPECTED_NETLIST_START "Unexpected NETLIST_START" +#define MF_0_UNEXPECTED_NETLIST_START "Unexpected NETLIST_START" // nl_setup.cpp //#define MF_1_CLASS_1_NOT_FOUND "Class {1} not found!" #define MF_1_UNABLE_TO_PARSE_MODEL_1 "Unable to parse model: {1}" #define MF_1_MODEL_ALREADY_EXISTS_1 "Model already exists: {1}" -#define MF_1_ADDING_ALIAS_1_TO_ALIAS_LIST "Error adding alias {1} to alias list" +#define MF_1_ADDING_ALIAS_1_TO_ALIAS_LIST "Error adding alias {1} to alias list" #define MF_1_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1 "You must pass an equal number of pins to DIPPINS {1}" #define MF_1_UNKNOWN_OBJECT_TYPE_1 "Unknown object type {1}" -#define MF_2_INVALID_NUMBER_CONVERSION_1_2 "Invalid number conversion {1} : {2}" +#define MF_2_INVALID_NUMBER_CONVERSION_1_2 "Invalid number conversion {1} : {2}" #define MF_1_ADDING_PARAMETER_1_TO_PARAMETER_LIST "Error adding parameter {1} to parameter list" -#define MF_2_ADDING_1_2_TO_TERMINAL_LIST "Error adding {1} {2} to terminal list" -#define MF_2_NET_C_NEEDS_AT_LEAST_2_TERMINAL "You must pass at least 2 terminals to NET_C" -#define MF_1_FOUND_NO_OCCURRENCE_OF_1 "Found no occurrence of {1}" -#define MF_2_TERMINAL_1_2_NOT_FOUND "terminal {1}({2}) not found!" -#define MF_2_OBJECT_1_2_WRONG_TYPE "object {1}({2}) found but wrong type" -#define MF_2_PARAMETER_1_2_NOT_FOUND "parameter {1}({2}) not found!" -#define MF_2_CONNECTING_1_TO_2 "Error connecting {1} to {2}" -#define MF_2_MERGE_RAIL_NETS_1_AND_2 "Trying to merge two rail nets: {1} and {2}" -#define MF_1_OBJECT_INPUT_TYPE_1 "Unable to determine input type of {1}" -#define MF_1_OBJECT_OUTPUT_TYPE_1 "Unable to determine output type of {1}" -#define MF_1_INPUT_1_ALREADY_CONNECTED "Input {1} already connected" -#define MF_0_LINK_TRIES_EXCEEDED "Error connecting -- bailing out" +#define MF_2_ADDING_1_2_TO_TERMINAL_LIST "Error adding {1} {2} to terminal list" +#define MF_2_NET_C_NEEDS_AT_LEAST_2_TERMINAL "You must pass at least 2 terminals to NET_C" +#define MF_1_FOUND_NO_OCCURRENCE_OF_1 "Found no occurrence of {1}" +#define MF_2_TERMINAL_1_2_NOT_FOUND "terminal {1}({2}) not found!" +#define MF_2_OBJECT_1_2_WRONG_TYPE "object {1}({2}) found but wrong type" +#define MF_2_PARAMETER_1_2_NOT_FOUND "parameter {1}({2}) not found!" +#define MF_2_CONNECTING_1_TO_2 "Error connecting {1} to {2}" +#define MF_2_MERGE_RAIL_NETS_1_AND_2 "Trying to merge two rail nets: {1} and {2}" +#define MF_1_OBJECT_INPUT_TYPE_1 "Unable to determine input type of {1}" +#define MF_1_OBJECT_OUTPUT_TYPE_1 "Unable to determine output type of {1}" +#define MF_1_INPUT_1_ALREADY_CONNECTED "Input {1} already connected" +#define MF_0_LINK_TRIES_EXCEEDED "Error connecting -- bailing out" #define MF_1_MODEL_NOT_FOUND "Model {1} not found" #define MF_1_MODEL_ERROR_1 "Model error {1}" #define MF_1_MODEL_ERROR_ON_PAIR_1 "Model error on pair {1}" #define MF_2_MODEL_PARAMETERS_NOT_UPPERCASE_1_2 "model parameters should be uppercase:{1} {2}" -#define MF_2_ENTITY_1_NOT_FOUND_IN_MODEL_2 "Entity {1} not found in model {2}" -#define MF_1_UNKNOWN_NUMBER_FACTOR_IN_1 "Unknown number factor in: {1}" -#define MF_1_NOT_FOUND_IN_SOURCE_COLLECTION "unable to find {1} in source collection" - -#define MW_3_OVERWRITING_PARAM_1_OLD_2_NEW_3 "Overwriting {1} old <{2}> new <{3}>" -#define MW_1_CONNECTING_1_TO_ITSELF "Connecting {1} to itself. This may be right, though" -#define MW_1_DUMMY_1_WITHOUT_CONNECTIONS "Found dummy terminal {1} without connections" -#define MW_1_TERMINAL_1_WITHOUT_CONNECTIONS "Found terminal {1} without connections" +#define MF_2_ENTITY_1_NOT_FOUND_IN_MODEL_2 "Entity {1} not found in model {2}" +#define MF_1_UNKNOWN_NUMBER_FACTOR_IN_1 "Unknown number factor in: {1}" +#define MF_1_NOT_FOUND_IN_SOURCE_COLLECTION "unable to find {1} in source collection" + +#define MW_3_OVERWRITING_PARAM_1_OLD_2_NEW_3 "Overwriting {1} old <{2}> new <{3}>" +#define MW_1_CONNECTING_1_TO_ITSELF "Connecting {1} to itself. This may be right, though" +#define MW_1_DUMMY_1_WITHOUT_CONNECTIONS "Found dummy terminal {1} without connections" +#define MW_1_TERMINAL_1_WITHOUT_CONNECTIONS "Found terminal {1} without connections" #define MW_3_REMOVE_DEVICE_1_CONNECTED_ONLY_TO_RAILS_2_3 "Found device {1} connected only to railterminals {2}/{3}. Will be removed" -#define MW_1_DATA_1_NOT_FOUND "unable to find data named {1} in source collection" +#define MW_1_DATA_1_NOT_FOUND "unable to find data named {1} in source collection" // nld_mm5837.cpp -#define MW_1_FREQUENCY_OUTSIDE_OF_SPECS_1 "MM5837: Frequency outside of specs: {1}" +#define MW_1_FREQUENCY_OUTSIDE_OF_SPECS_1 "MM5837: Frequency outside of specs: {1}" // nlid_proxy.cpp -#define MW_1_NO_POWER_TERMINALS_ON_DEVICE_1 "D/A Proxy: Found no valid combination of power terminals on device {1}" +#define MW_1_NO_POWER_TERMINALS_ON_DEVICE_1 "D/A Proxy: Found no valid combination of power terminals on device {1}" #endif /* NL_ERRSTR_H_ */ diff --git a/src/lib/netlist/plib/pexception.cpp b/src/lib/netlist/plib/pexception.cpp index 2eedd6f9d16..282acfe30d5 100644 --- a/src/lib/netlist/plib/pexception.cpp +++ b/src/lib/netlist/plib/pexception.cpp @@ -11,9 +11,9 @@ #include "pfmtlog.h" #if (defined(__x86_64__) || defined(__i386__)) && defined(__linux__) -#define HAS_FEENABLE_EXCEPT (1) +#define HAS_FEENABLE_EXCEPT (1) #else -#define HAS_FEENABLE_EXCEPT (0) +#define HAS_FEENABLE_EXCEPT (0) #endif namespace plib { diff --git a/src/lib/util/path_to_regex.cpp b/src/lib/util/path_to_regex.cpp index 927ababbb8a..89a21a5e7f6 100644 --- a/src/lib/util/path_to_regex.cpp +++ b/src/lib/util/path_to_regex.cpp @@ -1,7 +1,7 @@ // license:MIT // copyright-holders:Alfred Bratterud -// NOTE: Author allowed MAME project to distribute this file under MIT -// license. Other projects need to do it under Apache 2 license +// NOTE: Author allowed MAME project to distribute this file under MIT +// license. Other projects need to do it under Apache 2 license // // This file is a part of the IncludeOS unikernel - www.includeos.org // diff --git a/src/lib/util/path_to_regex.hpp b/src/lib/util/path_to_regex.hpp index 7608d77bb5d..a6b11a22031 100644 --- a/src/lib/util/path_to_regex.hpp +++ b/src/lib/util/path_to_regex.hpp @@ -1,7 +1,7 @@ // license:MIT // copyright-holders:Alfred Bratterud -// NOTE: Author allowed MAME project to distribute this file under MIT -// license. Other projects need to do it under Apache 2 license +// NOTE: Author allowed MAME project to distribute this file under MIT +// license. Other projects need to do it under Apache 2 license // // This file is a part of the IncludeOS unikernel - www.includeos.org // diff --git a/src/lib/util/server_ws.hpp b/src/lib/util/server_ws.hpp index 170dc31ae63..b9d4721e96b 100644 --- a/src/lib/util/server_ws.hpp +++ b/src/lib/util/server_ws.hpp @@ -64,7 +64,7 @@ namespace webpp { } }; - + class Connection { friend class SocketServerBase<socket_type>; friend class SocketServer<socket_type>; @@ -142,7 +142,7 @@ namespace webpp { catch (...) {} } }; - + class Message : public std::istream { friend class SocketServerBase<socket_type>; diff --git a/src/lib/util/sha1.hpp b/src/lib/util/sha1.hpp index 7befbd326f0..a293bebb7cc 100644 --- a/src/lib/util/sha1.hpp +++ b/src/lib/util/sha1.hpp @@ -36,76 +36,76 @@ namespace { // local // Rotate an integer value to left. inline unsigned int rol(unsigned int value, unsigned int steps) { - return ((value << steps) | (value >> (32 - steps))); + return ((value << steps) | (value >> (32 - steps))); } // Sets the first 16 integers in the buffert to zero. // Used for clearing the W buffert. inline void clearWBuffert(unsigned int * buffert) { - for (int pos = 16; --pos >= 0;) - { - buffert[pos] = 0; - } + for (int pos = 16; --pos >= 0;) + { + buffert[pos] = 0; + } } inline void innerHash(unsigned int * result, unsigned int * w) { - unsigned int a = result[0]; - unsigned int b = result[1]; - unsigned int c = result[2]; - unsigned int d = result[3]; - unsigned int e = result[4]; - - int round = 0; - - #define sha1macro(func,val) \ - { \ - const unsigned int t = rol(a, 5) + (func) + e + val + w[round]; \ - e = d; \ - d = c; \ - c = rol(b, 30); \ - b = a; \ - a = t; \ - } - - while (round < 16) - { - sha1macro((b & c) | (~b & d), 0x5a827999) - ++round; - } - while (round < 20) - { - w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); - sha1macro((b & c) | (~b & d), 0x5a827999) - ++round; - } - while (round < 40) - { - w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); - sha1macro(b ^ c ^ d, 0x6ed9eba1) - ++round; - } - while (round < 60) - { - w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); - sha1macro((b & c) | (b & d) | (c & d), 0x8f1bbcdc) - ++round; - } - while (round < 80) - { - w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); - sha1macro(b ^ c ^ d, 0xca62c1d6) - ++round; - } - - #undef sha1macro - - result[0] += a; - result[1] += b; - result[2] += c; - result[3] += d; - result[4] += e; + unsigned int a = result[0]; + unsigned int b = result[1]; + unsigned int c = result[2]; + unsigned int d = result[3]; + unsigned int e = result[4]; + + int round = 0; + + #define sha1macro(func,val) \ + { \ + const unsigned int t = rol(a, 5) + (func) + e + val + w[round]; \ + e = d; \ + d = c; \ + c = rol(b, 30); \ + b = a; \ + a = t; \ + } + + while (round < 16) + { + sha1macro((b & c) | (~b & d), 0x5a827999) + ++round; + } + while (round < 20) + { + w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); + sha1macro((b & c) | (~b & d), 0x5a827999) + ++round; + } + while (round < 40) + { + w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); + sha1macro(b ^ c ^ d, 0x6ed9eba1) + ++round; + } + while (round < 60) + { + w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); + sha1macro((b & c) | (b & d) | (c & d), 0x8f1bbcdc) + ++round; + } + while (round < 80) + { + w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1); + sha1macro(b ^ c ^ d, 0xca62c1d6) + ++round; + } + + #undef sha1macro + + result[0] += a; + result[1] += b; + result[2] += c; + result[3] += d; + result[4] += e; } } // namespace @@ -118,62 +118,62 @@ inline void innerHash(unsigned int * result, unsigned int * w) * the sha1 result in. */ inline void calc(void const * src, size_t bytelength, unsigned char * hash) { - // Init the result array. - unsigned int result[5] = { 0x67452301, 0xefcdab89, 0x98badcfe, - 0x10325476, 0xc3d2e1f0 }; - - // Cast the void src pointer to be the byte array we can work with. - unsigned char const * sarray = static_cast<unsigned char const *>(src); - - // The reusable round buffer - unsigned int w[80]; - - // Loop through all complete 64byte blocks. - - size_t endCurrentBlock; - size_t currentBlock = 0; - - if (bytelength >= 64) { - size_t const endOfFullBlocks = bytelength - 64; - - while (currentBlock <= endOfFullBlocks) { - endCurrentBlock = currentBlock + 64; - - // Init the round buffer with the 64 byte block data. - for (int roundPos = 0; currentBlock < endCurrentBlock; currentBlock += 4) - { - // This line will swap endian on big endian and keep endian on - // little endian. - w[roundPos++] = static_cast<unsigned int>(sarray[currentBlock + 3]) - | (static_cast<unsigned int>(sarray[currentBlock + 2]) << 8) - | (static_cast<unsigned int>(sarray[currentBlock + 1]) << 16) - | (static_cast<unsigned int>(sarray[currentBlock]) << 24); - } - innerHash(result, w); - } - } - - // Handle the last and not full 64 byte block if existing. - endCurrentBlock = bytelength - currentBlock; - clearWBuffert(w); - size_t lastBlockBytes = 0; - for (;lastBlockBytes < endCurrentBlock; ++lastBlockBytes) { - w[lastBlockBytes >> 2] |= static_cast<unsigned int>(sarray[lastBlockBytes + currentBlock]) << ((3 - (lastBlockBytes & 3)) << 3); - } - - w[lastBlockBytes >> 2] |= 0x80 << ((3 - (lastBlockBytes & 3)) << 3); - if (endCurrentBlock >= 56) { - innerHash(result, w); - clearWBuffert(w); - } - w[15] = bytelength << 3; - innerHash(result, w); - - // Store hash in result pointer, and make sure we get in in the correct - // order on both endian models. - for (int hashByte = 20; --hashByte >= 0;) { - hash[hashByte] = (result[hashByte >> 2] >> (((3 - hashByte) & 0x3) << 3)) & 0xff; - } + // Init the result array. + unsigned int result[5] = { 0x67452301, 0xefcdab89, 0x98badcfe, + 0x10325476, 0xc3d2e1f0 }; + + // Cast the void src pointer to be the byte array we can work with. + unsigned char const * sarray = static_cast<unsigned char const *>(src); + + // The reusable round buffer + unsigned int w[80]; + + // Loop through all complete 64byte blocks. + + size_t endCurrentBlock; + size_t currentBlock = 0; + + if (bytelength >= 64) { + size_t const endOfFullBlocks = bytelength - 64; + + while (currentBlock <= endOfFullBlocks) { + endCurrentBlock = currentBlock + 64; + + // Init the round buffer with the 64 byte block data. + for (int roundPos = 0; currentBlock < endCurrentBlock; currentBlock += 4) + { + // This line will swap endian on big endian and keep endian on + // little endian. + w[roundPos++] = static_cast<unsigned int>(sarray[currentBlock + 3]) + | (static_cast<unsigned int>(sarray[currentBlock + 2]) << 8) + | (static_cast<unsigned int>(sarray[currentBlock + 1]) << 16) + | (static_cast<unsigned int>(sarray[currentBlock]) << 24); + } + innerHash(result, w); + } + } + + // Handle the last and not full 64 byte block if existing. + endCurrentBlock = bytelength - currentBlock; + clearWBuffert(w); + size_t lastBlockBytes = 0; + for (;lastBlockBytes < endCurrentBlock; ++lastBlockBytes) { + w[lastBlockBytes >> 2] |= static_cast<unsigned int>(sarray[lastBlockBytes + currentBlock]) << ((3 - (lastBlockBytes & 3)) << 3); + } + + w[lastBlockBytes >> 2] |= 0x80 << ((3 - (lastBlockBytes & 3)) << 3); + if (endCurrentBlock >= 56) { + innerHash(result, w); + clearWBuffert(w); + } + w[15] = bytelength << 3; + innerHash(result, w); + + // Store hash in result pointer, and make sure we get in in the correct + // order on both endian models. + for (int hashByte = 20; --hashByte >= 0;) { + hash[hashByte] = (result[hashByte >> 2] >> (((3 - hashByte) & 0x3) << 3)) & 0xff; + } } } // namespace sha1 diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp index 5849abb8d73..8f5295de4af 100644 --- a/src/lib/util/unicode.cpp +++ b/src/lib/util/unicode.cpp @@ -389,7 +389,7 @@ std::string utf8_from_wstring(const std::wstring &string) //------------------------------------------------- // internal_normalize_unicode - uses utf8proc to -// normalize unicode +// normalize unicode //------------------------------------------------- static std::string internal_normalize_unicode(const char *s, size_t length, unicode_normalization_form normalization_form, bool null_terminated) @@ -437,7 +437,7 @@ static std::string internal_normalize_unicode(const char *s, size_t length, unic //------------------------------------------------- // normalize_unicode - uses utf8proc to normalize -// unicode +// unicode //------------------------------------------------- std::string normalize_unicode(const std::string &s, unicode_normalization_form normalization_form) @@ -448,7 +448,7 @@ std::string normalize_unicode(const std::string &s, unicode_normalization_form n //------------------------------------------------- // normalize_unicode - uses utf8proc to normalize -// unicode +// unicode //------------------------------------------------- std::string normalize_unicode(const char *s, unicode_normalization_form normalization_form) @@ -459,7 +459,7 @@ std::string normalize_unicode(const char *s, unicode_normalization_form normaliz //------------------------------------------------- // normalize_unicode - uses utf8proc to normalize -// unicode +// unicode //------------------------------------------------- std::string normalize_unicode(const char *s, size_t length, unicode_normalization_form normalization_form) diff --git a/src/mame/audio/nl_mario.cpp b/src/mame/audio/nl_mario.cpp index 6a7dab55359..2a00b09c152 100644 --- a/src/mame/audio/nl_mario.cpp +++ b/src/mame/audio/nl_mario.cpp @@ -96,12 +96,12 @@ static NETLIST_START(nl_mario_snd1) NET_C(R7.2, 2J_B.FC) NET_C(C4.2, GND) - SN74LS629(1J_B, CAP_N(39)) /* C5 */ + SN74LS629(1J_B, CAP_N(39)) /* C5 */ NET_C(1J_B.RNG, V5) NET_C(1J_B.ENQ, ttllow) NET_C(GND, 1J_B.GND) - SN74LS629(2J_B, CAP_N(6.8)) /* C16 */ + SN74LS629(2J_B, CAP_N(6.8)) /* C16 */ NET_C(2J_B.RNG, V5) NET_C(2J_B.ENQ, ttllow) NET_C(GND, 2J_B.GND) diff --git a/src/mame/audio/polyplay.cpp b/src/mame/audio/polyplay.cpp index 7a32b4c1cbe..87e881c2509 100644 --- a/src/mame/audio/polyplay.cpp +++ b/src/mame/audio/polyplay.cpp @@ -30,4 +30,4 @@ WRITE_LINE_MEMBER(polyplay_state::ctc_zc1_w) m_flipflop2 = ~m_flipflop2; m_speaker2->level_w(m_flipflop2); } -}
\ No newline at end of file +} diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 51545f99ead..7de230d0770 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -338,7 +338,7 @@ Notes: ---- -x-- ---- ---- disable fg layer ---- --x- ---- ---- disable sprite ---- ---x ---- ---- disable tx layer - ---- ---- 1--1 ---- unknown + ---- ---- 1--1 ---- unknown ---- ---- ---- --x- coin counter 1 ---- ---- ---- ---x coin counter 0 */ @@ -1584,7 +1584,7 @@ static MACHINE_CONFIG_START( bigfghtr, bigfghtr_state ) MCFG_CPU_ADD("mcu", I8751, XTAL_16MHz/2) // verified MCFG_CPU_PROGRAM_MAP(bigfghtr_mcu_map) MCFG_CPU_IO_MAP(bigfghtr_mcu_io_map) - + MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 85720b45726..278773aefa2 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -1196,20 +1196,20 @@ ROM_END /* Star Fighter (VGG) CPUs -QTY Type clock position function -1x R6502-13 2a 8-bit Microprocessor - main -1x TBA810 2f Audio Amplifier - sound -1x oscillator 10595 9c +QTY Type clock position function +1x R6502-13 2a 8-bit Microprocessor - main +1x TBA810 2f Audio Amplifier - sound +1x oscillator 10595 9c ROMs -QTY Type position status -6x TMS2716 0-5 dumped -1x MMI6341-1J 12c dumped +QTY Type position status +6x TMS2716 0-5 dumped +1x MMI6341-1J 12c dumped RAMs -QTY Type position -19x ITT4027 1-19 -2x 2114L3PC 5b,6b +QTY Type position +19x ITT4027 1-19 +2x 2114L3PC 5b,6b Others 1x 22x2 edge connector diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp index c414f7471b3..1affab02180 100644 --- a/src/mame/drivers/atarittl.cpp +++ b/src/mame/drivers/atarittl.cpp @@ -57,9 +57,9 @@ netlist system per-game: TM-057 (Stunt Cycle) - 566 Voltage-Controlled Oscillator - 1N751A Zener Diode - 1N752A Zener Diode + 566 Voltage-Controlled Oscillator + 1N751A Zener Diode + 1N752A Zener Diode TM-055 (Indy 4) 7406 Hex Inverter Buffers/Drivers with O.C. H.V. Outputs (note: Might not be needed, could just clone from 7404) @@ -94,13 +94,13 @@ #define HRES_MULT (1) // end -#define SC_VIDCLOCK (14318181/2) -#define SC_HTOTAL (0x1C8+1) // 456 -#define SC_VTOTAL (0x103+1) // 259 -#define SC_HBSTART (SC_HTOTAL) -#define SC_HBEND (32) -#define SC_VBSTART (SC_VTOTAL) -#define SC_VBEND (8) +#define SC_VIDCLOCK (14318181/2) +#define SC_HTOTAL (0x1C8+1) // 456 +#define SC_VTOTAL (0x103+1) // 259 +#define SC_HBSTART (SC_HTOTAL) +#define SC_HBEND (32) +#define SC_VBSTART (SC_VTOTAL) +#define SC_VBEND (8) class atarikee_state : public driver_device { @@ -184,7 +184,7 @@ private: int m_probe_bit4; int m_probe_bit5; int m_probe_bit6; - + std::unique_ptr<int[]> m_probe_data; int m_last_beam; diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 4d27c17a824..ff03e937c58 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -232,7 +232,7 @@ WRITE32_MEMBER(atlantis_state::board_ctrl_w) break; case CTRL_VSYNC_CLEAR: //VSYNC_IE (0x1) - //VSYNC_POL (0x2) off=negative true, on=positive true + //VSYNC_POL (0x2) off=negative true, on=positive true // 0x1 VBlank clear? if (changeData & 0x1) { if ((data & 0x0001) == 0) { diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 8172815e861..48571180652 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -261,7 +261,7 @@ uint32_t attache_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma } else bitmap.fill(0); - + // Text output for(y=0;y<(bitmap.height()-1)/10;y++) // lines { diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 914ea4ac667..8d624e22ebc 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -85,9 +85,9 @@ write - enable slave CPU, gpu, etc most of bits is unclear SH4 XTAL is 33MHz, SH4 MD0-2 pins is 001 or 011 (CPU core clk = XTAL*6, preipheral clk = XTAL, bus clk is XTAL or XTAL*2) TODO: - devicify NAND - somehow hook PVR2 renderer here - add sound + devicify NAND + somehow hook PVR2 renderer here + add sound */ @@ -206,9 +206,9 @@ WRITE64_MEMBER(atvtrack_state::control_w) else m_subcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -// logerror("Write %08x at %08x ",dat, 0x20000+addr*4+0); -// logbinary(dat); -// logerror("\n"); +// logerror("Write %08x at %08x ",dat, 0x20000+addr*4+0); +// logbinary(dat); +// logerror("\n"); } READ64_MEMBER(atvtrack_state::nand_data_r) @@ -319,7 +319,7 @@ WRITE32_MEMBER(atvtrack_state::gpu_w) { case 0x00/4: // not really required, game code will go even if GPU CPU shows no signs of live - if (data) // internal CPU start ? + if (data) // internal CPU start ? m_subcpu->space(AS_PROGRAM).write_byte(0x18001350, 1); // simulate GPUs internal CPU reply to skip busy loop break; case 0x70/4: @@ -369,7 +369,7 @@ WRITE64_MEMBER(atvtrack_state::ioport_w) // bit 7 IO - data bit *1 always 1 / set to 30 during slave CPU test, then to 10 // bit 6 IO - data bit Test ADC CS, ~DAC CS unused // bit 5 IO - data bit Down ADC CLK, ~DAC CLK unused - // bit 4 IO - data bit Service DAC data JP6 lamp + // bit 4 IO - data bit Service DAC data JP6 lamp // bit 3 IO - data bit Up ADC data JP5 coin counter // bit 2 I - unk, (SD: 1 = FPGA ready after config) // bit 1 O - data bits operation direction: 0 - output, 1 - input (SD: FPGA config data) @@ -389,9 +389,9 @@ WRITE64_MEMBER(atvtrack_state::ioport_w) if (data & 0x0100) m_slaverun = true; } -// logerror("SH4 16bit i/o port write "); -// logbinary((uint32_t)data,15,0); -// logerror("\n"); +// logerror("SH4 16bit i/o port write "); +// logbinary((uint32_t)data,15,0); +// logerror("\n"); } #ifdef SPECIALMODE if (offset == SH4_IOPORT_DMA/8) { @@ -424,7 +424,7 @@ uint32_t atvtrack_state::screen_update_atvtrack(screen_device &screen, bitmap_rg void get_altera10ke_eab(u8* dst, u8 *pof, int eab) { // extract Altera FLEX 10KE 4kbit Embedded Array Block (EAB) - u32 startbit = 0x45b * 8 + 1 + (0x25e6 * 8) * eab; // base ofsset actually depends on POF header size, however this EPC1PC8 dump havent it (bad dumper software?) + u32 startbit = 0x45b * 8 + 1 + (0x25e6 * 8) * eab; // base ofsset actually depends on POF header size, however this EPC1PC8 dump havent it (bad dumper software?) for (u32 bit = 0; bit < 4096; bit++) { diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp index 725e74d485d..56de6ca3405 100644 --- a/src/mame/drivers/aztarac.cpp +++ b/src/mame/drivers/aztarac.cpp @@ -215,7 +215,7 @@ ROM_START( aztarac ) ROM_LOAD( "c.j4", 0x0000, 0x1000, CRC(e897dfcd) SHA1(750df3d08512d8098a13ec62677831efa164c126) ) ROM_LOAD( "d.j3", 0x1000, 0x1000, CRC(4016de77) SHA1(7232ec003f1b9d3623d762f3270108a1d1837846) ) - ROM_REGION( 0x3000, "proms", 0 ) /* not hooked up */ + ROM_REGION( 0x3000, "proms", 0 ) /* not hooked up */ ROM_LOAD( "l5.l5", 0x0000, 0x0020, CRC(317fb438) SHA1(3130e1dbde06228707ba46ae85d8df8cc8f32b67) ) ROM_LOAD( "k8.k8", 0x0000, 0x1000, CRC(596ad8d9) SHA1(7e2d2d3e02712911ef5ef55d1df5740f6ec28bcb) ) ROM_LOAD( "k9.k9", 0x0000, 0x1000, CRC(b8544823) SHA1(78ff1fcb7e640929765533592015cfccef690179) ) diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index fc5ff1f7d10..8c84a56b31b 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -804,7 +804,7 @@ static MACHINE_CONFIG_START( tokio, bublbobl_state ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( tokiob, tokio ) - + MCFG_DEVICE_REMOVE("maincpu") MCFG_DEVICE_REMOVE("bmcu") diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index a2c70c94c23..aadc3752fad 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -950,7 +950,7 @@ static MACHINE_CONFIG_DERIVED( quizard1, quizard ) MCFG_CPU_ADD("mcu", I8751, 8000000) MCFG_CPU_IO_MAP(mcu_io_map) -// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse) +// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse) MACHINE_CONFIG_END @@ -967,7 +967,7 @@ static MACHINE_CONFIG_DERIVED( quizard4, quizard ) MCFG_CPU_ADD("mcu", I8751, 8000000) MCFG_CPU_IO_MAP(mcu_io_map) -// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse) +// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse) MACHINE_CONFIG_END @@ -1058,12 +1058,12 @@ ROM_END /* Quizard notes - The MCU controls the protection sequence, which in turn controls the game display language. - Each Quizard game (1,2,3,4) requires it's own MCU, you can upgrade between revisions by changing - just the CD, but not between games as a new MCU is required. + The MCU controls the protection sequence, which in turn controls the game display language. + Each Quizard game (1,2,3,4) requires it's own MCU, you can upgrade between revisions by changing + just the CD, but not between games as a new MCU is required. - The only dumped MCUs are German region ones for Quizard 1 and 4. - A Czech Quizard 4 MCU was located but it was an 89c51 type instead + The only dumped MCUs are German region ones for Quizard 1 and 4. + A Czech Quizard 4 MCU was located but it was an 89c51 type instead */ diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 09d80fa33b4..a1696f126a6 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -457,7 +457,7 @@ void deco32_state::deco32_set_audio_output(uint8_t raw_data) // TODO: assume linear with a 0.0-1.0 dB scale for now uint8_t raw_vol = 0xff - raw_data; float vol_output = ((float)raw_vol) / 255.0f; - + m_ym2151->set_output_gain(ALL_OUTPUTS, vol_output); m_oki1->set_output_gain(ALL_OUTPUTS, vol_output); m_oki2->set_output_gain(ALL_OUTPUTS, vol_output); @@ -734,8 +734,8 @@ WRITE32_MEMBER(deco32_state::nslasher_eeprom_w) pri_w(space,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ } - -// popmessage("%08x",data); + +// popmessage("%08x",data); if (ACCESSING_BITS_8_15) deco32_set_audio_output((data >> 8) & 0xff); } diff --git a/src/mame/drivers/fccpu20.cpp b/src/mame/drivers/fccpu20.cpp index 1bd7bc3e320..f5bc2668247 100644 --- a/src/mame/drivers/fccpu20.cpp +++ b/src/mame/drivers/fccpu20.cpp @@ -6,7 +6,7 @@ * * The only purpose of this driver is to be able to start the VME board as * a single board computer and not as a slot device. It allows the board to - * have a layout and number of other goodies as board driver too but the chassi + * have a layout and number of other goodies as board driver too but the chassi * emulated here is really imaginary representing any chassi that provides power * and used without any other VME board installed. * @@ -57,7 +57,7 @@ * *--------------------------------------------------------------------------- * TODO: - * - Add front layout + * - Add front layout ****************************************************************************/ #include "emu.h" @@ -77,7 +77,7 @@ INPUT_PORTS_END static SLOT_INTERFACE_START(cpu20_vme_cards) SLOT_INTERFACE("fccpu20", VME_FCCPU20) -SLOT_INTERFACE_END +SLOT_INTERFACE_END /* Machine configuration */ MACHINE_CONFIG_START (cpu20, cpu20_state) diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 04beb099114..35540290f72 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -70,7 +70,7 @@ * * History of Force Computers *--------------------------- - * 1981 Force Computers was founded in San Jose, California. Over time a European headquarter was opened + * 1981 Force Computers was founded in San Jose, California. Over time a European headquarter was opened * in Munich, Germany, and a Japanese headquarter in Tokyo * 1996 Force was aquired by Solectron Corporation in 1996 * 2004 Force was sold off from Solectron to Motorola @@ -644,7 +644,7 @@ void cpu30_state::update_irq_to_maincpu() static SLOT_INTERFACE_START(fccpu30_vme_cards) SLOT_INTERFACE("fcisio", VME_FCISIO1) SLOT_INTERFACE("fcscsi", VME_FCSCSI1) -SLOT_INTERFACE_END +SLOT_INTERFACE_END /* * Machine configuration diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 758d9b36602..6c52c93ab69 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -37,9 +37,9 @@ Memo: - 2player's input is not supported. -- Identify CRT Controller and fix layer misalignment in nekkyoku due of dynamic - changes. Actually same custom component as other V-System games of the era, - @seealso aerofgt.cpp +- Identify CRT Controller and fix layer misalignment in nekkyoku due of dynamic + changes. Actually same custom component as other V-System games of the era, + @seealso aerofgt.cpp - nekkyoku: soft reset enables flip screen without any real reason. diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index 451b249cb1c..b7f536f13a5 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -279,9 +279,9 @@ ROM_START( ms3 ) ROM_REGION( 0x200000, "snd", 0 ) ROM_LOAD( "1h5053xx.u6", 0x000000, 0x080000, CRC(6735c65a) SHA1(198cacec5441aa615c0de63a0b4e47265636bcee) ) - + ROM_REGION( 0x20000, "nvram", 0 ) - ROM_LOAD( "nvram", 0x000000, 0x020000, CRC(acbbc6d9) SHA1(6e86d24ad3793b41f1f23f80f9bdb22767abc3bf) ) + ROM_LOAD( "nvram", 0x000000, 0x020000, CRC(acbbc6d9) SHA1(6e86d24ad3793b41f1f23f80f9bdb22767abc3bf) ) ROM_END ROM_START( ms72c ) @@ -302,9 +302,9 @@ ROM_START( ms72c ) ROM_REGION( 0x200000, "snd", 0 ) ROM_LOAD( "1H5008FA Multistar 7.u6", 0x000000, 0x100000, CRC(69656637) SHA1(28c2cf48856ee4f820146fdbd0f3c7e307892dc6) ) - + ROM_REGION( 0x20000, "nvram", 0 ) - ROM_LOAD( "nvram", 0x000000, 0x020000, CRC(b5e42dbc) SHA1(f6afadb6877bca2cef40725b001c7918f9c99359) ) + ROM_LOAD( "nvram", 0x000000, 0x020000, CRC(b5e42dbc) SHA1(f6afadb6877bca2cef40725b001c7918f9c99359) ) ROM_END diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 906f2e20c3d..173b04f54c1 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -927,17 +927,17 @@ ADDRESS_MAP_END B800 = 9B (A, B, C, all input) B810 = 9B (A, B, C, all input) B820 = 90 (A input, B & C output) - + RAM/ROM/NVRAM are OK. - Reels RAM and scroll are OK. - (only reel 2 seems to be used by the game) + Reels RAM and scroll are OK. + (only reel 2 seems to be used by the game) - Video & atr RAM are OK. + Video & atr RAM are OK. PSG is OK. - AY8910 ports are OK. + AY8910 ports are OK. */ static ADDRESS_MAP_START( mbstar_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM @@ -11503,7 +11503,7 @@ ROM_END /* Mega Bonus Star II (Millennium Edition, Euro) Auto-Data Graz, 2002. - + W4 derivative hardware... PCB has a daughterboard with: @@ -11570,7 +11570,7 @@ ROM_END +-----------+ 40-Pin DIP Pin Identification for Z86C15 MCU (for reference): - + --------------------------------------------------------- Pin Symbol Function Direction --------------------------------------------------------- diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 37d4c2395ad..e9a2610a6f0 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -801,7 +801,7 @@ MACHINE_CONFIG_END Mattel Dalla$ (J.R. handheld) * COP444 MCU label COP444L-HYN/N * 8-digit 7seg display, 1-bit sound - + This is a board game, only the handheld device is emulated here. ***************************************************************************/ diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 2471564264d..bd4d6191b61 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -3686,7 +3686,7 @@ WRITE16_MEMBER(ginv1000_state::write_r) // R8,R15: input mux m_inp_mux = (data >> 8 & 1) | (data >> 14 & 2); - + // R1-R10: VFD matrix grid // R11-R14: VFD matrix plate m_grid = data >> 1 & 0x3ff; @@ -4446,13 +4446,13 @@ MACHINE_CONFIG_END * PCB label 1670-4619D * TMS1100NLL MP3491-N2 (die label 1100E MP3491) * HLCD0569, 67-segment LCD panel, no sound - + This handheld is not a toy, read the manual for more information. In short, it is a device for prediciting the winning chance of a gambling horserace. known releases: - USA: Thoroughbred Horse Race Analyzer - - China/Canada: Thoroughbred Horse Race Analyzer, distributed in 1994 by + - China/Canada: Thoroughbred Horse Race Analyzer, distributed in 1994 by Advanced Handicapping Technologies, Inc. ***************************************************************************/ @@ -4479,11 +4479,11 @@ WRITE32_MEMBER(horseran_state::lcd_output_w) // only 3 rows used if (offset > 2) return; - + // output segments (lamp row*100 + col) for (int i = 0; i < 24; i++) output().set_lamp_value(offset*100 + i+1, data >> i & 1); - + // col5-11 and col13-19 are 7segs for (int i = 0; i < 2; i++) output().set_digit_value(offset << 1 | i, BITSWAP8(data >> (4+8*i),7,3,5,2,0,1,4,6) & 0x7f); @@ -4497,7 +4497,7 @@ WRITE16_MEMBER(horseran_state::write_r) m_lcd->write_cs(data >> 2 & 1); m_lcd->write_data(data >> 1 & 1); m_lcd->write_clock(data & 1); - + // R3-R10: input mux m_inp_mux = data >> 3 & 0xff; } diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index a01d2bb60bc..c7fb8ad085f 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -6,37 +6,37 @@ IBM 6580 Displaywriter. A green-screen dedicated word-processing workstation. It uses 8" floppy disks. It could have up to 224k of ram. Consists of: - Electronics Module 6580 - Display 3300 - Keyboard 5330 [a "beamspring"-type] - Dual Diskette Unit 6360 + Electronics Module 6580 + Display 3300 + Keyboard 5330 [a "beamspring"-type] + Dual Diskette Unit 6360 Optional: - Printers: 5215, 5218, 5228 - Printer Sharing feature - Mag Card Unit - Asynchronous and Bisynchronous communications features - 66-line display and adapter (800x1056 px, 8x16 character cell) + Printers: 5215, 5218, 5228 + Printer Sharing feature + Mag Card Unit + Asynchronous and Bisynchronous communications features + 66-line display and adapter (800x1056 px, 8x16 character cell) All chips have IBM part numbers on them. F.e. on system board: - 8493077 - 8086 - 4178619 - 8251A - 4178617 - 8257-5 - 4178623 - 8259A - 4178628 - 8255A-5 - 4178625 - 8253-5 + 8493077 - 8086 + 4178619 - 8251A + 4178617 - 8257-5 + 4178623 - 8259A + 4178628 - 8255A-5 + 4178625 - 8253-5 IRQ levels per PSM p. 6-5 - 0 incoming data for printer sharing/3277 DE - 1 transfer data to commo data link - 2 printer and mag card data xfer - 3 keyboard incoming data - 4 diskette - 5 (not in use) - 6 software timer [50 ms period] - 7 error on commo data link - nmi "or when a dump switch operation is initiated" ["memory record" button] + 0 incoming data for printer sharing/3277 DE + 1 transfer data to commo data link + 2 printer and mag card data xfer + 3 keyboard incoming data + 4 diskette + 5 (not in use) + 6 software timer [50 ms period] + 7 error on commo data link + nmi "or when a dump switch operation is initiated" ["memory record" button] To do: @@ -119,10 +119,10 @@ Displaywriter System Manual S544-2023-0 (?) -- mentioned in US patents 4648071 a uint8_t gfx_expand[16] = { - 0x00, 0x03, 0x0c, 0x0f, - 0x30, 0x33, 0x3c, 0x3f, - 0xc0, 0xc3, 0xcc, 0xcf, - 0xf0, 0xf3, 0xfc, 0xff + 0x00, 0x03, 0x0c, 0x0f, + 0x30, 0x33, 0x3c, 0x3f, + 0xc0, 0xc3, 0xcc, 0xcf, + 0xf0, 0xf3, 0xfc, 0xff }; @@ -294,7 +294,7 @@ READ8_MEMBER(ibm6580_state::video_r) switch (offset) { case 8: - data = 1; // 25-line video board ID. 66-line is 0x40. + data = 1; // 25-line video board ID. 66-line is 0x40. data |= (m_screen->hblank() ? 8 : 0); data |= (m_screen->vblank() ? 4 : 0); // pure guesswork. 0x2, 0x10 and 0x20 are unknown video signals. @@ -315,8 +315,8 @@ READ8_MEMBER(ibm6580_state::video_r) void ibm6580_state::vblank_w(screen_device &screen, bool state) { -// if (state) -// m_pic8259->ir6_w(state); +// if (state) +// m_pic8259->ir6_w(state); if (ioport("DUMP")->read()) m_p40 |= 4; @@ -403,7 +403,7 @@ WRITE8_MEMBER(ibm6580_state::led_w) break; default: -// printf ("LED 0x%08x: unknown\n", data); +// printf ("LED 0x%08x: unknown\n", data); break; } } @@ -601,22 +601,22 @@ WRITE8_MEMBER(ibm6580_state::floppy_w) switch (offset) { - case 0: // 8150 -- mcu reset? + case 0: // 8150 -- mcu reset? m_floppy_mcu_sr.enqueue(0x00); m_floppy_mcu_sr.enqueue(0x00); break; - case 1: // 8152 + case 1: // 8152 m_fdc->soft_reset(); break; - case 5: // 815A + case 5: // 815A m_fdc->fifo_w(space, offset, data); if (m_floppy_idle) m_floppy_idle = false; break; - case 6: // 815C + case 6: // 815C m_floppy_mcu_cr.enqueue(data); m_floppy_mcu_cr_fifo++; if (floppy_mcu_cr_full()) @@ -631,7 +631,7 @@ READ8_MEMBER(ibm6580_state::floppy_r) switch (offset) { - case 0: // 8150 + case 0: // 8150 // bit 4 -- ?? ready // bit 5 -- mcu busy // bit 6 -- ?? idle @@ -639,14 +639,14 @@ READ8_MEMBER(ibm6580_state::floppy_r) data |= 0x40; break; - case 4: // 8158 + case 4: // 8158 data = m_fdc->msr_r(space, offset); break; - case 5: // 815a + case 5: // 815a data = m_fdc->fifo_r(space, offset); - case 6: // 815c + case 6: // 815c if (!m_floppy_mcu_sr.empty()) data = m_floppy_mcu_sr.dequeue(); break; @@ -665,7 +665,7 @@ READ8_MEMBER(ibm6580_state::floppy_r) f->dskchg_r(), f->idx_r(), f->get_cyl() )); else - DBG_LOG(2,"Floppy", ("%02x == %02x (idle %d irq %d drq %d)\n", + DBG_LOG(2,"Floppy", ("%02x == %02x (idle %d irq %d drq %d)\n", 0x8150 + (offset << 1), data, m_floppy_idle, m_fdc->get_irq(), m_fdc->get_drq() )); @@ -677,17 +677,17 @@ READ8_MEMBER(ibm6580_state::floppy_r) static ADDRESS_MAP_START(ibm6580_mem, AS_PROGRAM, 16, ibm6580_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000, 0x3ffff) AM_RAM // system RAM + AM_RANGE(0x00000, 0x3ffff) AM_RAM // system RAM AM_RANGE(0x90000, 0x90001) AM_WRITE(unk_latch_w) - AM_RANGE(0xef000, 0xeffff) AM_RAM AM_SHARE("videoram") // 66-line vram starts at 0xec000 + AM_RANGE(0xef000, 0xeffff) AM_RAM AM_SHARE("videoram") // 66-line vram starts at 0xec000 AM_RANGE(0xfc000, 0xfffff) AM_ROM AM_REGION("user1", 0) ADDRESS_MAP_END static ADDRESS_MAP_START(ibm6580_io, AS_IO, 16, ibm6580_state) ADDRESS_MAP_UNMAP_HIGH // -// AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE8("upd8251", i8251_device, data_r, data_w) -// AM_RANGE(0x0029, 0x0029) AM_DEVREADWRITE8("upd8251", i8251_device, status_r, control_w) +// AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE8("upd8251", i8251_device, data_r, data_w) +// AM_RANGE(0x0029, 0x0029) AM_DEVREADWRITE8("upd8251", i8251_device, status_r, control_w) // AM_RANGE(0x0000, 0x0007) AM_DEVREADWRITE8("pic8259", pic8259_device, read, write, 0x00ff) AM_RANGE(0x0008, 0x000f) AM_WRITE (pic_latch_w) @@ -702,7 +702,7 @@ static ADDRESS_MAP_START(ibm6580_io, AS_IO, 16, ibm6580_state) AM_RANGE(0x5000, 0x500f) AM_UNMAP AM_RANGE(0x6000, 0x601f) AM_UNMAP AM_RANGE(0x8060, 0x807f) AM_UNMAP - AM_RANGE(0x8150, 0x815f) AM_READWRITE8(floppy_r, floppy_w, 0x00ff) // HLE of floppy board + AM_RANGE(0x8150, 0x815f) AM_READWRITE8(floppy_r, floppy_w, 0x00ff) // HLE of floppy board AM_RANGE(0x81a0, 0x81af) AM_UNMAP AM_RANGE(0xc000, 0xc00f) AM_UNMAP AM_RANGE(0xe000, 0xe02f) AM_READWRITE8(video_r, video_w, 0x00ff) @@ -868,11 +868,11 @@ void ibm6580_state::video_start() } FLOPPY_FORMATS_MEMBER( ibm6580_state::floppy_formats ) - FLOPPY_HFE_FORMAT, - FLOPPY_IPF_FORMAT, - FLOPPY_MFI_FORMAT, - FLOPPY_TD0_FORMAT, - FLOPPY_IMD_FORMAT + FLOPPY_HFE_FORMAT, + FLOPPY_IPF_FORMAT, + FLOPPY_MFI_FORMAT, + FLOPPY_TD0_FORMAT, + FLOPPY_IMD_FORMAT FLOPPY_FORMATS_END0 static SLOT_INTERFACE_START( dw_floppies ) @@ -921,9 +921,9 @@ static MACHINE_CONFIG_START( ibm6580, ibm6580_state ) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(ibm6580_state, floppy_intrq)) -// MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) +// MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq0_w)) -// MCFG_UPD765_HDL_CALLBACK(WRITELINE(ibm6580_state, floppy_hdl)) +// MCFG_UPD765_HDL_CALLBACK(WRITELINE(ibm6580_state, floppy_hdl)) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", dw_floppies, "8sssd", ibm6580_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", dw_floppies, "8sssd", ibm6580_state::floppy_formats) diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index cc2039a7fe6..c3db52b8913 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -669,13 +669,13 @@ void jollyjgr_state::machine_reset() static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* 3MHz verified */ + MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* 3MHz verified */ MCFG_CPU_PROGRAM_MAP(jollyjgr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", jollyjgr_state, jollyjgr_interrupt) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(59.18) /* 59.1864Hz measured */ + MCFG_SCREEN_REFRESH_RATE(59.18) /* 59.1864Hz measured */ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) @@ -689,7 +689,7 @@ static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/2) /* 1.7897725MHz verified */ + MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/2) /* 1.7897725MHz verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index 184de0e11a0..35da86a3b7a 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -8,7 +8,7 @@ TODO: - Video: weird palette changes, Laserbase colors, missing bg scrolling between stages (CRT address lines + m_hset ( or m_vset ?)) - Sound: sound related i/o writes ( out_w handler ) -- Interrupts - NMI/Int timing is wrong, it's based on measures of broken PCB +- Interrupts - NMI/Int timing is wrong, it's based on measures of broken PCB TS 20.01.2017 There's incomplete schematics available. It's missing a couple of important elements (analog sound, interrupts). @@ -110,7 +110,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pit_out_5_w); TIMER_DEVICE_CALLBACK_MEMBER(laserbas_scanline); MC6845_UPDATE_ROW(crtc_update_row); - + virtual void machine_start() override; virtual void machine_reset() override; @@ -128,12 +128,12 @@ TIMER_DEVICE_CALLBACK_MEMBER( laserbas_state::laserbas_scanline ) { int scanline = param; - if(scanline == 0 || scanline == 135) + if(scanline == 0 || scanline == 135) { m_maincpu->set_input_line(0, HOLD_LINE ); } - if(scanline == 240 && m_nmi) + if(scanline == 240 && m_nmi) { m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -144,23 +144,23 @@ MC6845_UPDATE_ROW( laserbas_state::crtc_update_row ) int x, x_max, dx, pixaddr; const rgb_t *palette = m_palette->palette()->entry_list_raw(); uint32_t *p = &bitmap.pix32(y); - + if (m_flipscreen) { y=0x100-y-1-0x20; dx = -1; - x = 0x100-1; + x = 0x100-1; x_max = -1; } else { dx = 1; - x = 0; + x = 0; x_max = 0x100; } pixaddr=y<<8; - + { while ( x != x_max ) { @@ -198,8 +198,8 @@ WRITE8_MEMBER(laserbas_state::videoctrl_w) m_flipscreen = !(data & 0x80); m_vset = (data>>3)&7; // inc-ed on interrupts ( 8 ints / frame ?) m_hset = data&7; - } - else + } + else { data^=0xff; m_bset = data>>4; // bg pen @@ -284,7 +284,7 @@ void laserbas_state::write_pit_out(int num, int state) if((!state)& m_cnt_out[num]){ // 0->1 rising edge CLK m_counter[num] = (m_counter[num]+1)&0x0f; // 4 bit counters 74393 } - int data =(state) | ((m_counter[num]&7)<<1); // combine output from 8253 with counter bits 0-3 + int data =(state) | ((m_counter[num]&7)<<1); // combine output from 8253 with counter bits 0-3 data<<=4; if(m_counter[num]&8) data^=0x0f; // counter bit 4 xors the data ( 7486 x 6) switch(num){ @@ -295,7 +295,7 @@ void laserbas_state::write_pit_out(int num, int state) case 4: m_dac5->write(data);break; case 5: m_dac6->write(data);break; } - + m_cnt_out[num]=state; } @@ -441,12 +441,12 @@ static MACHINE_CONFIG_START( laserbas, laserbas_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) + MCFG_SOUND_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) MCFG_SOUND_ADD("dac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) MCFG_SOUND_ADD("dac3", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) MCFG_SOUND_ADD("dac4", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) MCFG_SOUND_ADD("dac5", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) - MCFG_SOUND_ADD("dac6", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) + MCFG_SOUND_ADD("dac6", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) @@ -454,7 +454,7 @@ static MACHINE_CONFIG_START( laserbas, laserbas_state ) MCFG_SOUND_ROUTE_EX(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac5", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac5", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac6", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac6", -1.0, DAC_VREF_NEG_INPUT) - + MACHINE_CONFIG_END /* @@ -545,6 +545,6 @@ ROM_START( futflash ) ROM_LOAD( "ff.8", 0xf000, 0x0800, CRC(623f558f) SHA1(be6c6565df658555f21c43a8c2459cf399794a84) ) ROM_END -GAME( 1980, futflash, 0, laserbas, laserbas, driver_device, 0, ROT270, "Hoei", "Future Flash", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1980, futflash, 0, laserbas, laserbas, driver_device, 0, ROT270, "Hoei", "Future Flash", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1981, laserbas, futflash, laserbas, laserbas, driver_device, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1981, laserbasa,futflash, laserbas, laserbas, driver_device, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 8365956a3c5..8f4f9b7f7f5 100644 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -55,7 +55,7 @@ public: DECLARE_WRITE_LINE_MEMBER(h4_w); DECLARE_WRITE8_MEMBER(portb_w); DECLARE_WRITE8_MEMBER(portc_w); - + DECLARE_WRITE_LINE_MEMBER(timerirq_w) { m_maincpu->set_input_line(M68K_IRQ_4, state); diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp index 5e332cd3105..141276284a8 100644 --- a/src/mame/drivers/miniforce.cpp +++ b/src/mame/drivers/miniforce.cpp @@ -139,11 +139,11 @@ miniforce_state(const machine_config &mconfig, device_type type, const char *tag static ADDRESS_MAP_START (miniforce_mem, AS_PROGRAM, 32, miniforce_state) ADDRESS_MAP_UNMAP_HIGH /* The ROMs contains an OS9 bootloader. It is position independent but reset vector suggests that it sits flat on adress 0 (zero) */ -// AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */ -// AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */ -// AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */ -// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ -// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ +// AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */ +// AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */ +// AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */ +// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ +// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ ADDRESS_MAP_END #endif @@ -167,13 +167,13 @@ static SLOT_INTERFACE_START(miniforce_vme_cards) SLOT_INTERFACE("fccpu20", VME_FCCPU20) SLOT_INTERFACE("fcisio", VME_FCISIO1) SLOT_INTERFACE("fcscsi", VME_FCSCSI1) -SLOT_INTERFACE_END +SLOT_INTERFACE_END /* * Machine configuration */ MACHINE_CONFIG_START (miniforce, miniforce_state) -// MCFG_CPU_PROGRAM_MAP (miniforce_mem) +// MCFG_CPU_PROGRAM_MAP (miniforce_mem) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", "slot1", miniforce_vme_cards, "fccpu20") MCFG_VME_SLOT_ADD ("vme", "slot2", miniforce_vme_cards, nullptr) diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp index 9f3568104b2..b8ad2aa3e7b 100644 --- a/src/mame/drivers/mvme147.cpp +++ b/src/mame/drivers/mvme147.cpp @@ -385,19 +385,19 @@ READ8_MEMBER (mvme147_state::pcc8_r){ LOG("Call to %s[%04x] ", FUNCNAME, offset); switch(offset + P8BASE) { - case P8_TIMER1_INT_CNTL : LOG(" -> %02x - Timer 1 Interrupt Control - not implemented\n", ret); break; - case P8_TIMER1_CNTL : LOG(" -> %02x - Timer 1 Control - not implemented\n", ret); break; - case P8_TIMER2_INT_CNTL : LOG(" -> %02x - Timer 2 Interrupt Control - not implemented\n", ret); break; - case P8_TIMER2_CNTL : LOG(" -> %02x - Timer 2 Control - not implemented\n", ret); break; - case P8_ACFAIL_INT_CNTL : LOG(" -> %02x - AC Fail Interrupt Control Register - not implemented\n", ret); break; - case P8_WDOG_TIMER_CNTL : LOG(" -> %02x - Watchdog Timer Control Register - not implemented\n", ret); break; - case P8_PRINTER_INT_CNTL : LOG(" -> %02x - Printer Interrupt Control Register - not implemented\n", ret); break; - case P8_PRINTER_CNTL : LOG(" -> %02x - Printer Control Register - not implemented\n", ret); break; - case P8_DMA_INT_CNTL : LOG(" -> %02x - DMA Interrupt Control Register - not implemented\n", ret); break; - case P8_DMA_CNTL_STAT : LOG(" -> %02x - DMA Control and Status Register - not implemented\n", ret); break; - case P8_BUSERR_CNTL : LOG(" -> %02x - Bus Error Interrupt Control Register - not implemented\n", ret); break; - case P8_DMA_STATUS : LOG(" -> %02x - DMA Status Register - not implemented\n", ret); break; - case P8_ABORT_INT_CNTL : LOG(" -> %02x - Abort Interrupt Control Register - not fully implemented\n", ret); + case P8_TIMER1_INT_CNTL : LOG(" -> %02x - Timer 1 Interrupt Control - not implemented\n", ret); break; + case P8_TIMER1_CNTL : LOG(" -> %02x - Timer 1 Control - not implemented\n", ret); break; + case P8_TIMER2_INT_CNTL : LOG(" -> %02x - Timer 2 Interrupt Control - not implemented\n", ret); break; + case P8_TIMER2_CNTL : LOG(" -> %02x - Timer 2 Control - not implemented\n", ret); break; + case P8_ACFAIL_INT_CNTL : LOG(" -> %02x - AC Fail Interrupt Control Register - not implemented\n", ret); break; + case P8_WDOG_TIMER_CNTL : LOG(" -> %02x - Watchdog Timer Control Register - not implemented\n", ret); break; + case P8_PRINTER_INT_CNTL : LOG(" -> %02x - Printer Interrupt Control Register - not implemented\n", ret); break; + case P8_PRINTER_CNTL : LOG(" -> %02x - Printer Control Register - not implemented\n", ret); break; + case P8_DMA_INT_CNTL : LOG(" -> %02x - DMA Interrupt Control Register - not implemented\n", ret); break; + case P8_DMA_CNTL_STAT : LOG(" -> %02x - DMA Control and Status Register - not implemented\n", ret); break; + case P8_BUSERR_CNTL : LOG(" -> %02x - Bus Error Interrupt Control Register - not implemented\n", ret); break; + case P8_DMA_STATUS : LOG(" -> %02x - DMA Status Register - not implemented\n", ret); break; + case P8_ABORT_INT_CNTL : LOG(" -> %02x - Abort Interrupt Control Register - not fully implemented\n", ret); /* Bit 3 When this bit is high, the interrupt is enabled. The interrupt is disabled when this bit is low. This bit is cleared by reset. Bit 6 This bit indicates the current state of the ABORT switch. When this bit is low, the ABORT switch is not pressed. When this bit is high, the ABORT switch is pressed. @@ -415,9 +415,9 @@ READ8_MEMBER (mvme147_state::pcc8_r){ break; case P8_SCSI_INT_CNTL : LOG(" -> %02x - SCSI Port Interrupt Control Register - not implemented\n", ret); break; case P8_SLAVE_BASE_ADDR : LOG(" -> %02x - Slave Base Address Register - not implemented\n", ret); break; - case P8_SWI_1_CNTL : LOG(" -> %02x - Software Interrupt 1 Control Register - not implemented\n", ret); break; + case P8_SWI_1_CNTL : LOG(" -> %02x - Software Interrupt 1 Control Register - not implemented\n", ret); break; case P8_INT_VECT_BASE : LOG(" -> %02x - Interrupt Vector Base - not implemented\n", ret); break; - case P8_SWI_2_CNTL : LOG(" -> %02x - Software Interrupt 2 Control Register - not implemented\n", ret); break; + case P8_SWI_2_CNTL : LOG(" -> %02x - Software Interrupt 2 Control Register - not implemented\n", ret); break; case P8_REVISION_LEVEL : LOG(" -> %02x - PCC Revision Level Register - not implemented\n", ret); break; case P8_PRINTER_STATUS : LOG(" -> %02x - Printer Status Register - not implemented\n", ret); break; default: @@ -431,17 +431,17 @@ WRITE8_MEMBER (mvme147_state::pcc8_w){ switch(offset + P8BASE) { case P8_TIMER1_INT_CNTL : LOG("Timer 1 Interrupt Control - not implemented\n"); break; - case P8_TIMER1_CNTL : LOG("Timer 1 Control - not implemented\n"); break; + case P8_TIMER1_CNTL : LOG("Timer 1 Control - not implemented\n"); break; case P8_TIMER2_INT_CNTL : LOG("Timer 2 Interrupt Control - not implemented\n"); break; - case P8_TIMER2_CNTL : LOG("Timer 2 Control - not implemented\n"); break; + case P8_TIMER2_CNTL : LOG("Timer 2 Control - not implemented\n"); break; case P8_ACFAIL_INT_CNTL : LOG("AC Fail Interrupt Control Register - not implemented\n"); break; case P8_WDOG_TIMER_CNTL : LOG("Watchdog Timer Control Register - not implemented\n"); break; case P8_PRINTER_INT_CNTL: LOG("Printer Interrupt Control Register - not implemented\n"); break; case P8_PRINTER_CNTL : LOG("Printer Control Register - not implemented\n"); break; case P8_DMA_INT_CNTL : LOG("DMA Interrupt Control Register - not implemented\n"); break; case P8_DMA_CNTL_STAT : LOG("DMA Control and Status Register - not implemented\n"); break; - case P8_BUSERR_CNTL : LOG("Bus Error Interrupt Control Register - not implemented\n"); break; - case P8_DMA_STATUS : LOG("DMA Status Register - not implemented\n"); break; + case P8_BUSERR_CNTL : LOG("Bus Error Interrupt Control Register - not implemented\n"); break; + case P8_DMA_STATUS : LOG("DMA Status Register - not implemented\n"); break; case P8_ABORT_INT_CNTL : LOG("Abort Interrupt Control Register - not implemented\n"); break; case P8_TABADD_FC_CNTL : LOG("Table Address Function Code Register - not implemented\n"); break; case P8_SERIAL_INT_CNTL : LOG("Serial Port Interrupt Control Register - not implemented\n"); break; @@ -472,9 +472,9 @@ WRITE8_MEMBER (mvme147_state::pcc8_w){ break; case P8_SCSI_INT_CNTL : LOG("SCSI Port Interrupt Control Register - not implemented\n"); break; case P8_SLAVE_BASE_ADDR : LOG("Slave Base Address Register - not implemented\n"); break; - case P8_SWI_1_CNTL : LOG("Software Interrupt 1 Control Register - not implemented\n"); break; + case P8_SWI_1_CNTL : LOG("Software Interrupt 1 Control Register - not implemented\n"); break; case P8_INT_VECT_BASE : LOG("Interrupt Vector Base - not implemented\n"); break; - case P8_SWI_2_CNTL : LOG("Software Interrupt 2 Control Register - not implemented\n"); break; + case P8_SWI_2_CNTL : LOG("Software Interrupt 2 Control Register - not implemented\n"); break; case P8_REVISION_LEVEL : LOG("PCC Revision Level Register - not implemented\n"); break; case P8_PRINTER_DATA : LOG("Printer Data Register - not implemented\n"); break; default: @@ -579,7 +579,7 @@ READ8_MEMBER (mvme147_state::vmechip_r){ case VC_INT_HNDL_MASK : LOG(" -> %02x - Interrupt Handler Mask Register - not implemented\n", ret); break; case VC_UTIL_INT_MASK : LOG(" -> %02x - Utility Interrupt Mask Register - not implemented\n", ret); break; case VC_UTIL_INT_VECT : LOG(" -> %02x - Utility Interrupt Vector Register - not implemented\n", ret); break; - case VC_INT_REQUEST : LOG(" -> %02x - Interrupt Request Register - not implemented\n", ret); break; + case VC_INT_REQUEST : LOG(" -> %02x - Interrupt Request Register - not implemented\n", ret); break; case VC_VMEBUS_STAT_ID : LOG(" -> %02x - VMEbus Status/ID Register - not implemented\n", ret); break; case VC_BUS_ERR_STATUS : LOG(" -> %02x - Bus Error Status Register - not implemented\n", ret); break; case VC_GCSR_BASE_ADR : LOG(" -> %02x - GCSR Base Address Configuration Register - not implemented\n", ret); break; @@ -598,15 +598,15 @@ WRITE8_MEMBER (mvme147_state::vmechip_w){ m_vc_cntl_conf = data & 0xff; break; case VC_VMEBUS_REQ_CONF : LOG("VMEbus Requester Configuration Register - not implemented\n"); break; - case VC_MASTER_CONF : LOG("Master Configuration Register - not implemented\n"); break; - case VC_SLAVE_CONF : LOG("Slave Configuration Register - not implemented\n"); break; - case VC_TIMER_CONF : LOG("Timer Configuration Register - not implemented\n"); break; + case VC_MASTER_CONF : LOG("Master Configuration Register - not implemented\n"); break; + case VC_SLAVE_CONF : LOG("Slave Configuration Register - not implemented\n"); break; + case VC_TIMER_CONF : LOG("Timer Configuration Register - not implemented\n"); break; case VC_SLAVE_ADR_MOD : LOG("Slave Address Modifier Register - not implemented\n"); break; case VC_MASTER_ADR_MOD : LOG("Master Address Modifier Register - not implemented\n"); break; case VC_INT_HNDL_MASK : LOG("Interrupt Handler Mask Register - not implemented\n"); break; case VC_UTIL_INT_MASK : LOG("Utility Interrupt Mask Register - not implemented\n"); break; case VC_UTIL_INT_VECT : LOG("Utility Interrupt Vector Register - not implemented\n"); break; - case VC_INT_REQUEST : LOG("Interrupt Request Register - not implemented\n"); break; + case VC_INT_REQUEST : LOG("Interrupt Request Register - not implemented\n"); break; case VC_VMEBUS_STAT_ID : LOG("VMEbus Status/ID Register - not implemented\n"); break; case VC_BUS_ERR_STATUS : LOG("Bus Error Status Register - not implemented\n"); break; case VC_GCSR_BASE_ADR : LOG("GCSR Base Address Configuration Register - not implemented\n"); break; @@ -639,7 +639,7 @@ WRITE16_MEMBER (mvme147_state::vme_a16_w){ static SLOT_INTERFACE_START(mvme147_vme_cards) SLOT_INTERFACE("mvme350", VME_MVME350) -SLOT_INTERFACE_END +SLOT_INTERFACE_END /* * Machine configuration diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp index 3eeb35ca1e9..38beb8b2c03 100644 --- a/src/mame/drivers/mzr8105.cpp +++ b/src/mame/drivers/mzr8105.cpp @@ -188,8 +188,8 @@ static ADDRESS_MAP_START (mzr8105_mem, AS_PROGRAM, 16, mzr8105_state) AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */ AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */ AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */ -// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ -// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ +// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ +// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ ADDRESS_MAP_END /* Input ports */ @@ -198,7 +198,7 @@ INPUT_PORTS_END static SLOT_INTERFACE_START(mzr8105_vme_cards) SLOT_INTERFACE("mzr8300", VME_MZR8300) -SLOT_INTERFACE_END +SLOT_INTERFACE_END /* * Machine configuration diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 5184630ca12..84044e5c1a0 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1701,7 +1701,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline) m_master_intc->vblank_irq_trigger(); m_slave_intc->vblank_irq_trigger(); } - + if(scanline == cur_posirq) { m_master_intc->pos_irq_trigger(); @@ -1736,7 +1736,7 @@ static MACHINE_CONFIG_START( default, namcos2_state ) MCFG_FRAGMENT_ADD(configure_c148_standard) MCFG_NAMCO_C139_ADD("sci") - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) ) MCFG_SCREEN_SIZE(384, 264) diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 1e99e5b9ee3..808cbb501b0 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1476,7 +1476,7 @@ static ADDRESS_MAP_START( winrun_master_map, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x800000, 0x87ffff) AM_ROM AM_REGION("data", 0) AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram") AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map) ADDRESS_MAP_END @@ -1488,7 +1488,7 @@ static ADDRESS_MAP_START( winrun_slave_map, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x800000, 0x87ffff) AM_ROM AM_REGION("data", 0) AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram") AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map) ADDRESS_MAP_END @@ -1568,10 +1568,10 @@ static ADDRESS_MAP_START( driveyes_common_map, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x800000, 0x8fffff) AM_ROM AM_REGION("data", 0) AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram") AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("sci", namco_c139_device, ram_r, ram_w) AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map) ADDRESS_MAP_END - + static ADDRESS_MAP_START( driveyes_master_map, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */ @@ -1716,7 +1716,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( winrungp ) PORT_INCLUDE(winrun) - + PORT_MODIFY("DSW") PORT_DIPNAME( 0x20, 0x00, "PCM ROM") PORT_DIPSETTING( 0x20, "2M" ) @@ -1733,7 +1733,7 @@ static INPUT_PORTS_START( driveyes ) PORT_MODIFY("DIAL0") PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER("gearbox", namcoio_gearbox_device, in_r, nullptr ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("PORTH") /* 63B05Z0 - PORT H */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1850,8 +1850,8 @@ MACHINE_START_MEMBER(namcos21_state,namcos21) TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline) { int scanline = param; -// int cur_posirq = get_posirq_scanline()*2; - +// int cur_posirq = get_posirq_scanline()*2; + if(scanline == 240*2) { m_master_intc->vblank_irq_trigger(); @@ -1859,7 +1859,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline) if(m_gpu_intc) m_gpu_intc->vblank_irq_trigger(); } - + if(m_gpu_intc != nullptr) { if(scanline == (0xff-m_gpu_intc->get_posirq_line())*2) diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index 638c1455f0c..5c8ebfbdb27 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -61,33 +61,33 @@ TODO (game-specific): - Giant Gram 2: no VMU emulation; - Gun Survivor 2: crashes during game loading; - Lupin the Shooting: "com. error between Naomi BD and i/o BD" after some secs. of gameplay; - - marstv: locks up during anchor talking (does same in Demul); - - marstv: missing graphics at stage select, renderer fault or something else? + - marstv: locks up during anchor talking (does same in Demul); + - marstv: missing graphics at stage select, renderer fault or something else? - Monkey Ball: asserts when attempts to load a stage; - Oinori-Daimyoujin Matsuri: reports "B. RAM error" in test mode, inputs doesn't seem to work after that point; - OutTrigger: crashes on naomibd_r(); - - puyofev: hangs after pressing start (bp 0C03F490, similar if not same snippet as Tetris 4d on DC). + - puyofev: hangs after pressing start (bp 0C03F490, similar if not same snippet as Tetris 4d on DC). - Ringout 4x4: needs cabinet set to 4p, moans about not having two jamma i/o boards; - Super Major League '99: attract mode/gameplay bogusly have stop-motions from time to time; - - sfz3ugd: currently dies at disclaimer screen (regression); - - shangril: swapped mahjong inputs (M -> N, C -> B etc.); - - sprtjam: garbage on initial attract mode screen (regression). + - sfz3ugd: currently dies at disclaimer screen (regression); + - shangril: swapped mahjong inputs (M -> N, C -> B etc.); + - sprtjam: garbage on initial attract mode screen (regression). - The House of the Dead 2: game uses an earlier PVR so it has extra gfx issues; - The Typing of the Dead: missing keyboard inputs, doesn't enter into attract/test mode anymore (JVS issue); - vtennisg: crashes after stage screen or the attract mode (PVR or SH-4 bug, most likely); - World Kicks (both sets): "NAOMIM2: unhandled board write a0800600, 0000" after Naomi logo - - sl2007: - 0C04697A: MOV.L @($28,R14),R0 ;8c167734 - 0C04697C: TST R0,R0 - 0C04697E: BT $0C046998 - 0C046980: BRA $0C046990 - 0C04698E: BT $0C046998 - 0C046990: MOV.L @($28,R14),R3 - 0C046992: MOV #$FD,R5 - 0C046994: JSR R3 - 0C046608: NOP - 0C04660A: BRA $0C04660A ;tight loops there, NOP-ing this opcode makes to go further, perhaps not supposed to go here in the first place? - 0C046608: NOP + - sl2007: + 0C04697A: MOV.L @($28,R14),R0 ;8c167734 + 0C04697C: TST R0,R0 + 0C04697E: BT $0C046998 + 0C046980: BRA $0C046990 + 0C04698E: BT $0C046998 + 0C046990: MOV.L @($28,R14),R3 + 0C046992: MOV #$FD,R5 + 0C046994: JSR R3 + 0C046608: NOP + 0C04660A: BRA $0C04660A ;tight loops there, NOP-ing this opcode makes to go further, perhaps not supposed to go here in the first place? + 0C046608: NOP --------------------------------------------------------------------------------------------------------------------------------------------------- Guru's Readmes @@ -1585,7 +1585,7 @@ WRITE64_MEMBER(naomi_state::naomi_unknown1_w ) { } -// TODO: was using same handler as Naomi, tbd +// TODO: was using same handler as Naomi, tbd READ64_MEMBER(atomiswave_state::aw_unknown1_r ) { if ((offset * 8) == 0xc0) // trick so that it does not "wait for multiboard sync" @@ -1960,7 +1960,7 @@ static ADDRESS_MAP_START( aw_map, AS_PROGRAM, 64, atomiswave_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( aw_port, AS_IO, 64, atomiswave_state ) -// ??? +// ??? ADDRESS_MAP_END static ADDRESS_MAP_START( dc_audio_map, AS_PROGRAM, 32, dc_state ) @@ -2701,10 +2701,10 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( naomi_base, naomi_state ) MCFG_FRAGMENT_ADD( naomi_aw_base ) - + MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom") MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) - + MCFG_MIE_ADD("mie", XTAL_32MHz/2, "maple_dc", 0, nullptr, nullptr, nullptr, ":MIE.3", nullptr, ":MIE.5", nullptr, nullptr) // Actual frequency unknown, most likely 1/2 of 32MHz XTAL or even 2/3 (yes, 21MHz Z80 core) MCFG_SEGA_837_13551_DEVICE_ADD("837_13551", "mie", ":TILT", ":P1", ":P2", ":A0", ":A1", ":A2", ":A3", ":A4", ":A5", ":A6", ":A7", ":OUTPUT") MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("mie_eeprom") @@ -2808,10 +2808,10 @@ static MACHINE_CONFIG_START( aw_base, atomiswave_state ) MCFG_CPU_IO_MAP(aw_port) MCFG_MACRONIX_29L001MC_ADD("awflash") MCFG_AW_ROM_BOARD_ADD("rom_board", "rom_key", WRITE8(dc_state, g1_irq)) - + //MCFG_CPU_MODIFY("soundcpu") //MCFG_CPU_PROGRAM_MAP(aw_sound_map) - + MCFG_MACHINE_RESET_OVERRIDE(dc_state,dc_console) MACHINE_CONFIG_END @@ -6918,23 +6918,23 @@ ROM_END // ROM board ID# 840-0078B REV.B /* ROM_START( shors2k1 ) - NAOMI_BIOS - NAOMI_DEFAULT_EEPROM + NAOMI_BIOS + NAOMI_DEFAULT_EEPROM - ROM_REGION( 0x7800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD("epr-23739b.ic22", 0x00000000, 0x00400000, CRC() SHA1() ) - ROM_LOAD("mpr-23740.ic1", 0x00800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23741.ic2", 0x01800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23742.ic3", 0x02800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23743.ic4", 0x03800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23744.ic5", 0x04800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23745.ic6", 0x05800000, 0x01000000, CRC() SHA1() ) - ROM_LOAD("mpr-23746.ic7", 0x06800000, 0x01000000, CRC() SHA1() ) + ROM_REGION( 0x7800000, "rom_board", ROMREGION_ERASEFF) + ROM_LOAD("epr-23739b.ic22", 0x00000000, 0x00400000, CRC() SHA1() ) + ROM_LOAD("mpr-23740.ic1", 0x00800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23741.ic2", 0x01800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23742.ic3", 0x02800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23743.ic4", 0x03800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23744.ic5", 0x04800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23745.ic6", 0x05800000, 0x01000000, CRC() SHA1() ) + ROM_LOAD("mpr-23746.ic7", 0x06800000, 0x01000000, CRC() SHA1() ) - ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.ic46", 0x000000, 0x000084, CRC() SHA1() ) + ROM_REGION(0x84, "some_eeprom", 0) + ROM_LOAD( "sflash.ic46", 0x000000, 0x000084, CRC() SHA1() ) - ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated + ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated ROM_END */ @@ -6953,13 +6953,13 @@ ROM_START( shorsepm ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x6800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD("epr-24087b.ic22", 0x00000000, 0x00400000, CRC(9388f109) SHA1(b441bacd1af14ba0488c0f25fd6e6657b1de0cf6) ) - ROM_LOAD("mpr-24088.ic1", 0x00800000, 0x01000000, CRC(386d9a06) SHA1(c923be8a60a15bc7a747aa4a3c0ed66cc00aae79) ) - ROM_LOAD("mpr-24089.ic2", 0x01800000, 0x01000000, CRC(404e231b) SHA1(fa6f4c9a8463c3216468330a819efe8ecf31e278) ) - ROM_LOAD("mpr-24090.ic3", 0x02800000, 0x01000000, CRC(48fb173d) SHA1(e5de093c96b6aebafe6ec8f36bad5a033590ad34) ) - ROM_LOAD("mpr-24091.ic4", 0x03800000, 0x01000000, CRC(7c92174c) SHA1(8e53f31a2a9e088caf46344e6850dfbb2b9cc638) ) - ROM_LOAD("mpr-24092.ic5", 0x04800000, 0x01000000, CRC(d32299a6) SHA1(e9bf05f9e8691d0ee4fb15346958b5bea738da30) ) - ROM_LOAD("mpr-24093.ic6", 0x05800000, 0x01000000, CRC(6491dd68) SHA1(8777ceae12d8267bd9867385d0dc1facc6dac66c) ) + ROM_LOAD("epr-24087b.ic22", 0x00000000, 0x00400000, CRC(9388f109) SHA1(b441bacd1af14ba0488c0f25fd6e6657b1de0cf6) ) + ROM_LOAD("mpr-24088.ic1", 0x00800000, 0x01000000, CRC(386d9a06) SHA1(c923be8a60a15bc7a747aa4a3c0ed66cc00aae79) ) + ROM_LOAD("mpr-24089.ic2", 0x01800000, 0x01000000, CRC(404e231b) SHA1(fa6f4c9a8463c3216468330a819efe8ecf31e278) ) + ROM_LOAD("mpr-24090.ic3", 0x02800000, 0x01000000, CRC(48fb173d) SHA1(e5de093c96b6aebafe6ec8f36bad5a033590ad34) ) + ROM_LOAD("mpr-24091.ic4", 0x03800000, 0x01000000, CRC(7c92174c) SHA1(8e53f31a2a9e088caf46344e6850dfbb2b9cc638) ) + ROM_LOAD("mpr-24092.ic5", 0x04800000, 0x01000000, CRC(d32299a6) SHA1(e9bf05f9e8691d0ee4fb15346958b5bea738da30) ) + ROM_LOAD("mpr-24093.ic6", 0x05800000, 0x01000000, CRC(6491dd68) SHA1(8777ceae12d8267bd9867385d0dc1facc6dac66c) ) ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated ROM_END @@ -6971,13 +6971,13 @@ ROM_START( shorseps ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x6800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD("epr-24097a.ic22", 0x00000000, 0x00400000, CRC(ec61a9e8) SHA1(a418be12eeaa4a9c43d1c5dc87ecb5c48857a436) ) - ROM_LOAD("mpr-24098.ic1", 0x00800000, 0x01000000, CRC(c55b45be) SHA1(3dd42a8e21323026742ae764f0a22d96475b55e0) ) - ROM_LOAD("mpr-24099.ic2", 0x01800000, 0x01000000, CRC(e3f0f02e) SHA1(66bcbc251b43688bdc0000a1a9fd463d01ee4e04) ) - ROM_LOAD("mpr-24100.ic3", 0x02800000, 0x01000000, CRC(a5f3cbe9) SHA1(a290d0b1c2c249cbc0473357bde73e4187c96c0d) ) - ROM_LOAD("mpr-24101.ic4", 0x03800000, 0x01000000, CRC(daaf9531) SHA1(5a9651c69d3dd6367cf7f92546ffbb4be65635de) ) - ROM_LOAD("mpr-24102.ic5", 0x04800000, 0x01000000, CRC(55121ff3) SHA1(c5bc7839b8f9c93a2e600589ce5e158742afda0e) ) - ROM_LOAD("mpr-24103.ic6", 0x05800000, 0x01000000, CRC(bfbc3569) SHA1(c8ba7df05d675a15b3eb7c941e9ba231a30e746a) ) + ROM_LOAD("epr-24097a.ic22", 0x00000000, 0x00400000, CRC(ec61a9e8) SHA1(a418be12eeaa4a9c43d1c5dc87ecb5c48857a436) ) + ROM_LOAD("mpr-24098.ic1", 0x00800000, 0x01000000, CRC(c55b45be) SHA1(3dd42a8e21323026742ae764f0a22d96475b55e0) ) + ROM_LOAD("mpr-24099.ic2", 0x01800000, 0x01000000, CRC(e3f0f02e) SHA1(66bcbc251b43688bdc0000a1a9fd463d01ee4e04) ) + ROM_LOAD("mpr-24100.ic3", 0x02800000, 0x01000000, CRC(a5f3cbe9) SHA1(a290d0b1c2c249cbc0473357bde73e4187c96c0d) ) + ROM_LOAD("mpr-24101.ic4", 0x03800000, 0x01000000, CRC(daaf9531) SHA1(5a9651c69d3dd6367cf7f92546ffbb4be65635de) ) + ROM_LOAD("mpr-24102.ic5", 0x04800000, 0x01000000, CRC(55121ff3) SHA1(c5bc7839b8f9c93a2e600589ce5e158742afda0e) ) + ROM_LOAD("mpr-24103.ic6", 0x05800000, 0x01000000, CRC(bfbc3569) SHA1(c8ba7df05d675a15b3eb7c941e9ba231a30e746a) ) ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated ROM_END @@ -6990,8 +6990,8 @@ ROM_START( shorsepb ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x1800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD("rom1.ic1s", 0x00800000, 0x00800000, CRC(d1305180) SHA1(07078484ba938af9c1124521e90b1b4540c63fbd) ) - ROM_LOAD("rom2.ic2s", 0x01000000, 0x00800000, CRC(cfb9881d) SHA1(97632db5a99e15fd9256db195bf6ae60f848df74) ) + ROM_LOAD("rom1.ic1s", 0x00800000, 0x00800000, CRC(d1305180) SHA1(07078484ba938af9c1124521e90b1b4540c63fbd) ) + ROM_LOAD("rom2.ic2s", 0x01000000, 0x00800000, CRC(cfb9881d) SHA1(97632db5a99e15fd9256db195bf6ae60f848df74) ) ROM_REGION(0x84, "some_eeprom", 0) ROM_LOAD( "sflash.ic37", 0x000000, 0x000084, CRC(fe8f8f5c) SHA1(839461ab736e0228dec7e2512e1692d6ecc4e664) ) @@ -7006,18 +7006,18 @@ ROM_START( shorsepl ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xb800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD("epr-24107a.ic22", 0x00000000, 0x00400000, CRC(8df0f545) SHA1(b89c0d4bf1d5e95176251b6ea42b1d9f885d14bf) ) - ROM_LOAD("mpr-24108.ic1", 0x00800000, 0x01000000, CRC(e8e9c09c) SHA1(5e3d938fa5958c40c59511eef1f2607af7768cc9) ) - ROM_LOAD("mpr-24109.ic2", 0x01800000, 0x01000000, CRC(a5c103d0) SHA1(8f138146a95553c725298c179776ee312beda6d0) ) - ROM_LOAD("mpr-24110.ic3", 0x02800000, 0x01000000, CRC(58a5a8c2) SHA1(913d9e5f00a657e407855f00bf6db0af621ae2ca) ) - ROM_LOAD("mpr-24111.ic4", 0x03800000, 0x01000000, CRC(dcb17013) SHA1(f5523089f0844d43c1bab2044b5de241455e7526) ) - ROM_LOAD("mpr-24112.ic5", 0x04800000, 0x01000000, CRC(711e656b) SHA1(ef3dc54c92a3347da3c5ca697f2ad550906bd44b) ) - ROM_LOAD("mpr-24113.ic6", 0x05800000, 0x01000000, CRC(d6c7d611) SHA1(48955388e86a9f5aa44319501fd339cc662d5647) ) - ROM_LOAD("mpr-24114.ic7", 0x06800000, 0x01000000, CRC(cb1846b7) SHA1(49d0e51921c2c48b07290cd344b5df73df6d333e) ) - ROM_LOAD("mpr-24115.ic8", 0x07800000, 0x01000000, CRC(73c5168d) SHA1(d999b8d2c3b554ca4c256c1da2a5ad3741a6b3fd) ) - ROM_LOAD("mpr-24116.ic9", 0x08800000, 0x01000000, CRC(e074c41a) SHA1(77d8c5a98bd42d199e8e5a5e53b40fe3a1d5a349) ) - ROM_LOAD("mpr-24117.ic10", 0x09800000, 0x01000000, CRC(d6d33ab2) SHA1(1f4c182ac9eebe7b3d0a14f8984f59ffd6979ac0) ) - ROM_LOAD("mpr-24118.ic11", 0x0a800000, 0x01000000, CRC(99b64022) SHA1(e324f8f042dac1849692a05d8d7aa71d80c36ff3) ) + ROM_LOAD("epr-24107a.ic22", 0x00000000, 0x00400000, CRC(8df0f545) SHA1(b89c0d4bf1d5e95176251b6ea42b1d9f885d14bf) ) + ROM_LOAD("mpr-24108.ic1", 0x00800000, 0x01000000, CRC(e8e9c09c) SHA1(5e3d938fa5958c40c59511eef1f2607af7768cc9) ) + ROM_LOAD("mpr-24109.ic2", 0x01800000, 0x01000000, CRC(a5c103d0) SHA1(8f138146a95553c725298c179776ee312beda6d0) ) + ROM_LOAD("mpr-24110.ic3", 0x02800000, 0x01000000, CRC(58a5a8c2) SHA1(913d9e5f00a657e407855f00bf6db0af621ae2ca) ) + ROM_LOAD("mpr-24111.ic4", 0x03800000, 0x01000000, CRC(dcb17013) SHA1(f5523089f0844d43c1bab2044b5de241455e7526) ) + ROM_LOAD("mpr-24112.ic5", 0x04800000, 0x01000000, CRC(711e656b) SHA1(ef3dc54c92a3347da3c5ca697f2ad550906bd44b) ) + ROM_LOAD("mpr-24113.ic6", 0x05800000, 0x01000000, CRC(d6c7d611) SHA1(48955388e86a9f5aa44319501fd339cc662d5647) ) + ROM_LOAD("mpr-24114.ic7", 0x06800000, 0x01000000, CRC(cb1846b7) SHA1(49d0e51921c2c48b07290cd344b5df73df6d333e) ) + ROM_LOAD("mpr-24115.ic8", 0x07800000, 0x01000000, CRC(73c5168d) SHA1(d999b8d2c3b554ca4c256c1da2a5ad3741a6b3fd) ) + ROM_LOAD("mpr-24116.ic9", 0x08800000, 0x01000000, CRC(e074c41a) SHA1(77d8c5a98bd42d199e8e5a5e53b40fe3a1d5a349) ) + ROM_LOAD("mpr-24117.ic10", 0x09800000, 0x01000000, CRC(d6d33ab2) SHA1(1f4c182ac9eebe7b3d0a14f8984f59ffd6979ac0) ) + ROM_LOAD("mpr-24118.ic11", 0x0a800000, 0x01000000, CRC(99b64022) SHA1(e324f8f042dac1849692a05d8d7aa71d80c36ff3) ) ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated ROM_END diff --git a/src/mame/drivers/neodriv.hxx b/src/mame/drivers/neodriv.hxx index e635e7e8640..ec40fe14df4 100644 --- a/src/mame/drivers/neodriv.hxx +++ b/src/mame/drivers/neodriv.hxx @@ -1659,7 +1659,7 @@ ROM_START( roboarmy ) ROM_LOAD16_WORD_SWAP( "032-p1.p1", 0x000000, 0x080000, CRC(cd11cbd4) SHA1(23163e3da2f07e830a7f4a02aea1cb01a54ccbf3) ) /* TC534200 */ NEO_SFIX_128K( "032-s1.s1", CRC(ac0daa1b) SHA1(93bae4697dc403fce19422752a514326ccf66a91) ) /* TC531000 */ - + NEO_BIOS_AUDIO_128K( "032-m1.m1", CRC(35ec952d) SHA1(8aed30e26d7e2c70dbce5de752df416091066f7b) ) /* TC531001 */ ROM_REGION( 0x200000, "cslot1:ymsnd", 0 ) @@ -1676,7 +1676,7 @@ ROM_END ROM_START( roboarma ) /* MVS AND AES VERSION*/ ROM_REGION( 0x100000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT ) ROM_LOAD16_WORD_SWAP( "032-epr.p1", 0x000000, 0x080000, CRC(27c773cb) SHA1(597ca73f142b1129cc7780540bb9cfacd47bc6ce) ) /* D27C4000 */ - /* Found on legitimate Robo Army MVS and AES Carts. Debug code button which check control a sound test has been patched out because in a multislot situation that code could have been enabled + /* Found on legitimate Robo Army MVS and AES Carts. Debug code button which check control a sound test has been patched out because in a multislot situation that code could have been enabled that would stop roboarmy from working, sending it into an infinite loop ; correct chip label unknown */ NEO_SFIX_128K( "032-s1.s1", CRC(ac0daa1b) SHA1(93bae4697dc403fce19422752a514326ccf66a91) ) /* TC531000 */ @@ -2828,7 +2828,7 @@ ROM_START( samsho2ka ) /* KOREAN VERSION */ ROM_LOAD16_WORD_SWAP( "063-p1-kan.p1", 0x100000, 0x100000, CRC(147cc6d7) SHA1(8e22305f41a0688786ff55437c25948e6c8fda58) ) ROM_CONTINUE( 0x000000, 0x100000 ) // Basically samsho2k without loading ep1 and ep2 over p1-kan ; The game has been confirmed to exist in this state - + NEO_SFIX_128K( "063-s1-kan.s1", CRC(ff08f80b) SHA1(240c6a1c52edebb49cc99ea08484c6a2d61ebf84) ) NEO_BIOS_AUDIO_128K( "063-m1.m1", CRC(56675098) SHA1(90429fc40d056d480d0e2bbefbc691d9fa260fc4) ) /* TC531001 */ @@ -8791,8 +8791,8 @@ GAME( 1993, fatfurspa, fatfursp, neobase, neogeo, neogeo_state, neogeo, R GAME( 1995, savagere, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Savage Reign / Fu'un Mokushiroku - Kakutou Sousei", MACHINE_SUPPORTS_SAVE ) GAME( 1994, ssideki2, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Super Sidekicks 2 - The World Championship / Tokuten Ou 2 - Real Fight Football (NGM-061 ~ NGH-061)", MACHINE_SUPPORTS_SAVE ) GAME( 1994, samsho2, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Samurai Shodown II / Shin Samurai Spirits - Haohmaru Jigokuhen (NGM-063 ~ NGH-063)", MACHINE_SUPPORTS_SAVE ) -GAME( 1994, samsho2k, samsho2, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1994, samsho2ka, samsho2, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1994, samsho2k, samsho2, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1994, samsho2ka, samsho2, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, fatfury3, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Fatal Fury 3 - Road to the Final Victory / Garou Densetsu 3 - Haruka-naru Tatakai (NGM-069 ~ NGH-069)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, ssideki3, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "Super Sidekicks 3 - The Next Glory / Tokuten Ou 3 - Eikou e no Michi", MACHINE_SUPPORTS_SAVE ) GAME( 1995, kof95, neogeo, neobase, neogeo, neogeo_state, neogeo, ROT0, "SNK", "The King of Fighters '95 (NGM-084)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index 0e4ab95b11b..8c1fe03c27c 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -31,8 +31,8 @@ TODO: - - COPINT @ 84Hz instead of 50Hz? (with clock 3240506 is 50Hz) - - CLKINT arrives too late and COP reads the VFD data before CPU writes it + - COPINT @ 84Hz instead of 50Hz? (with clock 3240506 is 50Hz) + - CLKINT arrives too late and COP reads the VFD data before CPU writes it - VFD does not receive data from main CPU - bitmapped video - accurate video timing @@ -270,7 +270,7 @@ WRITE8_MEMBER( newbrain_state::enrg_w ) // clock enable int clk = BIT(data, 0); - + if (m_clk != clk) { m_clk = clk; check_interrupt(); @@ -497,7 +497,7 @@ WRITE8_MEMBER( newbrain_state::cop_d_w ) if (!m_cop_k6 && k6) { m_403_d = m_y[m_405_q & 0x0f]->read() & 0x0f; - + if (LOG_COP) logerror("%s %s keydata %01x\n", machine().time().as_string(), machine().describe_context(), m_403_d); } diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index 46608a6230c..814ed0fae33 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -74,7 +74,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } - // Super Constellation + // Super Constellation DECLARE_WRITE8_MEMBER(supercon_mux_w); DECLARE_WRITE8_MEMBER(supercon_control_w); DECLARE_READ8_MEMBER(supercon_input1_r); @@ -353,7 +353,7 @@ WRITE8_MEMBER(novag6502_state::sexpert_mux_w) // d3: enable beeper m_beeper->set_state(data >> 3 & 1); - + // d4-d7: 74145 to input mux/led select m_inp_mux = 1 << (data >> 4 & 0xf) & 0xff; display_matrix(8, 8, m_led_data, m_inp_mux); @@ -415,7 +415,7 @@ WRITE8_MEMBER(novag6502_state::sforte_lcd_data_w) { // d5,d6: led data display_matrix(2, 8, data >> 5 & 3, m_inp_mux); - + // d7: enable beeper m_beeper->set_state(data >> 7 & 1); } @@ -804,7 +804,7 @@ static MACHINE_CONFIG_START( sexpert, novag6502_state ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr)) - + MCFG_NVRAM_ADD_1FILL("nvram") MCFG_MACHINE_RESET_OVERRIDE(novag6502_state, sexpert) @@ -838,7 +838,7 @@ static MACHINE_CONFIG_DERIVED( sforte, sexpert ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sforte_map) - + MCFG_DEFAULT_LAYOUT(layout_novag_sforte) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index c89282b37da..098a030929f 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -38,12 +38,12 @@ Expansion: Expansion box, with 5 ISA slots and space for a 5.25" drive and a har Bondwell BW230 (Pro28 series) ============= Links: http://gallery.fdd5-25.net/details.php?image_id=3463&sessionid=1eaeb42abdf2758a020b16204a2a8e5a ; http://www.zonadepruebas.com/viewtopic.php?t=3696 ; ftp://ftp.whtech.com/emulators/mess/old/Complete%20MESS%20Geneve%20emulation/mess/sysinfo/bondwell.htm -Info: Info is hard to come by. A BW230 is nowhere to be found, the links about the Pro28 series suggest an XT compatible built around a passive backplane and a slot CPU. This is confirmed by the old MESS info. +Info: Info is hard to come by. A BW230 is nowhere to be found, the links about the Pro28 series suggest an XT compatible built around a passive backplane and a slot CPU. This is confirmed by the old MESS info. Form Factor: Desktop CPU: 8088 @ 4.77 MHz (MESS sysinfo: 3.75)/ 8 MHz RAM: 512K / 640K -Bus: at least 2x ISA: 1) CPU, RAM, Floppy controller - 2) Graphics, Game, Parallel +Bus: at least 2x ISA: 1) CPU, RAM, Floppy controller + 2) Graphics, Game, Parallel Video: Hercules/CGA Mass storage: 1x 5.25" 360K and 20/30MB Harddisk. @@ -57,7 +57,7 @@ RAM: 512K / 640K Bus: Proprietary expansion slot, carrying almost all ISA signals Video: On board, MDA/Hercules/CGA Mass storage: 1x 5.25" 360K -On board ports: Floppy, floppy expansion (for Amiga A1010/1011 (720 KB, 3.5") or A1020 (360 KB, 5.25" drives), speaker (but no speaker fitted), mouse, +On board ports: Floppy, floppy expansion (for Amiga A1010/1011 (720 KB, 3.5") or A1020 (360 KB, 5.25" drives), speaker (but no speaker fitted), mouse, Options: 8087 FPU Expansion: Expansion box: 2x ISA @@ -78,8 +78,8 @@ Options: 8087 FPU Zenith SuperSport ======================= -Links: http://www.focushacks.com/zenith/myzenith.html , http://retro-computing.blogspot.de/2006/08/zds-supersport-laptop.html , http://www.minuszerodegrees.net/manuals/Zenith%20Data%20Systems/ZDS%20SupersPort%20-%20Service%20Manual.pdf - http://www.minuszerodegrees.net/manuals/Zenith%20Data%20Systems/ZDS%20SupersPort%20-%20User%20and%20Technical%20Manual.pdf +Links: http://www.focushacks.com/zenith/myzenith.html , http://retro-computing.blogspot.de/2006/08/zds-supersport-laptop.html , http://www.minuszerodegrees.net/manuals/Zenith%20Data%20Systems/ZDS%20SupersPort%20-%20Service%20Manual.pdf + http://www.minuszerodegrees.net/manuals/Zenith%20Data%20Systems/ZDS%20SupersPort%20-%20User%20and%20Technical%20Manual.pdf Info: ZWL-184 to distinguish it from the later 80286 based models Form Factor: Laptop CPU: 80C88 @ 4.77 MHz or 8 MHz @@ -99,9 +99,9 @@ Info: Multitech PC/700 mainboard Form Factor: Desktop CPU: 8088 @ 4.77MHz / 8 MHz RAM: 640KB -Bus: 6x ISA: 1) MDA/Hercules/CGA and parallel port - 2) Floppy, RTC and serial port - 3) (optional) MFM harddisk controller +Bus: 6x ISA: 1) MDA/Hercules/CGA and parallel port + 2) Floppy, RTC and serial port + 3) (optional) MFM harddisk controller Video: MDA/Hercules, exchangable via ISA-slot Mass storage: 1x 5.25" 360K floppy and 1x 5.25" 360K floppy or MFM hard drive (10MB or 20MB) On board ports: parallel, serial, beeper @@ -111,18 +111,18 @@ Options: 8087 FPU NCR PC4i ======== Links: http://www.minuszerodegrees.net/manuals/NCR/NCR%20PC4i%20-%20Technical%20Reference%20Manual%20-%20January%201986.pdf -Info: The earlier PC4 is not quite IBM compatible, the "i" in PC4i indicates full IBM compatibility. - The NCR Graphics card supports a special 640x400 video mode +Info: The earlier PC4 is not quite IBM compatible, the "i" in PC4i indicates full IBM compatibility. + The NCR Graphics card supports a special 640x400 video mode Form Factor: All-in-one desktop CPU: 8088 @ 4.77 MHz RAM: 256K, expandable to 640K -Bus: 7x ISA: 1) (optional) RAM expansion board - 2) empty - 3) 32K Video/Graphics board (64K option) - 4) (optional) Alpha board - 5) empty - 6) (optional) MFM harddisk controller - 7) empty +Bus: 7x ISA: 1) (optional) RAM expansion board + 2) empty + 3) 32K Video/Graphics board (64K option) + 4) (optional) Alpha board + 5) empty + 6) (optional) MFM harddisk controller + 7) empty Video: K510: 4KB Alpha for internal monitor; K511: 32KB Graphics for internal monitor; K512: 32KB upgrade for K512; K140: 16KB Graphics for external monitor; K141: 4KB Alpha for external monitor Display: Mono or color CRT 640x400 pixel Mass storage: 1x 5.25" 360K floppy and 1x 5.25" 360K floppy or 10 MB harddisk @@ -133,7 +133,7 @@ Options: 8087 FPU, K101 memory upgrade in 64K steps, 1.2MB floppy and controller Olivetti M15 ============ Links: http://www.1000bit.it/ad/bro/olivetti/olivettiM15.pdf , http://electrickery.xs4all.nl/comp/m15/ , http://electrickery.xs4all.nl/comp/m15/doc/M15_InstallationAndOperationsGuide.pdf - http://www.museotecnologicamente.it/olivetti-m-15-1987/ , http://www.museotecnologicamente.it/wp-content/uploads/M15_Depliant_inglese.pdf + http://www.museotecnologicamente.it/olivetti-m-15-1987/ , http://www.museotecnologicamente.it/wp-content/uploads/M15_Depliant_inglese.pdf Info: The info brochure has a picture of a working M15. This shows the LCD display with a green background and blue text/graphics. Form Factor: Laptop CPU: 80C88 @ 4.77 MHz @@ -145,7 +145,7 @@ Mass storage: 2x 3.5" 720K drives Ports: serial, parallel, ext. floppy, RTC Expansion: External 5.25" 360K floppy drive - + IBM5550 ======= Information can be found at http://homepage3.nifty.com/ibm5550/index-e.html @@ -169,12 +169,12 @@ Options: Modem, color video output Sanyo MBC-16 ============ -Links: +Links: Info: In the MBC-16 I had, the graphics card had a Sanyo sticker on it, so I assume that was the original graphics card for the machine. Form Factor: Desktop CPU: 8088 @ 8MHz RAM: 640KB -Bus: 3x ISA: 1) ATI Graphics Solution SR https://sites.google.com/site/atiwonderseriesdatabase/ +Bus: 3x ISA: 1) ATI Graphics Solution SR https://sites.google.com/site/atiwonderseriesdatabase/ Video: MDA/CGA/Plantronics Mass storage: 1 or 2 5.25" 360K floppies, MFM harddisk on hardcard or via seperate controller On board ports: serial, parallel, floppy @@ -211,7 +211,7 @@ Links: http://www.atari-computermuseum.de/pc1.htm , http://trelohra.blogspot.de/ Form Factor: Desktop CPU: 8088 @ 4.77 MHz or 8 MHz RAM: 640K -Bus: 5x ISA: 1) Adaptec ACB-2072 RLL Controller Card +Bus: 5x ISA: 1) Adaptec ACB-2072 RLL Controller Card Video: On-board MDA/CGA/Hercules/EGA Mass storage: 1x 5.25" 360K floppy + 30MB RLL harddisk On board ports: floppy, parallel, serial, mouse, speaker @@ -221,20 +221,20 @@ Options: 8087 FPU Eagle 1600 ========== Links: https://archive.org/details/bitsavers_eagleCompu00Brochure_9975235 , http://www.vcfed.org/forum/showthread.php?49510-Eagle-Computer-model-list , http://bitsavers.trailing-edge.com/pdf/eagleComputer/1600/1600_Series_Training_Notes.pdf -Info: Eagle 1620 - 8086/128K, 2 Quad density floppy drives, 4 Expansion slots available, ~1983, Eagle 1630 - 8086/128K, 1 Quad density floppy drive, 10MB HD, 3 Expansion Slots available (Same as 1620 with hard drive), ~1983Eagle 1640 - 8086/512K, 1 Quad density floppy drive, 32MB HD, 3 Expansion Slots available, ~1984 - The native floppy format is 780K, 2 sides, 80 tracks/side, 1024 bytes/sector, 5 sectors per track. Standard 360K disks can be read - Holding "T" and resetting starts a system diagnostics test +Info: Eagle 1620 - 8086/128K, 2 Quad density floppy drives, 4 Expansion slots available, ~1983, Eagle 1630 - 8086/128K, 1 Quad density floppy drive, 10MB HD, 3 Expansion Slots available (Same as 1620 with hard drive), ~1983Eagle 1640 - 8086/512K, 1 Quad density floppy drive, 32MB HD, 3 Expansion Slots available, ~1984 + The native floppy format is 780K, 2 sides, 80 tracks/side, 1024 bytes/sector, 5 sectors per track. Standard 360K disks can be read + Holding "T" and resetting starts a system diagnostics test Form Factor: Desktop CPU: 8086 @ 8 MHz RAM: 128K / 512K -Bus: 8xISA: 1) SASI board, connects to a XEBEC Sl410 SASI => MFM bridge board - 2) Floppy controller - 3) empty - 4) Video/graphics controller board - 5) empty - 6) empty - 7) Serial board: 2x serial, one sync/async, one async only - 8) Parallel board +Bus: 8xISA: 1) SASI board, connects to a XEBEC Sl410 SASI => MFM bridge board + 2) Floppy controller + 3) empty + 4) Video/graphics controller board + 5) empty + 6) empty + 7) Serial board: 2x serial, one sync/async, one async only + 8) Parallel board Video: 80x25 text mode, 720x352 pixel graphics mode Mass storage: 1x 5.25" QD 780K floppy and 1x 5.25" QD 820K floppy or 10/30MB MFM harddisk Options: 8087 FPU, EagleNet File server, EightPort serial card, High Resolution color board and video, Video Cassette Adapter board for 80MB backup on video cassette @@ -245,9 +245,9 @@ Links: http://minuszerodegrees.net/manuals.htm#VTech , http://minuszerodegrees.n Form Factor: Desktop CPU: 8088 @ 4.77 MHz or 10 MHz RAM: 512K / 640K, additionally 512K or 1M EMS on board -Bus: 8xISA: 1) Monochrome graphics/color graphics card - 2) Multi I/O Card (Floppy, 2x serial, parallel, game, RTC) - 3) (optional) hard disk controller +Bus: 8xISA: 1) Monochrome graphics/color graphics card + 2) Multi I/O Card (Floppy, 2x serial, parallel, game, RTC) + 3) (optional) hard disk controller Video: MDA/CGA/Hercules Mass storage: 2x 5.25" 360K floppies and 1 or 2 harddisks (20MB / 30MB / 40MB) On board ports: speaker @@ -259,9 +259,9 @@ Links: http://minuszerodegrees.net/manuals.htm#VTech , http://th99.classic-compu Form Factor: Desktop CPU: 8088 @ 4.77MHz or 10 MHz RAM: 512K / 640K, additionally 512K or 1M EMS on board -Bus: 8x ISA: 1) Monochrome graphics/color graphics card http://th99.classic-computing.de/src/v/U-Z/52547.htm , alternatively an EGA card - 2) Multi I/O Card (Floppy, 2x serial, 1x parallel, game, RTC) http://th99.classic-computing.de/src/i/U-Z/52519.htm - 3) (optional) hard disk controller +Bus: 8x ISA: 1) Monochrome graphics/color graphics card http://th99.classic-computing.de/src/v/U-Z/52547.htm , alternatively an EGA card + 2) Multi I/O Card (Floppy, 2x serial, 1x parallel, game, RTC) http://th99.classic-computing.de/src/i/U-Z/52519.htm + 3) (optional) hard disk controller Video: MDA/Hercules/CGA Mass storage: 2x 5.25" 360K or 1x 5.25" 360K and 1x 3.5" 720K, additional harddisk optional On board ports: speaker @@ -433,7 +433,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_single_360K ) MCFG_SLOT_DEFAULT_OPTION("525dd") MCFG_SLOT_FIXED(true) MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END +MACHINE_CONFIG_END //Data General One @@ -547,12 +547,12 @@ static MACHINE_CONFIG_DERIVED ( ncrpc4i, pccga ) //MCFG_DEVICE_MODIFY("mb:isa") MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false) - + MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") MCFG_RAM_EXTRA_OPTIONS("64K, 128K, 256K, 512K") MACHINE_CONFIG_END - + // Siemens Sicomp PC16-05 static DEVICE_INPUT_DEFAULTS_START( siemens ) @@ -844,7 +844,7 @@ ROM_START ( ataripc1 ) ROMX_LOAD( "award_atari_pc_bios_3.06.bin", 0x8000, 0x8000, CRC(256427ce) SHA1(999f6af64b79f88c1d3492f386d9bee08efb50e7), ROM_BIOS(1)) ROM_SYSTEM_BIOS( 1, "v3.08", "v3.08" ) ROMX_LOAD( "award_atari_pc_bios_3.08.bin", 0x8000, 0x8000, CRC(929a2443) SHA1(8e98f3c9180c55b1f5521727779c016083d27960), ROM_BIOS(2)) //same as on Atari PC3, also used on Atari PC2 -ROM_END +ROM_END ROM_START( ataripc3 ) ROM_REGION(0x10000,"bios", 0) @@ -888,26 +888,26 @@ ROM_END ***************************************************************************/ -/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ -COMP( 1984, dgone, ibm5150, 0, dgone, pccga, driver_device, 0, "Data General", "Data General/One" , MACHINE_NOT_WORKING)/* CGA, 2x 3.5" disk drives */ -COMP( 1985, bw230, ibm5150, 0, bondwell, bondwell, pc_state, bondwell, "Bondwell Holding", "BW230 (PRO28 Series)", 0 ) -COMP( 1984, compc1, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-1" , MACHINE_NOT_WORKING) -COMP( 1987, pc10iii, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-10 III" , MACHINE_NOT_WORKING) -COMP( 1992, iskr3104, ibm5150, 0, iskr3104, pccga, driver_device, 0, "Schetmash", "Iskra 3104", MACHINE_NOT_WORKING) -COMP( 1989, mk88, ibm5150, 0, mk88, pccga, driver_device, 0, "<unknown>", "MK-88", MACHINE_NOT_WORKING) -COMP( 1991, poisk2, ibm5150, 0, poisk2, pccga, driver_device, 0, "<unknown>", "Poisk-2", MACHINE_NOT_WORKING) -COMP( 1990, mc1702, ibm5150, 0, pccga, pccga, driver_device, 0, "<unknown>", "Elektronika MC-1702", MACHINE_NOT_WORKING) -COMP( 1987, zdsupers, ibm5150, 0, zenith, pccga, driver_device, 0, "Zenith Data Systems", "SuperSport", 0) -COMP( 1985, sicpc1605, ibm5150, 0, siemens, pccga, driver_device, 0, "Siemens", "Sicomp PC16-05", MACHINE_NOT_WORKING) -COMP( 1985, ncrpc4i, ibm5150, 0, ncrpc4i, pccga, driver_device, 0, "NCR", "PC4i", MACHINE_NOT_WORKING) -COMP( 198?, olivm15, ibm5150, 0, m15, pccga, driver_device, 0, "Olivetti", "M15", 0) -COMP( 1983, ibm5550, ibm5150, 0, ibm5550, pccga, driver_device, 0, "International Business Machines", "IBM 5550", MACHINE_NOT_WORKING) -COMP( 1985, pc7000, ibm5150, 0, pccga, pccga, driver_device, 0, "Sharp", "PC-7000", MACHINE_NOT_WORKING) -COMP( 1988, sx16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "SX-16", MACHINE_NOT_WORKING) -COMP( 198?, mbc16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "MBC-16" , MACHINE_NOT_WORKING) -COMP( 1987, ataripc1, ibm5150, 0, ataripc1, pccga, driver_device, 0, "Atari", "PC1" , 0) -COMP( 1988, ataripc3, ibm5150, 0, pccga, pccga, driver_device, 0, "Atari", "PC3" , 0) -COMP( 1989, ssam88s, ibm5150, 0, pccga, pccga, driver_device, 0, "Samsung", "Samtron 88S" , MACHINE_NOT_WORKING) -COMP( 1983, eagle1600, ibm5150, 0, eagle1600, pccga, driver_device, 0, "Eagle", "1600" , MACHINE_NOT_WORKING) -COMP( 1988, laser_turbo_xt, ibm5150, 0, laser_turbo_xt, 0, driver_device, 0, "VTech", "Laser Turbo XT" , 0) -COMP( 1989, laser_xt3, ibm5150, 0, laser_xt3, 0, driver_device, 0, "VTech", "Laser XT/3" , 0) +/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ +COMP( 1984, dgone, ibm5150, 0, dgone, pccga, driver_device, 0, "Data General", "Data General/One" , MACHINE_NOT_WORKING)/* CGA, 2x 3.5" disk drives */ +COMP( 1985, bw230, ibm5150, 0, bondwell, bondwell, pc_state, bondwell, "Bondwell Holding", "BW230 (PRO28 Series)", 0 ) +COMP( 1984, compc1, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-1" , MACHINE_NOT_WORKING) +COMP( 1987, pc10iii, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-10 III" , MACHINE_NOT_WORKING) +COMP( 1992, iskr3104, ibm5150, 0, iskr3104, pccga, driver_device, 0, "Schetmash", "Iskra 3104", MACHINE_NOT_WORKING) +COMP( 1989, mk88, ibm5150, 0, mk88, pccga, driver_device, 0, "<unknown>", "MK-88", MACHINE_NOT_WORKING) +COMP( 1991, poisk2, ibm5150, 0, poisk2, pccga, driver_device, 0, "<unknown>", "Poisk-2", MACHINE_NOT_WORKING) +COMP( 1990, mc1702, ibm5150, 0, pccga, pccga, driver_device, 0, "<unknown>", "Elektronika MC-1702", MACHINE_NOT_WORKING) +COMP( 1987, zdsupers, ibm5150, 0, zenith, pccga, driver_device, 0, "Zenith Data Systems", "SuperSport", 0) +COMP( 1985, sicpc1605, ibm5150, 0, siemens, pccga, driver_device, 0, "Siemens", "Sicomp PC16-05", MACHINE_NOT_WORKING) +COMP( 1985, ncrpc4i, ibm5150, 0, ncrpc4i, pccga, driver_device, 0, "NCR", "PC4i", MACHINE_NOT_WORKING) +COMP( 198?, olivm15, ibm5150, 0, m15, pccga, driver_device, 0, "Olivetti", "M15", 0) +COMP( 1983, ibm5550, ibm5150, 0, ibm5550, pccga, driver_device, 0, "International Business Machines", "IBM 5550", MACHINE_NOT_WORKING) +COMP( 1985, pc7000, ibm5150, 0, pccga, pccga, driver_device, 0, "Sharp", "PC-7000", MACHINE_NOT_WORKING) +COMP( 1988, sx16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "SX-16", MACHINE_NOT_WORKING) +COMP( 198?, mbc16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "MBC-16" , MACHINE_NOT_WORKING) +COMP( 1987, ataripc1, ibm5150, 0, ataripc1, pccga, driver_device, 0, "Atari", "PC1" , 0) +COMP( 1988, ataripc3, ibm5150, 0, pccga, pccga, driver_device, 0, "Atari", "PC3" , 0) +COMP( 1989, ssam88s, ibm5150, 0, pccga, pccga, driver_device, 0, "Samsung", "Samtron 88S" , MACHINE_NOT_WORKING) +COMP( 1983, eagle1600, ibm5150, 0, eagle1600, pccga, driver_device, 0, "Eagle", "1600" , MACHINE_NOT_WORKING) +COMP( 1988, laser_turbo_xt, ibm5150, 0, laser_turbo_xt, 0, driver_device, 0, "VTech", "Laser Turbo XT" , 0) +COMP( 1989, laser_xt3, ibm5150, 0, laser_xt3, 0, driver_device, 0, "VTech", "Laser XT/3" , 0) diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 33140a2ebf5..3285b30972d 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -17,8 +17,8 @@ - some later SWs put "Invalid command byte 05" (Absolutely Mahjong on Epson logo) - investigate on POR bit - test 2dd more - - clean-ups/split into devices. - + - clean-ups/split into devices. + TODO (PC-9801RS): - extra features; - keyboard shift doesn't seem to disable properly; @@ -44,7 +44,7 @@ - AD&D Champions of Krynn - AI Shougi (asserts upon loading, 3'5 image?) - Aki no Tsukasa no Fushigi no Kabe (works in PC-9801RS only) - - alice + - alice - Aoki Ookami no Shiroki Mejika - Gengis Khan - Arcshu - Arcus 2 @@ -62,54 +62,54 @@ * Bokosuka Wars - Jangou 2: floppy fails to load after the title screen; - - runners (size assert) - - Sorcerian (2dd image) - - Twilight Zone 3 (2dd image) + - runners (size assert) + - Sorcerian (2dd image) + - Twilight Zone 3 (2dd image) List of per-game TODO: - 4dboxing: inputs are unresponsive; - - 4dboxing: crashes after user disk creation (regression); - - agumixsl: non-interlace mode doesn't resize graphics, has rectangle selection bugs (note: needs GDC = 5 MHz to boot); + - 4dboxing: crashes after user disk creation (regression); + - agumixsl: non-interlace mode doesn't resize graphics, has rectangle selection bugs (note: needs GDC = 5 MHz to boot); - agenesis: fails loading, attempting to read IDE RAM switch port; - - alice: doesn't set bitmap interlace properly, can't do disk swaps via the File Manager; - - applecl1: can't pass hands apparently; - - arctic, fsmoon: Doesn't detect sound board (tied to 0x00ec ports); + - alice: doesn't set bitmap interlace properly, can't do disk swaps via the File Manager; + - applecl1: can't pass hands apparently; + - arctic, fsmoon: Doesn't detect sound board (tied to 0x00ec ports); - atragon: HDD install disk swap doesn't work? - - asokokof: black screen with BGM, executes invalid opcode (previous note "waits at 0x225f6"); + - asokokof: black screen with BGM, executes invalid opcode (previous note "waits at 0x225f6"); - arquelph: beeps out at initial sound check, no voice samples, extra sound board tested; - - bandkun: can't install to HDD, has unemulated sound boards in settings (Roland MT-32 & D-10/D-110, Kawai MSB-98, Korg M1, MIDI); - - bishohzx: Soft House logo uses pseudo-ROZ effect (?), no title screen graphics? - - bishotsu: beeps out before game (missing sound board?), doesn't draw some text? - + - bandkun: can't install to HDD, has unemulated sound boards in settings (Roland MT-32 & D-10/D-110, Kawai MSB-98, Korg M1, MIDI); + - bishohzx: Soft House logo uses pseudo-ROZ effect (?), no title screen graphics? + - bishotsu: beeps out before game (missing sound board?), doesn't draw some text? + - deflektr: no sound, moans about a DIP-SW setting during loading, has timing issues (keyboard being too fast on PC-9801RS); - - edge: has gfx glitch when intro scrolls to top-left; - - edge: user disk creation is offset? + - edge: has gfx glitch when intro scrolls to top-left; + - edge: user disk creation is offset? - idolsaga: Moans with a "(program) ended. remove the floppy disk and turn off the power." - - karateka: no sound; - - lovelyho: Doesn't show kanjis in PC-9801F version (tries to read them thru the 0xa9 port); + - karateka: no sound; + - lovelyho: Doesn't show kanjis in PC-9801F version (tries to read them thru the 0xa9 port); - madoum1, madoum2, madoum3: doesn't display bitmap gfxs during gameplay; - quarth: sound cuts off at title screen, doesn't work on 9801rs (bogus "corrupt .exe" detected); - prinmak2, tim: cursor stays stuck when using mouse (works with keyboard); - puyopuyo: beeps out when it's supposed to play samples, Not supposed to use ADPCM, is it a PIT issue? - runners: wrong double height on the title screen; - - rusty: black stripes when scrolling; - - rusty: voice pitches are too slow (tested with -26 and -86); + - rusty: black stripes when scrolling; + - rusty: voice pitches are too slow (tested with -26 and -86); - win211: EGC drawing issue (byte wide writes?) - - win31: doesn't boot at - - per-game TODO (Dounjishi SW): + - win31: doesn't boot at + + per-game TODO (Dounjishi SW): - Absolutely Mahjong: Transitions are too fast. - + per-game TODO (PC-9821): - Battle Skin Panic: gfx bugs at the Gainax logo, it crashes after it; - Policenauts: CD-ROM drive not found; Notes: - - annivers: GRPH (ALT) key cycles through different color schemes (normal, b&w, legacy); + - annivers: GRPH (ALT) key cycles through different color schemes (normal, b&w, legacy); - Animahjong V3 makes advantage of the possibility of installing 2 sound boards, where SFX and BGMs are played on separate chips. - Apple Club 1/2 needs data disks to load properly; - Beast Lord: needs a titan.fnt, in MS-DOS - - fhtag2: product key is 001J0283TA 100001 + - fhtag2: product key is 001J0283TA 100001 - To deprotect BASIC modules set 0xcd7 in ram to 0 ======================================================================================== @@ -595,13 +595,13 @@ public: DECLARE_WRITE16_MEMBER(grcg_gvram_w); DECLARE_READ16_MEMBER(grcg_gvram0_r); DECLARE_WRITE16_MEMBER(grcg_gvram0_w); - + DECLARE_READ16_MEMBER(pc9821_grcg_gvram_r); DECLARE_WRITE16_MEMBER(pc9821_grcg_gvram_w); DECLARE_READ16_MEMBER(pc9821_grcg_gvram0_r); DECLARE_WRITE16_MEMBER(pc9821_grcg_gvram0_w); uint16_t m_pc9821_256vram_bank; - + DECLARE_READ16_MEMBER(upd7220_grcg_r); DECLARE_WRITE16_MEMBER(upd7220_grcg_w); void egc_blit_w(uint32_t offset, uint16_t data, uint16_t mem_mask); @@ -2313,41 +2313,41 @@ READ8_MEMBER(pc9801_state::ext2_video_ff_r) uint8_t res; res = 0; - + switch(m_ext2_ff) { -// case 0x00: ? -// case 0x01: 200 line color / b&w mode (i/o 0x68 -> 0x02) -// case 0x02: Odd-numbered raster mask (i/o 0x68 -> 0x08) +// case 0x00: ? +// case 0x01: 200 line color / b&w mode (i/o 0x68 -> 0x02) +// case 0x02: Odd-numbered raster mask (i/o 0x68 -> 0x08) case 0x03: res = m_video_ff[DISPLAY_REG]; break; // display reg -// case 0x04: palette mode (i/o 0x6a -> 0x00) -// case 0x05: GDC sync mode (i/o 0x6a -> 0x40) -// case 0x06: unknown (i/o 0x6a -> 0x44) -// case 0x07: EGC compatibility mode (i/o 0x6a -> 0x04) -// case 0x08: Protected mode f/f (i/o 0x6a -> 0x06) -// case 0x09: GDC clock #0 (i/o 0x6a -> 0x82) +// case 0x04: palette mode (i/o 0x6a -> 0x00) +// case 0x05: GDC sync mode (i/o 0x6a -> 0x40) +// case 0x06: unknown (i/o 0x6a -> 0x44) +// case 0x07: EGC compatibility mode (i/o 0x6a -> 0x04) +// case 0x08: Protected mode f/f (i/o 0x6a -> 0x06) +// case 0x09: GDC clock #0 (i/o 0x6a -> 0x82) case 0x0a: res = m_ex_video_ff[ANALOG_256_MODE]; break; // 256 color mode -// case 0x0b: VRAM access mode (i/o 0x6a -> 0x62) -// case 0x0c: unknown -// case 0x0d: VRAM boundary mode (i/o 0x6a -> 0x68) -// case 0x0e: 65536 color GFX mode (i/o 0x6a -> 0x22) -// case 0x0f: 65,536 color palette mode (i/o 0x6a -> 0x24) -// case 0x10: unknown (i/o 0x6a -> 0x6a) -// case 0x11: Reverse mode related (i/o 0x6a -> 0x26) -// case 0x12: 256 color overscan color (i/o 0x6a -> 0x2c) -// case 0x13: Reverse mode related (i/o 0x6a -> 0x28) -// case 0x14: AGDC Drawing processor selection (i/o 0x6a -> 0x66) -// case 0x15: unknown (i/o 0x6a -> 0x60) -// case 0x16: unknown (i/o 0x6a -> 0xc2) -// case 0x17: bitmap config direction (i/o 0x6a -> 0x6c) -// case 0x18: High speed palette write (i/o 0x6a -> 0x2a) -// case 0x19: unknown (i/o 0x6a -> 0x48) -// case 0x1a: unknown (i/o 0x6a -> 0xc8) -// case 0x1b: unknown (i/o 0x6a -> 0x2e) -// case 0x1c: unknown (i/o 0x6a -> 0x6e) -// case 0x1d: unknown (i/o 0x6a -> 0xc0) -// case 0x1e: unknown (i/o 0x6a -> 0x80 or 0x46?) -// case 0x1f: unknown (i/o 0x6a -> 0x08) +// case 0x0b: VRAM access mode (i/o 0x6a -> 0x62) +// case 0x0c: unknown +// case 0x0d: VRAM boundary mode (i/o 0x6a -> 0x68) +// case 0x0e: 65536 color GFX mode (i/o 0x6a -> 0x22) +// case 0x0f: 65,536 color palette mode (i/o 0x6a -> 0x24) +// case 0x10: unknown (i/o 0x6a -> 0x6a) +// case 0x11: Reverse mode related (i/o 0x6a -> 0x26) +// case 0x12: 256 color overscan color (i/o 0x6a -> 0x2c) +// case 0x13: Reverse mode related (i/o 0x6a -> 0x28) +// case 0x14: AGDC Drawing processor selection (i/o 0x6a -> 0x66) +// case 0x15: unknown (i/o 0x6a -> 0x60) +// case 0x16: unknown (i/o 0x6a -> 0xc2) +// case 0x17: bitmap config direction (i/o 0x6a -> 0x6c) +// case 0x18: High speed palette write (i/o 0x6a -> 0x2a) +// case 0x19: unknown (i/o 0x6a -> 0x48) +// case 0x1a: unknown (i/o 0x6a -> 0xc8) +// case 0x1b: unknown (i/o 0x6a -> 0x2e) +// case 0x1c: unknown (i/o 0x6a -> 0x6e) +// case 0x1d: unknown (i/o 0x6a -> 0xc0) +// case 0x1e: unknown (i/o 0x6a -> 0x80 or 0x46?) +// case 0x1f: unknown (i/o 0x6a -> 0x08) default: if(m_ext2_ff < 0x20) popmessage("PC-9821: read ext2 f/f with value %02x",m_ext2_ff); @@ -2383,7 +2383,7 @@ READ16_MEMBER(pc9801_state::pc9821_grcg_gvram_r) { return space.read_word(0xf00000|(offset*2)|((m_analog256.write_bank)*0x8000),mem_mask); } - + return grcg_gvram_r(space,offset,mem_mask); } @@ -2394,7 +2394,7 @@ WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram_w) space.write_word(0xf00000|(offset*2)|(m_analog256.write_bank*0x8000),data,mem_mask); return; } - + grcg_gvram_w(space,offset,data,mem_mask); } @@ -2405,12 +2405,12 @@ READ16_MEMBER(pc9801_state::pc9821_grcg_gvram0_r) switch(offset*2) { case 4: return m_analog256.write_bank; -// case 6: return m_analog256.read_bank; +// case 6: return m_analog256.read_bank; } - + //return 0; } - + return grcg_gvram0_r(space,offset,mem_mask); } @@ -2422,11 +2422,11 @@ WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram0_w) switch(offset*2) { case 4: COMBINE_DATA(&m_analog256.write_bank); break; -// case 6: COMBINE_DATA(&m_analog256.read_bank); break; +// case 6: COMBINE_DATA(&m_analog256.read_bank); break; } //return; } - + grcg_gvram0_w(space,offset,data,mem_mask); } diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 76869986421..b7298c672b2 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -110,20 +110,20 @@ public: TIMER_CALLBACK_MEMBER(protection_deferred_w); protected: - required_device<cpu_device> m_maincpu; - required_device<m68705r_device> m_mcu; - required_device<gfxdecode_device> m_gfxdecode; - required_device<palette_device> m_palette; + required_device<cpu_device> m_maincpu; + required_device<m68705r_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; - required_shared_ptr<u8> m_vram1; - required_shared_ptr<u8> m_vram2; + required_shared_ptr<u8> m_vram1; + required_shared_ptr<u8> m_vram2; tilemap_t *m_tilemap1; tilemap_t *m_tilemap2; - u8 m_vidctrl; - std::unique_ptr<u8[]> m_palram; - u8 m_fromMCU; + u8 m_vidctrl; + std::unique_ptr<u8[]> m_palram; + u8 m_fromMCU; }; diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 1e6f5df0f07..bfd0b3d2124 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -2219,21 +2219,21 @@ ROM_END ---------------+--+------------------ ---------------+--+------------------ ---------------+--+------------------ |01| GND GND |01| GND +5V |01| +5V GEARS SWITCH |02| GND |02| +5V |02| +5V - 50 PTS COIN-IN |03| GND |03| |03| - |04| GND +5V |04| +5V |04| - 25 PTS COIN-IN |05| GND |05| COMMON ACCEL + BREAK (HI) |05| - +5V |06| +5V BRAKE POT |06| ACCEL POT |06| + 50 PTS COIN-IN |03| GND |03| |03| + |04| GND +5V |04| +5V |04| + 25 PTS COIN-IN |05| GND |05| COMMON ACCEL + BREAK (HI) |05| + +5V |06| +5V BRAKE POT |06| ACCEL POT |06| +5V |07| +5V |07| COMMON ACCEL + BREAK (LO) |07| GND - +5V |08| +5V |08| GND |08| VIDEO GND + +5V |08| +5V |08| GND |08| VIDEO GND |09| AUDIO SIGNAL 4(***) |09| AUDIO SIGNAL 1(***) VIDEO SYNC |09| VIDEO BLUE |10| AUDIO SIGNAL 3(***) |10| AUDIO SIGNAL 2(***) VIDEO GREEN |10| VIDEO RED - +12V |11| GND |11| GND |11| + +12V |11| GND |11| GND |11| WHEEL X SIGNAL |12| |12| |12| WHEEL Z SIGNAL |13| |13| |13| -5V |14| |14| |14| - AUDIO SIGNAL 1(*) |15| AMP AUDIO SIGNAL (**) |15| GND |15| GND - AUDIO SIGNAL 2(*) |16| AMP AUDIO SIGNAL (**) |16| GND |16| GND - AUDIO SIGNAL 3(*) |17| |17| GND |17| GND + AUDIO SIGNAL 1(*) |15| AMP AUDIO SIGNAL (**) |15| GND |15| GND + AUDIO SIGNAL 2(*) |16| AMP AUDIO SIGNAL (**) |16| GND |16| GND + AUDIO SIGNAL 3(*) |17| |17| GND |17| GND AUDIO SIGNAL 4(*) |18| |18| GND |18| GND @@ -2321,7 +2321,7 @@ ROM_START( polepos2bs ) ROM_REGION( 0x2000, "soundz80bl", 0 ) ROM_LOAD( "aboard-spi.11", 0x0000, 0x2000, CRC(47226cda) SHA1(03115ead04b11e7ef3ef08d32d4d61a56dc35190) ) /* redumped. the former one has bit6 stuck */ -// ROM_REGION( 0x2000, "pals", 0 ) +// ROM_REGION( 0x2000, "pals", 0 ) // ...not dumped yet... ROM_END diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index c281bca19f5..546d64efbc3 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -23,10 +23,10 @@ TODO: - get other rom versions and games - document the light-organ related stuff - -NOTES: - The hardware is based on the K1520 PC system, with video output coming through a standard Colormat TV. - + +NOTES: + The hardware is based on the K1520 PC system, with video output coming through a standard Colormat TV. + There are at least two revisions: - Revision 1 - @@ -35,14 +35,14 @@ NOTES: 012-7100 ZRE CPU-Board K2521 (3KiB ROM, 1KiB RAM) 012-7040 PFS-1 ROM Board K3820 #1 - Games 1 to 4 (16KiB ROM) 012-7040 PFS-2 ROM Board K3820 #2 - Games 5 to 8 (16KiB ROM) - + - Revision 2 - 2319-84-01 FAZ Graphics card (Color and Sound Logic) 2319-84-02 ABS Graphics card (1KiB ROM for Charset) 02 899-0101 ZRE-PP CPU-Board (56KiB ROM, 64KiB* RAM) Basically revision 2 combines the ZRE, PFS-1 and PFS-2 onto a single board. - + memory map: - Revision 1 - @@ -55,7 +55,7 @@ memory map: Hirschjagd (1c00 - 27ff) Hase und Wolf (2800 - 3fff) Schmetterlingsfang (4000 - 4fff) - + 5000 - 8fff PFS-2 Schiessbude (5000 - 5fff) Autorennen (6000 - 73ff) opto-akust. Merkspiel (7400 - 7fff) @@ -88,7 +88,7 @@ i/o ports: 80 - 83 ZRE-PP UB857D (Z80 CTC) 84 - 87 ZRE-PP UB855D (Z80 PIO) ?? - ?? ZRE-PP UB8560D (Z80 SIO) - + read: 83 CTC COUNT 3 (IN1) used as hardware random number generator @@ -103,7 +103,7 @@ i/o ports: bit 6 = bookkeeping (Summe Spiele) bit 7 = coin sensor (+IRQ to make the game acknowledge it) - 85 PIO PORT B + 85 PIO PORT B bit 0-4 = light organ (unemulated :)) ) bit 5-7 = sound parameter (unemulated, it's very difficult to figure out how those work) @@ -203,11 +203,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( polyplay_mem_zrepp, AS_PROGRAM, 8, polyplay_state ) AM_RANGE(0x0000, 0xbfff) AM_ROM - + AM_RANGE(0xc000, 0xcfff) AM_RAM - + AM_RANGE(0xd000, 0xd7ff) AM_ROM AM_REGION("gfx1", 0) - + AM_RANGE(0xea00, 0xebff) AM_RAM AM_RANGE(0xec00, 0xf7ff) AM_RAM_WRITE(polyplay_characterram_w) AM_SHARE("characterram") @@ -281,14 +281,14 @@ static MACHINE_CONFIG_START( polyplay_zre, polyplay_state ) MCFG_Z80CTC_ZC0_CB(WRITELINE(polyplay_state, ctc_zc0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(polyplay_state, ctc_zc1_w)) //MCFG_Z80CTC_ZC2_CB(WRITELINE(polyplay_state, ctc_zc2_w)) - + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, POLYPLAY_MAIN_CLOCK / 4) /* UB855D */ MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80CPU_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(polyplay_state, pio_porta_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(polyplay_state, pio_porta_w)) MCFG_Z80PIO_IN_PB_CB(READ8(polyplay_state, pio_portb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(polyplay_state, pio_portb_w)) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index aea6a39b2a0..6ec195e768d 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -58,7 +58,7 @@ Occassionally, ERROR 13 -keyboard stuck- appears (for reasons yet unknown). CORVUS HARD DISK ---------------- -Up to 4 Corvus Disks with up to 20 MB each can be emulated (to be mounted as hard disks 2 - 5). +Up to 4 Corvus Disks with up to 20 MB each can be emulated (to be mounted as hard disks 2 - 5). MS DOS 2.x and CP/M v2.x were once supported, but are untested (in part because no binary drivers have survived). To get a Corvus 11 drive up and running under CP/M 1.x, you'll need drcdutil.td0 from Donald Maslin's Archive. @@ -110,7 +110,7 @@ COLOR EMULATION (NEC 7220 + extra hardware) THE DEC 'R-M-B' COLOR CABLE VS. THE UNOFFICIAL 'R-G-B' MODE (A BIT OF HISTORY) The standard DEC "color cable" connected the green gun of a VR241 to the mono output of the Rainbow (DIP setting COLOR_MONITOR). - + An unofficial DIY cable enabled R-G-B graphics + seperate text (emulated by DIP setting DUAL MONITOR). As DEC decided not to endorse R-G-B, many commercial programs show incorrect colors. A patch from one of the archives corrects the GWBASIC palette problem when using 2 monitors [Bavarese]. @@ -455,7 +455,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). #include "imagedev/harddriv.h" #include "machine/wd2010.h" -#include "machine/corvushd.h" +#include "machine/corvushd.h" #include "machine/z80dart.h" #include "bus/rs232/rs232.h" @@ -488,8 +488,8 @@ public: m_inp2(*this, "W14"), m_inp3(*this, "W15"), m_inp4(*this, "W18"), - m_inp5(*this, "DEC HARD DISK"), // DO NOT CHANGE ORDER - m_inp6(*this, "CORVUS HARD DISKS"), // DO NOT CHANGE ORDER + m_inp5(*this, "DEC HARD DISK"), // DO NOT CHANGE ORDER + m_inp6(*this, "CORVUS HARD DISKS"), // DO NOT CHANGE ORDER m_inp7(*this, "GRAPHICS OPTION"), // DO NOT CHANGE ORDER m_inp8(*this, "MEMORY PRESENT"), // DO NOT CHANGE ORDER m_inp9(*this, "MONO MONITOR TYPE"), @@ -505,7 +505,7 @@ public: m_fdc(*this, FD1793_TAG), m_hdc(*this, "hdc"), - m_corvus_hdc(*this, "corvus"), + m_corvus_hdc(*this, "corvus"), m_mpsc(*this, "upd7201"), m_dbrg_A(*this, "com8116_a"), @@ -660,7 +660,7 @@ private: required_device<fd1793_t> m_fdc; optional_device<wd2010_device> m_hdc; - required_device<corvus_hdc_t> m_corvus_hdc; + required_device<corvus_hdc_t> m_corvus_hdc; required_device<upd7201_device> m_mpsc; required_device<com8116_device> m_dbrg_A; @@ -954,7 +954,7 @@ AM_RANGE(0x11, 0x11) AM_DEVREADWRITE("kbdser", i8251_device, status_r, control_w // See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION ) // Corvus B/H harddisk controller (incompatible with EXT.COMM OPTION): -AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("corvus", corvus_hdc_t, read, write) +AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("corvus", corvus_hdc_t, read, write) AM_RANGE(0x21, 0x21) AM_READ(corvus_status_r) // =========================================================== @@ -1074,7 +1074,7 @@ PORT_DIPNAME(0x01, 0x00, "DEC HARD DISK") PORT_TOGGLE PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x01, DEF_STR(On)) -PORT_START("CORVUS HARD DISKS") +PORT_START("CORVUS HARD DISKS") PORT_DIPNAME(0x01, 0x00, "CORVUS HARD DISKS") PORT_TOGGLE PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(0x01, DEF_STR(On)) @@ -1229,7 +1229,7 @@ void rainbow_state::machine_reset() } if (m_inp6->read() == 0x00) // Unmap port if Corvus not present - io.unmap_readwrite(0x20, 0x20); + io.unmap_readwrite(0x20, 0x20); // *********** FLOPPY DISK CONTROLLER [ NOT OPTIONAL ] m_unit = INVALID_DRIVE; @@ -2148,7 +2148,7 @@ READ8_MEMBER(rainbow_state::system_parameter_r) BIOS uses a seperate IRQ vector for RAM board detection (at least on a 100-B). */ return (((m_inp5->read() == 1) ? 0 : 1) | - ((m_inp7->read() == 1) ? 0 : 4) | // Floppy is always present (bit 1 zero) + ((m_inp7->read() == 1) ? 0 : 4) | // Floppy is always present (bit 1 zero) #ifdef OLD_RAM_BOARD_PRESENT ((m_inp8->read() > MOTHERBOARD_RAM) ? 0 : 8) | #else @@ -3288,7 +3288,7 @@ MCFG_WD2010_IN_INDEX_CB(VCC) // " MCFG_HARDDISK_ADD("decharddisk1") /// ******************************** / HARD DISK CONTROLLER **************************************** -MCFG_DEVICE_ADD("corvus", CORVUS_HDC, 0) +MCFG_DEVICE_ADD("corvus", CORVUS_HDC, 0) MCFG_HARDDISK_ADD("harddisk1") MCFG_HARDDISK_INTERFACE("corvus_hdd") MCFG_HARDDISK_ADD("harddisk2") diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index 4ff3e935878..61528ba1065 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -245,7 +245,7 @@ static MACHINE_CONFIG_START( rm380z, rm380z_state ) /* cassette */ MCFG_CASSETTE_ADD( "cassette" ) -// MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED) +// MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED) //m_cassette->change_state((BIT(data,x)) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR); @@ -272,19 +272,19 @@ static MACHINE_CONFIG_START( rm480z, rm380z_state ) MCFG_MACHINE_RESET_OVERRIDE(rm380z_state, rm480z) /* video hardware */ -// MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(50) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE((RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1)), (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))) -// MCFG_SCREEN_VISIBLE_AREA(0, (RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1))-1, 0, (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))-1) -// MCFG_SCREEN_UPDATE_DRIVER(rm380z_state, screen_update_rm480z) -// MCFG_SCREEN_PALETTE("palette") +// MCFG_SCREEN_ADD("screen", RASTER) +// MCFG_SCREEN_REFRESH_RATE(50) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE((RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1)), (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))) +// MCFG_SCREEN_VISIBLE_AREA(0, (RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1))-1, 0, (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))-1) +// MCFG_SCREEN_UPDATE_DRIVER(rm380z_state, screen_update_rm480z) +// MCFG_SCREEN_PALETTE("palette") -// MCFG_PALETTE_ADD_MONOCHROME("palette") +// MCFG_PALETTE_ADD_MONOCHROME("palette") /* keyboard */ -// MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) -// MCFG_GENERIC_KEYBOARD_CB(WRITE8(rm380z_state, keyboard_put)) +// MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) +// MCFG_GENERIC_KEYBOARD_CB(WRITE8(rm380z_state, keyboard_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index ef1702a5bc9..276f9592ce5 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -785,7 +785,7 @@ void slapfght_state::machine_reset() MACHINE_RESET_MEMBER(slapfght_state,getstar) { // don't boot the mcu since we don't have a dump yet -// m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); +// m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); machine_reset(); } diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 30dd4ec6e68..34c16c1dc1e 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -3450,7 +3450,7 @@ GAME( 1998, prc298sp, stvbios, stv, stv, stv_state, stv, ROT0 GAME( 1998, prc298su, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Summer Ver (J 980603 V1.100)", MACHINE_NOT_WORKING ) // GAME( 1998, prc298au, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Autumn Ver (J 980827 V1.000)", MACHINE_NOT_WORKING ) GAME( 2000, prc2ksu, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 2000 Summer (J 000509 V1.000) ", MACHINE_NOT_WORKING ) // internal string 2000_SUMMER - + GAME( 1999, pclubor, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Goukakenran (J 991104 V1.000)", MACHINE_NOT_WORKING ) GAME( 1999, pclubol, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Olive (J 980717 V1.000)", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index cf993d23146..0606a1e194f 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -4208,11 +4208,11 @@ GAME( 1994, hthero94, intcup94, f3_224a, f3, taito_f3_state, intcup94, ROT0, " GAME( 1994, kaiserkn, 0, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation Japan", "Kaiser Knuckle (Ver 2.1O 1994/07/29)", 0 ) GAME( 1994, kaiserknj,kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Kaiser Knuckle (Ver 2.1J 1994/07/29)", 0 ) GAME( 1994, gblchmp, kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito America Corporation", "Global Champion (Ver 2.1A 1994/07/29)", 0 ) -GAME( 1994, dankuga, 0, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Dan-Ku-Ga (Ver 0.0J 1994/12/13, prototype)", 0 ) +GAME( 1994, dankuga, 0, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Dan-Ku-Ga (Ver 0.0J 1994/12/13, prototype)", 0 ) GAME( 1994, dariusg, 0, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation Japan", "Darius Gaiden - Silver Hawk (Ver 2.5O 1994/09/19)", 0 ) GAME( 1994, dariusgj, dariusg, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation", "Darius Gaiden - Silver Hawk (Ver 2.5J 1994/09/19)", 0 ) GAME( 1994, dariusgu, dariusg, f3, f3, taito_f3_state, dariusg, ROT0, "Taito America Corporation", "Darius Gaiden - Silver Hawk (Ver 2.5A 1994/09/19)", 0 ) -GAME( 1994, dariusgx, 0, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation", "Darius Gaiden - Silver Hawk Extra Version (Ver 2.7J 1995/03/06) (Official Hack)", 0 ) +GAME( 1994, dariusgx, 0, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation", "Darius Gaiden - Silver Hawk Extra Version (Ver 2.7J 1995/03/06) (Official Hack)", 0 ) GAME( 1994, bublbob2, 0, f3_224a, f3, taito_f3_state, bubsymph, ROT0, "Taito Corporation Japan", "Bubble Bobble II (Ver 2.6O 1994/12/16)", 0 ) GAME( 1994, bublbob2o,bublbob2, f3_224a, f3, taito_f3_state, bubsymph, ROT0, "Taito Corporation Japan", "Bubble Bobble II (Ver 2.5O 1994/10/05)", 0 ) GAME( 1994, bublbob2p,bublbob2, f3_224a, f3, taito_f3_state, bubsymph, ROT0, "Taito Corporation Japan", "Bubble Bobble II (Ver 0.0J 1993/12/13, prototype)", 0 ) diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index afee324b8c6..ffc4e397e59 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -4,7 +4,7 @@ TODO: - - keyboard + - keyboard - LDV1000 mode - PR7820 INT/_EXT line - coin counter @@ -334,9 +334,9 @@ WRITE_LINE_MEMBER(thayers_state::kbclk_w) } if (LOG) logerror("rx bit %u\n",m_rx_bit); - + if (BIT(m_rx_bit, 3)) { - // 1, 0, 1, Q9, P3, P2, P1, P0, 1, 1 + // 1, 0, 1, Q9, P3, P2, P1, P0, 1, 1 bool q9 = (m_keylatch == 9); m_keydata = 0xa0 | q9 << 4 | m_row[m_keylatch]->read(); if (LOG) logerror("keydata %02x keylatch %u\n",m_keydata,m_keylatch); diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index 46917219621..ce751775a85 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -39,7 +39,7 @@ Supported games: batsugun TP-030 Toaplan Batsugun batsuguna TP-030 Toaplan Batsugun (older) batsugunsp TP-030 Toaplan Batsugun (Special Version) - enmadaio TP-031 Toaplan Enma Daio + enmadaio TP-031 Toaplan Enma Daio pwrkick SW931201 Sunwise Power Kick othldrby ?????? Sunwise Othello Derby snowbro2 TP-033 Hanafram Snow Bros. 2 - With New Elves @@ -1559,7 +1559,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( enmadaio_oki, AS_0, 8, toaplan2_state ) AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank1") ADDRESS_MAP_END - + WRITE16_MEMBER(toaplan2_state::tekipaki_mcu_w) @@ -2661,7 +2661,7 @@ static INPUT_PORTS_START( enmadaio ) PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("yes") - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("no") + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("no") PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index 9c6508c7ce1..4fe93fc9196 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -230,7 +230,7 @@ static MACHINE_CONFIG_START( vcs80, vcs80_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1K") - + /* bankdev */ MCFG_DEVICE_ADD("bdmem", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(vcs80_bd_mem) diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index 41fd5feed8d..a6a2d6a64a5 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -2549,7 +2549,7 @@ ROM_END /* Fully working PCB set from my full-size Sub Hunter upright machine. -Essentally this pcb set is a Taito-made license of +Essentally this pcb set is a Taito-made license of 'Depthcharge' by Gremlin. PCB markings are: diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index cde608c590a..c2dec9dfb9e 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -644,7 +644,7 @@ uint16_t x1_state::check_keyboard_press() if (scancode >= 0x2c && scancode <= 0x5f) scancode = kanatable[scancode - 0x2c][1]; } - + if (scancode >= 0x41 && scancode < 0x5a) scancode += 0x20; // lowercase } @@ -658,7 +658,7 @@ uint16_t x1_state::check_keyboard_press() scancode = kanatable[scancode - 0x2c][2]; } } - + if(scancode >= 0x31 && scancode < 0x3a) scancode -= 0x10; if(scancode == 0x30) diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index a66adab876c..025a661153c 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -85,14 +85,14 @@ public: protected: // memory pointers - required_shared_ptr<u8> m_spriteram; - required_shared_ptr<u8> m_videoram; - required_shared_ptr<u8> m_colorram; + required_shared_ptr<u8> m_spriteram; + required_shared_ptr<u8> m_videoram; + required_shared_ptr<u8> m_colorram; // devices - required_device<m68705p_device> m_mcu; - required_device<cpu_device> m_maincpu; - required_device<screen_device> m_screen; + required_device<m68705p_device> m_mcu; + required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; required_device<palette_device> m_palette; // mcu-related diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 8ea4f134014..37d9f304f50 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -81,8 +81,8 @@ class dc_state : public driver_device DECLARE_WRITE64_MEMBER( sh4_soundram_w ); DECLARE_WRITE_LINE_MEMBER(aica_irq); DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq); - - + + required_device<sh4_base_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<powervr2_device> m_powervr2; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 0bf7a485dcd..07938191fdb 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -186,7 +186,7 @@ public: uint16_t port_b_tattass(int unused); void tattass_sound_cb( address_space &space, uint16_t data, uint16_t mem_mask ); void deco32_set_audio_output(uint8_t raw_data); - + DECO16IC_BANK_CB_MEMBER(fghthist_bank_callback); DECO16IC_BANK_CB_MEMBER(captaven_bank_callback); DECO16IC_BANK_CB_MEMBER(tattass_bank_callback); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 5ad57bee517..459bd749e29 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -143,7 +143,7 @@ public: void reset_all_subcpus(int state); TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline); - + // C123 Tilemap Emulation // TODO: merge with namcos1.cpp implementation and convert to device public: @@ -334,7 +334,7 @@ public: int get_pos_irq_scanline() { return (get_palette_register(5) - 32) & 0xff; } TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline); - + required_shared_ptr<uint8_t> m_dpram; /* 2Kx8 */ required_shared_ptr<uint16_t> m_paletteram; optional_shared_ptr<uint16_t> m_spriteram; diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index 0ec60ea94e5..1816bf5f557 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -70,7 +70,7 @@ public: optional_device<cpu_device> m_dsp; optional_device<namcoio_gearbox_device> m_io_gearbox; optional_device<namco_c148_device> m_gpu_intc; - + std::unique_ptr<uint8_t[]> m_videoram; std::unique_ptr<uint8_t[]> m_maskram; std::unique_ptr<uint16_t[]> m_winrun_dspcomram; @@ -158,12 +158,12 @@ public: DECLARE_WRITE16_MEMBER(winrun_gpu_register_w); DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w); DECLARE_READ16_MEMBER(winrun_gpu_videoram_r); - + TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline); uint8_t m_gearbox_state; DECLARE_CUSTOM_INPUT_MEMBER(driveyes_gearbox_r); - + DECLARE_DRIVER_INIT(driveyes); DECLARE_DRIVER_INIT(winrun); DECLARE_DRIVER_INIT(starblad); diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 53e53905b68..bef91e413d7 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -91,7 +91,7 @@ public: required_shared_ptr<uint64_t> pvr2_texture_ram; required_shared_ptr<uint64_t> pvr2_framebuffer_ram; required_shared_ptr<uint64_t> elan_ram; - + DECLARE_DRIVER_INIT(naomi2); }; @@ -102,9 +102,9 @@ public: : dc_state(mconfig, type, tag), m_awflash(*this, "awflash") { } - + required_device<macronix_29l001mc_device> m_awflash; - + DECLARE_READ64_MEMBER( aw_flash_r ); DECLARE_WRITE64_MEMBER( aw_flash_w ); DECLARE_READ64_MEMBER( aw_modem_r ); @@ -116,9 +116,9 @@ public: DECLARE_DRIVER_INIT(xtrmhnt2); DECLARE_READ64_MEMBER( xtrmhnt2_hack_r ); - + protected: - uint8_t aw_ctrl_type; + uint8_t aw_ctrl_type; inline int decode_reg32_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift); }; diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h index 9c575c10bea..6516525804e 100644 --- a/src/mame/includes/novagbase.h +++ b/src/mame/includes/novagbase.h @@ -47,7 +47,7 @@ public: u16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments u32 m_display_cache[0x20]; // (internal use) u8 m_display_decay[0x20][0x20]; // (internal use) - + TIMER_DEVICE_CALLBACK_MEMBER(display_decay_tick); void display_update(); void set_display_size(int maxx, int maxy); diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 93852b1c409..1e54ae627d1 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -7,7 +7,7 @@ #include "machine/z80sio.h" #include "sound/speaker.h" -#define POLYPLAY_MAIN_CLOCK XTAL_9_8304MHz +#define POLYPLAY_MAIN_CLOCK XTAL_9_8304MHz #define Z80CPU_TAG "maincpu" #define Z80CTC_TAG "z80ctc" @@ -59,10 +59,10 @@ public: uint8_t m_flipflop2; required_device<speaker_sound_device> m_speaker1; required_device<speaker_sound_device> m_speaker2; - + /* video */ virtual void video_start() override; - DECLARE_WRITE8_MEMBER(polyplay_characterram_w); + DECLARE_WRITE8_MEMBER(polyplay_characterram_w); DECLARE_PALETTE_INIT(polyplay); uint32_t screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h index a55abdea6a8..7448b710ad4 100644 --- a/src/mame/includes/rm380z.h +++ b/src/mame/includes/rm380z.h @@ -125,7 +125,7 @@ public: DECLARE_WRITE8_MEMBER(disk_0_control); DECLARE_WRITE8_MEMBER( keyboard_put ); - + DECLARE_DRIVER_INIT(rm380z); DECLARE_DRIVER_INIT(rm380z34d); DECLARE_DRIVER_INIT(rm380z34e); diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index acdd694d3ec..147086de778 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -159,21 +159,21 @@ protected: void pbillian_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - required_ioport_array<2> m_dsw; - required_ioport_array<2> m_dials; - optional_ioport_array<2> m_plungers; - optional_device<m68705p_device> m_mcu; - optional_device<samples_device> m_samples; - optional_region_ptr<u8> m_samples_region; + required_ioport_array<2> m_dsw; + required_ioport_array<2> m_dials; + optional_ioport_array<2> m_plungers; + optional_device<m68705p_device> m_mcu; + optional_device<samples_device> m_samples; + optional_region_ptr<u8> m_samples_region; - std::unique_ptr<s16[]> m_samplebuf; + std::unique_ptr<s16[]> m_samplebuf; // HLE-related for prebillian int m_curr_player; // 68705 related - u8 m_portB_out; - u8 m_portC_out; + u8 m_portB_out; + u8 m_portC_out; // spinner quadrature stuff int m_oldpos[2]; diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h index fa1f3d1ce8d..adb956251a2 100644 --- a/src/mame/includes/vcs80.h +++ b/src/mame/includes/vcs80.h @@ -43,13 +43,13 @@ public: DECLARE_WRITE8_MEMBER( pio_w ); DECLARE_READ8_MEMBER( pio_pa_r ); DECLARE_WRITE8_MEMBER( pio_pb_w ); - + DECLARE_READ8_MEMBER( mem_r ) { m_pio->port_b_write((!BIT(offset, 0)) << 7); return m_bdmem->read8(space, offset); } - + DECLARE_WRITE8_MEMBER( mem_w ) { m_pio->port_b_write((!BIT(offset, 0)) << 7); @@ -65,7 +65,7 @@ public: } return 0xff; } - + DECLARE_WRITE8_MEMBER( io_w ) { m_pio->port_b_write((!BIT(offset, 0)) << 7); diff --git a/src/mame/includes/xbox_nv2a.h b/src/mame/includes/xbox_nv2a.h index 65d3b79048d..e56e586f495 100644 --- a/src/mame/includes/xbox_nv2a.h +++ b/src/mame/includes/xbox_nv2a.h @@ -108,7 +108,7 @@ public: { union { - uint32_t i; + uint32_t i; float f; } cnv; diff --git a/src/mame/includes/zorba.h b/src/mame/includes/zorba.h index 9eae677473f..1c14b8399b3 100644 --- a/src/mame/includes/zorba.h +++ b/src/mame/includes/zorba.h @@ -99,7 +99,7 @@ private: required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; - required_device<ieee488_device> m_ieee; + required_device<ieee488_device> m_ieee; uint8_t m_intmask; uint8_t m_tx_rx_rdy; diff --git a/src/mame/machine/a1200kbd.cpp b/src/mame/machine/a1200kbd.cpp index 74bde2898ca..92b51d8bfdf 100644 --- a/src/mame/machine/a1200kbd.cpp +++ b/src/mame/machine/a1200kbd.cpp @@ -4,10 +4,10 @@ Amiga 1200 Keyboard - Skeleton device, needs MC68HC05Cx device support + Skeleton device, needs MC68HC05Cx device support - 391508-01 = Rev 0 is MC68HC05C4AFN - 391508-02 = Rev 1 is MC68HC05C12FN + 391508-01 = Rev 0 is MC68HC05C4AFN + 391508-02 = Rev 1 is MC68HC05C12FN ***************************************************************************/ diff --git a/src/mame/machine/a1200kbd.h b/src/mame/machine/a1200kbd.h index b5f4b9de7d5..c919018d246 100644 --- a/src/mame/machine/a1200kbd.h +++ b/src/mame/machine/a1200kbd.h @@ -4,7 +4,7 @@ Amiga 1200 Keyboard - Skeleton device, needs MC68HC05Cx device support + Skeleton device, needs MC68HC05Cx device support ***************************************************************************/ diff --git a/src/mame/machine/harddriv.cpp b/src/mame/machine/harddriv.cpp index 9d41af07fe8..396264b5573 100644 --- a/src/mame/machine/harddriv.cpp +++ b/src/mame/machine/harddriv.cpp @@ -388,7 +388,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_wr1_write ) machine().output().set_value("SEL3", m_sel3_data); break; - case 4: /* SEL4 */ + case 4: /* SEL4 */ m_sel4_data = data; machine().output().set_value("SEL4", m_sel4_data); break; diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index 3d5fafdea73..baa10e83f37 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -30,24 +30,24 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const } static ADDRESS_MAP_START( dw_fdc_io, AS_IO, 8, dw_fdc_device ) -// AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READWRITE(bus_r, bus_w) +// AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READWRITE(bus_r, bus_w) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(p1_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(p2_w) -// AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(t0_r) +// AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(t0_r) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(t1_r) ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( dw_fdc ) - MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified + MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified MCFG_CPU_IO_MAP(dw_fdc_io) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_UPD765A_ADD("upd765", false, false) -// MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) -// MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8257", dma8257_device, XXX)) -// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats) -// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats) +// MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) +// MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8257", dma8257_device, XXX)) +// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats) +// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats) MACHINE_CONFIG_END machine_config_constructor dw_fdc_device::device_mconfig_additions() const diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp index a697bb76464..1ae0e34fe9c 100644 --- a/src/mame/machine/ibm6580_kbd.cpp +++ b/src/mame/machine/ibm6580_kbd.cpp @@ -37,7 +37,7 @@ static ADDRESS_MAP_START( dw_keyboard_io, AS_IO, 8, dw_keyboard_device ) ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( dw_keyboard ) - MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator + MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator MCFG_CPU_IO_MAP(dw_keyboard_io) MACHINE_CONFIG_END @@ -52,7 +52,7 @@ INPUT_PORTS_START( dw_keyboard ) * Keyboard Matrix -- p. 5-6 ('83) and p. 26 ('82) */ PORT_START("DIP") - PORT_DIPNAME( 0xff, 1, "Layout" ) + PORT_DIPNAME( 0xff, 1, "Layout" ) PORT_DIPSETTING( 1, "U.S." ) PORT_DIPSETTING( 250, "U.S. Dvorak" ) @@ -97,7 +97,7 @@ INPUT_PORTS_START( dw_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_START("COL.4") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')') @@ -270,7 +270,7 @@ WRITE8_MEMBER( dw_keyboard_device::bus_w ) */ if ((data & 0x72) != 0x72) - DBG_LOG(1,"bus",( "<- %02x = send %d strobe %d clock %d | dip clk %d dip load %d\n", + DBG_LOG(1,"bus",( "<- %02x = send %d strobe %d clock %d | dip clk %d dip load %d\n", data, BIT(data, 0), BIT(data, 1), BIT(data, 4), BIT(data, 5), BIT(data, 6))); m_bus = data; diff --git a/src/mame/machine/namco_c139.cpp b/src/mame/machine/namco_c139.cpp index 0e081a7836e..ed021210762 100644 --- a/src/mame/machine/namco_c139.cpp +++ b/src/mame/machine/namco_c139.cpp @@ -2,13 +2,13 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco C139 - Serial I/F Controller + Namco C139 - Serial I/F Controller + + + TODO: + - Make this to actually work! + - Is RAM shared with a specific CPU other than master/slave? - - TODO: - - Make this to actually work! - - Is RAM shared with a specific CPU other than master/slave? - ***************************************************************************/ #include "emu.h" @@ -35,9 +35,9 @@ ADDRESS_MAP_END DEVICE_ADDRESS_MAP_START( regs_map, 16, namco_c139_device ) AM_RANGE(0x00, 0x00) AM_READ(status_r) // WRITE clears flags AM_RANGE(0x02, 0x02) AM_NOP // settings? -// AM_RANGE(0x0a, 0x0a) // WRITE tx_w -// AM_RANGE(0x0c, 0x0c) // READ rx_r -// AM_RANGE(0x0e, 0x0e) // +// AM_RANGE(0x0a, 0x0a) // WRITE tx_w +// AM_RANGE(0x0c, 0x0c) // READ rx_r +// AM_RANGE(0x0e, 0x0e) // ADDRESS_MAP_END //------------------------------------------------- diff --git a/src/mame/machine/namco_c139.h b/src/mame/machine/namco_c139.h index 08a38e74425..bee3f51a6a3 100644 --- a/src/mame/machine/namco_c139.h +++ b/src/mame/machine/namco_c139.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco C139 - Serial I/F Controller + Namco C139 - Serial I/F Controller ***************************************************************************/ @@ -37,7 +37,7 @@ public: DECLARE_ADDRESS_MAP(regs_map, 16); DECLARE_READ16_MEMBER(status_r); - + DECLARE_READ16_MEMBER(ram_r); DECLARE_WRITE16_MEMBER(ram_w); diff --git a/src/mame/machine/namco_c148.cpp b/src/mame/machine/namco_c148.cpp index d09d82c7ff6..e7e60b8aeb7 100644 --- a/src/mame/machine/namco_c148.cpp +++ b/src/mame/machine/namco_c148.cpp @@ -2,27 +2,27 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco C148 - CPU Bus Manager + Namco C148 - CPU Bus Manager - Does some Memory Decode, Interrupt Handling, 3 bit PIO port, Bus Controller + Does some Memory Decode, Interrupt Handling, 3 bit PIO port, Bus Controller + + Based off implementation from K.Wilkins and Phil Stroffolino + + TODO: + - hookup C116 device, @see mame/includes/namcoic.h - Based off implementation from K.Wilkins and Phil Stroffolino - - TODO: - - hookup C116 device, @see mame/includes/namcoic.h - ============================================================================= Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02 Bus Controller? 1C0XXX ???????? 1C2XXX ???????? 1C4XXX - -x- master priority bit? + -x- master priority bit? Master/Slave IRQ level 1C6XXX D00-D02 EXIRQ level 1C8XXX D00-D02 POSIRQ level 1CAXXX D00-D02 SCIRQ level 1CCXXX D00-D02 VBLANK IRQ level 1CEXXX D00-D02 - xxx irq level for specific irq. + xxx irq level for specific irq. ???????? 1D0XXX ???????? 1D4000 trigger master/slave INT? @@ -35,9 +35,9 @@ Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02 EEPROM Ready status 1E0XXX R D01 Sound CPU Reset control 1E2XXX W D01 Slave 68000 & IO CPU Reset 1E4XXX W D01 - xxx PIO ports, per-HW / CPU specific + xxx PIO ports, per-HW / CPU specific Watchdog reset kicker 1E6XXX W - xxx Unknown at current stage if internal or external to the C148 + xxx Unknown at current stage if internal or external to the C148 ***************************************************************************/ @@ -131,11 +131,11 @@ void namco_c148_device::device_reset() // IRQ section //************************************************************************** -READ8_MEMBER( namco_c148_device::pos_irq_level_r ) { return m_irqlevel.pos & 7; } -READ8_MEMBER( namco_c148_device::vblank_irq_level_r ) { return m_irqlevel.vblank & 7; } -READ8_MEMBER( namco_c148_device::cpu_irq_level_r ) { return m_irqlevel.cpu & 7; } -READ8_MEMBER( namco_c148_device::ex_irq_level_r ) { return m_irqlevel.ex & 7; } -READ8_MEMBER( namco_c148_device::sci_irq_level_r ) { return m_irqlevel.sci & 7; } +READ8_MEMBER( namco_c148_device::pos_irq_level_r ) { return m_irqlevel.pos & 7; } +READ8_MEMBER( namco_c148_device::vblank_irq_level_r ) { return m_irqlevel.vblank & 7; } +READ8_MEMBER( namco_c148_device::cpu_irq_level_r ) { return m_irqlevel.cpu & 7; } +READ8_MEMBER( namco_c148_device::ex_irq_level_r ) { return m_irqlevel.ex & 7; } +READ8_MEMBER( namco_c148_device::sci_irq_level_r ) { return m_irqlevel.sci & 7; } inline void namco_c148_device::flush_irq_acks() { @@ -146,23 +146,23 @@ inline void namco_c148_device::flush_irq_acks() m_hostcpu->set_input_line(i,CLEAR_LINE); } -WRITE8_MEMBER( namco_c148_device::pos_irq_level_w ) { m_irqlevel.pos = data & 7; flush_irq_acks(); if(data != 0) { LOG(("%s: pos IRQ level = %02x\n",this->tag(),data)); } } -WRITE8_MEMBER( namco_c148_device::vblank_irq_level_w ) { m_irqlevel.vblank = data & 7; flush_irq_acks(); LOG(("%s: vblank IRQ level = %02x\n",this->tag(),data)); } -WRITE8_MEMBER( namco_c148_device::cpu_irq_level_w ) { m_irqlevel.cpu = data & 7; flush_irq_acks(); LOG(("%s: cpu IRQ level = %02x\n",this->tag(),data)); } -WRITE8_MEMBER( namco_c148_device::ex_irq_level_w ) { m_irqlevel.ex = data & 7; flush_irq_acks(); LOG(("%s: ex IRQ level = %02x\n",this->tag(),data)); } -WRITE8_MEMBER( namco_c148_device::sci_irq_level_w ) { m_irqlevel.sci = data & 7; flush_irq_acks(); LOG(("%s: sci IRQ level = %02x\n",this->tag(),data)); } +WRITE8_MEMBER( namco_c148_device::pos_irq_level_w ) { m_irqlevel.pos = data & 7; flush_irq_acks(); if(data != 0) { LOG(("%s: pos IRQ level = %02x\n",this->tag(),data)); } } +WRITE8_MEMBER( namco_c148_device::vblank_irq_level_w ) { m_irqlevel.vblank = data & 7; flush_irq_acks(); LOG(("%s: vblank IRQ level = %02x\n",this->tag(),data)); } +WRITE8_MEMBER( namco_c148_device::cpu_irq_level_w ) { m_irqlevel.cpu = data & 7; flush_irq_acks(); LOG(("%s: cpu IRQ level = %02x\n",this->tag(),data)); } +WRITE8_MEMBER( namco_c148_device::ex_irq_level_w ) { m_irqlevel.ex = data & 7; flush_irq_acks(); LOG(("%s: ex IRQ level = %02x\n",this->tag(),data)); } +WRITE8_MEMBER( namco_c148_device::sci_irq_level_w ) { m_irqlevel.sci = data & 7; flush_irq_acks(); LOG(("%s: sci IRQ level = %02x\n",this->tag(),data)); } -READ16_MEMBER( namco_c148_device::vblank_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.vblank, CLEAR_LINE); return 0; } -READ16_MEMBER( namco_c148_device::pos_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.pos, CLEAR_LINE); return 0; } -READ16_MEMBER( namco_c148_device::cpu_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.cpu, CLEAR_LINE); return 0; } -READ16_MEMBER( namco_c148_device::ex_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.ex, CLEAR_LINE); return 0; } -READ16_MEMBER( namco_c148_device::sci_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.sci, CLEAR_LINE); return 0; } +READ16_MEMBER( namco_c148_device::vblank_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.vblank, CLEAR_LINE); return 0; } +READ16_MEMBER( namco_c148_device::pos_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.pos, CLEAR_LINE); return 0; } +READ16_MEMBER( namco_c148_device::cpu_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.cpu, CLEAR_LINE); return 0; } +READ16_MEMBER( namco_c148_device::ex_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.ex, CLEAR_LINE); return 0; } +READ16_MEMBER( namco_c148_device::sci_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.sci, CLEAR_LINE); return 0; } -WRITE16_MEMBER( namco_c148_device::vblank_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.vblank, CLEAR_LINE); } -WRITE16_MEMBER( namco_c148_device::pos_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.pos, CLEAR_LINE); } -WRITE16_MEMBER( namco_c148_device::cpu_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.cpu, CLEAR_LINE); } -WRITE16_MEMBER( namco_c148_device::ex_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.ex, CLEAR_LINE); } -WRITE16_MEMBER( namco_c148_device::sci_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.sci, CLEAR_LINE); } +WRITE16_MEMBER( namco_c148_device::vblank_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.vblank, CLEAR_LINE); } +WRITE16_MEMBER( namco_c148_device::pos_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.pos, CLEAR_LINE); } +WRITE16_MEMBER( namco_c148_device::cpu_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.cpu, CLEAR_LINE); } +WRITE16_MEMBER( namco_c148_device::ex_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.ex, CLEAR_LINE); } +WRITE16_MEMBER( namco_c148_device::sci_irq_ack_w ) { m_hostcpu->set_input_line(m_irqlevel.sci, CLEAR_LINE); } //************************************************************************** // Comm ports diff --git a/src/mame/machine/namco_c148.h b/src/mame/machine/namco_c148.h index 3f53228ebcc..7b920708e2b 100644 --- a/src/mame/machine/namco_c148.h +++ b/src/mame/machine/namco_c148.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco C148 - CPU Bus Manager + Namco C148 - CPU Bus Manager ***************************************************************************/ @@ -27,7 +27,7 @@ #define MCFG_NAMCO_C148_EXT2_CB(_cb) \ devcb = &namco_c148_device::set_out_ext2_callback(*device, DEVCB_##_cb); - + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -48,20 +48,20 @@ public: dev.m_hostcpu_tag = tag; dev.m_hostcpu_master = is_master; } - + static void link_c148_device(device_t &device, const char *tag) { namco_c148_device &dev = downcast<namco_c148_device &>(device); dev.m_linked_c148_tag = tag; } - + template<class _Object> static devcb_base &set_out_ext1_callback(device_t &device, _Object object) { return downcast<namco_c148_device &>(device).m_out_ext1_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_ext2_callback(device_t &device, _Object object) { return downcast<namco_c148_device &>(device).m_out_ext2_cb.set_callback(object); } devcb_write8 m_out_ext1_cb; devcb_write8 m_out_ext2_cb; - + DECLARE_READ8_MEMBER( vblank_irq_level_r ); DECLARE_WRITE8_MEMBER( vblank_irq_level_w ); DECLARE_READ16_MEMBER( vblank_irq_ack_r ); @@ -76,12 +76,12 @@ public: DECLARE_WRITE8_MEMBER( cpu_irq_level_w ); DECLARE_READ16_MEMBER( cpu_irq_ack_r ); DECLARE_WRITE16_MEMBER( cpu_irq_ack_w ); - + DECLARE_READ8_MEMBER( ex_irq_level_r ); DECLARE_WRITE8_MEMBER( ex_irq_level_w ); DECLARE_READ16_MEMBER( ex_irq_ack_r ); DECLARE_WRITE16_MEMBER( ex_irq_ack_w ); - + DECLARE_READ8_MEMBER( sci_irq_level_r ); DECLARE_WRITE8_MEMBER( sci_irq_level_w ); DECLARE_READ16_MEMBER( sci_irq_ack_r ); @@ -110,11 +110,11 @@ protected: virtual void device_start() override; virtual void device_reset() override; private: - cpu_device *m_hostcpu; /**< reference to the host cpu */ - namco_c148_device *m_linked_c148; /**< reference to linked master/slave c148 */ - const char *m_hostcpu_tag; /**< host cpu tag name */ - const char *m_linked_c148_tag; /**< other c148 tag name */ - bool m_hostcpu_master; /**< define if host cpu is master */ + cpu_device *m_hostcpu; /**< reference to the host cpu */ + namco_c148_device *m_linked_c148; /**< reference to linked master/slave c148 */ + const char *m_hostcpu_tag; /**< host cpu tag name */ + const char *m_linked_c148_tag; /**< other c148 tag name */ + bool m_hostcpu_master; /**< define if host cpu is master */ struct{ uint8_t cpu; uint8_t ex; diff --git a/src/mame/machine/namcoio_gearbox.cpp b/src/mame/machine/namcoio_gearbox.cpp index cf4c472a653..68f0c82e794 100644 --- a/src/mame/machine/namcoio_gearbox.cpp +++ b/src/mame/machine/namcoio_gearbox.cpp @@ -2,24 +2,24 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco 6-speed Gearbox device - + Namco 6-speed Gearbox device + Used in Ridge Racer deluxe cabinet, Ace Driver and Driver's Eyes - User side gear scheme: - 1 3 5 - |-|-| - 2 4 6 - - Being a mechanical part there are currently two methods hooked up, - emulated and natural. - First one just uses whatever is read in the inputs, second one - simulates clutch lock as in a real car. - - TODO: - - check clutch lock via real HW, and get a way to lock current gear via - MAME's input system; - - Custom part #; - - gear output for artwork system; + User side gear scheme: + 1 3 5 + |-|-| + 2 4 6 + + Being a mechanical part there are currently two methods hooked up, + emulated and natural. + First one just uses whatever is read in the inputs, second one + simulates clutch lock as in a real car. + + TODO: + - check clutch lock via real HW, and get a way to lock current gear via + MAME's input system; + - Custom part #; + - gear output for artwork system; ***************************************************************************/ @@ -74,7 +74,7 @@ static INPUT_PORTS_START( gearbox_inputs ) PORT_START("GEARBOX") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Gearbox Up") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Gearbox Down") - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("Gearbox Left") + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("Gearbox Left") PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_NAME("Gearbox Right") PORT_START("CLUTCH") @@ -105,21 +105,21 @@ CUSTOM_INPUT_MEMBER( namcoio_gearbox_device::in_r ) { if(ioport("CONFIG")->read() & 1) return ioport("GEARBOX")->read() & 0xf; - + bool clutch_pressed = (ioport("CLUTCH")->read() & 1) == 0; - const char gearbox_output[16] = { '-', '-', '-', '-', - '-', '6', '5', 'N', - '-', '2', '1', 'N', + const char gearbox_output[16] = { '-', '-', '-', '-', + '-', '6', '5', 'N', + '-', '2', '1', 'N', '-', '4', '3', 'N' }; - + if(ioport("CONFIG")->read() & 2) popmessage("%c %c",gearbox_output[m_gearbox_state],clutch_pressed == true ? '*' : '.'); - + if(clutch_pressed == false) return m_gearbox_state; - + m_gearbox_state = ioport("GEARBOX")->read() & 0xf; - + return 0xf; // return neutral while changing gear } diff --git a/src/mame/machine/namcoio_gearbox.h b/src/mame/machine/namcoio_gearbox.h index 463338930d0..5d80d09d8e4 100644 --- a/src/mame/machine/namcoio_gearbox.h +++ b/src/mame/machine/namcoio_gearbox.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Namco 6-speed Gearbox device + Namco 6-speed Gearbox device ***************************************************************************/ diff --git a/src/mame/machine/namcos2.cpp b/src/mame/machine/namcos2.cpp index d2c23f350ed..876b79fc799 100644 --- a/src/mame/machine/namcos2.cpp +++ b/src/mame/machine/namcos2.cpp @@ -86,7 +86,7 @@ WRITE8_MEMBER(namcos2_shared_state::sound_reset_w) /* Suspend execution */ m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } - + if (namcos2_kickstart != nullptr) { //printf( "dspkick=0x%x\n", data ); @@ -97,11 +97,11 @@ WRITE8_MEMBER(namcos2_shared_state::sound_reset_w) } } -// TODO: +// TODO: WRITE8_MEMBER(namcos2_shared_state::system_reset_w) -{ +{ reset_all_subcpus(data & 1 ? CLEAR_LINE : ASSERT_LINE); - + if (data & 0x01) { address_space &masterspace = m_maincpu->space(AS_PROGRAM); diff --git a/src/mame/machine/naomibd.cpp b/src/mame/machine/naomibd.cpp index 03505146558..559ec53c9f7 100644 --- a/src/mame/machine/naomibd.cpp +++ b/src/mame/machine/naomibd.cpp @@ -53,7 +53,7 @@ "M4" type carts: no effect, ROM_OFFSET bit 29 always return 1 then read, used by BIOS to determine this cart is encrypted and require bit 30 set then read ROM header * bit 28 (mode bit 0) - "M2" type carts: ROM_OFFSET - master/slave ROM board select + "M2" type carts: ROM_OFFSET - master/slave ROM board select * bit 0 can be set for "M4" type carts, function unknown diff --git a/src/mame/machine/nl_stuntcyc.cpp b/src/mame/machine/nl_stuntcyc.cpp index ccbf4b2906e..7ec790eafbd 100644 --- a/src/mame/machine/nl_stuntcyc.cpp +++ b/src/mame/machine/nl_stuntcyc.cpp @@ -46,7 +46,7 @@ NETLIST_START(stuntcyc) ALIAS( 32H, L4.QB) ALIAS( 64H, L4.QC) ALIAS(128H, L4.QD) - + TTL_74107(K4_1, 128H, P, P, P) ALIAS(256H, K4_1.Q) ALIAS(256H_Q, K4_1.QQ) @@ -450,7 +450,7 @@ NETLIST_START(stuntcyc) PROM_82S123(d7, GROUND, S1, S2, S3, S4, S5) PARAM(d7.ROM, "004811.d7") - + ALIAS(MAX_SCORE_Q, d7.O6) TTL_7410_NAND(D6_1, 256H_Q, 128H, 128H) diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp index f7d9b6245b0..5a2b80ea2b7 100644 --- a/src/mame/machine/pc9801_86.cpp +++ b/src/mame/machine/pc9801_86.cpp @@ -4,8 +4,8 @@ NEC PC-9801-86 sound card - Similar to PC-9801-26, this one has YM2608 instead of YM2203 and an - additional DAC port + Similar to PC-9801-26, this one has YM2608 instead of YM2203 and an + additional DAC port TODO: - joystick code should be shared between -26, -86 and -118 diff --git a/src/mame/machine/pc9801_kbd.cpp b/src/mame/machine/pc9801_kbd.cpp index c0199096563..728c9c4b23b 100644 --- a/src/mame/machine/pc9801_kbd.cpp +++ b/src/mame/machine/pc9801_kbd.cpp @@ -9,7 +9,7 @@ - Verify untested keys: STOP, COPY, and vf-1 through vf-5 - STOP is correct, verified with branmar2 + STOP is correct, verified with branmar2 - Problems with natural keyboard (most nonprinting keys don't work) diff --git a/src/mame/machine/rm380z.cpp b/src/mame/machine/rm380z.cpp index 5bcf5c50004..a6931c93677 100644 --- a/src/mame/machine/rm380z.cpp +++ b/src/mame/machine/rm380z.cpp @@ -33,8 +33,8 @@ WRITE8_MEMBER( rm380z_state::port_write ) case 0xFC: // PORT0 //printf("FBFCw[%2.2x] FBFD [%2.2x] FBFE [%2.2x] PC [%4.4x] writenum [%4.4x]\n",data,m_fbfd,m_fbfe,m_maincpu->safe_pc(),writenum); m_port0 = data; - - m_cassette->output((m_port0 & 0xEF) ? +1.0 : -1.0); // set 2400hz, bit 4 + + m_cassette->output((m_port0 & 0xEF) ? +1.0 : -1.0); // set 2400hz, bit 4 if (data&0x01) { @@ -64,7 +64,7 @@ WRITE8_MEMBER( rm380z_state::port_write ) case 0xFE: // line on screen to write to divided by 2 //printf("FBFC [%2.2x] FBFD [%2.2x] FBFEw[%2.2x] PC [%4.4x] writenum [%4.4x]\n",m_port0,m_fbfd,data,m_maincpu->safe_pc(),writenum); m_fbfe=data; - + break; case 0xFF: // user I/O port @@ -98,10 +98,10 @@ READ8_MEMBER( rm380z_state::port_read ) case 0xFE: // PORT1 if ((m_cassette)->input() < +0.0) - m_port1 &= 0xDF; // bit 5 off + m_port1 &= 0xDF; // bit 5 off else - m_port1 |= 0x20; // bit 5 on - + m_port1 |= 0x20; // bit 5 on + data = m_port1; //printf("read of port1 from PC [%x]\n",m_maincpu->safe_pc()); break; @@ -251,14 +251,14 @@ DRIVER_INIT_MEMBER( rm380z_state, rm380z34d ) { m_videomode=RM380Z_VIDEOMODE_40COL; m_old_videomode=m_videomode; - m_port0_mask=0xdf; // disable 80 column mode + m_port0_mask=0xdf; // disable 80 column mode } DRIVER_INIT_MEMBER( rm380z_state, rm380z34e ) { m_videomode=RM380Z_VIDEOMODE_40COL; m_old_videomode=m_videomode; - m_port0_mask=0xdf; // disable 80 column mode + m_port0_mask=0xdf; // disable 80 column mode } @@ -273,8 +273,8 @@ void rm380z_state::machine_reset() m_old_old_fbfd=0x00; writenum=0; -// m_videomode=RM380Z_VIDEOMODE_80COL; -// m_old_videomode=m_videomode; +// m_videomode=RM380Z_VIDEOMODE_80COL; +// m_old_videomode=m_videomode; m_rasterlineCtr=0; // note: from COS 4.0 videos, screen seems to show garbage at the beginning diff --git a/src/mame/machine/zorbakbd.h b/src/mame/machine/zorbakbd.h index 196a4831c41..6d03fc5a9c5 100644 --- a/src/mame/machine/zorbakbd.h +++ b/src/mame/machine/zorbakbd.h @@ -40,4 +40,4 @@ protected: u8 m_row_select; }; -#endif // MAME_MACHINE_ZORBAKBD_H
\ No newline at end of file +#endif // MAME_MACHINE_ZORBAKBD_H diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp index e53b1c5fa14..cae826bfec7 100644 --- a/src/mame/video/combatsc.cpp +++ b/src/mame/video/combatsc.cpp @@ -431,7 +431,7 @@ uint32_t combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_in { rectangle clip; clip = cliprect; - + for (i = 0; i < 32; i++) { // scrollram [0x20]-[0x3f]: char enable (presumably bit 0 only) @@ -439,7 +439,7 @@ uint32_t combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_in if(m_scrollram[base_scroll] == 0) continue; - + clip.min_y = i * 8; clip.max_y = clip.min_y + 7; diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp index 5549b11e137..8cd4f6c57ee 100644 --- a/src/mame/video/deco16ic.cpp +++ b/src/mame/video/deco16ic.cpp @@ -735,7 +735,7 @@ static int deco16_pf_update( if (tilemap_8x8) { int numrows = rows; - + // wolffang uses a larger 8x8 tilemap for the Japanese intro text, everything else seems to need this logic tho? if (!(tilemapsizes & 4)) numrows = rows >> 1; diff --git a/src/mame/video/goldstar.cpp b/src/mame/video/goldstar.cpp index f7c4477e57e..369c6f89de1 100644 --- a/src/mame/video/goldstar.cpp +++ b/src/mame/video/goldstar.cpp @@ -487,9 +487,9 @@ uint32_t wingco_state::screen_update_mbstar(screen_device &screen, bitmap_ind16 const rectangle visible2(0*8, (14+48)*8-1, 14*8, (36+7)*8-1); // seems to be the one used... const rectangle visible3(0*8, (14+48)*8-1, 4*8, (4+7)*8-1); -// m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); +// m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); m_reel2_tilemap->draw(screen, bitmap, visible2, 0, 0); -// m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); +// m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); } if (m_cm_enable_reg & 0x02) diff --git a/src/mame/video/namcos21.cpp b/src/mame/video/namcos21.cpp index 01865fb2f62..d7f5cb7ad14 100644 --- a/src/mame/video/namcos21.cpp +++ b/src/mame/video/namcos21.cpp @@ -417,9 +417,9 @@ uint32_t namcos21_state::screen_update_driveyes(screen_device &screen, bitmap_in for( pri=pivot; pri<8; pri++ ) c355_obj_draw(screen, bitmap, cliprect, pri ); - + c355_obj_draw(screen, bitmap, cliprect, 15 ); //driver's eyes - + return 0; } @@ -444,7 +444,7 @@ void namcos21_state::winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &c { case 0xff: break; - // TODO: additive blending? winrun car select uses register [0xc] for a xscroll value + // TODO: additive blending? winrun car select uses register [0xc] for a xscroll value case 0x00: pDest[sx] = (pDest[sx]&0x1fff)+0x4000; break; @@ -469,6 +469,6 @@ uint32_t namcos21_state::screen_update_winrun(screen_device &screen, bitmap_ind1 winrun_bitmap_draw(bitmap,cliprect); //popmessage("%04x %04x %04x|%04x %04x",m_winrun_gpu_register[0],m_winrun_gpu_register[2/2],m_winrun_gpu_register[4/2],m_winrun_gpu_register[0xa/2],m_winrun_gpu_register[0xc/2]); - + return 0; } diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 9aa6f65cb44..817b0d162ce 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -2,9 +2,9 @@ // copyright-holders:Curt Coder /* - TODO: + TODO: - - GR is always 0 + - GR is always 0 */ @@ -99,7 +99,7 @@ void newbrain_state::screen_update(bitmap_rgb32 &bitmap, const rectangle &clipre if (rc3 && txt) { rc_ = 7; } - + uint16_t charrom_addr = (m_ucr << 11) | (rc_ << 8) | ((BIT(rd, 7) && m_fs) << 7) | (rd & 0x7f); uint8_t crd = m_char_rom->base()[charrom_addr & 0xfff]; bool crd0 = BIT(crd, 0); diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp index 8a3b6442faf..b2028d09e98 100644 --- a/src/mame/video/taito_f3.cpp +++ b/src/mame/video/taito_f3.cpp @@ -323,7 +323,7 @@ pri_alp_bitmap */ -void taito_f3_state::device_post_load() +void taito_f3_state::device_post_load() { /* force a reread of the dynamic tiles in the pixel layer */ m_gfxdecode->gfx(3)->mark_all_dirty(); diff --git a/src/osd/asio.h b/src/osd/asio.h index 61260f3f142..64acfab9674 100644 --- a/src/osd/asio.h +++ b/src/osd/asio.h @@ -32,4 +32,4 @@ #define ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true) #include "asio/include/asio.hpp" -#undef interface
\ No newline at end of file +#undef interface diff --git a/src/osd/modules/sound/pa_sound.cpp b/src/osd/modules/sound/pa_sound.cpp index a54adca958b..b866c510f55 100644 --- a/src/osd/modules/sound/pa_sound.cpp +++ b/src/osd/modules/sound/pa_sound.cpp @@ -2,9 +2,9 @@ // copyright-holders:intealls, R.Belmont /*************************************************************************** - pa_sound.c + pa_sound.c - PortAudio interface. + PortAudio interface. *******************************************************************c********/ diff --git a/src/tools/imgtool/charconv.cpp b/src/tools/imgtool/charconv.cpp index 387d646f006..0dadc8acb88 100644 --- a/src/tools/imgtool/charconv.cpp +++ b/src/tools/imgtool/charconv.cpp @@ -78,7 +78,7 @@ void imgtool::simple_charconverter::from_utf8(std::ostream &dest, const char *sr { ch = 0xFFFD; rc = 1; - } + } iter += rc; // do the reverse lookup diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp index 10d35ac34a0..a0986d6a62d 100644 --- a/src/tools/imgtool/imgtool.cpp +++ b/src/tools/imgtool/imgtool.cpp @@ -92,8 +92,8 @@ static std::string extract_padded_string(const char *source, size_t len) //------------------------------------------------- // extract_padded_filename - this is a common -// enough scenario that it is justified to have -// this in common code +// enough scenario that it is justified to have +// this in common code //------------------------------------------------- std::string extract_padded_filename(const char *source, size_t filename_length, size_t extension_length) diff --git a/src/tools/imgtool/modules/mac.cpp b/src/tools/imgtool/modules/mac.cpp index b379286438d..f94246c5e7f 100644 --- a/src/tools/imgtool/modules/mac.cpp +++ b/src/tools/imgtool/modules/mac.cpp @@ -6405,7 +6405,7 @@ static void generic_mac_get_info(const imgtool_class *imgclass, uint32_t state, case IMGTOOLINFO_PTR_GET_ICON_INFO: info->get_iconinfo = mac_image_geticoninfo; break; case IMGTOOLINFO_PTR_SUGGEST_TRANSFER: info->suggest_transfer = mac_image_suggesttransfer; break; case IMGTOOLINFO_PTR_FLOPPY_FORMAT: info->p = (void *) floppyoptions_apple35_mac; break; - case IMGTOOLINFO_PTR_CHARCONVERTER: info->charconverter = &charconverter_macos_roman; break; + case IMGTOOLINFO_PTR_CHARCONVERTER: info->charconverter = &charconverter_macos_roman; break; } } diff --git a/src/tools/imgtool/modules/rsdos.cpp b/src/tools/imgtool/modules/rsdos.cpp index 9ee8de3cf8c..4bcde9444ab 100644 --- a/src/tools/imgtool/modules/rsdos.cpp +++ b/src/tools/imgtool/modules/rsdos.cpp @@ -247,7 +247,7 @@ static imgtoolerr_t process_rsdos_file(struct rsdos_dirent *ent, imgtool::image //------------------------------------------------- // prepare_dirent - create a new directory entry -// with a specified name +// with a specified name //------------------------------------------------- static imgtoolerr_t prepare_dirent(rsdos_dirent &ent, const char *fname) |