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

fixed write to window registers

This commit is contained in:
mightymax 2007-01-10 23:01:25 +00:00
parent defa6952f8
commit ea38d6c3da
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/GPU.h
View File

@ -214,6 +214,11 @@ typedef union windowcnt_t
/*13*/ unsigned WIN1_Effect_Enable:1; /*13*/ unsigned WIN1_Effect_Enable:1;
/*14*/ unsigned :2; /*14*/ unsigned :2;
} bitfield ; } bitfield ;
struct
{
unsigned char low ;
unsigned char high ;
} bytes ;
unsigned short val ; unsigned short val ;
} windowcnt_t ; } windowcnt_t ;
@ -528,7 +533,9 @@ void GPU_setWINDOW_XDIM_Component(GPU *gpu, u8 v, u8 num) ;
void GPU_setWINDOW_YDIM_Component(GPU *gpu, u8 v, u8 num) ; void GPU_setWINDOW_YDIM_Component(GPU *gpu, u8 v, u8 num) ;
void GPU_setWINDOW_INCNT(GPU *gpu, u16 v) ; void GPU_setWINDOW_INCNT(GPU *gpu, u16 v) ;
void GPU_setWINDOW_INCNT(GPU *gpu, u16 v) ; void GPU_setWINDOW_OUTCNT(GPU *gpu, u16 v) ;
void GPU_setWINDOW_INCNT_Component(GPU *gpu, u8 v,u8 num) ;
void GPU_setWINDOW_OUTCNT_Component(GPU *gpu, u8 v,u8 num) ;
void GPU_setMASTER_BRIGHT (GPU *gpu, u16 v); void GPU_setMASTER_BRIGHT (GPU *gpu, u16 v);

46
desmume/src/MMU.c
View File

@ -803,6 +803,30 @@ void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val)
case REG_DISPB_WIN1V+1: case REG_DISPB_WIN1V+1:
GPU_setWINDOW_YDIM_Component(SubScreen.gpu,val,3) ; GPU_setWINDOW_YDIM_Component(SubScreen.gpu,val,3) ;
break ; break ;
case REG_DISPA_WININ:
GPU_setWINDOW_INCNT_Component(MainScreen.gpu,val,0) ;
break ;
case REG_DISPA_WININ+1:
GPU_setWINDOW_INCNT_Component(MainScreen.gpu,val,1) ;
break ;
case REG_DISPA_WINOUT:
GPU_setWINDOW_OUTCNT_Component(MainScreen.gpu,val,0) ;
break ;
case REG_DISPA_WINOUT+1:
GPU_setWINDOW_OUTCNT_Component(MainScreen.gpu,val,1) ;
break ;
case REG_DISPB_WININ:
GPU_setWINDOW_INCNT_Component(SubScreen.gpu,val,0) ;
break ;
case REG_DISPB_WININ+1:
GPU_setWINDOW_INCNT_Component(SubScreen.gpu,val,1) ;
break ;
case REG_DISPB_WINOUT:
GPU_setWINDOW_OUTCNT_Component(SubScreen.gpu,val,0) ;
break ;
case REG_DISPB_WINOUT+1:
GPU_setWINDOW_OUTCNT_Component(SubScreen.gpu,val,1) ;
break ;
#ifdef LOG_CARD #ifdef LOG_CARD
case 0x040001A0 : /* TODO (clear): ??? */ case 0x040001A0 : /* TODO (clear): ??? */
case 0x040001A1 : case 0x040001A1 :
@ -1244,6 +1268,18 @@ void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val)
case REG_DISPB_MASTERBRIGHT: case REG_DISPB_MASTERBRIGHT:
GPU_setMASTER_BRIGHT (SubScreen.gpu, val); GPU_setMASTER_BRIGHT (SubScreen.gpu, val);
break; break;
case REG_DISPA_WININ:
GPU_setWINDOW_INCNT(MainScreen.gpu, val) ;
break ;
case REG_DISPA_WINOUT:
GPU_setWINDOW_OUTCNT(MainScreen.gpu, val) ;
break ;
case REG_DISPB_WININ:
GPU_setWINDOW_INCNT(SubScreen.gpu, val) ;
break ;
case REG_DISPB_WINOUT:
GPU_setWINDOW_OUTCNT(SubScreen.gpu, val) ;
break ;
case REG_IME : case REG_IME :
MMU.reg_IME[proc] = val&1; MMU.reg_IME[proc] = val&1;
T1WriteWord(MMU.MMU_MEM[proc][0x40], 0x208, val); T1WriteWord(MMU.MMU_MEM[proc][0x40], 0x208, val);
@ -1746,7 +1782,15 @@ void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val)
//GPULOG("SUB INIT 32B %08X\r\n", val); //GPULOG("SUB INIT 32B %08X\r\n", val);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x1000, val); T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x1000, val);
return; return;
case REG_DISPA_WININ:
GPU_setWINDOW_INCNT(MainScreen.gpu, val & 0xFFFF) ;
GPU_setWINDOW_OUTCNT(MainScreen.gpu, (val >> 16) & 0xFFFF) ;
break ;
case REG_DISPB_WININ:
GPU_setWINDOW_INCNT(SubScreen.gpu, val & 0xFFFF) ;
GPU_setWINDOW_OUTCNT(SubScreen.gpu, (val >> 16) & 0xFFFF) ;
break ;
case REG_IME : case REG_IME :
MMU.reg_IME[proc] = val & 1; MMU.reg_IME[proc] = val & 1;
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x208, val); T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x208, val);