X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=c47cf19002dc87c8a9aa063c4a58993de45ba602;hb=145650410c2a6a4b0277067e8237537bb57063af;hp=93d6876460f887e3fa5624e724b9fdd7889865eb;hpb=0ffefdb8bd172c258497ce0cd14d1f2ea1358f69;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 93d6876..c47cf19 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -38,6 +38,7 @@ int PicoInit(void)
   z80_init(); // init even if we aren't going to use it
 
   PicoInitMCD();
+  PicoSVPInit();
 
   SRam.data=0;
 
@@ -161,15 +162,16 @@ int PicoReset(int hard)
 
 // dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)
 // same for Outrunners (92-121, when active is set to 24)
+// 96 is VR hack
 static const int dma_timings[] = {
-83,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+96,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
 102, 205, 204, 102, // vblank: 40cell:
 16,   16,  15,   8, // active: 32cell:
 24,   18,  17,   9  // ...
 };
 
 static const int dma_bsycles[] = {
-(488<<8)/82,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+(488<<8)/96,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
 (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
 (488<<8)/16,  (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
 (488<<8)/24,  (488<<8)/18,  (488<<8)/17,  (488<<8)/9
@@ -255,6 +257,12 @@ static int CheckIdle(void)
 // to be called on 224 or line_sample scanlines only
 static __inline void getSamples(int y)
 {
+#if SIMPLE_WRITE_SOUND
+  if (y != 224) return;
+  PsndRender(0, PsndLen);
+  if (PicoWriteSound) PicoWriteSound(PsndLen);
+  PsndClear();
+#else
   static int curr_pos = 0;
 
   if(y == 224) {
@@ -271,6 +279,7 @@ static __inline void getSamples(int y)
     emustatus&=~1;
     curr_pos = PsndRender(0, PsndLen/2);
   }
+#endif
 }
 
 
@@ -495,6 +504,17 @@ void PicoFrameDrawOnly(void)
   for (y=0;y<224;y++) PicoLine(y);
 }
 
+int PicoGetStat(pstat_t which)
+{
+  switch (which)
+  {
+    case PS_PAL:       return Pico.m.pal;
+    case PS_40_CELL:   return Pico.video.reg[12]&1;
+    case PS_240_LINES: return Pico.m.pal && (Pico.video.reg[1]&8);
+  }
+  return 0;
+}
+
 // callback to output message from emu
 void (*PicoMessage)(const char *msg)=NULL;