ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: 

- fix boot firmware when no cartridge in slot1;
This commit is contained in:
mtabachenko 2013-07-09 07:54:51 +00:00
parent 822cf3d289
commit c97207b8d4
5 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/NDSSystem.cpp
View File

@ -2639,9 +2639,6 @@ void NDS_Reset()
}
// Write the header checksum to memory (the firmware needs it to see the cart)
_MMU_write16<ARMCPU_ARM9>(0x027FF808, T1ReadWord(MMU.CART_ROM, 0x15E));
//--------------------------------
//setup the homebrew argv
//this is useful for nitrofs apps which are emulating themselves via cflash

12
desmume/src/addons/slot1_none.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2010-2012 DeSmuME team
Copyright (C) 2010-2013 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -16,13 +16,19 @@
*/
#include "../slot1.h"
#include "../registers.h"
#include "../MMU.h"
static void slot1_info(char *info) { strcpy(info, "Slot1 no-card emulation"); }
static void slot1_config(void) {}
static BOOL slot1_init() { return (TRUE); }
static void slot1_reset() {}
static void slot1_reset()
{
// Write the header checksum to memory (the firmware needs it to see the cart)
_MMU_write16<ARMCPU_ARM9>(0x027FF808, 0);
}
static void slot1_close() {}
@ -41,6 +47,8 @@ static u16 slot1_read16(u8 PROCNUM, u32 adr)
}
static u32 slot1_read32(u8 PROCNUM, u32 adr)
{
if (adr == REG_GCDATAIN && MMU.dscard[PROCNUM].command[0] == 0xB8)
return 0;
return 0xFFFFFFFF;
}

16
desmume/src/addons/slot1_r4.cpp
View File

@ -1,20 +1,18 @@
/* Copyright (C) 2010-2011 DeSmuME team
/*
Copyright (C) 2010-2013 DeSmuME team
This file is part of DeSmuME
DeSmuME is free software; you can redistribute it and/or modify
This file 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
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,
This file 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
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
#include <time.h>
@ -51,6 +49,8 @@ static BOOL init()
}
static void reset() {
// Write the header checksum to memory (the firmware needs it to see the cart)
_MMU_write16<ARMCPU_ARM9>(0x027FF808, T1ReadWord(MMU.CART_ROM, 0x15E));
init_r4_flash();
}

20
desmume/src/addons/slot1_retail.cpp
View File

@ -1,20 +1,18 @@
/* Copyright (C) 2010-2011 DeSmuME team
/*
Copyright (C) 2010-2013 DeSmuME team
This file is part of DeSmuME
DeSmuME is free software; you can redistribute it and/or modify
This file 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
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,
This file 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
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../slot1.h"
@ -27,7 +25,11 @@ static void config(void) {}
static BOOL init() { return (TRUE); }
static void reset() {}
static void reset()
{
// Write the header checksum to memory (the firmware needs it to see the cart)
_MMU_write16<ARMCPU_ARM9>(0x027FF808, T1ReadWord(MMU.CART_ROM, 0x15E));
}
static void close() {}

20
desmume/src/addons/slot1_retail_nand.cpp
View File

@ -1,20 +1,18 @@
/* Copyright (C) 2011 DeSmuME team
/*
Copyright (C) 2010-2013 DeSmuME team
This file is part of DeSmuME
DeSmuME is free software; you can redistribute it and/or modify
This file 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
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,
This file 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
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../slot1.h"
@ -27,7 +25,11 @@ static void config(void) {}
static BOOL init() { return (TRUE); }
static void reset() {}
static void reset()
{
// Write the header checksum to memory (the firmware needs it to see the cart)
_MMU_write16<ARMCPU_ARM9>(0x027FF808, T1ReadWord(MMU.CART_ROM, 0x15E));
}
static void close() {}