Skip to content

Commit 07e2d77

Browse files
committed
a
1 parent 3d94667 commit 07e2d77

File tree

6 files changed

+35
-4
lines changed

6 files changed

+35
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DS34 ?= 0
66
SMB ?= 0
77
TMANIP ?= 1
88
ETH ?= 1
9-
EXFAT ?= 0
9+
EXFAT ?= 1
1010
DVRP ?= 0
1111
IOP_RESET ?= 1
1212
XFROM ?= 0
@@ -62,12 +62,12 @@ ifeq ($(COH), 1)
6262
EE_LIBS += -liopreboot
6363
LIBPAD = 2
6464
HAS_COH = -COH
65-
EE_CFLAGS += -DSUPPORT_SYSTEM_2X6
65+
EE_CFLAGS += -DSUPPORT_SYSTEM_2X6 -DCOMMON_PRINTF
6666
HOMEBREW_DONGLEMAN = 1
6767
EE_OBJS += mcman_irx.o
6868
ifeq ($(ACUART), 1)
6969
$(info -- adding support for arcade UART)
70-
EE_OBJS += acuart_tty_irx.o
70+
EE_OBJS += acuart_tty_irx.o accore_irx.o
7171
EE_CFLAGS += -DACUART
7272
HAS_ACUART = -ACUART
7373
endif

docs/IOPBOOT.CNF

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# example of custom IOP Boot list. these modules are executed in order before program UI is ready
2+
ACCORE = mc0:accore.irx
3+
ACUART = mc0:acuart.irx
4+
ACTTY = mc0:actty.irx
5+
LED = rom:LED

embed.make

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ $(EE_ASM_DIR)sior_irx.s: $(PS2SDK)/iop/irx/sior.irx | $(EE_ASM_DIR)
173173

174174
$(EE_ASM_DIR)acuart_tty_irx.s: iop/__precompiled/acuart_tty.irx | $(EE_ASM_DIR)
175175
$(BIN2S) $< $@ acuart_tty_irx
176+
177+
$(EE_ASM_DIR)accore_irx.s: iop/__precompiled/accore.irx | $(EE_ASM_DIR)
178+
$(BIN2S) $< $@ accore_irx
176179

177180
iop/AllowDVDV.irx: iop/AllowDVDV
178181
$(MAKE) -C $<

iop/__precompiled/accore.irx

5.98 KB
Binary file not shown.

iop/__precompiled/acuart_tty.irx

16 Bytes
Binary file not shown.

src/main.c

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ IMPORT_BIN2C(cdvd_irx);
7070

7171
#ifdef ACUART
7272
IMPORT_BIN2C(acuart_tty_irx);
73+
IMPORT_BIN2C(accore_irx);
7374
#endif
7475

7576
// Mandatory IRX
@@ -2491,6 +2492,8 @@ static void Reset()
24912492
#endif
24922493
#ifdef ACUART
24932494
int i, d;
2495+
i = SifExecModuleBuffer(&accore_irx, size_accore_irx, 0, NULL, &d);
2496+
DPRINTF(" [ACCORE]: id=%d, ret=%d\n", i, d);
24942497
i = SifExecModuleBuffer(&acuart_tty_irx, size_acuart_tty_irx, 0, NULL, &d);
24952498
DPRINTF(" [ACUART]: id=%d, ret=%d\n", i, d);
24962499
#endif
@@ -2796,6 +2799,10 @@ int main(int argc, char *argv[])
27962799
sprintf(mainMsg, "%s", LNG(Loaded_Config));
27972800

27982801
#ifdef SUPPORT_SYSTEM_2X6
2802+
if (ROMVER_data[4] != 'T' || ROMVER_data[5] != 'Z') {
2803+
drawMsg("ERR: Console is not arcade system. use regular wLaunchELF instead");
2804+
SleepThread();
2805+
}
27992806
#define ACJV_PATHCNT 5
28002807
int id, ret;
28012808
const char* ACJVPATHS[ACJV_PATHCNT] = {"./ACJVLOAD.IRX", "mc0:/ACJVLOAD.IRX", "mc1:/ACJVLOAD.IRX", "mass0:/ACJVLOAD.IRX", "mass1:/ACJVLOAD.IRX"};
@@ -2817,9 +2824,25 @@ int main(int argc, char *argv[])
28172824
) {
28182825
DPRINTF("Starting watchdog\n");
28192826
id = SifLoadStartModule("rom0:DAEMON", 0, NULL, &ret);
2820-
sprintf(mainMsg + strlen(mainMsg), (id > 0 && ret != 1) ? " | watchdog running" : " | watchdog error");
2827+
sprintf(mainMsg + strlen(mainMsg), (id > 0 && ret != 1) ? " | watch OK" : " | watch NG");
28212828
}
28222829
DPRINTF("%s\n",mainMsg);
2830+
2831+
{
2832+
int var_cnt;
2833+
char *RAM_p, *CNF_p, *name, *value;
2834+
if ((RAM_p = preloadCNF("mc1:IOPBOOT.CNF"))) {
2835+
CNF_p = RAM_p;
2836+
for (var_cnt = 0; get_CNF_string(&CNF_p, &name, &value); var_cnt++) {
2837+
id = SifLoadStartModule(value, 0, NULL, &ret);
2838+
printf("%s:%s %d %d\n", name, value, id, ret);
2839+
if (ret != 0 || id < 0) {drawMsg(value); sleep(2);}
2840+
// ((i & 3) != 0)
2841+
}
2842+
free(RAM_p);
2843+
}
2844+
sprintf(mainMsg + strlen(mainMsg), (RAM_p) ? " | IOPLS OK" : " | IOPLS NG");
2845+
}
28232846
#endif
28242847

28252848
//Here nearly everything is ready for the main menu event loop

0 commit comments

Comments
 (0)