printk_init disabled in release

MrColdbird · Jun 24, 2011 · 83d5448 · 83d5448
1 parent 3c4628e
commit 83d5448
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/popsloader/Makefile b/popsloader/Makefile
@@ -1,7 +1,7 @@
 EXTRA_OPTIONS = -j4
 
 all:
-	make $(EXTRA_OPTIONS) -C popcorn CONFIG_620=1 CONFIG_639=1 CONFIG_635=1 CONFIG_500=1 DEBUG=1
+	make $(EXTRA_OPTIONS) -C popcorn CONFIG_620=1 CONFIG_639=1 CONFIG_635=1 CONFIG_500=1 #DEBUG=1
 	make $(EXTRA_OPTIONS) -C loader 
 	make $(EXTRA_OPTIONS) -C core
 	@mkdir dist || true

diff --git a/popsloader/core/main.c b/popsloader/core/main.c
@@ -266,7 +266,7 @@ int module_start(SceSize args, void* argp)
 	pops_fw_version = FW_635;
 	psp_fw_version = sceKernelDevkitVersion();
 	psp_model = sceKernelGetModel();
-	pspDebugScreenInit();
+	printk_init();
 	mount_memory_stick();
 	setup_nid_resolver();
 	sctrlSetCustomStartModule(&custom_start_module);

diff --git a/popsloader/core/main.h b/popsloader/core/main.h
@@ -18,8 +18,13 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#ifdef DEBUG
 #define printk pspDebugScreenPrintf
 #define printk_init pspDebugScreenInit
+#else
+#define printk(...)
+#define printk_init(...)
+#endif
 
 #define BASE_PATH "ms0:/seplugins/popsloader/"
 #define MODULE_PATH BASE_PATH "modules/"

diff --git a/popsloader/loader/main.c b/popsloader/loader/main.c
@@ -170,7 +170,7 @@ int module_start(SceSize args, void* argp)
 
 	psp_fw_version = sceKernelDevkitVersion();
 	psp_model = sceKernelGetModel();
-	pspDebugScreenInit();
+	printk_init();
 	mount_memory_stick();
 
 	ret = load_popsloader();

diff --git a/popsloader/loader/main.h b/popsloader/loader/main.h
@@ -18,8 +18,13 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#ifdef DEBUG
 #define printk pspDebugScreenPrintf
 #define printk_init pspDebugScreenInit
+#else
+#define printk(...)
+#define printk_init(...)
+#endif
 
 #define BASE_PATH "ms0:/seplugins/popsloader/"
 #define MODULE_PATH BASE_PATH "modules/"