mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 03:44:34 +00:00
Code Issues Projects Releases Wiki Activity

Use intptr types in more code files (#1385)

Browse source 
* Use intptr types for segments and a few system files

* Use intptr types for more dma rom addresses

* Use intptr types in data referring to rom files

* Update and cleanup a few message casts

* Change sys_cfb functions and debugHeapStart to use pointers

* Update graph.c for the sys_cfb return type change
This commit is contained in:
Roman971 2022-10-02 17:38:09 +02:00 • committed by GitHub
parent e257416c07
commit f5a7c5612b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 205 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/code/sys_cfb.c
View file

@ -1,11 +1,11 @@
#include "global.h"
u32 sSysCfbFbPtr[2];
u32 sSysCfbEnd;
uintptr_t sSysCfbFbPtr[2];
uintptr_t sSysCfbEnd;
void SysCfb_Init(s32 n64dd) {
u32 screenSize;
u32 tmpFbEnd;
uintptr_t tmpFbEnd;
if (osMemSize >= 0x800000) {
// "8MB or more memory is installed"
@ -42,13 +42,13 @@ void SysCfb_Reset(void) {
sSysCfbEnd = 0;
}
u32 SysCfb_GetFbPtr(s32 idx) {
void* SysCfb_GetFbPtr(s32 idx) {
if (idx < 2) {
return sSysCfbFbPtr[idx];
return (void*)sSysCfbFbPtr[idx];
}
return 0;
return NULL;
}
u32 SysCfb_GetFbEnd(void) {
return sSysCfbEnd;
void* SysCfb_GetFbEnd(void) {
return (void*)sSysCfbEnd;
}