merge mapper code from FCEUX

[fceu.git] / mappers / 40.c

diff --git a/mappers/40.c b/mappers/40.c
index d608de2..9cdc24c 100644 (file)
--- a/mappers/40.c
+++ b/mappers/40.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
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "mapinc.h"
@@ -25,23 +25,22 @@ static DECLFW(Mapper40_write)
 {
  switch(A&0xe000)
  {
-  case 0x8000:IRQa=0;IRQCount=0;break;
+  case 0x8000:IRQa=0;IRQCount=0;X6502_IRQEnd(FCEU_IQEXT);break;
   case 0xa000:IRQa=1;break;
-  case 0xe000:ROM_BANK8(0xc000,V&7);
-              X6502_Rebase();break;
+  case 0xe000:ROM_BANK8(0xc000,V&7);break;
  }
 }
 
-static void FP_FASTAPASS(1) Mapper40IRQ(int a)
+static void Mapper40IRQ(int a)
 {
  if(IRQa)
  {
         if(IRQCount<4096)
-        IRQCount+=a;
-       else
+         IRQCount+=a;
+        else
         {
          IRQa=0;
-         TriggerIRQ();
+         X6502_IRQBegin(FCEU_IQEXT);
         }
  }
 }