(PSP) Move files around

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)
 

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

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

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)

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

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
 

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