X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico%2FPico.c;h=fcec65f6d6515f2540ed99fe895fff58e8a86297;hb=4c436138e4f9f49726352c34499a2de76a7c1c79;hp=a0da0d34908b13bf2b5af5f89ec234e32cf30456;hpb=213c16adcb630666f694646645a8ed4bc30c334b;p=picodrive.git

diff --git a/Pico/Pico/Pico.c b/Pico/Pico/Pico.c
index a0da0d3..fcec65f 100644
--- a/Pico/Pico/Pico.c
+++ b/Pico/Pico/Pico.c
@@ -8,40 +8,36 @@ picohw_state PicoPicohw;
 static int prev_line_cnt_irq3 = 0, prev_line_cnt_irq5 = 0;
 static int fifo_bytes_line = (16000<<16)/60/262/2;
 
+static const int guessed_rates[] = { 8000, 14000, 12000, 14000, 16000, 18000, 16000, 16000 }; // ?
+
+#define PICOHW_FIFO_IRQ_THRESHOLD 12
+
 PICO_INTERNAL void PicoReratePico(void)
 {
-  int rate = (PicoPicohw.r12 & 0xf) ? 16000 : 8000;
+  int rate = guessed_rates[PicoPicohw.r12 & 7];
   if (Pico.m.pal)
        fifo_bytes_line = (rate<<16)/50/312/2;
   else fifo_bytes_line = (rate<<16)/60/262/2;
   PicoPicoPCMRerate(rate);
 }
 
-static void PicoLinePico(int count)
+static void PicoLinePico(void)
 {
-  PicoPicohw.line_counter += count;
+  PicoPicohw.line_counter++;
 
 #if 1
   if ((PicoPicohw.r12 & 0x4003) && PicoPicohw.line_counter - prev_line_cnt_irq3 > 200) {
     prev_line_cnt_irq3 = PicoPicohw.line_counter;
     // just a guess/hack, allows 101 Dalmantians to boot
-    elprintf(EL_ANOMALY, "irq3");
-    SekInterrupt(3);
-    return;
-  }
-
-  if (PicoPicohw.fifo_bytes == 16) {
-    prev_line_cnt_irq3 = PicoPicohw.line_counter;
-    elprintf(EL_ANOMALY, "irq3, fb=%i", PicoPicohw.fifo_bytes);
+    elprintf(EL_PICOHW, "irq3");
     SekInterrupt(3);
-    PicoPicohw.fifo_bytes--;
     return;
   }
 #endif
 
   if (PicoPicohw.fifo_bytes > 0)
   {
-    PicoPicohw.fifo_line_bytes += fifo_bytes_line * count;
+    PicoPicohw.fifo_line_bytes += fifo_bytes_line;
     if (PicoPicohw.fifo_line_bytes >= (1<<16)) {
       PicoPicohw.fifo_bytes -= PicoPicohw.fifo_line_bytes >> 16;
       PicoPicohw.fifo_line_bytes &= 0xffff;
@@ -52,10 +48,20 @@ static void PicoLinePico(int count)
   else
     PicoPicohw.fifo_line_bytes = 0;
 
+#if 1
+  if (PicoPicohw.fifo_bytes_prev >= PICOHW_FIFO_IRQ_THRESHOLD &&
+      PicoPicohw.fifo_bytes < PICOHW_FIFO_IRQ_THRESHOLD) {
+    prev_line_cnt_irq3 = PicoPicohw.line_counter; // ?
+    elprintf(EL_PICOHW, "irq3, fb=%i", PicoPicohw.fifo_bytes);
+    SekInterrupt(3);
+  }
+  PicoPicohw.fifo_bytes_prev = PicoPicohw.fifo_bytes;
+#endif
+
 #if 0
   if (PicoPicohw.line_counter - prev_line_cnt_irq5 > 512) {
     prev_line_cnt_irq5 = PicoPicohw.line_counter;
-    elprintf(EL_ANOMALY, "irq5");
+    elprintf(EL_PICOHW, "irq5");
     SekInterrupt(5);
   }
 #endif
@@ -67,7 +73,7 @@ static void PicoResetPico(void)
   PicoPicohw.xpcm_ptr = PicoPicohw.xpcm_buffer;
 }
 
-PICO_INTERNAL int PicoInitPico(void)
+PICO_INTERNAL void PicoInitPico(void)
 {
   elprintf(EL_STATUS, "Pico detected");
   PicoLineHook = PicoLinePico;
@@ -87,7 +93,5 @@ PICO_INTERNAL int PicoInitPico(void)
     case 2: PicoPicohw.r1 = 0x40; break;
     case 3: PicoPicohw.r1 = 0x20; break;
   }
-
-  return 0;
 }