merge PCM code from FCEUX

[fceu.git] / ppu098.c

diff --git a/ppu098.c b/ppu098.c
index fe0e5c2..7591282 100644 (file)
--- a/ppu098.c
+++ b/ppu098.c
@@ -34,8 +34,8 @@
 #include  "video.h"
 #include  "input.h"
 
-#ifdef GP2X
-#include       "drivers/gp2x/asmutils.h"
+#ifdef __arm__
+#include       "drivers/arm/asmutils.h"
 #endif
 
 #define Pal     (PALRAM)
@@ -86,34 +86,6 @@ static void makeppulut(void)
  }
 }
 
-#if defined(ASM_6502) && !defined(DEBUG_ASM_6502)
-static void asmcpu_update(int32 cycles)
-{
- // some code from x6502.c
- fhcnt-=cycles;
- if(fhcnt<=0)
- {
-  FrameSoundUpdate();
-  fhcnt+=fhinc;
- }
-
- if(PCMIRQCount>0)
- {
-  PCMIRQCount-=cycles;
-  if(PCMIRQCount<=0)
-  {
-   vdis=1;
-   if((PSG[0x10]&0x80) && !(PSG[0x10]&0x40))
-   {
-    extern uint8 SIRQStat;
-    SIRQStat|=0x80;
-    X6502_IRQBegin(FCEU_IQDPCM);
-   }
-  }
- }
-}
-#endif
-
 extern int ppudead;
 extern int kook;
 
@@ -699,7 +671,7 @@ static void Fixit1(void)
 void MMC5_hb(int);     /* Ugh ugh ugh. */
 static void DoLine(void)
 {
-#ifndef GP2X
+#ifndef __arm__
  int x;
 #endif
  uint8 *target=XBuf+scanline*320+32;
@@ -720,7 +692,7 @@ static void DoLine(void)
  if(SpriteON)
   CopySprites098(target);
 
-#ifdef GP2X
+#ifdef __arm__
  if(ScreenON || SpriteON)  // Yes, very el-cheapo.
  {
   if(PPU[1]&0x01)