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

included wifi.c/h into builds

This commit is contained in:
mightymax 2007-01-13 10:17:16 +00:00
parent 76a44178c2
commit 9326265fab
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
desmume/src/MMU.c
View File

@ -29,6 +29,7 @@
#include "NDSSystem.h" #include "NDSSystem.h"
#include "cflash.h" #include "cflash.h"
#include "cp15.h" #include "cp15.h"
#include "wifi.h"
#include "registers.h" #include "registers.h"
@ -634,6 +635,10 @@ u16 FASTCALL MMU_read16(u32 proc, u32 adr)
if ((adr>=0x08800000)&&(adr<0x09900000)) if ((adr>=0x08800000)&&(adr<0x09900000))
return (unsigned short)cflash_read(adr); return (unsigned short)cflash_read(adr);
/* wifi mac access */
if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
return WIFI_read16(&wifiMac,adr) ;
adr &= 0x0FFFFFFF; adr &= 0x0FFFFFFF;
if((adr>>24)==4) if((adr>>24)==4)
@ -848,10 +853,10 @@ void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val)
case REG_VRAMCNTD: case REG_VRAMCNTD:
if(proc == ARMCPU_ARM9) if(proc == ARMCPU_ARM9)
{ {
MMU_VRAMWriteBackToLCD(REG_VRAMCNTA) ; MMU_VRAMWriteBackToLCD(0) ;
MMU_VRAMWriteBackToLCD(REG_VRAMCNTB) ; MMU_VRAMWriteBackToLCD(1) ;
MMU_VRAMWriteBackToLCD(REG_VRAMCNTC) ; MMU_VRAMWriteBackToLCD(2) ;
MMU_VRAMWriteBackToLCD(REG_VRAMCNTD) ; MMU_VRAMWriteBackToLCD(3) ;
switch(val & 0x1F) switch(val & 0x1F)
{ {
case 1 : case 1 :
@ -1143,6 +1148,10 @@ void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val)
return; return;
} }
/* wifi mac access */
if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
WIFI_write16(&wifiMac,adr,val) ;
adr &= 0x0FFFFFFF; adr &= 0x0FFFFFFF;
// This is bad, remove it // This is bad, remove it

1
desmume/src/Makefile.am
View File

@ -10,6 +10,7 @@ libdesmume_a_SOURCES = \
FIFO.c FIFO.h \ FIFO.c FIFO.h \
GPU.c GPU.h \ GPU.c GPU.h \
mc.c mc.h \ mc.c mc.h \
wifi.c wifi.h \
MMU.c MMU.h NDSSystem.c NDSSystem.h registers.h \ MMU.c MMU.h NDSSystem.c NDSSystem.h registers.h \
ROMReader.c ROMReader.h \ ROMReader.c ROMReader.h \
saves.c saves.h \ saves.c saves.h \

24
desmume/src/windows/DeSmuME.dev
View File

@ -1,7 +1,7 @@
[Project] [Project]
FileName=DeSmuME.dev FileName=DeSmuME.dev
Name=DeSmuME Name=DeSmuME
UnitCount=68 UnitCount=70
Type=0 Type=0
Ver=1 Ver=1
ObjFiles= ObjFiles=
@ -27,7 +27,7 @@ CustomMakefile=
IncludeVersionInfo=1 IncludeVersionInfo=1
SupportXPThemes=1 SupportXPThemes=1
CompilerSet=0 CompilerSet=0
CompilerSettings=0000000001001000000100 CompilerSettings=00000000010010010000ib
[Unit1] [Unit1]
FileName=..\ROMReader.c FileName=..\ROMReader.c
@ -726,3 +726,23 @@ Priority=1000
OverrideBuildCmd=0 OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit69]
FileName=..\wifi.h
CompileCpp=1
Folder=
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit70]
FileName=..\wifi.c
CompileCpp=1
Folder=
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=