X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=mappers%2F85.c;h=bae3b666eb67652ee969522d18d6459e758c6ca9;hp=c93788b89b59ae6da911f46e40d9287827c4a895;hb=d97315ac0bca825d2d50a44453bc5652946e2c67;hpb=890e37ba2b8ea1c7593dc05926d7431e3bd00bfb

diff --git a/mappers/85.c b/mappers/85.c
index c93788b..bae3b66 100644
--- a/mappers/85.c
+++ b/mappers/85.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2002 Ben Parnell
+ *  Copyright (C) 2002 Xodnizel
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,16 +21,45 @@
 #include "mapinc.h"
 
 #define vrctemp mapbyte1[0]
-#define indox	mapbyte1[1]
+static uint8 indox;
+
+#include "emu2413.h"
 
 static int acount=0;
 
-void KillOPL(void);
-void UpdateOPL(int Count);
-void vrc7translate(uint8 A, uint8 V);
-void LoadOPL(void);
-extern uint8 VRC7Instrument[16][8];
-extern uint8 VRC7Chan[3][6];
+static OPLL *VRC7Sound=NULL;
+static int dwave=0;
+
+void DoVRC7Sound(void)
+{
+ int32 z,a;
+
+ //if(FSettings.soundq>=1) return;
+ z=((SOUNDTS<<16)/soundtsinc)>>4;
+ a=z-dwave;
+
+ moocow(VRC7Sound, &Wave[dwave], a, 1);
+
+ dwave+=a;
+}
+
+void UpdateOPLNEO(int32 *Wave, int Count)
+{
+ moocow(VRC7Sound, Wave, Count, 4);
+}
+
+void UpdateOPL(int Count)
+{
+ int32 z,a;
+
+  z=((SOUNDTS<<16)/soundtsinc)>>4;
+ a=z-dwave;
+
+ if(VRC7Sound && a)
+  moocow(VRC7Sound, &Wave[dwave], a, 1);
+
+ dwave=0;
+}
 
 static INLINE void DaMirror(int V)
 {
@@ -40,55 +69,64 @@ static INLINE void DaMirror(int V)
 
 DECLFW(Mapper85_write)
 {
-	A|=(A&8)<<1;
-
-	if(A>=0xa000 && A<=0xDFFF)
-	{
-	 A&=0xF010;
-	 {
-	  int x=((A>>4)&1)|((A-0xA000)>>11);
- 	  mapbyte3[x]=V;
-	  setchr1(x<<10,V);
-	 }
-	}
-	else if(A==0x9030)
-	{
-	 if(FSettings.SndRate)
-          vrc7translate(indox,V);
-         GameExpSound.Fill=UpdateOPL;
-	}
-	else switch(A&0xF010)
+        A|=(A&8)<<1;
+
+        if(A>=0xa000 && A<=0xDFFF)
+        {
+        // printf("$%04x, $%04x\n",X.PC,A);
+         A&=0xF010;
+         {
+          int x=((A>>4)&1)|((A-0xA000)>>11);
+           mapbyte3[x]=V;
+          setchr1(x<<10,V);
+         }
+        }
+        else if(A==0x9030)
+        {
+         if(FSettings.SndRate)
+         {
+          OPLL_writeReg(VRC7Sound, indox, V);
+          GameExpSound.Fill=UpdateOPL;
+          GameExpSound.NeoFill=UpdateOPLNEO;
+         }
+        }
+        else switch(A&0xF010)
         {
-         case 0x8000:mapbyte2[0]=V;setprg8(0x8000,V);
-                     X6502_Rebase();break;
-         case 0x8010:mapbyte2[1]=V;setprg8(0xa000,V);
-                     X6502_Rebase();break;
-         case 0x9000:mapbyte2[2]=V;setprg8(0xc000,V);
-                     X6502_Rebase();break;
+         case 0x8000:mapbyte2[0]=V;setprg8(0x8000,V);break;
+         case 0x8010:mapbyte2[1]=V;setprg8(0xa000,V);break;
+         case 0x9000:mapbyte2[2]=V;setprg8(0xc000,V);break;
          case 0x9010:indox=V;break;
          case 0xe000:mapbyte2[3]=V;DaMirror(V);break;
          case 0xE010:IRQLatch=V;
+                     X6502_IRQEnd(FCEU_IQEXT);
                      break;
          case 0xF000:IRQa=V&2;
                      vrctemp=V&1;
-                     if(V&2) {IRQCount=IRQLatch;acount=0;}
+                     if(V&2) {IRQCount=IRQLatch;}
+                     acount=0;
+                     X6502_IRQEnd(FCEU_IQEXT);
                      break;
          case 0xf010:if(vrctemp) IRQa=1;
                      else IRQa=0;
+                     X6502_IRQEnd(FCEU_IQEXT);
                      break;
         }
 }
 
 static void FP_FASTAPASS(1) KonamiIRQHook(int a)
 {
+  #define ACBOO 341
+//  #define ACBOO ((227*2)+1)
   if(IRQa)
    {
-    acount+=(a<<1)+a;
-    if(acount>=339)
+    acount+=a*3;
+
+    if(acount>=ACBOO)
     {
-     doagainbub:acount-=339;IRQCount++;
-     if(IRQCount&0x100) {TriggerIRQ();IRQCount=IRQLatch;}
-     if(acount>=339) goto doagainbub;
+     doagainbub:acount-=ACBOO;
+     IRQCount++;
+     if(IRQCount&0x100) {X6502_IRQBegin(FCEU_IQEXT);IRQCount=IRQLatch;}
+     if(acount>=ACBOO) goto doagainbub;
     }
  }
 }
@@ -97,7 +135,7 @@ void Mapper85_StateRestore(int version)
 {
  int x;
 
- if(version<72)
+ if(version<7200)
  {
   for(x=0;x<8;x++)
    mapbyte3[x]=CHRBankList[x];
@@ -111,22 +149,37 @@ void Mapper85_StateRestore(int version)
  for(x=0;x<3;x++)
   setprg8(0x8000+x*8192,mapbyte2[x]);
  DaMirror(mapbyte2[3]);
- LoadOPL();
+ //LoadOPL();
 }
 
 static void M85SC(void)
 {
-  KillOPL();
+ if(VRC7Sound)
+  OPLL_set_rate(VRC7Sound, FSettings.SndRate);
 }
 
-void VRC7_ESI(void)
+static void M85SKill(void)
+{
+ if(VRC7Sound)
+  OPLL_delete(VRC7Sound);
+ VRC7Sound=NULL;
+}
+
+static void VRC7SI(void)
+{
+  GameExpSound.RChange=M85SC;
+  GameExpSound.Kill=M85SKill;
+
+  VRC7Sound=OPLL_new(3579545, FSettings.SndRate?FSettings.SndRate:44100);
+  OPLL_reset(VRC7Sound);
+  OPLL_reset(VRC7Sound);
+}
+
+void NSFVRC7_Init(void)
 {
-   if(FSettings.SndRate)
-   {
     SetWriteHandler(0x9010,0x901F,Mapper85_write);
     SetWriteHandler(0x9030,0x903F,Mapper85_write);
-   }
-   GameExpSound.RChange=M85SC;
+    VRC7SI();
 }
 
 void Mapper85_init(void)
@@ -134,10 +187,9 @@ void Mapper85_init(void)
   MapIRQHook=KonamiIRQHook;
   SetWriteHandler(0x8000,0xffff,Mapper85_write);
   GameStateRestore=Mapper85_StateRestore;
-  VRC7_ESI();
   if(!VROM_size)
    SetupCartCHRMapping(0, CHRRAM, 8192, 1);
-  AddExState(VRC7Instrument, 16, 0, "VC7I");
-  AddExState(VRC7Chan, sizeof(VRC7Chan), 0, "V7CH");
-
+  //AddExState(VRC7Instrument, 16, 0, "VC7I");
+  //AddExState(VRC7Chan, sizeof(VRC7Chan), 0, "V7CH");
+  VRC7SI();
 }