From 38c4130b4b481e5da3274b5c154c99480fc5454d Mon Sep 17 00:00:00 2001 From: CaH4e3 Date: Sun, 22 Mar 2009 18:14:44 +0000 Subject: [PATCH] fixed --- src/boards/199.cpp | 2 ++ src/boards/copyfami_mmc3.cpp | 3 ++- src/boards/mmc3.cpp | 4 ++-- src/boards/mmc3.h | 2 -- src/boards/sheroes.cpp | 3 ++- src/boards/super24.cpp | 3 ++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/boards/199.cpp b/src/boards/199.cpp index 3fe48845..28d130a6 100644 --- a/src/boards/199.cpp +++ b/src/boards/199.cpp @@ -26,6 +26,8 @@ #include "mapinc.h" #include "mmc3.h" +static uint8 *CHRRAM=NULL; // and here too + static void M199PW(uint32 A, uint8 V) { setprg8(A,V); diff --git a/src/boards/copyfami_mmc3.cpp b/src/boards/copyfami_mmc3.cpp index 4dd5eb5d..b1238535 100644 --- a/src/boards/copyfami_mmc3.cpp +++ b/src/boards/copyfami_mmc3.cpp @@ -45,7 +45,8 @@ D6-D0 - Small Page High Address (D6,D5,D4,D3,D2,D1,D0,A11,A10,A9,A8,A7,A6,A5,A4, static uint8 reg[3]; -//static uint8 *CHRRAM=NULL; // already declared in mmc3.h. static != extern +static uint8 *CHRRAM=NULL; // there is no more extern CHRRAM in mmc3.h + // I need chrram here and local static == local static uint32 CHRRAMSIZE; static SFORMAT StateRegs[]= diff --git a/src/boards/mmc3.cpp b/src/boards/mmc3.cpp index 9912119c..f43620e4 100644 --- a/src/boards/mmc3.cpp +++ b/src/boards/mmc3.cpp @@ -28,12 +28,12 @@ #include "mmc3.h" uint8 MMC3_cmd; -uint8 *WRAM; -uint8 *CHRRAM; uint32 CHRRAMSize; uint8 DRegBuf[8]; uint8 EXPREGS[8]; /* For bootleg games, mostly. */ +static uint8 *WRAM; +static uint8 *CHRRAM; static uint8 A000B,A001B; #undef IRQCount diff --git a/src/boards/mmc3.h b/src/boards/mmc3.h index 937f80f8..558f8c3b 100644 --- a/src/boards/mmc3.h +++ b/src/boards/mmc3.h @@ -1,6 +1,4 @@ extern uint8 MMC3_cmd; -extern uint8 *WRAM; -extern uint8 *CHRRAM; extern uint8 EXPREGS[8]; extern uint8 DRegBuf[8]; diff --git a/src/boards/sheroes.cpp b/src/boards/sheroes.cpp index 2bb1ce17..8acd54f2 100644 --- a/src/boards/sheroes.cpp +++ b/src/boards/sheroes.cpp @@ -21,7 +21,8 @@ #include "mapinc.h" #include "mmc3.h" -//static uint8 *CHRRAM; // already declared in mmc3.h. static != extern +static uint8 *CHRRAM; // there is no more extern CHRRAM in mmc3.h + // I need chrram here and local static == local static uint8 tekker; static void MSHCW(uint32 A, uint8 V) diff --git a/src/boards/super24.cpp b/src/boards/super24.cpp index 18ae7457..e5c7a3ba 100644 --- a/src/boards/super24.cpp +++ b/src/boards/super24.cpp @@ -21,7 +21,8 @@ #include "mapinc.h" #include "mmc3.h" -//static uint8 *CHRRAM = NULL; // CHRRAM is already declared in mmc3.h. Besides, static and extern don't really go well together. +static uint8 *CHRRAM = NULL; // there is no more extern CHRRAM in mmc3.h + // I need chrram here and local static == local static int masko8[8]={63,31,15,1,3,0,0,0}; static void Super24PW(uint32 A, uint8 V)