From 399f5a1b33c99628aaa85cb724cf7ec4636ea846 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Mon, 17 Jan 2022 17:45:20 -0300 Subject: Split rsp files (#602) --- src/code/sys_ucode.c | 7 +++++-- src/code/z_jpeg.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/code') diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index 9bde9e6df..f9433eab2 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -7,8 +7,11 @@ extern u64 rspbootTextStart[]; extern u64 rspbootTextEnd[]; -u64* initialgspUcodeText = gspF3DEX2_NoN_fifoTextStart; -u64* initialgspUcodeData = gspF3DEX2_NoN_fifoDataStart; +extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[]; +extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[]; + +u64* initialgspUcodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart; +u64* initialgspUcodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart; u64* SysUcode_GetUCodeBoot(void) { return rspbootTextStart; diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index c611ab1f8..7b9254ccd 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -16,6 +16,9 @@ #define MARKER_COM 0xFE #define MARKER_EOI 0xD9 +extern u64 njpgdspMainTextStart[]; +extern u64 njpgdspMainDataStart[]; + /** * Configures and schedules a JPEG decoder task and waits for it to finish. */ @@ -25,9 +28,9 @@ void Jpeg_ScheduleDecoderTask(JpegContext* jpegCtx) { 0, // flags NULL, // ucode_boot 0, // ucode_boot_size - gJpegUCode, // ucode + njpgdspMainTextStart, // ucode 0x1000, // ucode_size - gJpegUCodeData, // ucode_data + njpgdspMainDataStart, // ucode_data 0x800, // ucode_data_size NULL, // dram_stack 0, // dram_stack_size -- cgit v1.2.3