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

review

This commit is contained in:
angie 2023-09-23 13:51:08 -03:00
parent 71d0f4e050
commit c734cce6f0
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/macros.h
View File

@ -21,7 +21,7 @@
#define ARRAY_COUNT_2D(arr) (ARRAY_COUNT(arr) * ARRAY_COUNT(arr[0]))
#define SEGMENTED_TO_VIRTUAL(addr) (void*)(((uintptr_t)(gSegments[SEGMENT_NUMBER(addr)]) + K0BASE) + SEGMENT_OFFSET(addr))
#define SEGMENTED_TO_VIRTUAL(addr) (void*)((gSegments[SEGMENT_NUMBER(addr)] + K0BASE) + SEGMENT_OFFSET(addr))
#define GET_ACTIVE_CAM(play) ((play)->cameraPtrs[(play)->activeCamId])

2
src/code/z_demo.c
View File

@ -1,6 +1,6 @@
#include "prevent_bss_reordering.h"
#include "PR/ultratypes.h"
#include "prevent_bss_reordering2.h"
#include "PR/ultratypes.h"
// Variables are put before most headers as a hacky way to bypass bss reordering
struct CutsceneCamera;

2
src/libultra/flash/osFlash.c
View File

@ -14,8 +14,8 @@ static s32 sBssPad[5];
uintptr_t osFlashGetAddr(u32 pageNum) {
uintptr_t addr;
// Account for hardware bug in old flash where the address bits are shifted 1-off where they should be
if (__osFlashVersion == OLD_FLASH) {
// Account for hardware bug in old flash where the address bits are shifted 1-off where they should be
addr = pageNum * (FLASH_BLOCK_SIZE >> 1);
} else {
addr = pageNum * FLASH_BLOCK_SIZE;

6
src/libultra/io/pfsisplug.c
View File

@ -70,10 +70,10 @@ void __osPfsRequestData(u8 poll) {
req.align1 = CONT_CMD_NOP;
for (i = 0; i < __osMaxControllers; i++) {
*((__OSContRequesFormat*)bufPtr) = req;
*(__OSContRequesFormat*)bufPtr = req;
bufPtr += sizeof(__OSContRequesFormat);
}
*((u8*)bufPtr) = CONT_CMD_END;
*bufPtr = CONT_CMD_END;
}
void __osPfsGetInitData(u8* pattern, OSContStatus* contData) {
@ -85,7 +85,7 @@ void __osPfsGetInitData(u8* pattern, OSContStatus* contData) {
bufptr = (u8*)&__osPfsPifRam;
for (i = 0; i < __osMaxControllers; i++, bufptr += sizeof(req), contData++) {
req = *((__OSContRequesFormat*)bufptr);
req = *(__OSContRequesFormat*)bufptr;
contData->errno = CHNL_ERR(req);
if (contData->errno) {

4
src/libultra/os/stopthread.c
View File

@ -1,11 +1,9 @@
#include "ultra64.h"
void osStopThread(OSThread* t) {
register u32 saveMask;
register u32 saveMask = __osDisableInt();
register u16 state;
saveMask = __osDisableInt();
if (t == NULL) {
state = OS_STATE_RUNNING;
} else {