gcc 4.2 warning fixes

[picodrive.git] / Pico / Pico / Pico.c

diff --git a/Pico/Pico/Pico.c b/Pico/Pico/Pico.c
index e1133c0..bd2bece 100644 (file)
--- a/Pico/Pico/Pico.c
+++ b/Pico/Pico/Pico.c
@@ -6,8 +6,22 @@
 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 void PicoLineHookPico(int count)
+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 = 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)
 {
   PicoPicohw.line_counter += count;
 
@@ -15,49 +29,64 @@ static void PicoLineHookPico(int count)
   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.line_counter & 3) == 0 || count > 10)
+  if (PicoPicohw.fifo_bytes > 0)
   {
-    if (PicoPicohw.fifo_bytes > 0)
-      PicoPicohw.fifo_bytes--;
+    PicoPicohw.fifo_line_bytes += fifo_bytes_line * count;
+    if (PicoPicohw.fifo_line_bytes >= (1<<16)) {
+      PicoPicohw.fifo_bytes -= PicoPicohw.fifo_line_bytes >> 16;
+      PicoPicohw.fifo_line_bytes &= 0xffff;
+      if (PicoPicohw.fifo_bytes < 0)
+        PicoPicohw.fifo_bytes = 0;
+    }
   }
+  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
 }
 
+static void PicoResetPico(void)
+{
+  PicoPicoPCMReset();
+  PicoPicohw.xpcm_ptr = PicoPicohw.xpcm_buffer;
+}
+
 PICO_INTERNAL int PicoInitPico(void)
 {
   elprintf(EL_STATUS, "Pico detected");
-  PicoLineHook = PicoLineHookPico;
+  PicoLineHook = PicoLinePico;
+  PicoResetHook = PicoResetPico;
 
   PicoAHW = PAHW_PICO;
   memset(&PicoPicohw, 0, sizeof(PicoPicohw));
-  PicoPicohw.pen_pos[0] = 0x03c + 352/2;
-  PicoPicohw.pen_pos[1] = 0x200 + 252/2;
-  prev_line_cnt_irq3 = 0, prev_line_cnt_irq5 = 0;
+  PicoPicohw.pen_pos[0] = 0x03c + 320/2;
+  PicoPicohw.pen_pos[1] = 0x200 + 240/2;
+  prev_line_cnt_irq3 = prev_line_cnt_irq5 = 0;
 
   // map version register
   PicoDetectRegion();
-  elprintf(EL_STATUS, "a %x", Pico.m.hardware);
   switch (Pico.m.hardware >> 6) {
     case 0: PicoPicohw.r1 = 0x00; break;
     case 1: PicoPicohw.r1 = 0x00; break;