Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Robbbert
Robbbert committed Jan 7, 2017
2 parents b227bbf + febf0e0 commit 26643a4
Show file tree
Hide file tree
Showing 56 changed files with 3,240 additions and 2,256 deletions.
5 changes: 2 additions & 3 deletions 3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h
View file
Expand Up @@ -7076,8 +7076,7 @@ static const char *ReadString(std::string *s, const char *ptr) {
static bool ReadAttribute(std::string *name, std::string *type, static bool ReadAttribute(std::string *name, std::string *type,
std::vector<unsigned char> *data, size_t *marker_size, std::vector<unsigned char> *data, size_t *marker_size,
const char *marker, size_t size) { const char *marker, size_t size) {
using namespace bx; size_t name_len = bx::strnlen(marker, size);
size_t name_len = strnlen(marker, size);
if (name_len == size) { if (name_len == size) {
// String does not have a terminating character. // String does not have a terminating character.
return false; return false;
Expand All @@ -7087,7 +7086,7 @@ static bool ReadAttribute(std::string *name, std::string *type,
marker += name_len + 1; marker += name_len + 1;
size -= name_len + 1; size -= name_len + 1;


size_t type_len = strnlen(marker, size); size_t type_len = bx::strnlen(marker, size);
if (type_len == size) { if (type_len == size) {
return false; return false;
} }
Expand Down
46 changes: 31 additions & 15 deletions hash/a2600.xml
View file
Expand Up @@ -5035,8 +5035,8 @@ Info from Atariage and Atarimania
</part> </part>
</software> </software>


<software name="dodgeeme" cloneof="dodgeem"> <software name="dodgeeme2" cloneof="dodgeem">
<description>Dodge 'Em (PAL)</description> <description>Dodge 'Em (PAL, Earlier)</description>
<year>1980</year> <year>1980</year>
<publisher>Atari</publisher> <publisher>Atari</publisher>
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
Expand All @@ -5046,13 +5046,16 @@ Info from Atariage and Atarimania
</part> </part>
</software> </software>


<software name="dodgeemef" cloneof="dodgeem"> <software name="dodgeeme" cloneof="dodgeem">
<description>Dodge 'Em (PAL) (Fixed?)</description> <description>Dodge 'Em (PAL, Later)</description>
<year>1980</year> <year>1987</year>
<publisher>Atari</publisher> <publisher>Atari</publisher>
<info name="serial" value="CX2637" />
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
<feature name="pcb" value="C011885 REV F" />
<feature name="u1" value="" /> <!-- ROM -->
<dataarea name="rom" size="4096"> <dataarea name="rom" size="4096">
<rom name="dodge 'em (head on) (1980) (atari, carla meninsky) (cx2637, cx2637p) (pal) [fixed].bin" size="4096" crc="10cfc6c0" sha1="b26674d6e30d1a0bb2719b9bb1b3ccfa346260cf" offset="0" /> <rom name="AIP.u1" size="4096" crc="10cfc6c0" sha1="b26674d6e30d1a0bb2719b9bb1b3ccfa346260cf" offset="0" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -7275,12 +7278,15 @@ Info from Atariage and Atarimania
</software> </software>


<software name="haunted"> <software name="haunted">
<description>Haunted House</description> <description>Haunted House (NTSC)</description>
<year>1982</year> <year>1981</year>
<publisher>Atari</publisher> <publisher>Atari</publisher>
<info name="serial" value="CX2654" />
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
<feature name="pcb" value="C011885 REV F" />
<feature name="u1" value="" /> <!-- ROM -->
<dataarea name="rom" size="4096"> <dataarea name="rom" size="4096">
<rom name="haunted house (mystery mansion, graves' manor, nightmare manor) (1982) (atari, james andreasen - sears) (cx2654 - 49-75141).bin" size="4096" crc="aa62d961" sha1="1476c869619075b551b20f2c7f95b11e0d16aec1" offset="0" /> <rom name="054.u1" size="4096" crc="aa62d961" sha1="1476c869619075b551b20f2c7f95b11e0d16aec1" offset="0" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -10655,11 +10661,14 @@ Info from Atariage and Atarimania


<software name="outlawe" cloneof="outlaw"> <software name="outlawe" cloneof="outlaw">
<description>Outlaw (PAL)</description> <description>Outlaw (PAL)</description>
<year>1978</year> <year>1979</year>
<publisher>Atari</publisher> <publisher>Atari</publisher>
<info name="serial" value="CX-2605-P" />
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
<feature name="pcb" value="C010789" />
<feature name="u1" value="" /> <!-- ROM -->
<dataarea name="rom" size="2048"> <dataarea name="rom" size="2048">
<rom name="outlaw (1978) (atari, david crane) (cx2605, cx2605p) (pal).bin" size="2048" crc="64f136d2" sha1="4a1514a7cf4279fded1b0db6f5b31818b9ff011c" offset="0" /> <rom name="B113.u1" size="2048" crc="64f136d2" sha1="4a1514a7cf4279fded1b0db6f5b31818b9ff011c" offset="0" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -16865,11 +16874,15 @@ Info from Atariage and Atarimania


<software name="tubybird"> <software name="tubybird">
<description>Tuby Bird (PAL)</description> <description>Tuby Bird (PAL)</description>
<year>19??</year> <year>1983?</year>
<publisher>Suntek</publisher> <publisher>Suntek, Quelle</publisher>
<info name="serial" value="SS-020 (Suntek), 465.302 8 (Quelle)" />
<info name="alt_title" value="Vogel Flieh (Quelle)"/>
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
<feature name="pcb" value="21003A" />
<feature name="u1" value="" /> <!-- Epoxy blob ROM -->
<dataarea name="rom" size="4096"> <dataarea name="rom" size="4096">
<rom name="tuby bird (aka dolphin) (rainbow vision - suntek) (ss-020) (pal).bin" size="4096" crc="1ca034ca" sha1="f4f941b779bcb7902df0eb7cf6b985f56e751183" offset="0" /> <rom name="u1" size="4096" crc="1ca034ca" sha1="f4f941b779bcb7902df0eb7cf6b985f56e751183" offset="0" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -17539,9 +17552,12 @@ Info from Atariage and Atarimania
<description>Weltraumtunnel (PAL)</description> <description>Weltraumtunnel (PAL)</description>
<year>1983</year> <year>1983</year>
<publisher>Quelle</publisher> <publisher>Quelle</publisher>
<info name="alt_title" value="Laaser Voley"/>
<part name="cart" interface="a2600_cart"> <part name="cart" interface="a2600_cart">
<feature name="pcb" value="0019" />
<feature name="u1" value="" /> <!-- Epoxy blob ROM -->
<dataarea name="rom" size="4096"> <dataarea name="rom" size="4096">
<rom name="weltraumtunnel (aka laser gates) (1983) (quelle) (292.651 7) (pal).bin" size="4096" crc="dc1d3627" sha1="c513703d638c01b0c26922d5e3e7bfb65ea597da" offset="0" /> <rom name="u1" size="4096" crc="dc1d3627" sha1="c513703d638c01b0c26922d5e3e7bfb65ea597da" offset="0" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down
8 changes: 5 additions & 3 deletions hash/megadriv.xml
View file
Expand Up @@ -4816,11 +4816,12 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption)
<description>Mega Games I (Euro)</description> <description>Mega Games I (Euro)</description>
<year>1992</year> <year>1992</year>
<publisher>Sega</publisher> <publisher>Sega</publisher>
<info name="release" value="19921001"/>
<part name="cart" interface="megadriv_cart"> <part name="cart" interface="megadriv_cart">
<feature name="pcb" value="171-5978BA"/> <feature name="pcb" value="171-5978BA"/> <!-- Also found with 171-5978B -->
<feature name="u1" value="MPR-15009 W50"/> <!-- location not really marked on PCB, using u1 for consistency --> <feature name="u1" value="MPR-15009 W50"/> <!-- location not really marked on PCB, using u1 for consistency -->
<dataarea name="rom" width="16" endianness="big" size="1048576"> <dataarea name="rom" width="16" endianness="big" size="1048576">
<rom name="mpr-15009 w50.u1" size="1048576" crc="db753224" sha1="076df34a01094ce0893f32600e24323567e2a23b" offset="0x000000"/> <rom name="MPR-15009 W50.u1" size="1048576" crc="db753224" sha1="076df34a01094ce0893f32600e24323567e2a23b" offset="0x000000"/>
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -7385,11 +7386,12 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption)
<description>Sonic the Hedgehog (Euro, USA)</description> <description>Sonic the Hedgehog (Euro, USA)</description>
<year>1991</year> <year>1991</year>
<publisher>Sega</publisher> <publisher>Sega</publisher>
<info name="release" value="19910623"/>
<part name="cart" interface="megadriv_cart"> <part name="cart" interface="megadriv_cart">
<feature name="pcb" value="171-5703"/> <feature name="pcb" value="171-5703"/>
<feature name="ic1" value="MPR-13913-F, MPR-13913 W33"/> <feature name="ic1" value="MPR-13913-F, MPR-13913 W33"/>
<dataarea name="rom" width="16" endianness="big" size="524288"> <dataarea name="rom" width="16" endianness="big" size="524288">
<rom name="mpr-13913-f.ic1" size="524288" crc="f9394e97" sha1="6ddb7de1e17e7f6cdb88927bd906352030daa194" offset="0x000000"/> <rom name="MPR-13913-F.ic1" size="524288" crc="f9394e97" sha1="6ddb7de1e17e7f6cdb88927bd906352030daa194" offset="0x000000"/>
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down
9 changes: 8 additions & 1 deletion hash/n64.xml
View file
Expand Up @@ -10899,9 +10899,16 @@ clips onto the player's ear.
<year>1999</year> <year>1999</year>
<publisher>Acclaim Entertainment</publisher> <publisher>Acclaim Entertainment</publisher>
<info name="serial" value="NUS-NRWD-NOE"/> <info name="serial" value="NUS-NRWD-NOE"/>
<info name="release" value="19991226"/>
<info name="alt_title" value="Turok - Rage Wars (Cart)"/>
<part name="cart" interface="n64_cart"> <part name="cart" interface="n64_cart">
<feature name="pcb_model" value="NUS-01A-02" />
<feature name="u1" value="U1" /> <!-- ROM -->
<feature name="u2" value="U2" /> <!-- empty socket -->
<feature name="u3" value="U3" /> <!-- CIC -->
<feature name="cart_back_label" value="NUS-EUR-1" />
<dataarea name="rom" size="8388608"> <dataarea name="rom" size="8388608">
<rom name="turok - legenden des verlorenen landes (germany).bin" size="8388608" crc="a2754ca4" sha1="51792351f4fd61c11f4b3b755a5eb8b9ea725b72" offset="000000" /> <rom name="NUS-NRWD-0.u1" size="8388608" crc="a2754ca4" sha1="51792351f4fd61c11f4b3b755a5eb8b9ea725b72" offset="000000" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down
61 changes: 28 additions & 33 deletions hash/snes.xml
View file
Expand Up @@ -9929,8 +9929,8 @@ more investigation needed...
<feature name="cart_back_label" value="920214" /> <feature name="cart_back_label" value="920214" />
<feature name="slot" value="hirom" /> <feature name="slot" value="hirom" />
<dataarea name="rom" size="3145728"> <dataarea name="rom" size="3145728">
<rom name="shvc-adkj-0 p0.u1" size="2097152" crc="5b606ef7" sha1="6b47084fba80ce07347010a7bb4af063f058936b" offset="0x000000" /> <rom name="SHVC-ADKJ-0 P0.u1" size="2097152" crc="5b606ef7" sha1="6b47084fba80ce07347010a7bb4af063f058936b" offset="0x000000" />
<rom name="shvc-adkj-0 p3.u2" size="1048576" crc="5b379b50" sha1="83b0507f1a84e686d76b5b869c1a5f2e22278097" offset="0x200000" /> <rom name="SHVC-ADKJ-0 P3.u2" size="1048576" crc="5b379b50" sha1="83b0507f1a84e686d76b5b869c1a5f2e22278097" offset="0x200000" />
</dataarea> </dataarea>
<dataarea name="nvram" size="8192"> <dataarea name="nvram" size="8192">
</dataarea> </dataarea>
Expand Down Expand Up @@ -11930,7 +11930,7 @@ more investigation needed...
<feature name="cart_back_label" value="901121" /> <feature name="cart_back_label" value="901121" />
<feature name="slot" value="lorom" /> <feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576"> <dataarea name="rom" size="1048576">
<rom name="shvc-eh-0.u1" size="1048576" crc="5cb9bc35" sha1="745ebf8164ca7be58829c6130c0e06f330cd0748" offset="0x000000" /> <rom name="SHVC-EH-0.u1" size="1048576" crc="5cb9bc35" sha1="745ebf8164ca7be58829c6130c0e06f330cd0748" offset="0x000000" />
</dataarea> </dataarea>
<dataarea name="nvram" size="8192"> <dataarea name="nvram" size="8192">
</dataarea> </dataarea>
Expand Down Expand Up @@ -19340,17 +19340,17 @@ more investigation needed...
<description>Nintendo Scope 6 (Euro)</description> <description>Nintendo Scope 6 (Euro)</description>
<year>1992</year> <year>1992</year>
<publisher>Nintendo</publisher> <publisher>Nintendo</publisher>
<info name="serial" value="SNSP-LR-FAH, SNSP-LR-FAH-1" /> <info name="serial" value="SNSP-LR-FAH, SNSP-LR-FAH-1, SNSP-LR-UKV" />
<part name="cart" interface="snes_cart"> <part name="cart" interface="snes_cart">
<feature name="pcb" value="SHVC-1A0N-02" /> <feature name="pcb" value="SHVC-1A0N-02" />
<feature name="u1" value="U1 MASK ROM" /> <feature name="u1" value="U1 MASK ROM" />
<feature name="u2" value="U2 CIC" /> <feature name="u2" value="U2 CIC" />
<feature name="lockout" value="" /> <feature name="lockout" value="" />
<feature name="cart_model" value="SNSP-006" /> <feature name="cart_model" value="SNSP-006" />
<feature name="cart_back_label" value="SNSP-FAH" /> <feature name="cart_back_label" value="SNSP-FAH, SNSP-UKV" />
<feature name="slot" value="lorom" /> <feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576"> <dataarea name="rom" size="1048576">
<rom name="spal-lr-0.u1" size="1048576" crc="b1859ca4" sha1="e5efb589e2dd783ef2d99f01caa866d8a3a04d16" offset="0x000000" /> <rom name="SPAL-LR-0.u1" size="1048576" crc="b1859ca4" sha1="e5efb589e2dd783ef2d99f01caa866d8a3a04d16" offset="0x000000" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -25243,7 +25243,7 @@ more investigation needed...
<feature name="cart_back_label" value="920214" /> <feature name="cart_back_label" value="920214" />
<feature name="slot" value="lorom" /> <feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576"> <dataarea name="rom" size="1048576">
<rom name="shvc-fc-0.u1" size="1048576" crc="7c94c86c" sha1="9d60d55b690c02413aa668ed9da196b4f1449e81" offset="0x000000" /> <rom name="SHVC-FC-0.u1" size="1048576" crc="7c94c86c" sha1="9d60d55b690c02413aa668ed9da196b4f1449e81" offset="0x000000" />
</dataarea> </dataarea>
<dataarea name="nvram" size="8192"> <dataarea name="nvram" size="8192">
</dataarea> </dataarea>
Expand Down Expand Up @@ -28147,7 +28147,7 @@ Alternate board (XL-1)
<feature name="cart_back_label" value="SNSP-EUR, SNSP-FAH" /> <feature name="cart_back_label" value="SNSP-EUR, SNSP-FAH" />
<feature name="slot" value="lorom" /> <feature name="slot" value="lorom" />
<dataarea name="rom" size="524288"> <dataarea name="rom" size="524288">
<rom name="spal-fs-0.u1" size="524288" crc="442c47cb" sha1="6eb6dd6da1e8eefad24c30b59ededbd671b9db2c" offset="0x000000" /> <rom name="SPAL-FS-0.u1" size="524288" crc="442c47cb" sha1="6eb6dd6da1e8eefad24c30b59ededbd671b9db2c" offset="0x000000" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
Expand Down Expand Up @@ -33286,6 +33286,26 @@ Alternate board (XL-1)
</dataarea> </dataarea>
</part> </part>
</software> </software>

<software name="lostvik">
<description>The Lost Vikings (Euro)</description>
<year>1993</year>
<publisher>Interplay</publisher>
<info name="serial" value="SNSP-LV-SCN" />
<info name="release" value="19931028" />
<part name="cart" interface="snes_cart">
<feature name="pcb" value="SHVC-1A0N-20" />
<feature name="u1" value="U1 MASK ROM" />
<feature name="u2" value="U2 CIC" />
<feature name="lockout" value="" />
<feature name="cart_model" value="SNSP-006" />
<feature name="cart_back_label" value="SNSP-UKV" />
<feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576">
<rom name="SPAL-LV-0.u1" size="1048576" crc="66989491" sha1="2bd4c2af6e5d7252d16342fd1a64454dca3ce557" offset="0x000000" />
</dataarea>
</part>
</software>


<software name="turnburns" cloneof="turnburn"> <software name="turnburns" cloneof="turnburn">
<!-- single cartridge source: Zidanax --> <!-- single cartridge source: Zidanax -->
Expand Down Expand Up @@ -46113,18 +46133,6 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
</part> </part>
</software> </software>


<software name="lostvik">
<description>The Lost Vikings (Euro)</description>
<year>1993</year>
<publisher>Interplay</publisher>
<part name="cart" interface="snes_cart">
<feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576">
<rom name="lost vikings, the (europe).sfc" size="1048576" crc="66989491" sha1="2bd4c2af6e5d7252d16342fd1a64454dca3ce557" offset="0x000000" />
</dataarea>
</part>
</software>

<software name="lostvikf" cloneof="lostvik"> <software name="lostvikf" cloneof="lostvik">
<description>The Lost Vikings (Fra)</description> <description>The Lost Vikings (Fra)</description>
<year>1993</year> <year>1993</year>
Expand Down Expand Up @@ -59520,19 +59528,6 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
</part> </part>
</software> </software>


<!-- Most likely this is simply a bad dump of syvalionp. -->
<software name="syvalionp2" cloneof="syvalion">
<description>Syvalion (Euro, Prototype 2)</description>
<year>1992</year>
<publisher>Toshiba EMI</publisher>
<part name="cart" interface="snes_cart">
<feature name="slot" value="lorom" />
<dataarea name="rom" size="1048576">
<rom name="syvalion (europe) (beta).sfc" size="1048576" crc="be122755" sha1="ddfa611f1177f371c1107dbd8e8ecdb19011a232" offset="0x000000" status="baddump" />
</dataarea>
</part>
</software>

<software name="syvalion"> <software name="syvalion">
<description>Syvalion (Euro)</description> <description>Syvalion (Euro)</description>
<year>1992</year> <year>1992</year>
Expand Down

0 comments on commit 26643a4

Please sign in to comment.