merge mapper code from FCEUX

[fceu.git] / mappers / 17.c

diff --git a/mappers/17.c b/mappers/17.c
index 1e76421..c20bc28 100644 (file)
--- a/mappers/17.c
+++ b/mappers/17.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,22 +15,21 @@
  *
  * 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"
 
 
 
-static void FP_FASTAPASS(1) FFEIRQHook(int a)
+static void FFEIRQHook(int a)
 {
   if(IRQa)
   {
    IRQCount+=a;
-
    if(IRQCount>=0x10000)
    {
-    TriggerIRQ();
+    X6502_IRQBegin(FCEU_IQEXT);
     IRQa=0;
     IRQCount=0;
    }
@@ -42,24 +41,20 @@ DECLFW(Mapper17_write)
 {
         switch(A){
         default:
-                  break;
+                   break;
         case 0x42FE:
                    onemir((V>>4)&1);
                    break;
         case 0x42FF:
                    MIRROR_SET((V>>4)&1);
-                  break;
-        case 0x4501:IRQa=V&1;break;
+                   break;
+        case 0x4501:IRQa=0;X6502_IRQEnd(FCEU_IQEXT);break;
         case 0x4502:IRQCount&=0xFF00;IRQCount|=V;break;
         case 0x4503:IRQCount&=0x00FF;IRQCount|=V<<8;IRQa=1;break;
-        case 0x4504: ROM_BANK8(0x8000,V);
-                     X6502_Rebase();break;
-        case 0x4505: ROM_BANK8(0xA000,V);
-                     X6502_Rebase();break;
-        case 0x4506: ROM_BANK8(0xC000,V);
-                     X6502_Rebase();break;
-        case 0x4507: ROM_BANK8(0xE000,V);
-                     X6502_Rebase();break;
+        case 0x4504: ROM_BANK8(0x8000,V);break;
+        case 0x4505: ROM_BANK8(0xA000,V);break;
+        case 0x4506: ROM_BANK8(0xC000,V);break;
+        case 0x4507: ROM_BANK8(0xE000,V);break;
         case 0x4510: VROM_BANK1(0x0000,V);break;
         case 0x4511: VROM_BANK1(0x0400,V);break;
         case 0x4512: VROM_BANK1(0x0800,V);break;