X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdac.cpp;h=9dc1a2ef28c34bb9b7d32d2fe04b67e53e1f4948;hb=dd520b965a1e6531bd1d285494b223ab04c5368b;hp=0ad2b9f7114da3d59120bebe04edb06ea50cf477;hpb=191b0f477fee869ee36744763acb2d3e4d25aa28;p=virtualjaguar

diff --git a/src/dac.cpp b/src/dac.cpp
index 0ad2b9f..9dc1a2e 100644
--- a/src/dac.cpp
+++ b/src/dac.cpp
@@ -11,11 +11,22 @@
 // work correctly...! Perhaps just need to set up SSI stuff so BUTCH doesn't get
 // confused...
 
+// ALSO: Need to implement some form of proper locking to replace the clusterfuck
+//       that is the current spinlock implementation. Since the DSP is a separate
+//       entity, could we get away with running it in the sound IRQ?
+
+// ALSO: It may be a good idea to physically separate the left and right buffers
+//       to prevent things like the DSP filling only one side and such. Do such
+//       mono modes exist on the Jag? Seems to according to Super Burnout.
+
+#include "dac.h"
+
 #include "SDL.h"
-#include "m68k.h"
+#include "gui.h"
 #include "jaguar.h"
+#include "log.h"
+#include "m68k.h"
 #include "settings.h"
-#include "dac.h"
 
 //#define DEBUG_DAC
 
@@ -43,7 +54,7 @@ static bool SDLSoundInitialized = false;
 // We can get away with using native endian here because we can tell SDL to use the native
 // endian when looking at the sample buffer, i.e., no need to worry about it.
 
-static uint16 * DACBuffer;
+static uint16 DACBuffer[BUFFER_SIZE];
 static uint8 SCLKFrequencyDivider = 19;				// Default is roughly 22 KHz (20774 Hz in NTSC mode)
 /*static*/ uint16 serialMode = 0;
 
@@ -57,7 +68,8 @@ int GetCalculatedFrequency(void);
 //
 void DACInit(void)
 {
-	memory_malloc_secure((void **)&DACBuffer, BUFFER_SIZE * sizeof(uint16), "DAC buffer");
+//	memory_malloc_secure((void **)&DACBuffer, BUFFER_SIZE * sizeof(uint16), "DAC buffer");
+//	DACBuffer = (uint16 *)memory_malloc(BUFFER_SIZE * sizeof(uint16), "DAC buffer");
 
 	desired.freq = GetCalculatedFrequency();		// SDL will do conversion on the fly, if it can't get the exact rate. Nice!
 	desired.format = AUDIO_S16SYS;					// This uses the native endian (for portability)...
@@ -96,7 +108,7 @@ void DACDone(void)
 		SDL_CloseAudio();
 	}
 
-	memory_free(DACBuffer);
+//	memory_free(DACBuffer);
 	WriteLog("DAC: Done.\n");
 }
 
@@ -162,7 +174,7 @@ if (numLeftSamplesReady == 0 || numRightSamplesReady == 0)
 }
 
 //
-// Calculate the frequency of SCLK * 32 using the divider
+// Calculate the freq9uency of SCLK * 32 using the divider
 //
 int GetCalculatedFrequency(void)
 {
@@ -208,8 +220,10 @@ WriteLog("Tail=%X, Head=%X", ltail, lhead);
 	WriteLog("LTail=%X, LHead=%X, BUFFER_SIZE-1=%X\n", LeftFIFOTailPtr, LeftFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("RTail=%X, RHead=%X, BUFFER_SIZE-1=%X\n", RightFIFOTailPtr, RightFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("From while: Tail=%X, Head=%X", (LeftFIFOTailPtr + 2) & (BUFFER_SIZE - 1), LeftFIFOHeadPtr);
-	log_done();
-	exit(0);
+//	LogDone();
+//	exit(0);
+	GUICrashGracefully("Stuck in left DAC spinlock!");
+	return;
 }
 		}//*/
 
@@ -278,6 +292,8 @@ LTail=60D8, LHead=60D8, BUFFER_SIZE-1=FFFF
 RTail=DB, RHead=60D9, BUFFER_SIZE-1=FFFF
 From while: Tail=60DA, Head=60D8
 */
+#warning Spinlock problem--!!! FIX !!!
+#warning Odd: The right FIFO is empty, but the left FIFO is full!
 		// Spin until buffer has been drained (for too fast processors!)...
 uint32 spin = 0;
 		while (((RightFIFOTailPtr + 2) & (BUFFER_SIZE - 1)) == RightFIFOHeadPtr)//;
@@ -295,8 +311,10 @@ WriteLog("Tail=%X, Head=%X", rtail, rhead);
 	WriteLog("LTail=%X, LHead=%X, BUFFER_SIZE-1=%X\n", LeftFIFOTailPtr, LeftFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("RTail=%X, RHead=%X, BUFFER_SIZE-1=%X\n", RightFIFOTailPtr, RightFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("From while: Tail=%X, Head=%X", (RightFIFOTailPtr + 2) & (BUFFER_SIZE - 1), RightFIFOHeadPtr);
-	log_done();
-	exit(0);
+//	LogDone();
+//	exit(0);
+	GUICrashGracefully("Stuck in right DAC spinlock!");
+	return;
 }
 		}//*/
 
@@ -328,9 +346,13 @@ WriteLog("Tail=%X, Head=%X", rtail, rhead);
 				{
 					if (SDL_OpenAudio(&desired, NULL) < 0)	// NULL means SDL guarantees what we want
 					{
+// This is bad, Bad, BAD !!! DON'T ABORT BECAUSE WE DIDN'T GET OUR FREQ! !!! FIX !!!
+#warning !!! FIX !!! Aborting because of SDL audio problem is bad!
 						WriteLog("DAC: Failed to initialize SDL sound: %s.\nDesired freq: %u\nShutting down!\n", SDL_GetError(), desired.freq);
-						log_done();
-						exit(1);
+//						LogDone();
+//						exit(1);
+						GUICrashGracefully("Failed to initialize SDL sound!");
+						return;
 					}
 				}
 
@@ -379,5 +401,5 @@ uint16 DACReadWord(uint32 offset, uint32 who/*= UNKNOWN*/)
 	else if (offset == RRXD + 2)
 		return rrxd;
 
-	return 0xFFFF;	// May need SSTAT as well... (but may be a Jaguar II only feature)		
+	return 0xFFFF;	// May need SSTAT as well... (but may be a Jaguar II only feature)
 }