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

Forgot to remove a couple debug lines. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@856 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
mattmenke 2009-03-29 06:48:18 +00:00
parent 8661323a0a
commit 74dcf7d8a9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/api/PadApi.h
View File

@ -69,7 +69,7 @@ EXPORT_C_(s32) PADqueryMtap(u8 port);
// Sets the active pad slot for the specified port. // Sets the active pad slot for the specified port.
// Both numbers are 1-based indices. Should return 0 if there's no // Both numbers are 1-based indices. Should return 0 if there's no
// pad on the specified slot. Even if PADqueryMtap(port) returns 0, // pad on the specified slot. Even if PADqueryMtap(port) returns 0,
// should handle this properly for slot != 1, to so PCSX2 can allow // should handle this properly for slot != 1, so emulator can allow
// Multitap to be enabled/disabled elsewhere. // Multitap to be enabled/disabled elsewhere.
EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot); EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot);

9
pcsx2/Sio.cpp
View File

@ -430,11 +430,9 @@ void SIO_CommandWrite(u8 value,int way) {
return; return;
} }
static int test;
switch (sio.mtapst) switch (sio.mtapst)
{ {
case 0x1: case 0x1:
test = value;
sio.packetsize++; sio.packetsize++;
sio.parp = 1; sio.parp = 1;
SIO_INT(); SIO_INT();
@ -474,6 +472,7 @@ void SIO_CommandWrite(u8 value,int way) {
SIO_INT(); SIO_INT();
return; return;
case 0x21: case 0x21:
// Set pad slot.
sio.packetsize++; sio.packetsize++;
sio.parp++; sio.parp++;
sio.mtapst = 2; sio.mtapst = 2;
@ -492,11 +491,14 @@ void SIO_CommandWrite(u8 value,int way) {
SIO_INT(); SIO_INT();
return; return;
case 0x22: case 0x22:
// Set memcard slot.
sio.packetsize++; sio.packetsize++;
sio.parp++; sio.parp++;
sio.mtapst = 2; sio.mtapst = 2;
switch (sio.CtrlReg&0x2002) { switch (sio.CtrlReg&0x2002) {
case 0x0002: case 0x0002:
// Not sure if these checks are absolutely needed, but
// prefer to be safe.
if (IsMtapPresent(1)) if (IsMtapPresent(1))
sio.activeMemcardSlot[0] = value; sio.activeMemcardSlot[0] = value;
break; break;
@ -626,6 +628,9 @@ void InitializeSIO(u8 value)
if( sio.activeMemcardSlot[mcidx] ) if( sio.activeMemcardSlot[mcidx] )
{ {
// Might want to more agressively declare a card's non-existence here.
// As non-zero slots always report a failure, and have to read
// the FAT before writing, think this should be fine.
sio2.packet.recvVal1 = 0x1D100; sio2.packet.recvVal1 = 0x1D100;
PAD_LOG( "START MEMCARD[%d][%d] - Only one memcard supported per slot - reported as missing.", sio.GetMemcardIndex(), sio.activeMemcardSlot[mcidx]); PAD_LOG( "START MEMCARD[%d][%d] - Only one memcard supported per slot - reported as missing.", sio.GetMemcardIndex(), sio.activeMemcardSlot[mcidx]);
} }