X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=boards%2Fsuper24.c;h=205c8d2cc3cc061f2db83d4ba3af4d24a24e2e6c;hp=4265b5c76dea86dbd8acc27c420c5d62b9bcbd9e;hb=e2d0dd92bfad989cce4270fc0ac5a712476c7c50;hpb=971a1d07d2f5b5a6f991ed5712275c04b933734f

diff --git a/boards/super24.c b/boards/super24.c
index 4265b5c..205c8d2 100644
--- a/boards/super24.c
+++ b/boards/super24.c
@@ -1,141 +1,99 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2005 CaH4e3
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint8 *CHRRAM = NULL;
-static uint8 resetmode;
-static int masko8[8]={63,31,15,1,3,0,0,0};
-
-static void Super24PW(uint32 A, uint8 V)
-{
- uint32 NV=V&masko8[EXPREGS[0]&7];
- NV|=(EXPREGS[1]<<1);
- setprg8r((NV>>6)&0xF,A,NV);
-}
-
-static void Super24CW(uint32 A, uint8 V)
-{
- if(EXPREGS[0]&0x20)
-  setchr1r(0x10,A,V);
- else
- {
-  uint32 NV=V|(EXPREGS[2]<<3);
-  setchr1r((NV>>9)&0xF,A,NV);
- }
-}
-
-static DECLFW(Super24Write)
-{
- switch(A)
- {
-  case 0x5FF0: EXPREGS[0]=V;
-               FixMMC3PRG(MMC3_cmd);
-               FixMMC3CHR(MMC3_cmd);
-               break;
-  case 0x5FF1: EXPREGS[1]=V;
-               FixMMC3PRG(MMC3_cmd);
-               break;
-  case 0x5FF2: EXPREGS[2]=V;
-               FixMMC3CHR(MMC3_cmd);
-               break;
- }
-}
-
-static DECLFW(Super24IRQ)
-{
-  switch(A&0xE001)
-  {
-    case 0xc000: IRQLatch=V;
-                 if(resetmode==1)
-                   IRQCount=IRQLatch;
-                 break;
-    case 0xc001: resetmode=1;
-                 IRQCount=IRQLatch;
-                 break;
-    case 0xE000: IRQa=0;
-                 X6502_IRQEnd(FCEU_IQEXT);
-                 if(resetmode==1)
-                   IRQCount=IRQLatch;
-                 break;
-    case 0xE001: IRQa=1;
-                 if(resetmode==1)
-                   IRQCount=IRQLatch;
-                 break;
-  }
-}
-
-static void Super24HB(void)
-{
-  resetmode=0;
-  if(IRQCount!=0)
-  {
-    IRQCount--;
-    if(IRQCount==0)
-    {
-      if(IRQa)
-      {
-        resetmode=1;
-        X6502_IRQBegin(FCEU_IQEXT);
-      }
-    }
-  }
-}
-
-static void Super24Power(void)
-{
- EXPREGS[0]=0x24;
- EXPREGS[1]=159;
- EXPREGS[2]=0;
- GenMMC3Power();
- SetWriteHandler(0x5000,0x7FFF,Super24Write);
- SetWriteHandler(0xC000,0xFFFF,Super24IRQ);
- SetReadHandler(0x8000,0xFFFF,CartBR);
-}
-
-static void Super24Reset(void)
-{
- EXPREGS[0]=0x24;
- EXPREGS[1]=159;
- EXPREGS[2]=0;
- MMC3RegReset();
-}
-
-static void Super24Close(void)
-{
- if(CHRRAM)
-  FCEU_gfree(CHRRAM);
- CHRRAM = NULL;
-}
-
-void Super24_Init(CartInfo *info)
-{
- info->Power=Super24Power;
- info->Reset=Super24Reset;
- info->Close=Super24Close;
- cwrap=Super24CW;
- pwrap=Super24PW;
-  CHRRAM=(uint8*)FCEU_gmalloc(8192);
- SetupCartCHRMapping(0x10, CHRRAM, 8192, 1);
- GameHBIRQHook=Super24HB;
- AddExState(CHRRAM, 8192, 0, "CHRR");
- AddExState(EXPREGS, 3, 0, "BIG2");
-}
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2005 CaH4e3
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+//static uint8 *CHRRAM = NULL;
+static int masko8[8]={63,31,15,1,3,0,0,0};
+
+static void Super24PW(uint32 A, uint8 V)
+{
+  uint32 NV=V&masko8[EXPREGS[0]&7];
+  NV|=(EXPREGS[1]<<1);
+  setprg8r((NV>>6)&0xF,A,NV);
+}
+
+static void Super24CW(uint32 A, uint8 V)
+{
+  if(EXPREGS[0]&0x20)
+    setchr1r(0x10,A,V);
+  else
+  {
+    uint32 NV=V|(EXPREGS[2]<<3);
+    setchr1r((NV>>9)&0xF,A,NV);
+  }
+}
+
+static DECLFW(Super24Write)
+{
+  switch(A)
+  {
+    case 0x5FF0: EXPREGS[0]=V;
+                 FixMMC3PRG(MMC3_cmd);
+                 FixMMC3CHR(MMC3_cmd);
+                 break;
+    case 0x5FF1: EXPREGS[1]=V;
+                 FixMMC3PRG(MMC3_cmd);
+                 break;
+    case 0x5FF2: EXPREGS[2]=V;
+                 FixMMC3CHR(MMC3_cmd);
+                 break;
+  }
+}
+
+static void Super24Power(void)
+{
+  EXPREGS[0]=0x24;
+  EXPREGS[1]=159;
+  EXPREGS[2]=0;
+  GenMMC3Power();
+  SetWriteHandler(0x5000,0x7FFF,Super24Write);
+  SetReadHandler(0x8000,0xFFFF,CartBR);
+}
+
+static void Super24Reset(void)
+{
+  EXPREGS[0]=0x24;
+  EXPREGS[1]=159;
+  EXPREGS[2]=0;
+  MMC3RegReset();
+}
+
+static void Super24Close(void)
+{
+  if(CHRRAM)
+    FCEU_gfree(CHRRAM);
+  CHRRAM = NULL;
+}
+
+void Super24_Init(CartInfo *info)
+{
+  GenMMC3_Init(info, 128, 256, 0, 0);
+  info->Power=Super24Power;
+  info->Reset=Super24Reset;
+  info->Close=Super24Close;
+  cwrap=Super24CW;
+  pwrap=Super24PW;
+  CHRRAM=(uint8*)FCEU_gmalloc(8192);
+  SetupCartCHRMapping(0x10, CHRRAM, 8192, 1);
+  AddExState(CHRRAM, 8192, 0, "CHRR");
+  AddExState(EXPREGS, 3, 0, "BIG2");
+}