X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=7d418604d3544497cdaaa393ae73f15ae82d930b;hb=69996cb7c62468cd97842e35bdd2b74006a28dba;hp=18cc46eada9500a35a74a5c5b7c78112b676fbb9;hpb=7a93adeb29f01f5867ff36606cd73a382b6ee0e3;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 18cc46e..7d41860 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -8,14 +8,9 @@
 
 
 #include <string.h>
-#include "sound.h"
 #include "ym2612.h"
 #include "sn76496.h"
 
-#ifndef __GNUC__
-#pragma warning (disable:4244)
-#endif
-
 #if defined(_USE_MZ80)
 #include "../../cpu/mz80/mz80.h"
 #elif defined(_USE_DRZ80)
@@ -29,11 +24,8 @@
 // master int buffer to mix to
 static int PsndBuffer[2*44100/50];
 
-//int z80CycleAim = 0;
-
 // dac
-short *dac_out;
-unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
+static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
 
 // for Pico
 int PsndRate=0;
@@ -51,7 +43,7 @@ void YM2612TimerHandler(int c,int cnt);
 extern int *sn76496_regs;
 
 
-static void dac_recalculate()
+static void dac_recalculate(void)
 {
   int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;
 
@@ -107,15 +99,16 @@ static void dac_recalculate()
 }
 
 
-void sound_reset()
+PICO_INTERNAL void sound_reset(void)
 {
-  extern int z80stopCycle;
   void *ym2612_regs;
 
   // also clear the internal registers+addr line
   ym2612_regs = YM2612GetRegs();
   memset(ym2612_regs, 0, 0x200+4);
-  z80stopCycle = 0;
+  // setting these to 0 might confuse timing code,
+  // so better set to something like this instead
+  z80startCycle = z80stopCycle = 0x01000000;
 
   sound_rerate(0);
 }
@@ -168,7 +161,7 @@ void sound_rerate(int preserve_state)
 
 
 // This is called once per raster (aka line), but not necessarily for every line
-void sound_timers_and_dac(int raster)
+PICO_INTERNAL void sound_timers_and_dac(int raster)
 {
   int pos, len;
   int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;
@@ -216,7 +209,7 @@ void sound_timers_and_dac(int raster)
 }
 
 
-void sound_clear(void)
+PICO_INTERNAL void sound_clear(void)
 {
   int len = PsndLen;
   if (PsndLen_exc_add) len++;
@@ -225,8 +218,9 @@ void sound_clear(void)
 }
 
 
-int sound_render(int offset, int length)
+PICO_INTERNAL int sound_render(int offset, int length)
 {
+  int  buf32_updated = 0;
   int *buf32 = PsndBuffer+offset;
   int stereo = (PicoOpt & 8) >> 3;
   // emulating CD && PCM option enabled && PCM chip on && have enabled channels
@@ -247,16 +241,22 @@ int sound_render(int offset, int length)
     SN76496Update(PsndOut+offset, length, stereo);
 
   // Add in the stereo FM buffer
-  if (PicoOpt & 1)
-    YM2612UpdateOne(buf32, length, stereo, 1);
+  if (PicoOpt & 1) {
+    buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);
+  } else
+    memset32(buf32, 0, length<<stereo);
+
+//printf("active_chs: %02x\n", buf32_updated);
 
   // CD: PCM sound
-  if (do_pcm)
+  if (do_pcm) {
     pcm_update(buf32, length, stereo);
+    //buf32_updated = 1;
+  }
 
   // CD: CDDA audio
-//  if ((PicoMCD & 1) && (PicoOpt & 0x800))
-//    mp3_update(PsndBuffer+offset, length, stereo);
+  if ((PicoMCD & 1) && (PicoOpt & 0x800))
+    mp3_update(buf32, length, stereo);
 
   // convert + limit to normal 16bit output
   if (stereo)
@@ -310,11 +310,13 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
 
 static unsigned char DrZ80_in(unsigned short p)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x read", p);
   return 0xff;
 }
 
 static void DrZ80_out(unsigned short p,unsigned char d)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);
 }
 
 static void DrZ80_irq_callback()
@@ -325,7 +327,7 @@ static void DrZ80_irq_callback()
 #endif
 
 // z80 functionality wrappers
-void z80_init()
+PICO_INTERNAL void z80_init(void)
 {
 #if defined(_USE_MZ80)
   struct mz80context z80;
@@ -359,7 +361,7 @@ void z80_init()
 #endif
 }
 
-void z80_reset()
+PICO_INTERNAL void z80_reset(void)
 {
 #if defined(_USE_MZ80)
   mz80reset();
@@ -376,14 +378,14 @@ void z80_reset()
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
-void z80_resetCycles()
+PICO_INTERNAL void z80_resetCycles(void)
 {
 #if defined(_USE_MZ80)
   mz80GetElapsedTicks(1);
 #endif
 }
 
-void z80_int()
+PICO_INTERNAL void z80_int(void)
 {
 #if defined(_USE_MZ80)
   mz80int(0);
@@ -394,7 +396,7 @@ void z80_int()
 }
 
 // returns number of cycles actually executed
-int z80_run(int cycles)
+PICO_INTERNAL int z80_run(int cycles)
 {
 #if defined(_USE_MZ80)
   int ticks_pre = mz80GetElapsedTicks(0);
@@ -407,7 +409,7 @@ int z80_run(int cycles)
 #endif
 }
 
-void z80_pack(unsigned char *data)
+PICO_INTERNAL void z80_pack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
   struct mz80context mz80;
@@ -422,7 +424,7 @@ void z80_pack(unsigned char *data)
 #endif
 }
 
-void z80_unpack(unsigned char *data)
+PICO_INTERNAL void z80_unpack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
   if(*(int *)data == 0x00005A6D) { // "mZ" save?
@@ -448,18 +450,18 @@ void z80_unpack(unsigned char *data)
 #endif
 }
 
-void z80_exit()
+PICO_INTERNAL void z80_exit(void)
 {
 #if defined(_USE_MZ80)
   mz80shutdown();
 #endif
 }
 
-#if defined(__DEBUG_PRINT) || defined(WIN32)
-void z80_debug(char *dstr)
+#if defined(__DEBUG_PRINT) || defined(__GP2X__)
+PICO_INTERNAL void z80_debug(char *dstr)
 {
 #if defined(_USE_DRZ80)
-  sprintf(dstr, "%sZ80 state: PC: %04x SP: %04x\n", dstr, drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
 #endif
 }
 #endif