Skip to content

configurable item indexes cap #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
israpps wants to merge 1 commit into
base: main
Choose a base branch
from
Open

configurable item indexes cap #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions include/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#ifndef COMMONDEF
#define COMMONDEF

#define CONFIG_KEY_INDEXES 5

enum
{
SOURCE_MC0 = 0,
Expand Down Expand Up @@ -128,18 +131,28 @@ char *DEFPATH[] = {
"mc?:/BOOT/ULE.ELF", // AUTO [0]
"mc?:/APPS/ULE/ELF",
"mass:/BOOT/BOOT.ELF",
"mass:/PS2BBL/L2[1].ELF", // L2 [3]
"",
"",
"mass:/PS2BBL/L2[1].ELF", // L2 [CONFIG_KEY_INDEXES * 1]
"mass:/PS2BBL/L2[2].ELF",
"mass:/PS2BBL/L2[3].ELF",
"mass:/PS2BBL/R2[1].ELF", // R2 [6]
"",
"",
"mass:/PS2BBL/R2[1].ELF", // R2 [CONFIG_KEY_INDEXES * 2]
"mass:/PS2BBL/R2[2].ELF",
"mass:/PS2BBL/R2[3].ELF",
"mc?:/OPL/OPNPS2LD.ELF", // L1 [9]
"",
"",
"mc?:/OPL/OPNPS2LD.ELF", // L1 [CONFIG_KEY_INDEXES * 3]
"mc?:/APPS/OPNPS2LD/ELF",
"mass:/PS2BBL/OPNPS2LD.ELF",
"mass:/RESCUE.ELF", // R1 [12]
"",
"",
"mass:/RESCUE.ELF", // R1 [CONFIG_KEY_INDEXES * 4]
"mc?:/BOOT/BOOT2.ELF",
"mc?:/APPS/ULE.ELF",
"",
"",
};

#ifndef COMMIT_HASH
Expand Down
18 changes: 9 additions & 9 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
typedef struct
{
int SKIPLOGO;
char *KEYPATHS[17][3];
char *KEYPATHS[17][CONFIG_KEY_INDEXES];
int DELAY;
int OSDHISTORY_READ;
int TRAYEJECT;
int LOGO_DISP; //0: NO, 1: Only Console info, any other value: YES
} CONFIG;
CONFIG GLOBCFG;

char *EXECPATHS[3];
char *EXECPATHS[CONFIG_KEY_INDEXES];
u8 ROMVER[16];
int PAD = 0;
static int config_source = SOURCE_INVALID;
Expand Down Expand Up @@ -239,9 +239,9 @@ int main(int argc, char *argv[])
GLOBCFG.LOGO_DISP = atoi(value);
continue;
}
if (!strncmp("LK_", name, 3)) {
if (!strncmp("LK_", name, CONFIG_KEY_INDEXES)) {
for (x = 0; x < 17; x++) {
for (j = 0; j < 3; j++) {
for (j = 0; j < CONFIG_KEY_INDEXES; j++) {
sprintf(TMP, "LK_%s_E%d", KEYS_ID[x], j + 1);
if (!strcmp(name, TMP)) {
GLOBCFG.KEYPATHS[x][j] = value;
Expand Down Expand Up @@ -281,8 +281,8 @@ int main(int argc, char *argv[])
} else {
scr_printf("Can't find config, loading hardcoded paths\n");
for (x = 0; x < 5; x++)
for (j = 0; j < 3; j++)
GLOBCFG.KEYPATHS[x][j] = CheckPath(DEFPATH[3 * x + j]);
for (j = 0; j < CONFIG_KEY_INDEXES; j++)
GLOBCFG.KEYPATHS[x][j] = CheckPath(DEFPATH[CONFIG_KEY_INDEXES * x + j]);
sleep(1);
}

Expand Down Expand Up @@ -349,7 +349,7 @@ int main(int argc, char *argv[])
if (PAD & button) {
DPRINTF("PAD detected\n");
// if button detected, copy path to corresponding index
for (j = 0; j < 3; j++) {
for (j = 0; j < CONFIG_KEY_INDEXES; j++) {
EXECPATHS[j] = CheckPath(GLOBCFG.KEYPATHS[x + 1][j]);
if (exist(EXECPATHS[j])) {
scr_setfontcolor(0x00ff00);
Expand All @@ -369,7 +369,7 @@ int main(int argc, char *argv[])
}
DPRINTF("Wait time consummed. running AUTO entry\n");
TimerEnd();
for (j = 0; j < 3; j++) {
for (j = 0; j < CONFIG_KEY_INDEXES; j++) {
EXECPATHS[j] = CheckPath(GLOBCFG.KEYPATHS[0][j]);
if (exist(EXECPATHS[j])) {
scr_setfontcolor(0x00ff00);
Expand Down Expand Up @@ -488,7 +488,7 @@ void SetDefaultSettings(void)
{
int i, j;
for (i = 0; i < 17; i++)
for (j = 0; j < 3; j++)
for (j = 0; j < CONFIG_KEY_INDEXES; j++)
GLOBCFG.KEYPATHS[i][j] = "isra:/";
GLOBCFG.SKIPLOGO = 0;
GLOBCFG.OSDHISTORY_READ = 1;
Expand Down