Merge remote-tracking branch 'origin/master' into Android-trash

Conflicts:
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

1 files changed, 18 insertions, 18 deletions

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
index 2118728cd8..1cdc76194f 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 
@@ -35,8 +35,8 @@ namespace SWPixelEngine
 
 enum
 {
-    INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-    INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
+	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
+	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
 };
 
 // STATE_TO_SAVE
@@ -50,7 +50,7 @@ static int et_SetFinishOnMainThread;
 
 void DoState(PointerWrap &p)
 {
-    p.DoPOD(pereg);
+	p.DoPOD(pereg);
 	p.Do(g_bSignalTokenInterrupt);
 	p.Do(g_bSignalFinishInterrupt);
 	p.Do(et_SetTokenOnMainThread);
@@ -64,10 +64,10 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate);
 
 void Init()
 {
-    memset(&pereg, 0, sizeof(pereg));
+	memset(&pereg, 0, sizeof(pereg));
 
-    et_SetTokenOnMainThread = false;
-    g_bSignalFinishInterrupt = false;
+	et_SetTokenOnMainThread = false;
+	g_bSignalFinishInterrupt = false;
 
 	et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
 	et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
@@ -77,10 +77,10 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 {
 	DEBUG_LOG(PIXELENGINE, "(r16): 0x%08x", _iAddress);
 
-    u16 address = _iAddress & 0xFFF;
+	u16 address = _iAddress & 0xFFF;
 
-    if (address <= 0x2e)
-        _uReturnValue = ((u16*)&pereg)[address >> 1];
+	if (address <= 0x2e)
+		_uReturnValue = ((u16*)&pereg)[address >> 1];
 }
 
 void Write32(const u32 _iValue, const u32 _iAddress)
@@ -92,7 +92,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 {
 	u16 address = _iAddress & 0xFFF;
 
-    switch (address)
+	switch (address)
 	{
 	case PE_CTRL_REGISTER:	
 		{
@@ -101,7 +101,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 			if (tmpCtrl.PEToken)	g_bSignalTokenInterrupt = false;
 			if (tmpCtrl.PEFinish)	g_bSignalFinishInterrupt = false;
 
-            pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable;
+			pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable;
 			pereg.ctrl.PEFinishEnable = tmpCtrl.PEFinishEnable;
 			pereg.ctrl.PEToken = 0;		// this flag is write only
 			pereg.ctrl.PEFinish = 0;	// this flag is write only
@@ -112,7 +112,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 		break;
 	default:
 		if (address <= 0x2e)
-            ((u16*)&pereg)[address >> 1] = _iValue;    
+			((u16*)&pereg)[address >> 1] = _iValue;
 		break;
 	}
 }
@@ -125,13 +125,13 @@ bool AllowIdleSkipping()
 void UpdateInterrupts()
 {
 	// check if there is a token-interrupt
-    if (g_bSignalTokenInterrupt	& pereg.ctrl.PETokenEnable)
-        ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true);
+	if (g_bSignalTokenInterrupt	& pereg.ctrl.PETokenEnable)
+		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true);
 	else
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, false);
 
 	// check if there is a finish-interrupt
-    if (g_bSignalFinishInterrupt & pereg.ctrl.PEFinishEnable)
+	if (g_bSignalFinishInterrupt & pereg.ctrl.PEFinishEnable)
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, true);
 	else
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, false);
@@ -142,7 +142,7 @@ void UpdateInterrupts()
 void SetToken_OnMainThread(u64 userdata, int cyclesLate)
 {
 	g_bSignalTokenInterrupt = true;
-    INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", pereg.token);
+	INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", pereg.token);
 	UpdateInterrupts();
 }
 
@@ -157,7 +157,7 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
 void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
 {
 	pereg.token = _token;
-    if (_bSetTokenAcknowledge) // set token INT
+	if (_bSetTokenAcknowledge) // set token INT
 	{
 		CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread,
 			_token | (_bSetTokenAcknowledge << 16));