dspico/pico-loader
1
0
Fork 0
mirror of https://github.com/LNH-team/pico-loader.git synced 2026-06-02 01:06:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed the way API version 2 is exposed in picoLoader7.h

Browse Source
This commit is contained in:
Gericom
2026-01-10 14:58:59 +01:00
parent 56d20b37ac
commit a17194dc67
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arm7/source/header.cpp
View File

@@ -11,5 +11,8 @@ pload_header7_t gLoaderHeader
{ {
.entryPoint = (void*)&_start, .entryPoint = (void*)&_start,
.apiVersion = PICO_LOADER_API_VERSION, .apiVersion = PICO_LOADER_API_VERSION,
.launcherPath = "/_picoboot.nds" .v2 =
{
.launcherPath = "/_picoboot.nds"
}
}; };

2
arm7/source/main.cpp
View File

@@ -222,7 +222,7 @@ extern "C" void loaderMain()
sLoader.SetRomPath(gLoaderHeader.loadParams.romPath); sLoader.SetRomPath(gLoaderHeader.loadParams.romPath);
handleSavePath(); handleSavePath();
sLoader.SetArguments(gLoaderHeader.loadParams.arguments, gLoaderHeader.loadParams.argumentsLength); sLoader.SetArguments(gLoaderHeader.loadParams.arguments, gLoaderHeader.loadParams.argumentsLength);
sLoader.SetLauncherPath(gLoaderHeader.launcherPath); sLoader.SetLauncherPath(gLoaderHeader.v2.launcherPath);
sLoader.Load(BootMode::Normal); sLoader.Load(BootMode::Normal);
} }

29
include/picoLoader7.h
View File

@@ -3,9 +3,6 @@
/// @brief The Pico Loader API version supported by this header file. /// @brief The Pico Loader API version supported by this header file.
#define PICO_LOADER_API_VERSION 2 #define PICO_LOADER_API_VERSION 2
/// @brief The minimum Pico Loader API version that supports the launcherPath setting.
#define PICO_LOADER_LAUNCHER_PATH_MIN_API_VERSION 2
/// @brief Enum to specify the drive to boot from. /// @brief Enum to specify the drive to boot from.
typedef enum typedef enum
{ {
@@ -38,6 +35,13 @@ typedef struct
char arguments[256]; char arguments[256];
} pload_params_t; } pload_params_t;
/// @brief Struct representing the API version 2 part of the header of picoLoader7.bin.
typedef struct
{
/// @brief The path of the rom to return to when exiting an application.
char launcherPath[256];
} pload_header7_v2_t;
/// @brief Struct representing the header of picoLoader7.bin. /// @brief Struct representing the header of picoLoader7.bin.
typedef struct typedef struct
{ {
@@ -56,21 +60,6 @@ typedef struct
/// @brief The load params, see \see pload_params_t. /// @brief The load params, see \see pload_params_t.
pload_params_t loadParams; pload_params_t loadParams;
// === api version 2 === /// @brief The API version 2 part of the header. Only access this when \see apiVersion >= 2.
pload_header7_v2_t v2;
/// @brief The path of the rom to return to when exiting an application.
char launcherPath[256];
} pload_header7_t; } pload_header7_t;
#ifdef __cplusplus
extern "C" {
#endif
static inline bool pload_supportsLauncherPath(const pload_header7_t* header)
{
return header->apiVersion >= PICO_LOADER_LAUNCHER_PATH_MIN_API_VERSION;
}
#ifdef __cplusplus
}
#endif