From 919220751c203a4cfb54344055a5d9705eee3028 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Sep 2015 15:33:54 +0200
Subject: [PATCH] (PSP) Move files around

---
 Makefile.psp1                                         |  2 +-
 Makefile.psp1.salamander                              |  2 +-
 .../psp1}/kernel_functions_prx/Makefile               |  0
 .../psp1}/kernel_functions_prx/kernel_functions.exp   |  0
 .../psp1}/kernel_functions_prx/kernel_functions.h     |  1 +
 {psp1 => bootstrap/psp1}/kernel_functions_prx/main.c  | 11 +++++------
 dist-scripts/dist-cores.sh                            |  4 ++--
 frontend/drivers/platform_psp.c                       |  2 +-
 input/drivers/psp_input.c                             |  2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename {psp1 => bootstrap/psp1}/kernel_functions_prx/Makefile (100%)
 rename {psp1 => bootstrap/psp1}/kernel_functions_prx/kernel_functions.exp (100%)
 rename {psp1 => bootstrap/psp1}/kernel_functions_prx/kernel_functions.h (99%)
 rename {psp1 => bootstrap/psp1}/kernel_functions_prx/main.c (95%)

diff --git a/Makefile.psp1 b/Makefile.psp1
index d4d43ebafa..6c00736853 100644
--- a/Makefile.psp1
+++ b/Makefile.psp1
@@ -51,7 +51,7 @@ CFLAGS += $(RARCH_DEFINES)
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1
 
-PSP_OBJECTS = griffin/griffin.o psp1/kernel_functions.o
+PSP_OBJECTS = griffin/griffin.o bootstrap/psp1/kernel_functions.o
 
 OBJS = $(PSP_OBJECTS)
 
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index 903dfb37e4..369eddb0c4 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -43,7 +43,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/file/retro_file.o \
 		 libretro-common/hash/rhash.o \
-		 psp1/kernel_functions.o 
+		 bootstrap/psp1/kernel_functions.o 
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
diff --git a/psp1/kernel_functions_prx/Makefile b/bootstrap/psp1/kernel_functions_prx/Makefile
similarity index 100%
rename from psp1/kernel_functions_prx/Makefile
rename to bootstrap/psp1/kernel_functions_prx/Makefile
diff --git a/psp1/kernel_functions_prx/kernel_functions.exp b/bootstrap/psp1/kernel_functions_prx/kernel_functions.exp
similarity index 100%
rename from psp1/kernel_functions_prx/kernel_functions.exp
rename to bootstrap/psp1/kernel_functions_prx/kernel_functions.exp
diff --git a/psp1/kernel_functions_prx/kernel_functions.h b/bootstrap/psp1/kernel_functions_prx/kernel_functions.h
similarity index 99%
rename from psp1/kernel_functions_prx/kernel_functions.h
rename to bootstrap/psp1/kernel_functions_prx/kernel_functions.h
index 52cec35adb..07254f5598 100644
--- a/psp1/kernel_functions_prx/kernel_functions.h
+++ b/bootstrap/psp1/kernel_functions_prx/kernel_functions.h
@@ -8,6 +8,7 @@ extern "C" {
 #endif
 
 unsigned int read_system_buttons(void);
+
 void exitspawn_kernel( const char* fileName, SceSize args, void * argp);
 
 #ifdef __cplusplus
diff --git a/psp1/kernel_functions_prx/main.c b/bootstrap/psp1/kernel_functions_prx/main.c
similarity index 95%
rename from psp1/kernel_functions_prx/main.c
rename to bootstrap/psp1/kernel_functions_prx/main.c
index a17bc5a8b3..335b156097 100644
--- a/psp1/kernel_functions_prx/main.c
+++ b/bootstrap/psp1/kernel_functions_prx/main.c
@@ -1,16 +1,15 @@
 #include <stdio.h>
+#include <string.h>
 
 #include <pspdebug.h>
 #include <pspsdk.h>
 #include <pspctrl.h>
 #include <psploadexec_kernel.h>
 #include <pspthreadman_kernel.h>
-#include <string.h>
 
 PSP_MODULE_INFO("kernel_functions", PSP_MODULE_KERNEL, 0, 0);
 PSP_MAIN_THREAD_ATTR(0);
 
-
 static volatile int thread_active;
 static unsigned int buttons;
 static SceUID main_thread_id;
@@ -33,16 +32,17 @@ static int main_thread(SceSize args, void *argp)
    return 0;
 }
 
-
 unsigned int read_system_buttons(void)
 {
    return buttons;
 }
 
-void exitspawn_kernel( const char* fileName, SceSize args, void * argp){
-   thread_active = 0;
+void exitspawn_kernel(const char *fileName, SceSize args, void *argp)
+{
    struct SceKernelLoadExecVSHParam game_param;
 
+   thread_active = 0;
+
    memset(&game_param,0,sizeof(game_param));
 
    game_param.size = sizeof(game_param);
@@ -75,7 +75,6 @@ int module_start(SceSize args, void *argp)
    return 0;
 }
 
-
 int module_stop(void)
 {
    if (main_thread_id >= 0)
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 01648c433c..ba8df73fac 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -13,8 +13,8 @@ EXT=a
 
 mkdir -p ../pkg/${platform}/cores/
 
-make -C ../${platform}/kernel_functions_prx/ clean || exit 1
-make -C ../${platform}/kernel_functions_prx/ || exit 1
+make -C ../bootstrap/${platform}/kernel_functions_prx/ clean || exit 1
+make -C ../bootstrap/${platform}/kernel_functions_prx/ || exit 1
 cp -f ../kernel_functions.prx ../pkg/${platform}/kernel_functions.prx
 
 # Vita
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 1073d7ad8c..c7619479a6 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -43,7 +43,7 @@ int scePowerSetArmClockFrequency(int freq);
 
 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)
 #ifndef VITA
-#include "../../psp1/kernel_functions.h"
+#include "../../bootstrap/psp1/kernel_functions.h"
 #endif
 #endif
 
diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c
index 62b043253f..e9a00a618d 100644
--- a/input/drivers/psp_input.c
+++ b/input/drivers/psp_input.c
@@ -36,7 +36,7 @@
 #include "../../general.h"
 #include "../input_common.h"
 #ifdef HAVE_KERNEL_PRX
-#include "../../psp1/kernel_functions.h"
+#include "../../bootstrap/psp1/kernel_functions.h"
 #endif
 
 #define MAX_PADS 1