protection and more mapper support for new mem code

[picodrive.git] / pico / sound / sound.c

diff --git a/pico/sound/sound.c b/pico/sound/sound.c
index a7510db..6e0db26 100644 (file)
--- a/pico/sound/sound.c
+++ b/pico/sound/sound.c
@@ -107,14 +107,9 @@ static void dac_recalculate(void)
 \r
 PICO_INTERNAL void PsndReset(void)\r
 {\r
-  void *ym2612_regs;\r
-\r
-  // also clear the internal registers+addr line\r
-  ym2612_regs = YM2612GetRegs();\r
-  memset(ym2612_regs, 0, 0x200+4);\r
-  timers_reset();\r
-\r
+  // PsndRerate calls YM2612Init, which also resets\r
   PsndRerate(0);\r
+  timers_reset();\r
 }\r
 \r
 \r
@@ -416,8 +411,8 @@ PICO_INTERNAL void PsndGetSamplesMS(void)
 \r
   // upmix to "stereo" if needed\r
   if (stereo) {\r
-    int i = length, *p = (void *)PsndOut;\r
-    while (i--)\r
+    int i, *p;\r
+    for (i = length, p = (void *)PsndOut; i > 0; i--, p++)\r
       *p |= *p << 16;\r
   }\r
 \r