falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match SysCfb_Init without extra symbols (#1780)

This commit is contained in:
Derek Hensley 2024-12-28 03:47:11 -08:00 committed by GitHub
parent da09352606
commit 385c45ad48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/buffers.h
View File

@ -15,9 +15,6 @@ typedef union {
}; };
} BufferLow; } BufferLow;
// Equivalent to gLoBuffer.framebufferHiRes, but a different symbol is required to match
extern u16 gFramebufferHiRes1[HIRES_BUFFER_WIDTH][HIRES_BUFFER_HEIGHT];
extern BufferLow gLoBuffer; extern BufferLow gLoBuffer;
@ -36,9 +33,6 @@ typedef union {
}; };
} BufferHigh; } BufferHigh;
// Equivalent to gHiBuffer.framebufferHiRes, but a different symbol is required to match
extern u16 gFramebufferHiRes0[HIRES_BUFFER_HEIGHT][HIRES_BUFFER_WIDTH];
extern BufferHigh gHiBuffer; extern BufferHigh gHiBuffer;
#ifndef FRAMEBUFFERS_START_ADDR #ifndef FRAMEBUFFERS_START_ADDR

5
linker_scripts/final/undefined_syms.ld
View File

@ -1,8 +1,3 @@
// sys_cfb buffers
gFramebufferHiRes1 = gLoBuffer;
gFramebufferHiRes0 = gHiBuffer;
// Ucode symbols // Ucode symbols
rspbootTextEnd = rspbootTextStart + 0x160; rspbootTextEnd = rspbootTextStart + 0x160;

14
src/code/sys_cfb.c
View File

@ -88,10 +88,16 @@ void SysCfb_SetHiResMode(void) {
} }
void SysCfb_Init(void) { void SysCfb_Init(void) {
sCfbLoRes1 = gLoBuffer.framebuffer; do {
sCfbLoRes0 = gHiBuffer.framebuffer; sCfbLoRes1 = gLoBuffer.framebuffer;
sCfbHiRes1 = gFramebufferHiRes1; sCfbLoRes0 = gHiBuffer.framebuffer;
sCfbHiRes0 = gFramebufferHiRes0; } while ((u64)0);
do {
sCfbHiRes1 = gLoBuffer.framebufferHiRes;
sCfbHiRes0 = gHiBuffer.framebufferHiRes;
} while ((u64)0);
SysCfb_SetLoResMode(); SysCfb_SetLoResMode();
} }