Skip to content
This repository was archived by the owner on Apr 29, 2025. It is now read-only.

Commit bccf0fc

Browse files
marcanmarcan
committed
s/devkitfail/devkitppc/g
1 parent 2fb61e4 commit bccf0fc

14 files changed

+36
-36
lines changed

‎channel/channelapp/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $(TARGET_APP)_nopax.elf: $(FILES_SRC_OBJ) newrvl.ld
111111
@$(CC) $(FILES_SRC_OBJ) $(LDFLAGS_APP) -o $@
112112

113113
$(TARGET_APP).elf: $(TARGET_APP)_nopax.elf
114-
@$(WIIPAX) -s devkitfail $< $@
114+
@$(WIIPAX) -s devkitppc $< $@
115115

116116
$(TARGET_CHAN).elf: $(TARGET_APP)_nopax.elf
117117
@echo $(@F)

‎wiipax/client/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CFLAGS = -Wall -W -Os -g
22
TARGET = wiipax
33
OBJS = LzFind.o LzmaEnc.o LzmaDec.o lzma.o main.o
44
OBJS += stub_mini.o stub_mini_debug.o
5-
OBJS += stub_dkf.o stub_dkf_debug.o
6-
OBJS += stub_dkfc.o stub_dkfc_debug.o
5+
OBJS += stub_dkp.o stub_dkp_debug.o
6+
OBJS += stub_dkpc.o stub_dkpc_debug.o
77

88
NOMAPFILE = 1
99

‎wiipax/client/main.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ extern int stub_mini_elf_len;
1717
extern char stub_mini_elf[];
1818
extern int stub_mini_debug_elf_len;
1919
extern char stub_mini_debug_elf[];
20-
extern int stub_dkf_elf_len;
21-
extern char stub_dkf_elf[];
22-
extern int stub_dkf_debug_elf_len;
23-
extern char stub_dkf_debug_elf[];
24-
extern int stub_dkfc_elf_len;
25-
extern char stub_dkfc_elf[];
26-
extern int stub_dkfc_debug_elf_len;
27-
extern char stub_dkfc_debug_elf[];
20+
extern int stub_dkp_elf_len;
21+
extern char stub_dkp_elf[];
22+
extern int stub_dkp_debug_elf_len;
23+
extern char stub_dkp_debug_elf[];
24+
extern int stub_dkpc_elf_len;
25+
extern char stub_dkpc_elf[];
26+
extern int stub_dkpc_debug_elf_len;
27+
extern char stub_dkpc_debug_elf[];
2828

2929
typedef struct {
3030
const char *name;
@@ -35,10 +35,10 @@ typedef struct {
3535
static const stub_t stubs[] = {
3636
{ "mini", &stub_mini_elf_len, (u8 *) stub_mini_elf },
3737
{ "mini_debug", &stub_mini_debug_elf_len, (u8 *) stub_mini_debug_elf },
38-
{ "devkitfail", &stub_dkf_elf_len, (u8 *) stub_dkf_elf },
39-
{ "devkitfail_debug", &stub_dkf_debug_elf_len, (u8 *) stub_dkf_debug_elf },
40-
{ "dkfailchannel", &stub_dkfc_elf_len, (u8 *) stub_dkfc_elf },
41-
{ "dkfailchannel_debug", &stub_dkfc_debug_elf_len, (u8 *) stub_dkfc_debug_elf },
38+
{ "devkitppc", &stub_dkp_elf_len, (u8 *) stub_dkp_elf },
39+
{ "devkitppc_debug", &stub_dkp_debug_elf_len, (u8 *) stub_dkp_debug_elf },
40+
{ "dkppcchannel", &stub_dkpc_elf_len, (u8 *) stub_dkpc_elf },
41+
{ "dkppcchannel_debug", &stub_dkpc_debug_elf_len, (u8 *) stub_dkpc_debug_elf },
4242
{ NULL, NULL, NULL }
4343
};
4444

‎wiipax/client/stub_dkf.c

-1
This file was deleted.

‎wiipax/client/stub_dkf_debug.c

-1
This file was deleted.

‎wiipax/client/stub_dkfc.c

-1
This file was deleted.

‎wiipax/client/stub_dkfc_debug.c

-1
This file was deleted.

‎wiipax/client/stub_dkp.c

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../stub/stub_dkp.c

‎wiipax/client/stub_dkp_debug.c

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../stub/stub_dkp_debug.c

‎wiipax/client/stub_dkpc.c

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../stub/stub_dkpc.c

‎wiipax/client/stub_dkpc_debug.c

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../stub/stub_dkpc_debug.c

‎wiipax/stub/Makefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ LDFLAGS += -nostartfiles -nodefaultlibs
88
OBJS_COMMON = crt0.o main.o string.o sync.o elf.o time.o LzmaDec.o
99
TARGET_ID =
1010

11-
ifeq ($(DEVKITFAIL),1)
12-
DEFINES += -DDEVKITFAIL
11+
ifeq ($(DKPPC),1)
12+
DEFINES += -DDKPPC
1313
OBJS = $(OBJS_COMMON)
14-
LDSCRIPT = devkitfail.ld
15-
TARGET_ID = _dkf
14+
LDSCRIPT = devkitppc.ld
15+
TARGET_ID = _dkp
1616
else
17-
ifeq ($(DKFAILCHANNEL),1)
18-
DEFINES += -DDEVKITFAIL
17+
ifeq ($(DKPPCCHANNEL),1)
18+
DEFINES += -DDKPPC
1919
OBJS = realmode.o $(OBJS_COMMON)
2020
LDSCRIPT = channel.ld
21-
TARGET_ID = _dkfc
21+
TARGET_ID = _dkpc
2222
else
2323
OBJS = realmode.o plunge.o $(OBJS_COMMON)
2424
LDSCRIPT = realmode.ld
@@ -53,14 +53,14 @@ release:
5353
$(Q)$(MAKE) clean
5454
$(Q)$(MAKE) NDEBUG=1
5555
$(Q)$(MAKE) NDEBUG=1 clean
56-
$(Q)$(MAKE) DEVKITFAIL=1
57-
$(Q)$(MAKE) DEVKITFAIL=1 clean
58-
$(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1
59-
$(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1 clean
60-
$(Q)$(MAKE) DKFAILCHANNEL=1
61-
$(Q)$(MAKE) DKFAILCHANNEL=1 clean
62-
$(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1
63-
$(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1 clean
56+
$(Q)$(MAKE) DKPPC=1
57+
$(Q)$(MAKE) DKPPC=1 clean
58+
$(Q)$(MAKE) DKPPC=1 NDEBUG=1
59+
$(Q)$(MAKE) DKPPC=1 NDEBUG=1 clean
60+
$(Q)$(MAKE) DKPPCCHANNEL=1
61+
$(Q)$(MAKE) DKPPCCHANNEL=1 clean
62+
$(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1
63+
$(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1 clean
6464

6565
.PHONY: release
6666

‎wiipax/stub/devkitfail.ld renamed to ‎wiipax/stub/devkitppc.ld

File renamed without changes.

‎wiipax/stub/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void stubmain(void) {
6868
write32(0x0c003004, 0);
6969

7070
#ifndef NDEBUG
71-
#ifndef DEVKITFAIL
71+
#ifndef DKPPC
7272
udelay(500 * 1000); // wait for mini - avoid EXI battle
7373
#endif
7474
gecko_init();
@@ -86,7 +86,7 @@ void stubmain(void) {
8686
write32(0x0c003000, 0xffffffff);
8787

8888
printf("Branching to 0x%08x\n", entry);
89-
#ifndef DEVKITFAIL
89+
#ifndef DKPPC
9090
// detect failkit apps packed with the mini stub
9191
if (entry & 0xc0000000) {
9292
void (*ep)() = (void (*)()) entry;

0 commit comments

Comments
 (0)