Merge pull request #2 from mamedev/master

syncing fork
mamedev · Jun 10, 2015 · 2bc883f · 2bc883f
2 parents 595c60e + c9e38b3
commit 2bc883f
Show file tree

Hide file tree

Showing 684 changed files with 23,515 additions and 12,154 deletions.
diff --git a/3rdparty/lsqlite3/lsqlite3.c b/3rdparty/lsqlite3/lsqlite3.c
@@ -47,7 +47,11 @@
 #define luaL_openlib(L,name,reg,nup) luaL_setfuncs(L,reg,nup)
 #endif
 
+#ifndef USE_SYSTEM_SQLITE
 #include "sqlite3/sqlite3.h"
+#else
+#include <sqlite3.h>
+#endif
 
 /* compile time features */
 #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)

diff --git a/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c
@@ -3697,7 +3697,7 @@ static PaError PaAlsaStream_GetAvailableFrames( PaAlsaStream *self, int queryCap
         *available, int *xrunOccurred )
 {
     PaError result = paNoError;
-    unsigned long captureFrames, playbackFrames;
+    unsigned long captureFrames = 0, playbackFrames = 0;
     *xrunOccurred = 0;
 
     assert( queryCapture || queryPlayback );
@@ -4579,7 +4579,7 @@ static PaError GetAlsaStreamPointer( PaStream* s, PaAlsaStream** stream )
 
 PaError PaAlsa_GetStreamInputCard( PaStream* s, int* card )
 {
-    PaAlsaStream *stream;
+    PaAlsaStream *stream = NULL;
     PaError result = paNoError;
     snd_pcm_info_t* pcmInfo;
 
@@ -4598,7 +4598,7 @@ PaError PaAlsa_GetStreamInputCard( PaStream* s, int* card )
 
 PaError PaAlsa_GetStreamOutputCard( PaStream* s, int* card )
 {
-    PaAlsaStream *stream;
+    PaAlsaStream *stream = NULL;
     PaError result = paNoError;
     snd_pcm_info_t* pcmInfo;
 

diff --git a/hash/a7800.xml b/hash/a7800.xml
@@ -2370,32 +2370,112 @@ almost nothing like the prototype.
 	</software>
 
 	<!-- XM board enhanced -->
-
-	<software name="dkongxm">
-		<description>Donkey Kong (PAL, Demo, XM enhanced)</description>
-		<year>2012</year>
-		<publisher>&lt;homebrew&gt;</publisher>
-		<info name="programmer" value="TEP392" />
-		<sharedfeat name="compatibility" value="PAL"/>
-		<part name="cart" interface="a7800_cart">
-			<feature name="slot" value="a78_sg9" />
-			<dataarea name="rom" size="147456">
-				<rom name="dkxm_final_demo_pal.bin" size="147456" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="dkongxmnu" cloneof="dkongxm" >
-		<description>Donkey Kong (NTSC, Demo, XM enhanced)</description>
-		<year>2012</year>
-		<publisher>&lt;homebrew&gt;</publisher>
-		<info name="programmer" value="TEP392" />
-		<sharedfeat name="compatibility" value="NTSC"/>
-		<part name="cart" interface="a7800_cart">
-			<feature name="slot" value="a78_sg9" />
-			<dataarea name="rom" size="147456">
-				<rom name="dkxm_final_demo_ntsc.bin" size="147456" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
-			</dataarea>
-		</part>
-	</software>
+    <!-- from http://atariage.com/forums/topic/204250-donkey-kong-xm-pre-order-and-demo/ -->
+
+    <!-- these ones are listed as 'working in MESS' but are apparently the only images that work on real hardware too -->
+    <software name="dkongxm">
+      <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2)</description>
+      <year>2012</year>
+      <publisher>&lt;homebrew&gt;</publisher>
+      <info name="programmer" value="TEP392" />
+      <sharedfeat name="compatibility" value="PAL"/>
+      <part name="cart" interface="a7800_cart">
+        <feature name="slot" value="a78_sg9" />
+        <dataarea name="rom" size="147456">
+          <rom name="dkxm_demo_v12_pal.bin" size="147456" crc="9f6c0600" sha1="18409eace880dda3646792f9ec050a87a3b1b382" offset="0" />
+        </dataarea>
+      </part>
+    </software>
+
+    <software name="dkongxmu" cloneof="dkongxm">
+      <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2)</description>
+      <year>2012</year>
+      <publisher>&lt;homebrew&gt;</publisher>
+      <info name="programmer" value="TEP392" />
+      <sharedfeat name="compatibility" value="NTSC"/>
+      <part name="cart" interface="a7800_cart">
+        <feature name="slot" value="a78_sg9" />
+        <dataarea name="rom" size="147456">
+          <rom name="dkxm_demo_v12_ntsc.bin" size="147456" crc="8b06bb4b" sha1="3129cbc91dc8f223f00db5c3273a4a330320be99" offset="0" />
+        </dataarea>
+      </part>
+    </software>
+
+    <!-- these are listed as 'with HSC emulation' and are designed for the prosystem emulator, they simulate some of the HSC features -->
+    <!-- remove them? -->
+
+    <software name="dkongxmps"  cloneof="dkongxm" supported="no">
+      <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
+      <year>2012</year>
+      <publisher>&lt;homebrew&gt;</publisher>
+      <info name="programmer" value="TEP392" />
+      <sharedfeat name="compatibility" value="PAL"/>
+      <part name="cart" interface="a7800_cart">
+        <feature name="slot" value="a78_sg9" />
+        <dataarea name="rom" size="147456">
+          <rom name="dkxm_final_demo_pal_hsc.bin" size="147456" crc="6510b674" sha1="65b723b470d287af51e9888813149c43fb11ac26" offset="0" />
+        </dataarea>
+      </part>
+    </software>
+
+    <software name="dkongxmups" cloneof="dkongxm" supported="no">
+      <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
+      <year>2012</year>
+      <publisher>&lt;homebrew&gt;</publisher>
+      <info name="programmer" value="TEP392" />
+      <sharedfeat name="compatibility" value="NTSC"/>
+      <part name="cart" interface="a7800_cart">
+        <feature name="slot" value="a78_sg9" />
+        <dataarea name="rom" size="147456">
+          <rom name="dkxm_final_demo_ntsc_hsc.bin" size="147456" crc="2c67fea7" sha1="7825c1946e3c7492fa9bbfae33029cd68c0d1135" offset="0" />
+        </dataarea>
+      </part>
+    </software>
+
+
+
+    <!-- an older version? sound is broken, did it work on the real hardware? -->
+    <software name="dkongxmo" cloneof="dkongxm" supported="no">
+		  <description>Donkey Kong (PAL, Demo, XM enhanced, older)</description>
+		  <year>2012</year>
+		  <publisher>&lt;homebrew&gt;</publisher>
+		  <info name="programmer" value="TEP392" />
+		  <sharedfeat name="compatibility" value="PAL"/>
+		  <part name="cart" interface="a7800_cart">
+			  <feature name="slot" value="a78_sg9" />
+			  <dataarea name="rom" size="147456">
+				  <rom name="dkxm_final_demo_pal.bin" size="147456" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
+			  </dataarea>
+		  </part>
+	  </software>
+
+	  <software name="dkongxmou" cloneof="dkongxm" supported="no" >
+		  <description>Donkey Kong (NTSC, Demo, XM enhanced, older)</description>
+		  <year>2012</year>
+		  <publisher>&lt;homebrew&gt;</publisher>
+		  <info name="programmer" value="TEP392" />
+		  <sharedfeat name="compatibility" value="NTSC"/>
+		  <part name="cart" interface="a7800_cart">
+			  <feature name="slot" value="a78_sg9" />
+			  <dataarea name="rom" size="147456">
+				  <rom name="dkxm_final_demo_ntsc.bin" size="147456" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
+			  </dataarea>
+		  </part>
+	  </software>
+
+    <!-- this one is meant to detect PAL / NTSC and runs on an A7800 CC2 development board, without sound? based off older code? -->
+    <software name="dkongxmcc" cloneof="dkongxm" supported="no">
+      <description>Donkey Kong (PAL/NTSC, Demo, XM enhanced, older, for CC2 board)</description>
+      <year>2012</year>
+      <publisher>&lt;homebrew&gt;</publisher>
+      <info name="programmer" value="TEP392" />
+      <part name="cart" interface="a7800_cart">
+        <feature name="slot" value="a78_sg9" />
+        <dataarea name="rom" size="147456">
+          <rom name="dkxm_final_demo.bin" size="0x20000" crc="fd503bd4" sha1="454d754a0c4603323e476d9418f343a6a1a0d017" offset="0x4000" />
+          <rom size="0x4000" offset="0x0000" loadflag="continue" />
+        </dataarea>
+      </part>
+    </software>
+
 </softwarelist>
diff --git a/hash/cgenie_cart.xml b/hash/cgenie_cart.xml
@@ -1,19 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<softwarelist name="cgenie_cart" description="EACA Colour Genie cartridges">
 
-<!-- Where was this plugged exactly?!? -->
+<softwarelist name="cgenie_cart" description="EACA Colour Genie EG2000 cartridges">
 
 	<software name="cdosintf">
 		<description>Colour DOS Interface</description>
-		<year>19??</year>
+		<year>1997</year>
 		<publisher>&lt;homebrew?&gt;</publisher>
+		<info name="author" value="C. Poetzsch, Jürgen Buchmüller" />
 		<part name="cart" interface="cgenie_cart">
 			<dataarea name="rom" size="2772">
 				<rom name="newe000.bin" size="2772" crc="953491a7" sha1="8d6a739a9058b3834897a15bcda5348b94008f5a" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
+	<software name="colmon2">
+		<description>Colour-Monitor 2.0</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Enter CALL E000 to start" />
+		<part name="cart" interface="cgenie_cart">
+			<dataarea name="rom" size="0x1000">
+				<rom name="colour_monitor_2.bin" size="0x1000" crc="a6b08d4d" sha1="2398f8ea430468dbd29fb0fabe89b2c21c2404f7" offset="0" />
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>