X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2Fpwm.c;h=50735642070dade44b90ef555c33ad51b642124e;hb=88fd63ad10faa746ef9d7ad7d98a72e51fe2aa86;hp=abe745e223bcf302268d1577087a7cc2ac8f172d;hpb=c1931173ab49838b8e6f934b11de8ff0b8fbbcf3;p=picodrive.git

diff --git a/pico/32x/pwm.c b/pico/32x/pwm.c
index abe745e..5073564 100644
--- a/pico/32x/pwm.c
+++ b/pico/32x/pwm.c
@@ -11,6 +11,8 @@ static int pwm_cycles;
 static int pwm_mult;
 static int pwm_ptr;
 static int pwm_irq_reload;
+static int pwm_doing_fifo;
+static int pwm_silent;
 
 void p32x_pwm_ctl_changed(void)
 {
@@ -19,7 +21,12 @@ void p32x_pwm_ctl_changed(void)
 
   cycles = (cycles - 1) & 0x0fff;
   pwm_cycles = cycles;
-  pwm_mult = 0x10000 / cycles;
+
+  // supposedly we should stop FIFO when xMd is 0,
+  // but mars test disagrees
+  pwm_mult = 0;
+  if ((control & 0x0f) != 0)
+    pwm_mult = 0x10000 / cycles;
 
   pwm_irq_reload = (control & 0x0f00) >> 8;
   pwm_irq_reload = ((pwm_irq_reload - 1) & 0x0f) + 1;
@@ -30,8 +37,7 @@ void p32x_pwm_ctl_changed(void)
 
 static void do_pwm_irq(SH2 *sh2, unsigned int m68k_cycles)
 {
-  Pico32x.sh2irqs |= P32XI_PWM;
-  p32x_update_irls(sh2, m68k_cycles);
+  p32x_trigger_irq(sh2, m68k_cycles, P32XI_PWM);
 
   if (Pico32x.regs[0x30 / 2] & P32XP_RTP) {
     p32x_event_schedule(m68k_cycles, P32X_EVENT_PWM, pwm_cycles / 3 + 1);
@@ -40,6 +46,15 @@ static void do_pwm_irq(SH2 *sh2, unsigned int m68k_cycles)
   }
 }
 
+static int convert_sample(unsigned int v)
+{
+  if (v == 0)
+    return 0;
+  if (v > pwm_cycles)
+    v = pwm_cycles;
+  return ((int)v - pwm_cycles / 2) * pwm_mult;
+}
+
 #define consume_fifo(sh2, m68k_cycles) { \
   int cycles_diff = ((m68k_cycles) * 3) - Pico32x.pwm_cycle_p; \
   if (cycles_diff >= pwm_cycles) \
@@ -49,57 +64,53 @@ static void do_pwm_irq(SH2 *sh2, unsigned int m68k_cycles)
 static void consume_fifo_do(SH2 *sh2, unsigned int m68k_cycles,
   int sh2_cycles_diff)
 {
-  int do_irq = 0;
+  struct Pico32xMem *mem = Pico32xMem;
+  unsigned short *fifo_l = mem->pwm_fifo[0];
+  unsigned short *fifo_r = mem->pwm_fifo[1];
+  int sum = 0;
 
-  if (pwm_cycles == 0)
+  if (pwm_cycles == 0 || pwm_doing_fifo)
     return;
 
   elprintf(EL_PWM, "pwm: %u: consume %d/%d, %d,%d ptr %d",
     m68k_cycles, sh2_cycles_diff, sh2_cycles_diff / pwm_cycles,
     Pico32x.pwm_p[0], Pico32x.pwm_p[1], pwm_ptr);
 
-  if (sh2_cycles_diff >= pwm_cycles * 17) {
-    // silence/skip
-    Pico32x.pwm_cycle_p = m68k_cycles * 3;
-    Pico32x.pwm_p[0] = Pico32x.pwm_p[1] = 0;
-    return;
-  }
-
-  while (sh2_cycles_diff >= pwm_cycles) {
-    struct Pico32xMem *mem = Pico32xMem;
-    short *fifo_l = mem->pwm_fifo[0];
-    short *fifo_r = mem->pwm_fifo[1];
+  // this is for recursion from dreq1 writes
+  pwm_doing_fifo = 1;
 
+  for (; sh2_cycles_diff >= pwm_cycles; sh2_cycles_diff -= pwm_cycles)
+  {
     if (Pico32x.pwm_p[0] > 0) {
       fifo_l[0] = fifo_l[1];
       fifo_l[1] = fifo_l[2];
       fifo_l[2] = fifo_l[3];
       Pico32x.pwm_p[0]--;
+      mem->pwm_current[0] = convert_sample(fifo_l[0]);
+      sum += mem->pwm_current[0];
     }
     if (Pico32x.pwm_p[1] > 0) {
       fifo_r[0] = fifo_r[1];
       fifo_r[1] = fifo_r[2];
       fifo_r[2] = fifo_r[3];
       Pico32x.pwm_p[1]--;
+      mem->pwm_current[1] = convert_sample(fifo_r[0]);
+      sum += mem->pwm_current[1];
     }
 
-    mem->pwm[pwm_ptr * 2    ] = fifo_l[0];
-    mem->pwm[pwm_ptr * 2 + 1] = fifo_r[0];
+    mem->pwm[pwm_ptr * 2    ] = mem->pwm_current[0];
+    mem->pwm[pwm_ptr * 2 + 1] = mem->pwm_current[1];
     pwm_ptr = (pwm_ptr + 1) & (PWM_BUFF_LEN - 1);
 
-    sh2_cycles_diff -= pwm_cycles;
-
     if (--Pico32x.pwm_irq_cnt == 0) {
       Pico32x.pwm_irq_cnt = pwm_irq_reload;
-      // irq also does dreq1, so call it after cycle update
-      do_irq = 1;
-      break;
+      do_pwm_irq(sh2, m68k_cycles);
     }
   }
   Pico32x.pwm_cycle_p = m68k_cycles * 3 - sh2_cycles_diff;
-
-  if (do_irq)
-    do_pwm_irq(sh2, m68k_cycles);
+  pwm_doing_fifo = 0;
+  if (sum != 0)
+    pwm_silent = 0;
 }
 
 static int p32x_pwm_schedule_(SH2 *sh2, unsigned int m68k_now)
@@ -114,8 +125,6 @@ static int p32x_pwm_schedule_(SH2 *sh2, unsigned int m68k_now)
   if (cycles_diff_sh2 >= pwm_cycles)
     consume_fifo_do(sh2, m68k_now, cycles_diff_sh2);
 
-  if (Pico32x.sh2irqs & P32XI_PWM)
-    return 0; // previous not acked
   if (!((Pico32x.sh2irq_mask[0] | Pico32x.sh2irq_mask[1]) & 1))
     return 0; // masked by everyone
 
@@ -138,6 +147,12 @@ void p32x_pwm_schedule_sh2(SH2 *sh2)
     p32x_event_schedule_sh2(sh2, P32X_EVENT_PWM, after);
 }
 
+void p32x_pwm_sync_to_sh2(SH2 *sh2)
+{
+  int m68k_cycles = sh2_cycles_done_m68k(sh2);
+  consume_fifo(sh2, m68k_cycles);
+}
+
 void p32x_pwm_irq_event(unsigned int m68k_now)
 {
   p32x_pwm_schedule(m68k_now);
@@ -188,8 +203,9 @@ void p32x_pwm_write16(unsigned int a, unsigned int d,
 
   a &= 0x0e;
   if (a == 0) { // control
-    // supposedly we should stop FIFO when xMd is 0,
-    // but mars test disagrees
+    // avoiding pops..
+    if ((Pico32x.regs[0x30 / 2] & 0x0f) == 0)
+      Pico32xMem->pwm_fifo[0][0] = Pico32xMem->pwm_fifo[1][0] = 0;
     Pico32x.regs[0x30 / 2] = d;
     p32x_pwm_ctl_changed();
     Pico32x.pwm_irq_cnt = pwm_irq_reload; // ?
@@ -200,12 +216,9 @@ void p32x_pwm_write16(unsigned int a, unsigned int d,
   }
   else if (a <= 8) {
     d = (d - 1) & 0x0fff;
-    if (d > pwm_cycles)
-      d = pwm_cycles;
-    d = (d - pwm_cycles / 2) * pwm_mult;
 
     if (a == 4 || a == 8) { // L ch or MONO
-      short *fifo = Pico32xMem->pwm_fifo[0];
+      unsigned short *fifo = Pico32xMem->pwm_fifo[0];
       if (Pico32x.pwm_p[0] < 3)
         Pico32x.pwm_p[0]++;
       else {
@@ -215,7 +228,7 @@ void p32x_pwm_write16(unsigned int a, unsigned int d,
       fifo[Pico32x.pwm_p[0]] = d;
     }
     if (a == 6 || a == 8) { // R ch or MONO
-      short *fifo = Pico32xMem->pwm_fifo[1];
+      unsigned short *fifo = Pico32xMem->pwm_fifo[1];
       if (Pico32x.pwm_p[1] < 3)
         Pico32x.pwm_p[1]++;
       else {
@@ -234,16 +247,31 @@ void p32x_pwm_update(int *buf32, int length, int stereo)
   int p = 0;
   int xmd;
 
+  consume_fifo(NULL, SekCyclesDone());
+
   xmd = Pico32x.regs[0x30 / 2] & 0x0f;
-  if ((xmd != 0x05 && xmd != 0x0a) || pwm_ptr <= 16)
-    goto out;
+  if (xmd == 0 || xmd == 0x06 || xmd == 0x09 || xmd == 0x0f)
+    goto out; // invalid?
+  if (pwm_silent)
+    return;
 
-  step = (pwm_ptr << 16) / length; // FIXME: division..
+  step = (pwm_ptr << 16) / length;
   pwmb = Pico32xMem->pwm;
 
   if (stereo)
   {
-    if (xmd == 0x0a) {
+    if (xmd == 0x05) {
+      // normal
+      while (length-- > 0) {
+        *buf32++ += pwmb[0];
+        *buf32++ += pwmb[1];
+
+        p += step;
+        pwmb += (p >> 16) * 2;
+        p &= 0xffff;
+      }
+    }
+    else if (xmd == 0x0a) {
       // channel swap
       while (length-- > 0) {
         *buf32++ += pwmb[1];
@@ -255,18 +283,24 @@ void p32x_pwm_update(int *buf32, int length, int stereo)
       }
     }
     else {
+      // mono - LMD, RMD specify dst
+      if (xmd & 0x06) // src is R
+        pwmb++;
+      if (xmd & 0x0c) // dst is R
+        buf32++;
       while (length-- > 0) {
-        *buf32++ += pwmb[0];
-        *buf32++ += pwmb[1];
+        *buf32 += *pwmb;
 
         p += step;
         pwmb += (p >> 16) * 2;
         p &= 0xffff;
+        buf32 += 2;
       }
     }
   }
   else
   {
+    // mostly unused
     while (length-- > 0) {
       *buf32++ += pwmb[0];
 
@@ -281,6 +315,8 @@ void p32x_pwm_update(int *buf32, int length, int stereo)
 
 out:
   pwm_ptr = 0;
+  pwm_silent = Pico32xMem->pwm_current[0] == 0
+    && Pico32xMem->pwm_current[1] == 0;
 }
 
 void p32x_pwm_state_loaded(void)
@@ -290,11 +326,11 @@ void p32x_pwm_state_loaded(void)
   p32x_pwm_ctl_changed();
 
   // for old savestates
-  cycles_diff_sh2 = SekCycleCntT * 3 - Pico32x.pwm_cycle_p;
+  cycles_diff_sh2 = Pico.t.m68c_cnt * 3 - Pico32x.pwm_cycle_p;
   if (cycles_diff_sh2 >= pwm_cycles || cycles_diff_sh2 < 0) {
     Pico32x.pwm_irq_cnt = pwm_irq_reload;
-    Pico32x.pwm_cycle_p = SekCycleCntT * 3;
-    p32x_pwm_schedule(SekCycleCntT);
+    Pico32x.pwm_cycle_p = Pico.t.m68c_cnt * 3;
+    p32x_pwm_schedule(Pico.t.m68c_cnt);
   }
 }