From 3bb7f0f5e24480fb9f052a858c2368dbd64c668a Mon Sep 17 00:00:00 2001 From: Edoardo Lolletti Date: Fri, 26 Apr 2024 22:00:24 +0200 Subject: [PATCH] Disable again lto and mark console id shared address as volatile --- arm9/Makefile | 4 ++-- arm9/src/nand/nandio.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arm9/Makefile b/arm9/Makefile index fa10bc2..7110017 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -30,12 +30,12 @@ CFLAGS := -g -Wall -O2\ -ffast-math \ $(ARCH) -CFLAGS += $(INCLUDE) -DARM9 -flto +CFLAGS += $(INCLUDE) -DARM9 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++23 ASFLAGS := -g $(ARCH) -march=armv5te -mtune=arm946e-s -LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -flto +LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/arm9/src/nand/nandio.c b/arm9/src/nand/nandio.c index c1952a7..751cc9c 100644 --- a/arm9/src/nand/nandio.c +++ b/arm9/src/nand/nandio.c @@ -53,7 +53,7 @@ void nandio_set_fat_sig_fix(u32 offset) static void getConsoleID(u8 *consoleID) { - u8 *fifo=(u8*)0x02300000; //shared mem address that has our computed key3 stuff + vu8 *fifo=(vu8*)0x02300000; //shared mem address that has our computed key3 stuff u8 key[16]; //key3 normalkey - keyslot 3 is used for DSi/twln NAND crypto u8 key_x[16];////key3_x - contains a DSi console id (which just happens to be the LFCS on 3ds)