Reset auto-suspend timer when buttons or touch changed

xerpi · Dec 30, 2016 · 61eb558 · 61eb558
1 parent a5dd599
commit 61eb558
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,7 @@ target_link_libraries(${PROJECT_NAME}.elf
 	SceThreadmgrForDriver_stub
 	SceIofilemgrForDriver_stub
 	SceBtForDriver_stub
+	SceKernelSuspendForDriver_stub
 )
 
 set_target_properties(${PROJECT_NAME}.elf

diff --git a/ds4vita.yml b/ds4vita.yml
@@ -1,4 +1,4 @@
-viimote:
+ds4vita:
   attributes: 0
   version:
     major: 1

diff --git a/main.c b/main.c
@@ -7,6 +7,8 @@
 #include <taihen.h>
 #include "log.h"
 
+extern int ksceKernelResetAutoSuspendTimer(int);
+
 #define DS4_VID 0x054C
 #define DS4_PID 0x05C4
 
@@ -207,9 +209,13 @@ static void patch_ctrldata_positive(SceCtrlData *pad_data, int count,
 
 	for (i = 0; i < count; i++) {
 		SceCtrlData kpad_data;
+		unsigned int orig_buttons;
+		int js_moved = 0;
 
 		ksceKernelMemcpyUserToKernel(&kpad_data, (uintptr_t)upad_data, sizeof(kpad_data));
 
+		orig_buttons = kpad_data.buttons;
+
 		if (ds4->cross)
 			kpad_data.buttons |= SCE_CTRL_CROSS;
 		if (ds4->circle)
@@ -240,14 +246,25 @@ static void patch_ctrldata_positive(SceCtrlData *pad_data, int count,
 		if (ds4->ps)
 			kpad_data.buttons |= SCE_CTRL_INTERCEPTED;
 
-		if (abs(ds4->left_x - 128) > DS4_ANALOG_THRESHOLD)
+		if (abs(ds4->left_x - 128) > DS4_ANALOG_THRESHOLD) {
 			kpad_data.lx = ds4->left_x;
-		if (abs(ds4->left_y - 128) > DS4_ANALOG_THRESHOLD)
+			js_moved = 1;
+		}
+		if (abs(ds4->left_y - 128) > DS4_ANALOG_THRESHOLD) {
 			kpad_data.ly = ds4->left_y;
-		if (abs(ds4->right_x - 128) > DS4_ANALOG_THRESHOLD)
+			js_moved = 1;
+		}
+		if (abs(ds4->right_x - 128) > DS4_ANALOG_THRESHOLD) {
 			kpad_data.rx = ds4->right_x;
-		if (abs(ds4->right_y - 128) > DS4_ANALOG_THRESHOLD)
+			js_moved = 1;
+		}
+		if (abs(ds4->right_y - 128) > DS4_ANALOG_THRESHOLD) {
 			kpad_data.ry = ds4->right_y;
+			js_moved = 1;
+		}
+
+		if ((orig_buttons ^ kpad_data.buttons) || js_moved)
+			ksceKernelResetAutoSuspendTimer(0);
 
 		ksceKernelMemcpyKernelToUser((uintptr_t)upad_data, &kpad_data, sizeof(kpad_data));
 
@@ -281,8 +298,10 @@ static void patch_touchdata(SceUInt32 port, SceTouchData *pData, SceUInt32 nBufs
 			num_reports++;
 		}
 
-		if (num_reports > 0)
+		if (num_reports > 0) {
+			ksceKernelResetAutoSuspendTimer(0);
 			ktouch_data.reportNum = num_reports;
+		}
 
 		ksceKernelMemcpyKernelToUser((uintptr_t)utouch_data, &ktouch_data, sizeof(ktouch_data));