Run cupIoWork in the main thread

Author: 173210

io.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <pspkernel.h>
 #include <psprtc.h>
+#include "main.h"
 #include "io.h"
 
 typedef struct _queue_t queue_t;
@@ -13,35 +14,33 @@ struct _queue_t {
 	size_t size;
 };
 
-static SceUID cupIoThid = 0;
-
 static queue_t *queue = NULL;
 
-static size_t left = 0;
+static int left = 0;
 static char buf[4096];
 
-static int cupIoThread(SceSize args, void *argp)
+void cupIoWork()
 {
 	SceUID log = -1;
 	SceUID fd;
 	const char *p;
 	int ret;
 
-	ret = sceIoChdir(argp);
-	if (ret)
-		return ret;
-
 	while (1) {
 		sceKernelSleepThread();
 
-		if (left) {
+		while (left) {
 			if (log < 0)
 				log = sceIoOpen("LOG.TXT",
 					PSP_O_WRONLY | PSP_O_APPEND | PSP_O_CREAT,
 					0777);
 			if (log >= 0) {
-				sceIoWrite(log, buf, left);
-				left = 0;
+				ret = sceIoWrite(log, buf, left);
+				if (ret > 0) {
+					left -= ret;
+					if (left < 0)
+						left = 0;
+				}
 
 				if (!sceIoClose(log))
 					log = -1;
@@ -65,7 +64,7 @@ static int cupIoThread(SceSize args, void *argp)
 	}
 }
 
-int logTime()
+int cupPrintTime()
 {
 	int ret;
 	pspTime time;
@@ -95,7 +94,7 @@ int cupPuts(const char *s)
 	if (left >= sizeof(buf))
 		return SCE_KERNEL_ERROR_NO_MEMORY;
 
-	logTime();
+	cupPrintTime();
 
 	p = buf + left;
 	while (*s && left < sizeof(buf)) {
@@ -105,7 +104,7 @@ int cupPuts(const char *s)
 		left++;
 	}
 
-	sceKernelWakeupThread(cupIoThid);
+	sceKernelWakeupThread(thid);
 
 	return 0;
 }
@@ -121,7 +120,7 @@ int cupPrintf(const char *fmt, ...)
 	if (left >= sizeof(buf))
 		return 0;
 
-	logTime();
+	cupPrintTime();
 
 	va_start(va, fmt);
 
@@ -131,35 +130,11 @@ int cupPrintf(const char *fmt, ...)
 
 	va_end(va);
 
-	sceKernelWakeupThread(cupIoThid);
-
-	return ret;
-}
-
-int cupIoInit(SceSize len, char *path)
-{
-	int ret;
-
-	ret = sceKernelCreateThread(
-		"cupIoThread", cupIoThread, 1, 2048, 0, NULL);
-	if (ret < 0)
-		return cupIoThid;
-	cupIoThid = ret;
-
-	ret = sceKernelStartThread(cupIoThid, len, path);
-	if (ret)
-		sceKernelDeleteThread(cupIoThid);
-
-	cupPrintf("capusbpsp started\n");
+	sceKernelWakeupThread(thid);
 
 	return ret;
 }
 
-int cupIoDeinit()
-{
-	return cupIoThid ? sceKernelTerminateDeleteThread(cupIoThid) : 0;
-}
-
 int cupIoWrite(const char *pre, const void *data, SceSize size)
 {
 	pspTime time;
@@ -195,7 +170,7 @@ int cupIoWrite(const char *pre, const void *data, SceSize size)
 
 	memcpy(p + len + 1, data, size);
 
-	sceKernelWakeupThread(cupIoThid);
+	sceKernelWakeupThread(thid);
 
 	return 0;
 }

io.h

@@ -3,10 +3,12 @@
 
 #include <psptypes.h>
 
+void cupIoWork();
+
+int cupPrintTime();
 int cupPuts(const char *s);
 int cupPrintf(const char *fmt, ...);
 
-int cupIoInit(SceSize len, char *path);
-int cupIoDeinit();
 int cupIoWrite(const char *pre, const void *data, SceSize size);
+
 #endif

main.c

@@ -41,7 +41,7 @@ static char modname[32];
 static const SceModule2 *module = NULL;
 static const stub_t *stub = NULL;
 
-static SceUID mainThid = 0;
+SceUID thid = 0;
 
 static int32_t jAsm(const void *p)
 {
@@ -150,16 +150,18 @@ int mainThread(SceSize args, void *argp)
 		module = (SceModule2 *)sceKernelFindModuleByName(modname);
 	} while (module == NULL);
 
+	sceKernelChangeThreadPriority(thid, 1);
+
 	stub = findStub(module, "sceUsbBus_driver");
 
 	if (stub == NULL)
-		ret = SCE_KERNEL_ERROR_ERROR;
-	else {
-		ret = hook(stub, calls, CALL_NUM);
-		cupIoInit(args, argp);
-	}
+		return SCE_KERNEL_ERROR_ERROR;
+
+	hook(stub, calls, CALL_NUM);
+	cupIoWork();
 
 exit:
+	thid = 0;
 	sceKernelExitDeleteThread(ret);
 	return ret;
 }
@@ -172,21 +174,19 @@ int module_start(SceSize args, void *argp)
 		module_info.modname, mainThread, 111, 2048, 0, NULL);
 	if (ret < 0)
 		return ret;
-	mainThid = ret;
+	thid = ret;
 
-	ret = sceKernelStartThread(mainThid, args, argp);
+	ret = sceKernelStartThread(thid, args, argp);
 	if (ret)
-		sceKernelDeleteThread(mainThid);
+		sceKernelDeleteThread(thid);
 
 	return ret;
 }
 
 int module_stop()
 {
-	if (mainThid)
-		sceKernelTerminateDeleteThread(mainThid);
-
-	cupIoDeinit();
+	if (thid)
+		sceKernelTerminateDeleteThread(thid);
 
 	if (module == (SceModule2 *)sceKernelFindModuleByName(modname)
 		&& stub == findStub(module, "sceUsbBus_driver"))

main.h

@@ -0,0 +1,6 @@
+#ifdef _MAIN_H_
+#define _MAIN_H_
+
+extern SceUID thid;
+
+#endif