From bccf0fcbeedade3b7ce537e98a3a9878bd829266 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 28 Jun 2018 18:07:34 +0900 Subject: [PATCH] s/devkitfail/devkitppc/g --- channel/channelapp/Makefile | 2 +- wiipax/client/Makefile | 4 +-- wiipax/client/main.c | 24 ++++++++--------- wiipax/client/stub_dkf.c | 1 - wiipax/client/stub_dkf_debug.c | 1 - wiipax/client/stub_dkfc.c | 1 - wiipax/client/stub_dkfc_debug.c | 1 - wiipax/client/stub_dkp.c | 1 + wiipax/client/stub_dkp_debug.c | 1 + wiipax/client/stub_dkpc.c | 1 + wiipax/client/stub_dkpc_debug.c | 1 + wiipax/stub/Makefile | 30 ++++++++++----------- wiipax/stub/{devkitfail.ld => devkitppc.ld} | 0 wiipax/stub/main.c | 4 +-- 14 files changed, 36 insertions(+), 36 deletions(-) delete mode 120000 wiipax/client/stub_dkf.c delete mode 120000 wiipax/client/stub_dkf_debug.c delete mode 120000 wiipax/client/stub_dkfc.c delete mode 120000 wiipax/client/stub_dkfc_debug.c create mode 120000 wiipax/client/stub_dkp.c create mode 120000 wiipax/client/stub_dkp_debug.c create mode 120000 wiipax/client/stub_dkpc.c create mode 120000 wiipax/client/stub_dkpc_debug.c rename wiipax/stub/{devkitfail.ld => devkitppc.ld} (100%) diff --git a/channel/channelapp/Makefile b/channel/channelapp/Makefile index 50ce009..d3c3b21 100644 --- a/channel/channelapp/Makefile +++ b/channel/channelapp/Makefile @@ -111,7 +111,7 @@ $(TARGET_APP)_nopax.elf: $(FILES_SRC_OBJ) newrvl.ld @$(CC) $(FILES_SRC_OBJ) $(LDFLAGS_APP) -o $@ $(TARGET_APP).elf: $(TARGET_APP)_nopax.elf - @$(WIIPAX) -s devkitfail $< $@ + @$(WIIPAX) -s devkitppc $< $@ $(TARGET_CHAN).elf: $(TARGET_APP)_nopax.elf @echo $(@F) diff --git a/wiipax/client/Makefile b/wiipax/client/Makefile index 1f3ecfc..2026a33 100644 --- a/wiipax/client/Makefile +++ b/wiipax/client/Makefile @@ -2,8 +2,8 @@ CFLAGS = -Wall -W -Os -g TARGET = wiipax OBJS = LzFind.o LzmaEnc.o LzmaDec.o lzma.o main.o OBJS += stub_mini.o stub_mini_debug.o -OBJS += stub_dkf.o stub_dkf_debug.o -OBJS += stub_dkfc.o stub_dkfc_debug.o +OBJS += stub_dkp.o stub_dkp_debug.o +OBJS += stub_dkpc.o stub_dkpc_debug.o NOMAPFILE = 1 diff --git a/wiipax/client/main.c b/wiipax/client/main.c index 0cd231d..65247e9 100644 --- a/wiipax/client/main.c +++ b/wiipax/client/main.c @@ -17,14 +17,14 @@ extern int stub_mini_elf_len; extern char stub_mini_elf[]; extern int stub_mini_debug_elf_len; extern char stub_mini_debug_elf[]; -extern int stub_dkf_elf_len; -extern char stub_dkf_elf[]; -extern int stub_dkf_debug_elf_len; -extern char stub_dkf_debug_elf[]; -extern int stub_dkfc_elf_len; -extern char stub_dkfc_elf[]; -extern int stub_dkfc_debug_elf_len; -extern char stub_dkfc_debug_elf[]; +extern int stub_dkp_elf_len; +extern char stub_dkp_elf[]; +extern int stub_dkp_debug_elf_len; +extern char stub_dkp_debug_elf[]; +extern int stub_dkpc_elf_len; +extern char stub_dkpc_elf[]; +extern int stub_dkpc_debug_elf_len; +extern char stub_dkpc_debug_elf[]; typedef struct { const char *name; @@ -35,10 +35,10 @@ typedef struct { static const stub_t stubs[] = { { "mini", &stub_mini_elf_len, (u8 *) stub_mini_elf }, { "mini_debug", &stub_mini_debug_elf_len, (u8 *) stub_mini_debug_elf }, - { "devkitfail", &stub_dkf_elf_len, (u8 *) stub_dkf_elf }, - { "devkitfail_debug", &stub_dkf_debug_elf_len, (u8 *) stub_dkf_debug_elf }, - { "dkfailchannel", &stub_dkfc_elf_len, (u8 *) stub_dkfc_elf }, - { "dkfailchannel_debug", &stub_dkfc_debug_elf_len, (u8 *) stub_dkfc_debug_elf }, + { "devkitppc", &stub_dkp_elf_len, (u8 *) stub_dkp_elf }, + { "devkitppc_debug", &stub_dkp_debug_elf_len, (u8 *) stub_dkp_debug_elf }, + { "dkppcchannel", &stub_dkpc_elf_len, (u8 *) stub_dkpc_elf }, + { "dkppcchannel_debug", &stub_dkpc_debug_elf_len, (u8 *) stub_dkpc_debug_elf }, { NULL, NULL, NULL } }; diff --git a/wiipax/client/stub_dkf.c b/wiipax/client/stub_dkf.c deleted file mode 120000 index 846981f..0000000 --- a/wiipax/client/stub_dkf.c +++ /dev/null @@ -1 +0,0 @@ -../stub/stub_dkf.c \ No newline at end of file diff --git a/wiipax/client/stub_dkf_debug.c b/wiipax/client/stub_dkf_debug.c deleted file mode 120000 index c992edb..0000000 --- a/wiipax/client/stub_dkf_debug.c +++ /dev/null @@ -1 +0,0 @@ -../stub/stub_dkf_debug.c \ No newline at end of file diff --git a/wiipax/client/stub_dkfc.c b/wiipax/client/stub_dkfc.c deleted file mode 120000 index 71be34f..0000000 --- a/wiipax/client/stub_dkfc.c +++ /dev/null @@ -1 +0,0 @@ -../stub/stub_dkfc.c \ No newline at end of file diff --git a/wiipax/client/stub_dkfc_debug.c b/wiipax/client/stub_dkfc_debug.c deleted file mode 120000 index e6ebaf3..0000000 --- a/wiipax/client/stub_dkfc_debug.c +++ /dev/null @@ -1 +0,0 @@ -../stub/stub_dkfc_debug.c \ No newline at end of file diff --git a/wiipax/client/stub_dkp.c b/wiipax/client/stub_dkp.c new file mode 120000 index 0000000..121f9dd --- /dev/null +++ b/wiipax/client/stub_dkp.c @@ -0,0 +1 @@ +../stub/stub_dkp.c \ No newline at end of file diff --git a/wiipax/client/stub_dkp_debug.c b/wiipax/client/stub_dkp_debug.c new file mode 120000 index 0000000..31195b8 --- /dev/null +++ b/wiipax/client/stub_dkp_debug.c @@ -0,0 +1 @@ +../stub/stub_dkp_debug.c \ No newline at end of file diff --git a/wiipax/client/stub_dkpc.c b/wiipax/client/stub_dkpc.c new file mode 120000 index 0000000..1a6cbf6 --- /dev/null +++ b/wiipax/client/stub_dkpc.c @@ -0,0 +1 @@ +../stub/stub_dkpc.c \ No newline at end of file diff --git a/wiipax/client/stub_dkpc_debug.c b/wiipax/client/stub_dkpc_debug.c new file mode 120000 index 0000000..241cdb1 --- /dev/null +++ b/wiipax/client/stub_dkpc_debug.c @@ -0,0 +1 @@ +../stub/stub_dkpc_debug.c \ No newline at end of file diff --git a/wiipax/stub/Makefile b/wiipax/stub/Makefile index 2aa6340..5601c12 100644 --- a/wiipax/stub/Makefile +++ b/wiipax/stub/Makefile @@ -8,17 +8,17 @@ LDFLAGS += -nostartfiles -nodefaultlibs OBJS_COMMON = crt0.o main.o string.o sync.o elf.o time.o LzmaDec.o TARGET_ID = -ifeq ($(DEVKITFAIL),1) -DEFINES += -DDEVKITFAIL +ifeq ($(DKPPC),1) +DEFINES += -DDKPPC OBJS = $(OBJS_COMMON) -LDSCRIPT = devkitfail.ld -TARGET_ID = _dkf +LDSCRIPT = devkitppc.ld +TARGET_ID = _dkp else -ifeq ($(DKFAILCHANNEL),1) -DEFINES += -DDEVKITFAIL +ifeq ($(DKPPCCHANNEL),1) +DEFINES += -DDKPPC OBJS = realmode.o $(OBJS_COMMON) LDSCRIPT = channel.ld -TARGET_ID = _dkfc +TARGET_ID = _dkpc else OBJS = realmode.o plunge.o $(OBJS_COMMON) LDSCRIPT = realmode.ld @@ -53,14 +53,14 @@ release: $(Q)$(MAKE) clean $(Q)$(MAKE) NDEBUG=1 $(Q)$(MAKE) NDEBUG=1 clean - $(Q)$(MAKE) DEVKITFAIL=1 - $(Q)$(MAKE) DEVKITFAIL=1 clean - $(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1 - $(Q)$(MAKE) DEVKITFAIL=1 NDEBUG=1 clean - $(Q)$(MAKE) DKFAILCHANNEL=1 - $(Q)$(MAKE) DKFAILCHANNEL=1 clean - $(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1 - $(Q)$(MAKE) DKFAILCHANNEL=1 NDEBUG=1 clean + $(Q)$(MAKE) DKPPC=1 + $(Q)$(MAKE) DKPPC=1 clean + $(Q)$(MAKE) DKPPC=1 NDEBUG=1 + $(Q)$(MAKE) DKPPC=1 NDEBUG=1 clean + $(Q)$(MAKE) DKPPCCHANNEL=1 + $(Q)$(MAKE) DKPPCCHANNEL=1 clean + $(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1 + $(Q)$(MAKE) DKPPCCHANNEL=1 NDEBUG=1 clean .PHONY: release diff --git a/wiipax/stub/devkitfail.ld b/wiipax/stub/devkitppc.ld similarity index 100% rename from wiipax/stub/devkitfail.ld rename to wiipax/stub/devkitppc.ld diff --git a/wiipax/stub/main.c b/wiipax/stub/main.c index d7f2cf4..5a001ae 100644 --- a/wiipax/stub/main.c +++ b/wiipax/stub/main.c @@ -68,7 +68,7 @@ void stubmain(void) { write32(0x0c003004, 0); #ifndef NDEBUG -#ifndef DEVKITFAIL +#ifndef DKPPC udelay(500 * 1000); // wait for mini - avoid EXI battle #endif gecko_init(); @@ -86,7 +86,7 @@ void stubmain(void) { write32(0x0c003000, 0xffffffff); printf("Branching to 0x%08x\n", entry); -#ifndef DEVKITFAIL +#ifndef DKPPC // detect failkit apps packed with the mini stub if (entry & 0xc0000000) { void (*ep)() = (void (*)()) entry;