More minor consistency changes

This commit is contained in:
Stevoisiak
2015-01-12 22:28:12 -05:00
parent cb86db7b68
commit f31b688cf5
32 changed files with 109 additions and 109 deletions

View File

@ -8,7 +8,7 @@
// DSPCR bits
#define DSPCR_DSPRESET 0x0800 // Reset DSP
#define DSPCR_ARDMA 0x0200 // ARAM dma in progress, if set
#define DSPCR_ARDMA 0x0200 // ARAM DMA in progress, if set
#define DSPCR_DSPINTMSK 0x0100 // * interrupt mask (RW)
#define DSPCR_DSPINT 0x0080 // * interrupt active (RWC)
#define DSPCR_ARINTMSK 0x0040

View File

@ -53,13 +53,13 @@ call 0x8078
lrs $AX0.L, @CMBL
andi $AC0.M, #0x0fff
mrr $AX0.H, $AC0.M
lri $AX1.H, #0x0000 ; DSP-dram addr
lri $AX1.H, #0x0000 ; DSP-DRAM addr
lri $AX1.L, #0x0020 ; length (32 bytes = 16 words, word 9 and 10 are addr where result should DMA'd to in main mem)
lri $IX3, #0x0000 ; there will be no ucode/iram upload
lri $AR0, #do_main ; return addr after dram upload
lri $AR0, #do_main ; return addr after DRAM upload
jmp 0x80bc ; DRAM upload !!
; $AX0.H-$AX0.L - CPU(PPC) addr = mail & 0x0fffffff
; upload data from mainmem to DSP dram and jump to 0x41 after that
; upload data from mainmem to DSP DRAM and jump to 0x41 after that
; ucode addr 0x0041
do_main:
@ -127,7 +127,7 @@ jmp 0x80b5 ; BootUcode()
halt
; does some crazy stuff with data at dram @0x3/0x5/0x6/0x7 with help of some values from drom :)
; does some crazy stuff with data at DRAM @0x3/0x5/0x6/0x7 with help of some values from drom :)
; result is @0x22,@0x23 and written back to main memory to dmem-0x08:dmem-0x09
BigCrazyFunction:
; {
@ -586,9 +586,9 @@ lri $AX1.H, #0x0020 ; DSP addr
call send_back
lri $AX1.L, #0x0008 ; length
call send_back
lri $IX3, #0x0000 ; there will be no iram dma
lri $IX3, #0x0000 ; there will be no iram DMA
call send_back
call 0x808b ; dram->CPU <<<--- important!!
call 0x808b ; DRAM->CPU <<<--- important!!
call send_back
ret
; }

View File

@ -353,7 +353,7 @@ void handle_dsp_mail(void)
}
else if (mail == 0x8888dead)
{
// Send memory dump (DSP dram from someone's cube?)
// Send memory dump (DSP DRAM from someone's GameCube?)
// not really sure why this is important - I guess just to try to keep tests predictable
u16* tmpBuf = (u16 *)MEM_VIRTUAL_TO_PHYSICAL(mem_dump);
@ -363,7 +363,7 @@ void handle_dsp_mail(void)
}
else if (mail == 0x8888beef)
{
// Provide register base to DSP (if using dsp_base.inc, it will dma them to the correct place)
// Provide register base to DSP (if using dsp_base.inc, it will DMA them to the correct place)
while (real_dsp.CheckMailTo());
real_dsp.SendMailTo((u32)dspbufP);
while (real_dsp.CheckMailTo());
@ -385,14 +385,14 @@ void handle_dsp_mail(void)
// ROM dumping mails
else if (mail == 0x8888c0de)
{
// DSP has copied irom to its dram...send address so it can dma it back
// DSP has copied irom to its DRAM...send address so it can dma it back
while (real_dsp.CheckMailTo());
real_dsp.SendMailTo((u32)dspbufP);
while (real_dsp.CheckMailTo());
}
else if (mail == 0x8888da7a)
{
// DSP has copied coef to its dram...send address so it can dma it back
// DSP has copied coef to its DRAM...send address so it can DMA it back
while (real_dsp.CheckMailTo());
real_dsp.SendMailTo((u32)&dspbufP[0x1000]);
while (real_dsp.CheckMailTo());
@ -525,7 +525,7 @@ void InitGeneral()
#endif
// Obtain the preferred video mode from the system
// This will correspond to the settings in the Wii menu
// This will correspond to the settings in the Wii Menu
rmode = VIDEO_GetPreferredMode(nullptr);
// Allocate memory for the display in the uncached region