libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2024-11-29 04:10:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fixed an assert in the first time wizard and added a note about the portable.ini

Browse Source 
- Removed some more Console messages
- Changed the SIF struct "free" function to "sif_free" to avoid confusing the debug malloc libs

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4372 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-02-26 19:02:25 +00:00
parent 7197a839d5
commit 2e04d9c6af
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Sif.h
View File

@ -42,7 +42,7 @@ struct sifFifo
s32 writePos;
s32 size;
s32 free()
s32 sif_free()
{
return FIFO_SIF_W - size;
}

6
pcsx2/Sif0.cpp
View File

@ -65,7 +65,7 @@ static __fi bool WriteFifoToEE()
static __fi bool WriteIOPtoFifo()
{
// There's some data ready to transfer into the fifo..
const int writeSize = min(sif0.iop.counter, sif0.fifo.free());
const int writeSize = min(sif0.iop.counter, sif0.fifo.sif_free());
SIF_LOG("Write IOP to Fifo: +++++++++++ %lX of %lX", writeSize, sif0.iop.counter);
@ -276,7 +276,7 @@ static __fi void HandleIOPTransfer()
else
{
// Write IOP to Fifo.
if (sif0.fifo.free() > 0)
if (sif0.fifo.sif_free() > 0)
{
WriteIOPtoFifo();
}
@ -304,7 +304,7 @@ __fi void SIF0Dma()
if (sif0.iop.busy)
{
if(sif0.fifo.free() > 0 || (sif0.iop.end == true && sif0.iop.counter == 0))
if(sif0.fifo.sif_free() > 0 || (sif0.iop.end == true && sif0.iop.counter == 0))
{
BusyCheck++;
HandleIOPTransfer();

6
pcsx2/Sif1.cpp
View File

@ -38,7 +38,7 @@ static __fi bool WriteEEtoFifo()
// There's some data ready to transfer into the fifo..
SIF_LOG("Sif 1: Write EE to Fifo");
const int writeSize = min((s32)sif1dma.qwc, sif1.fifo.free() >> 2);
const int writeSize = min((s32)sif1dma.qwc, sif1.fifo.sif_free() >> 2);
tDMA_TAG *ptag;
@ -242,7 +242,7 @@ static __fi void HandleEETransfer()
}
else
{
if (sif1.fifo.free() > 0)
if (sif1.fifo.sif_free() > 0)
{
WriteEEtoFifo();
}
@ -297,7 +297,7 @@ __fi void SIF1Dma()
if (sif1.ee.busy)
{
if(sif1.fifo.free() > 0 || (sif1.ee.end == true && sif1dma.qwc == 0))
if(sif1.fifo.sif_free() > 0 || (sif1.ee.end == true && sif1dma.qwc == 0))
{
BusyCheck++;
HandleEETransfer();

2
pcsx2/gui/AppConfig.cpp
View File

@ -1110,7 +1110,7 @@ void AppSaveSettings()
return;
}
Console.WriteLn("Saving ini files...");
//Console.WriteLn("Saving ini files...");
SaveUiSettings();
SaveVmSettings();

9
pcsx2/gui/AppUserMode.cpp
View File

@ -56,7 +56,7 @@ static wxFileName GetPortableIniPath()
static wxString GetMsg_PortableModeRights()
{
return pxE( "!Error:PortableModeRights",
return pxE( "!Notice:PortableModeRights",
L"Please ensure that these folders are created and that your user account is granted "
L"write permissions to them -- or re-run PCSX2 with elevated (administrator) rights, which "
L"should grant PCSX2 the ability to create the necessary folders itself. If you "
@ -177,7 +177,12 @@ wxConfigBase* Pcsx2App::TestForPortableInstall()
break;
case pxID_CUSTOM:
// Pretend like the portable ini was never found!
wxDialogWithHelpers dialog2( NULL, AddAppName(_("%s is switching to local install mode.")) );
dialog2 += dialog2.Heading( _("Try to remove the file called \"portable.ini\" from your installation directory manually." ) );
dialog2 += 6;
pxIssueConfirmation( dialog2, MsgButtons().OK() );
conf_portable.DetachPtr(); // Not sure but can't hurt
return NULL;
}

2
pcsx2/gui/FrameForGS.cpp
View File

@ -246,7 +246,7 @@ void GSPanel::OnLeftDclick(wxMouseEvent& evt)
if( !g_Conf->GSWindow.IsToggleFullscreenOnDoubleClick )
return;
Console.WriteLn("GSPanel::OnDoubleClick: Invoking Fullscreen-Toggle accelerator.");
//Console.WriteLn("GSPanel::OnDoubleClick: Invoking Fullscreen-Toggle accelerator.");
DirectKeyCommand(FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL);
}