diff --git a/desmume/src/addons.cpp b/desmume/src/addons.cpp index 22b7ec5b6..bbb2a1991 100644 --- a/desmume/src/addons.cpp +++ b/desmume/src/addons.cpp @@ -2,6 +2,7 @@ yopyop156@ifrance.com yopyop156.ifrance.com + Copyright (C) 2009 CrazyMax Copyright (C) 2009 DeSmuME team This file is part of DeSmuME @@ -18,7 +19,7 @@ You should have received a copy of the GNU General Public License along with DeSmuME; 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 "addons.h" diff --git a/desmume/src/addons.h b/desmume/src/addons.h index 9e18cfe72..19b5905a8 100644 --- a/desmume/src/addons.h +++ b/desmume/src/addons.h @@ -1,24 +1,25 @@ -/* Copyright (C) 2006 yopyop - yopyop156@ifrance.com - yopyop156.ifrance.com - - Copyright (C) 2009 DeSmuME team - - This file is part of DeSmuME - - DeSmuME 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. - - DeSmuME 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 DeSmuME; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/* Copyright (C) 2006 yopyop + yopyop156@ifrance.com + yopyop156.ifrance.com + + Copyright (C) 2009 CrazyMax + Copyright (C) 2009 DeSmuME team + + This file is part of DeSmuME + + DeSmuME 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. + + DeSmuME 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 DeSmuME; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __ADDONS_H__ diff --git a/desmume/src/addons/compactFlash.cpp b/desmume/src/addons/compactFlash.cpp index 01bfbaf2e..68c280690 100644 --- a/desmume/src/addons/compactFlash.cpp +++ b/desmume/src/addons/compactFlash.cpp @@ -2,6 +2,8 @@ yopyop156@ifrance.com yopyop156.ifrance.com + Copyright (C) 2006 Mic + Copyright (C) 2009 CrazyMax Copyright (C) 2009 DeSmuME team This file is part of DeSmuME @@ -18,16 +20,13 @@ You should have received a copy of the GNU General Public License along with DeSmuME; 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 "../addons.h" #include #ifdef EXPERIMENTAL_GBASLOT -#define DEBUG -#define CFLASHDEBUG - #include "debug.h" #include #include @@ -508,7 +507,7 @@ static BOOL cflash_build_fat( void) return TRUE; } -BOOL cflash_init() +static BOOL cflash_init() { if (inited) return FALSE; BOOL init_good = FALSE; @@ -666,7 +665,7 @@ static u16 fread_buffered(int dirent,u32 cluster,u32 offset) return freadBuffer[(offset-bufferStart)>>1]; } -unsigned int cflash_read(unsigned int address) +static unsigned int cflash_read(unsigned int address) { unsigned int ret_value = 0; size_t elems_read = 0; @@ -817,7 +816,7 @@ unsigned int cflash_read(unsigned int address) return ret_value; } -void cflash_write(unsigned int address,unsigned int data) +static void cflash_write(unsigned int address,unsigned int data) { static u8 sector_data[512]; static u32 sector_write_index = 0; @@ -904,7 +903,7 @@ void cflash_write(unsigned int address,unsigned int data) } } -void cflash_close( void) +static void cflash_close( void) { if (!inited) return; if (!CFlashUsePath) @@ -944,73 +943,75 @@ void cflash_close( void) inited = FALSE; } -BOOL CFlash_init(void) +static BOOL CFlash_init(void) { CFlashUseRomPath = TRUE; CFlashUsePath = TRUE; return TRUE; } -void CFlash_reset(void) +static void CFlash_reset(void) { cflash_close(); cflash_init(); } -void CFlash_close(void) + +static void CFlash_close(void) { cflash_close(); } -void CFlash_config(void) + +static void CFlash_config(void) { } -void CFlash_write08(u32 adr, u8 val) +static void CFlash_write08(u32 adr, u8 val) { cflash_write(adr, val); } -void CFlash_write16(u32 adr, u16 val) +static void CFlash_write16(u32 adr, u16 val) { cflash_write(adr, val); } -void CFlash_write32(u32 adr, u32 val) +static void CFlash_write32(u32 adr, u32 val) { cflash_write(adr, val); } -u8 CFlash_read08(u32 adr) +static u8 CFlash_read08(u32 adr) { return (cflash_read(adr)); } -u16 CFlash_read16(u32 adr) +static u16 CFlash_read16(u32 adr) { return (cflash_read(adr)); } -u32 CFlash_read32(u32 adr) +static u32 CFlash_read32(u32 adr) { return (cflash_read(adr)); } -void CFlash_info(char *info) +static void CFlash_info(char *info) { strcpy(info, "Compact Flash memory in slot"); } #else -BOOL CFlash_init(void) { return TRUE; } -void CFlash_reset(void) {} -void CFlash_close(void) {} -void CFlash_config(void){} -void CFlash_write08(u32 adr, u8 val){} -void CFlash_write16(u32 adr, u16 val){} -void CFlash_write32(u32 adr, u32 val){} -u8 CFlash_read08(u32 adr){return (0);} -u16 CFlash_read16(u32 adr){return (0);} -u32 CFlash_read32(u32 adr){return (0);} +static BOOL CFlash_init(void) { return TRUE; } +static void CFlash_reset(void) {} +static void CFlash_close(void) {} +static void CFlash_config(void){} +static void CFlash_write08(u32 adr, u8 val){} +static void CFlash_write16(u32 adr, u16 val){} +static void CFlash_write32(u32 adr, u32 val){} +static u8 CFlash_read08(u32 adr){return (0);} +static u16 CFlash_read16(u32 adr){return (0);} +static u32 CFlash_read32(u32 adr){return (0);} -void CFlash_info(char *info) +static void CFlash_info(char *info) { strcpy(info, "Compact Flash memory in slot"); } @@ -1030,5 +1031,4 @@ ADDONINTERFACE addonCFlash = { CFlash_read32, CFlash_info}; -#undef DEBUG #undef CFLASHDEBUG diff --git a/desmume/src/addons/gbagame.cpp b/desmume/src/addons/gbagame.cpp index 909644002..5823bb3e1 100644 --- a/desmume/src/addons/gbagame.cpp +++ b/desmume/src/addons/gbagame.cpp @@ -2,6 +2,7 @@ yopyop156@ifrance.com yopyop156.ifrance.com + Copyright (C) 2009 CrazyMax Copyright (C) 2009 DeSmuME team This file is part of DeSmuME @@ -18,7 +19,7 @@ You should have received a copy of the GNU General Public License along with DeSmuME; 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 "../addons.h" @@ -26,14 +27,15 @@ #include #include "../MMU.h" -u8 *GBArom = NULL; +static u8 *GBArom = NULL; -BOOL GBAgame_init(void) +static BOOL GBAgame_init(void) { GBArom = new u8 [32 * 1024 * 1024]; return (TRUE); -}; -void GBAgame_reset(void) +} + +static void GBAgame_reset(void) { memset(GBArom, 0, 32 * 1024 * 1024); @@ -54,41 +56,50 @@ void GBAgame_reset(void) } fclose(fgame); -}; -void GBAgame_close(void) +} + +static void GBAgame_close(void) { if (GBArom) { delete [] GBArom; GBArom = NULL; } -}; -void GBAgame_config(void) {} -void GBAgame_write08(u32 adr, u8 val){} -void GBAgame_write16(u32 adr, u16 val) {} -void GBAgame_write32(u32 adr, u32 val) {} -u8 GBAgame_read08(u32 adr) +} + +static void GBAgame_config(void) {} +static void GBAgame_write08(u32 adr, u8 val){} +static void GBAgame_write16(u32 adr, u16 val) {} +static void GBAgame_write32(u32 adr, u32 val) {} + +static u8 GBAgame_read08(u32 adr) { //INFO("Read08 at 0x%08X value 0x%02X\n", adr, (u8)T1ReadByte(GBArom, (adr - 0x08000000))); if ( (adr >= 0x08000004) && (adr < 0x080000A0) ) return MMU.MMU_MEM[0][0xFF][(adr +0x1C) & MMU.MMU_MASK[0][0xFF]]; return (u8)T1ReadByte(GBArom, (adr - 0x08000000)); } -u16 GBAgame_read16(u32 adr) + +static u16 GBAgame_read16(u32 adr) { //INFO("Read16 at 0x%08X value 0x%04X\n", adr, (u16)T1ReadWord(GBArom, (adr - 0x08000000))); if ( (adr >= 0x08000004) && (adr < 0x080000A0) ) return T1ReadWord(MMU.MMU_MEM[0][0xFF], (adr +0x1C) & MMU.MMU_MASK[0][0xFF]); return (u16)T1ReadWord(GBArom, (adr - 0x08000000)); } -u32 GBAgame_read32(u32 adr) + +static u32 GBAgame_read32(u32 adr) { //INFO("Read32 at 0x%08X value 0x%08X\n", adr, (u32)T1ReadLong(GBArom, (adr - 0x08000000))); if ( (adr >= 0x08000004) && (adr < 0x080000A0) ) return T1ReadLong(MMU.MMU_MEM[0][0xFF], (adr +0x1C) & MMU.MMU_MASK[0][0xFF]); return (u32)T1ReadLong(GBArom, (adr - 0x08000000)); } -void GBAgame_info(char *info) { strcpy(info, "GBA game in slot"); }; + +static void GBAgame_info(char *info) +{ + strcpy(info, "GBA game in slot"); +} ADDONINTERFACE addonGBAgame = { "GBA game", diff --git a/desmume/src/addons/none.cpp b/desmume/src/addons/none.cpp index 423a2eb1e..cd0605d72 100644 --- a/desmume/src/addons/none.cpp +++ b/desmume/src/addons/none.cpp @@ -2,6 +2,7 @@ yopyop156@ifrance.com yopyop156.ifrance.com + Copyright (C) 2009 CrazyMax Copyright (C) 2009 DeSmuME team This file is part of DeSmuME @@ -18,23 +19,23 @@ You should have received a copy of the GNU General Public License along with DeSmuME; 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 "../addons.h" #include -BOOL None_init(void) { return (TRUE); }; -void None_reset(void) {}; -void None_close(void) {}; -void None_config(void) {}; -void None_write08(u32 adr, u8 val) {}; -void None_write16(u32 adr, u16 val) {}; -void None_write32(u32 adr, u32 val) {}; -u8 None_read08(u32 adr){ return (0); }; -u16 None_read16(u32 adr){ return (0); }; -u32 None_read32(u32 adr){ return (0); }; -void None_info(char *info) { strcpy(info, "Nothing in GBA slot"); }; +static BOOL None_init(void) { return (TRUE); } +static void None_reset(void) {} +static void None_close(void) {} +static void None_config(void) {} +static void None_write08(u32 adr, u8 val) {} +static void None_write16(u32 adr, u16 val) {} +static void None_write32(u32 adr, u32 val) {} +static u8 None_read08(u32 adr){ return (0); } +static u16 None_read16(u32 adr){ return (0); } +static u32 None_read32(u32 adr){ return (0); } +static void None_info(char *info) { strcpy(info, "Nothing in GBA slot"); } ADDONINTERFACE addonNone = { "NONE", diff --git a/desmume/src/addons/rumblepak.cpp b/desmume/src/addons/rumblepak.cpp index 7f4b93f81..19274df89 100644 --- a/desmume/src/addons/rumblepak.cpp +++ b/desmume/src/addons/rumblepak.cpp @@ -2,6 +2,7 @@ yopyop156@ifrance.com yopyop156.ifrance.com + Copyright (C) 2009 CrazyMax Copyright (C) 2009 DeSmuME team This file is part of DeSmuME @@ -18,7 +19,7 @@ You should have received a copy of the GNU General Public License along with DeSmuME; 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 "../addons.h" @@ -28,21 +29,21 @@ void (*FeedbackON)(BOOL enable) = NULL; -BOOL RumblePak_init(void) { return (TRUE); }; +static BOOL RumblePak_init(void) { return (TRUE); } -void RumblePak_reset(void) +static void RumblePak_reset(void) { -}; +} -void RumblePak_close(void) {}; +static void RumblePak_close(void) {} -void RumblePak_config(void) {}; +static void RumblePak_config(void) {} -void RumblePak_write08(u32 adr, u8 val) +static void RumblePak_write08(u32 adr, u8 val) { -}; +} -void RumblePak_write16(u32 adr, u16 val) +static void RumblePak_write16(u32 adr, u16 val) { if (!FeedbackON) return; @@ -52,31 +53,34 @@ void RumblePak_write16(u32 adr, u16 val) FeedbackON(val); if (adr == 0x08001000) FeedbackON(val); -}; +} -void RumblePak_write32(u32 adr, u32 val) +static void RumblePak_write32(u32 adr, u32 val) { -}; +} -u8 RumblePak_read08(u32 adr) +static u8 RumblePak_read08(u32 adr) { return (0); -}; +} -u16 RumblePak_read16(u32 adr) +static u16 RumblePak_read16(u32 adr) { u16 val = ( (adr & 0x1FFFF) >> 1 ) & 0xFFFD; if (adr == 0x0801FFFE) val = 0x005D; // hack!!! anybody have docs for RumblePak? return ((u16)val); -}; +} -u32 RumblePak_read32(u32 adr) +static u32 RumblePak_read32(u32 adr) { return (0); -}; +} -void RumblePak_info(char *info) { strcpy(info, "NDS Rumble Pak (need joystick)"); }; +static void RumblePak_info(char *info) +{ + strcpy(info, "NDS Rumble Pak (need joystick with Feedback)"); +} ADDONINTERFACE addonRumblePak = { "Rumble Pak",