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

some cleanup 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1303 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-26 17:16:54 +00:00
parent 1580d6ecf1
commit d0cd722e81
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/HW/CommandProcessor.cpp
View File

@ -377,7 +377,7 @@ void Write16(const u16 _Value, const u32 _Address)
" - The good news is, the time you read that message, the fifo should be empty now :p\n" " - The good news is, the time you read that message, the fifo should be empty now :p\n"
" - Anyway, fifo flush will be forced if you press OK and dolphin might continue to work...\n" " - Anyway, fifo flush will be forced if you press OK and dolphin might continue to work...\n"
" - We aren't betting on that :)", fifo.CPReadWriteDistance); " - We aren't betting on that :)", fifo.CPReadWriteDistance);
/**/ */
LOG(COMMANDPROCESSOR, "*********************** GXSetGPFifo very soon? ***********************"); LOG(COMMANDPROCESSOR, "*********************** GXSetGPFifo very soon? ***********************");
u32 ct=0; u32 ct=0;
while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance > 0 ) while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance > 0 )
@ -406,7 +406,7 @@ void Write16(const u16 _Value, const u32 _Address)
//fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint; //fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint;
fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint ? true : false; fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint ? true : false;
//LOG(COMMANDPROCESSOR,"fifo.bFF_Breakpoint : %i",fifo.bFF_Breakpoint); //LOG(COMMANDPROCESSOR,"fifo.bFF_Breakpoint : %i",fifo.bFF_Breakpoint);
/**/ */
// update interrupts // update interrupts
UpdateInterrupts(); UpdateInterrupts();
@ -449,7 +449,7 @@ void Write16(const u16 _Value, const u32 _Address)
m_CPStatusReg.Breakpoint = 0; m_CPStatusReg.Breakpoint = 0;
InterlockedExchange((LONG*)&fifo.bFF_Breakpoint, 0); InterlockedExchange((LONG*)&fifo.bFF_Breakpoint, 0);
} }
}/**/ }*/
m_CPCtrlReg.Hex = tmpCtrl.Hex; m_CPCtrlReg.Hex = tmpCtrl.Hex;
UpdateInterrupts(); UpdateInterrupts();
LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value); LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value);
@ -617,7 +617,7 @@ void GatherPipeBursted()
LOG(COMMANDPROCESSOR, "(GatherPipeBursted): CPHiWatermark reached"); LOG(COMMANDPROCESSOR, "(GatherPipeBursted): CPHiWatermark reached");
// Wait for GPU to catch up // Wait for GPU to catch up
while (!(fifo.bFF_BPEnable && fifo.bFF_Breakpoint) && fifo.CPReadWriteDistance > (s32)fifo.CPLoWatermark) while (!(fifo.bFF_BPEnable && fifo.bFF_Breakpoint) && fifo.CPReadWriteDistance > fifo.CPLoWatermark)
{ {
ct++; ct++;
// dunno if others threads (like the audio thread) really need a forced context switch here // dunno if others threads (like the audio thread) really need a forced context switch here

12
Source/Core/DiscIO/Src/BannerLoaderWii.cpp
View File

@ -75,7 +75,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
{ {
if (!IsValid()) if (!IsValid())
{ {
return(false); return false;
} }
SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
@ -93,7 +93,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
} }
return(true); return true;
} }
std::string std::string
@ -126,15 +126,15 @@ CBannerLoaderWii::GetName(std::string& _rName, int language)
return true; return true;
} }
_rName = m_Name; return true;
return(true);
} }
bool bool
CBannerLoaderWii::GetCompany(std::string& _rCompany) CBannerLoaderWii::GetCompany(std::string& _rCompany)
{ {
return(false); _rCompany = "N/A";
return true;
} }
@ -150,7 +150,7 @@ CBannerLoaderWii::GetDescription(std::string& _rDescription)
return true; return true;
} }
return(false); return false;
} }

2
Source/Core/DiscIO/Src/BannerLoaderWii.h
View File

@ -66,8 +66,6 @@ class CBannerLoaderWii
int lut4to8[16]; int lut4to8[16];
int lut5to8[32]; int lut5to8[32];
std::string m_Name;
u8* m_pBannerFile; u8* m_pBannerFile;
bool m_IsValid; bool m_IsValid;