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

Bit more BBA work. Still no idea what I'm doing 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1569 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-12-17 22:55:03 +00:00
parent c0b5aaa995
commit 8e127c38e2
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
View File

@ -35,6 +35,7 @@ CEXIETHERNET::CEXIETHERNET() :
mWriteP = INVALID_P; mWriteP = INVALID_P;
mReadP = INVALID_P; mReadP = INVALID_P;
mReadyToSend = false; mReadyToSend = false;
Activated = false;
mExpectSpecialImmRead = false; mExpectSpecialImmRead = false;
@ -65,10 +66,10 @@ bool CEXIETHERNET::IsInterruptSet()
{ {
return false; return false;
} }
bool isActivated() bool CEXIETHERNET::isActivated()
{ {
// Todo: Return actual check // Todo: Return actual check
return true; return Activated;
} }
inline u8 makemaskb(int start, int end) { inline u8 makemaskb(int start, int end) {
return (u8)_rotl((2 << (end - start)) - 1, 7 - end); return (u8)_rotl((2 << (end - start)) - 1, 7 - end);
@ -128,7 +129,7 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
// Whinecube did nothing else as well // Whinecube did nothing else as well
printf("BBA Reset\n"); printf("BBA Reset\n");
} }
if(RISE(BBA_NCRA_SR) )/*&& isActivated()) */ if(RISE(BBA_NCRA_SR) && isActivated())
{ {
printf("BBA Start Recieve\n"); printf("BBA Start Recieve\n");
//exit(0); //exit(0);
@ -188,6 +189,7 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
}else if(_uSize == 2 && _uData == 0) }else if(_uSize == 2 && _uData == 0)
{ {
// Device ID Request // Device ID Request
// 100% this returns correctly
mSpecialImmData = EXI_DEVTYPE_ETHER; mSpecialImmData = EXI_DEVTYPE_ETHER;
mExpectSpecialImmRead = true; mExpectSpecialImmRead = true;
return; return;
@ -199,6 +201,8 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
mWriteP = (u8)getbitsw(Common::swap32(_uData), 16, 23); mWriteP = (u8)getbitsw(Common::swap32(_uData), 16, 23);
else //size == 2 else //size == 2
mWriteP = (u8)getbitsw(Common::swap32(_uData) & ~0x4000, 16, 23); //Whinecube : Dunno about this... mWriteP = (u8)getbitsw(Common::swap32(_uData) & ~0x4000, 16, 23); //Whinecube : Dunno about this...
// With Size of 4 and data of 0xc0006000 unswapped
// mWriteP will be 0x0060 unswapped and 0x0000 swapped. Which is correct?
if(mWriteP == 0x48) if(mWriteP == 0x48)
{ {
mWriteBuffer.clear(); mWriteBuffer.clear();
@ -216,11 +220,11 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
else if((_uSize == 4 && (_uData & 0xC0000000) == 0x80000000) || (_uSize == 2 && (_uData & 0x4000) == 0x0000)) else if((_uSize == 4 && (_uData & 0xC0000000) == 0x80000000) || (_uSize == 2 && (_uData & 0x4000) == 0x0000))
{ {
printf("Read from BBA register!\n"); printf("Read from BBA register!\n");
u32 SwappedData = Common::swap32(_uData);
// Read from BBA Register! // Read from BBA Register!
if(_uSize == 4) if(_uSize == 4)
{ {
//Holy Fuck that's crazy mReadP = (u32)getbitsw(SwappedData, 8, 23);
mReadP = (u32)getbitsw(_uData, 8, 23);
if(mReadP >= BBAMEM_SIZE) if(mReadP >= BBAMEM_SIZE)
{ {
printf("Illegal BBA address: 0x%04X\n", mReadP); printf("Illegal BBA address: 0x%04X\n", mReadP);
@ -231,7 +235,7 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
} }
else else
{ //size == 2 { //size == 2
mReadP = (u8)getbitsw(_uData, 16, 23); mReadP = (u8)getbitsw(SwappedData, 16, 23);
} }
switch(mReadP) switch(mReadP)
{ {
@ -280,7 +284,9 @@ void CEXIETHERNET::ImmWrite(u32 _uData, u32 _uSize)
u32 CEXIETHERNET::ImmRead(u32 _uSize) u32 CEXIETHERNET::ImmRead(u32 _uSize)
{ {
printf("IMM Read, size 0x%x\n", _uSize); printf("IMM Read, size 0x%x\n", _uSize);
if(mExpectSpecialImmRead) { if(mExpectSpecialImmRead)
{
// 100% that this returns correctly
printf("special IMMRead\n"); printf("special IMMRead\n");
mExpectSpecialImmRead = false; mExpectSpecialImmRead = false;
return mSpecialImmData; return mSpecialImmData;

2
Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
View File

@ -52,6 +52,7 @@ public:
bool IsPresent(); bool IsPresent();
void Update(); void Update();
bool IsInterruptSet(); bool IsInterruptSet();
bool isActivated();
void ImmWrite(u32 _uData, u32 _uSize); void ImmWrite(u32 _uData, u32 _uSize);
u32 ImmRead(u32 _uSize); u32 ImmRead(u32 _uSize);
void DMAWrite(u32 _uAddr, u32 _uSize); void DMAWrite(u32 _uAddr, u32 _uSize);
@ -67,6 +68,7 @@ private:
bool mExpectSpecialImmRead; //reset to false on deselect bool mExpectSpecialImmRead; //reset to false on deselect
u32 mSpecialImmData; u32 mSpecialImmData;
bool Activated;
#define BBAMEM_SIZE 0x1000 #define BBAMEM_SIZE 0x1000
u8 mBbaMem[BBAMEM_SIZE]; u8 mBbaMem[BBAMEM_SIZE];