-readded protection of mem region for apploader, should be more

safe now and prolly work even better, hopefully as good as with 
the linker script :P
-readded dsp shudown, some games want to have it so the get it
This commit is contained in:
fix94.1 2012-05-15 22:29:28 +00:00
parent eaa74bb49e
commit c00b684c99
5 changed files with 45 additions and 7 deletions

View File

@ -18,9 +18,6 @@ typedef void (*app_init)(void (*report)(const char *fmt, ...));
typedef void *(*app_final)(); typedef void *(*app_final)();
typedef void (*app_entry)(void (**init)(void (*report)(const char *fmt, ...)), int (**main)(), void *(**final)()); typedef void (*app_entry)(void (**init)(void (*report)(const char *fmt, ...)), int (**main)(), void *(**final)());
/* Apploader pointers */
static u8 *appldr = (u8 *) 0x81200000;
/* Constants */ /* Constants */
#define APPLDR_OFFSET 0x2440 #define APPLDR_OFFSET 0x2440
@ -50,11 +47,15 @@ s32 Apploader_Run(entry_point *entry, u8 vidMode, GXRModeObj *vmode, bool vipatc
/* Calculate apploader length */ /* Calculate apploader length */
appldr_len = buffer[5] + buffer[6]; appldr_len = buffer[5] + buffer[6];
SYS_SetArena1Hi(APPLOADER_END);
/* Read apploader code */ /* Read apploader code */
ret = WDVD_Read(appldr, appldr_len, APPLDR_OFFSET + 0x20); ret = WDVD_Read(APPLOADER_START, appldr_len, APPLDR_OFFSET + 0x20);
if (ret < 0) if (ret < 0)
return ret; return ret;
DCFlushRange(APPLOADER_START, appldr_len);
/* Set apploader entry function */ /* Set apploader entry function */
app_entry appldr_entry = (app_entry)buffer[4]; app_entry appldr_entry = (app_entry)buffer[4];

View File

@ -362,10 +362,9 @@ s32 Disc_BootPartition()
/* Set an appropriate video mode */ /* Set an appropriate video mode */
__Disc_SetVMode(); __Disc_SetVMode();
usleep(100 * 1000);
/* Shutdown IOS subsystems */ /* Shutdown IOS subsystems */
u32 level = IRQ_Disable(); u32 level = IRQ_Disable();
__dsp_shutdown();
__IOS_ShutdownSubsystems(); __IOS_ShutdownSubsystems();
__exception_closeall(); __exception_closeall();

View File

@ -26,6 +26,10 @@ static bool return_to_priiloader = false;
static bool return_to_disable = false; static bool return_to_disable = false;
static bool return_to_bootmii = false; static bool return_to_bootmii = false;
extern void __exception_closeall();
static vu16* const _dspReg = (u16*)0xCC005000;
extern u32 __PADDisableRecalibration(s32 disable);
void __Wpad_PowerCallback() void __Wpad_PowerCallback()
{ {
/* Poweroff console */ /* Poweroff console */
@ -138,3 +142,23 @@ void Sys_LoadMenu(void)
/* Return to the Wii system menu */ /* Return to the Wii system menu */
WII_ReturnToMenu(); //SYS_ResetSystem doesnt work properly with new libogc WII_ReturnToMenu(); //SYS_ResetSystem doesnt work properly with new libogc
} }
void __dsp_shutdown(void)
{
u32 tick;
_dspReg[5] = (DSPCR_DSPRESET|DSPCR_HALT);
_dspReg[27] &= ~0x8000;
while(_dspReg[5]&0x400);
while(_dspReg[5]&0x200);
_dspReg[5] = (DSPCR_DSPRESET|DSPCR_DSPINT|DSPCR_ARINT|DSPCR_AIINT|DSPCR_HALT);
_dspReg[0] = 0;
while((_SHIFTL(_dspReg[2],16,16)|(_dspReg[3]&0xffff))&0x80000000);
tick = gettick();
while((gettick()-tick)<44);
_dspReg[5] |= DSPCR_RES;
while(_dspReg[5]&DSPCR_RES);
}

View File

@ -18,6 +18,17 @@ extern "C" {
#define EXIT_TO_DISABLE 4 #define EXIT_TO_DISABLE 4
#define EXIT_TO_BOOTMII 5 #define EXIT_TO_BOOTMII 5
// DSPCR bits
#define DSPCR_DSPRESET 0x0800 // Reset DSP
#define DSPCR_DSPINT 0x0080 // * interrupt active (RWC)
#define DSPCR_ARINT 0x0020
#define DSPCR_AIINT 0x0008
#define DSPCR_HALT 0x0004 // halt DSP
#define DSPCR_RES 0x0001 // reset DSP
#define _SHIFTL(v, s, w) \
((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
/* Prototypes */ /* Prototypes */
void Sys_Init(void); void Sys_Init(void);
void Sys_LoadMenu(void); void Sys_LoadMenu(void);
@ -25,7 +36,7 @@ extern "C" {
void Sys_Test(void); void Sys_Test(void);
void Sys_Exit(void); void Sys_Exit(void);
void Sys_ExitTo(int); void Sys_ExitTo(int);
void Sys_Shutdown(void); void __dsp_shutdown(void);
void Open_Inputs(void); void Open_Inputs(void);
void Close_Inputs(void); void Close_Inputs(void);

View File

@ -48,6 +48,9 @@ void MEM2_init(unsigned int mem2Size)
{ {
g_mem2gp.init(mem2Size); g_mem2gp.init(mem2Size);
g_mem2gp.clear(); g_mem2gp.clear();
/* Protect space reserved for apploader */
SYS_SetArena1Hi(APPLOADER_START);
} }
void MEM2_cleanup(void) void MEM2_cleanup(void)