osFlash cleanup

pmret · Jul 20, 2023 · ecbf16b · ecbf16b
1 parent 72924bf
commit ecbf16b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/main.c b/src/main.c
@@ -77,6 +77,14 @@ SHIFT_BSS s32 D_800B0D08;
 // boot.s
 SHIFT_BSS u8 nuBootStack[0x2000];
 
+//osFlash.c (IDO)
+SHIFT_BSS u32 __osFlashID[4];
+SHIFT_BSS OSIoMesg __osFlashMsg;
+SHIFT_BSS OSMesgQueue __osFlashMessageQ;
+SHIFT_BSS OSPiHandle __osFlashHandler;
+SHIFT_BSS OSMesg __osFlashMsgBuf;
+SHIFT_BSS s32 __osFlashVersion;
+
 //
 // End of libultra BSS
 //

diff --git a/src/os/osFlash.c b/src/os/osFlash.c
@@ -1,20 +1,6 @@
 #include "ultra64.h"
 #include "PR/os_flash.h"
 
-#ifdef SHIFT
-#define SHIFT_BSS
-#else
-#define SHIFT_BSS extern
-#endif
-
-// TODO did this work?
-SHIFT_BSS u32 __osFlashID[4];
-SHIFT_BSS OSIoMesg __osFlashMsg;
-SHIFT_BSS OSMesgQueue __osFlashMessageQ;
-SHIFT_BSS OSPiHandle __osFlashHandler;
-SHIFT_BSS OSMesg __osFlashMsgBuf;
-SHIFT_BSS s32 __osFlashVersion;
-
 OSPiHandle* osFlashReInit(u8 latency, u8 pulse, u8 page_size, u8 rel_duration, u32 start) {
     __osFlashHandler.baseAddress = PHYS_TO_K1(start);
     __osFlashHandler.type++;