From 1f48dc380af205c43dce122ef88ee1e5ae2c2fd5 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Mon, 19 Nov 2012 09:25:50 +0100
Subject: [PATCH] gitignore, comments, upgrade native.

---
 .gitignore            |  1 +
 Core/HLE/sceGe.cpp    | 12 ++++++------
 Core/HLE/scePower.cpp | 11 +++++------
 native                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2e96b314a..26cc8297ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ android/ui_atlas.zim
 __testoutput.txt
 __testerror.txt
 ppge_atlas.zim.png
+local.properties
diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp
index 082a6dd4a5..2a8513410e 100644
--- a/Core/HLE/sceGe.cpp
+++ b/Core/HLE/sceGe.cpp
@@ -71,15 +71,17 @@ u32 sceGeListEnQueue(u32 listAddress, u32 stallAddress, u32 callbackId, u32 optP
 	else
 		state = SCE_GE_LIST_COMPLETED;
 
-	DEBUG_LOG(HLE,"List enqueued.");
+	DEBUG_LOG(HLE,"List %i enqueued.", listID);
 	//return display list ID
 	return listID;
 }
 
 u32 sceGeListEnQueueHead(u32 listAddress, u32 stallAddress, u32 callbackId, u32 optParamAddr)
 {
-	if (!stallAddress)
-		stallAddress = listAddress;
+	DEBUG_LOG(HLE,"sceGeListEnQueueHead(addr=%08x, stall=%08x, cbid=%08x, param=%08x)",
+		listAddress,stallAddress,callbackId,optParamAddr);
+	//if (!stallAddress)
+	//	stallAddress = listAddress;
 	u32 listID = gpu->EnqueueList(listAddress,stallAddress);
 	// HACKY
 	if (listID)
@@ -87,9 +89,7 @@ u32 sceGeListEnQueueHead(u32 listAddress, u32 stallAddress, u32 callbackId, u32
 	else
 		state = SCE_GE_LIST_COMPLETED;
 
-	DEBUG_LOG(HLE,"%i=sceGeListEnQueueHead(addr=%08x, stall=%08x, cbid=%08x, param=%08x)",
-		listID,	listAddress,stallAddress,callbackId,optParamAddr);
-	DEBUG_LOG(HLE,"List enqueued.");
+	DEBUG_LOG(HLE,"List %i enqueued.", listID);
 	//return display list ID
 	return listID;
 }
diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp
index f9dd533d8c..d4c49b0f27 100644
--- a/Core/HLE/scePower.cpp
+++ b/Core/HLE/scePower.cpp
@@ -135,12 +135,12 @@ int scePowerUnregisterCallback(int slotId)
 
 int sceKernelPowerLock(int lockType)
 {
-	DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerLock(%i)", lockType);
+	DEBUG_LOG(HLE,"0=sceKernelPowerLock(%i)", lockType);
 	return 0;
 }
 int sceKernelPowerUnlock(int lockType)
 {
-	DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerUnlock(%i)", lockType);
+	DEBUG_LOG(HLE,"0=sceKernelPowerUnlock(%i)", lockType);
 	return 0;
 }
 int sceKernelPowerTick(int flag)
@@ -161,13 +161,13 @@ int sceKernelVolatileMemTryLock(int type, int paddr, int psize)
 	}
 	else
 	{
-		ERROR_LOG(HLE, "sceKernelVolatileMemTryLock - already locked!");
-		//RETURN(ERROR_POWER_VMEM_IN_USE); // does this line still need to be here??
+		ERROR_LOG(HLE, "sceKernelVolatileMemTryLock(%i, %08x, %i) - already locked!", type, paddr, psize);
 		return ERROR_POWER_VMEM_IN_USE;
 	}
 
 	// Volatile RAM is always at 0x08400000 and is of size 0x00400000.
 	// It's always available in the emu.
+	// TODO: Should really reserve this properly!
 	Memory::Write_U32(0x08400000, paddr);
 	Memory::Write_U32(0x00400000, psize);
 
@@ -176,10 +176,9 @@ int sceKernelVolatileMemTryLock(int type, int paddr, int psize)
 
 int sceKernelVolatileMemUnlock(int type)
 {
-	INFO_LOG(HLE,"sceKernelVolatileMemUnlock()");
+	INFO_LOG(HLE,"sceKernelVolatileMemUnlock(%i)", type);
 	// TODO: sanity check
 	volatileMemLocked = false;
-
 	return 0;
 }
 
diff --git a/native b/native
index d0328191ef..8e673a20f7 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit d0328191ef57ba6b0a5986c4a8b388ea6d2c7764
+Subproject commit 8e673a20f70bb636a5cc4ba17cbbe6613869b461