From 765cfd63e97b4b7ece2ff4d4a65c2b65e1db7501 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Tue, 3 May 2022 23:43:09 +0100
Subject: Name rsp ucodes and surrounding cleanup (#1166)

* Name rsp ucodes and surrounding cleanup

* Fix comments alignment and remove unnecessary & in sys_ucode

* Change capitalization of sys_ucode variables

* Remove unnecessary externs for aspMain

* Improvements to Jpeg_ScheduleDecoderTask

* Split unknown rsp code into a separate file, spacing
---
 src/code/sys_ucode.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/code/sys_ucode.c')

diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 5ead2320c..2be2566e8 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,20 +1,20 @@
 #include "global.h"
 
-u32 D_8012DBA0 = (u32)&D_80155F50;
-u32 D_8012DBA4 = (u32)&D_80157580;
+u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
+u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
 
-u32 SysUcode_GetUCodeBoot(void) {
-    return &D_80009320;
+u64* SysUcode_GetUCodeBoot(void) {
+    return rspbootTextStart;
 }
 
-u32 SysUcode_GetUCodeBootSize(void) {
-    return (u32)&D_800093F0 - (u32)&D_80009320;
+size_t SysUcode_GetUCodeBootSize(void) {
+    return (size_t)((u8*)rspbootTextEnd - (u8*)rspbootTextStart);
 }
 
-u32 SysUcode_GetUCode(void) {
-    return D_8012DBA0;
+u64* SysUcode_GetUCode(void) {
+    return sDefaultGSPUCodeText;
 }
 
-u32 SysUcode_GetUCodeData(void) {
-    return D_8012DBA4;
+u64* SysUcode_GetUCodeData(void) {
+    return sDefaultGSPUCodeData;
 }
-- 
cgit v1.2.3