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

fixes and format

This commit is contained in:
angie 2023-09-19 16:11:51 -03:00
parent 64f5474213
commit a679b6bae4
10 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/PR/os_time.h
View File

@ -18,7 +18,7 @@ typedef struct OSTimer_s {
OSTime osGetTime(void);
void osSetTime(OSTime ticks);
s32 osSetTimer(OSTimer* t, OSTime value, OSTime interval, OSMesgQueue* mq, OSMesg msg);
s32 osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg);
s32 osStopTimer(OSTimer* t);

1
src/boot/fault.c
View File

@ -55,7 +55,6 @@
FaultMgr* sFaultInstance;
f32 sFaultTimeTotal; // read but not set anywhere
// data
const char* sCpuExceptions[] = {
"Interrupt",

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

@ -1,6 +1,7 @@
#include "ultra64.h"
#include "PR/os_internal_flash.h"
#include "alignment.h"
#include "macros.h"
u32 __osFlashID[4] ALIGNED(8);
OSIoMesg __osFlashMsg ALIGNED(8);

1
src/libultra/gu/lookat.c
View File

@ -1,4 +1,5 @@
#include "ultra64.h"
#include "macros.h"
void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
f32 length;

1
src/libultra/gu/lookathil.c
View File

@ -1,4 +1,5 @@
#include "ultra64.h"
#include "macros.h"
void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt,
f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, /* light 1 direction */

3
src/libultra/io/devmgr.c
View File

@ -49,7 +49,8 @@ void __osDevMgrMain(void* arg) {
__osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL, transfer->bmCtlShadow);
__osEPiRawReadIo(ioMesg->piHandle, LEO_STATUS, &status);
if (status & LEO_STATUS_MECHANIC_INTERRUPT) {
__osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL, transfer->bmCtlShadow | LEO_BM_CTL_CLR_MECHANIC_INTR);
__osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL,
transfer->bmCtlShadow | LEO_BM_CTL_CLR_MECHANIC_INTR);
}
block->errStatus = 4;
IO_WRITE(PI_STATUS_REG, PI_CLR_INTR);

16
src/libultra/vimodes/vimodempallan1.c
View File

@ -8,14 +8,14 @@ OSViMode osViModeMpalLan1 = {
// comRegs
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
VI_CTRL_PIXEL_ADV_3, // ctrl
WIDTH(320), // width
BURST(57, 30, 5, 70), // burst
VSYNC(525), // vSync
HSYNC(3089, 4), // hSync
LEAP(3097, 3098), // leap
HSTART(108, 748), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
WIDTH(320), // width
BURST(57, 30, 5, 70), // burst
VSYNC(525), // vSync
HSYNC(3089, 4), // hSync
LEAP(3097, 3098), // leap
HSTART(108, 748), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
},
{ // fldRegs
{

16
src/libultra/vimodes/vimodentschpf1.c
View File

@ -8,14 +8,14 @@ OSViMode osViModeNtscHpf1 = {
// comRegs
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_SERRATE_ON | VI_CTRL_ANTIALIAS_MODE_2 |
VI_CTRL_PIXEL_ADV_3, // ctrl
WIDTH(640), // width
BURST(57, 34, 5, 62), // 0x3E52239, // burst
VSYNC(524), // vSync
HSYNC(3093, 0), // hSync
LEAP(3093, 3093), // leap
HSTART(108, 748), // 0x6C02EC, // hStart
SCALE(1, 0), // xScale
VCURRENT(0), // vCurrent
WIDTH(640), // width
BURST(57, 34, 5, 62), // 0x3E52239, // burst
VSYNC(524), // vSync
HSYNC(3093, 0), // hSync
LEAP(3093, 3093), // leap
HSTART(108, 748), // 0x6C02EC, // hStart
SCALE(1, 0), // xScale
VCURRENT(0), // vCurrent
},
{ // fldRegs
{

16
src/libultra/vimodes/vimodentsclan1.c
View File

@ -8,14 +8,14 @@ OSViMode osViModeNtscLan1 = {
// comRegs
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
VI_CTRL_PIXEL_ADV_3, // ctrl
WIDTH(320), // width
BURST(57, 34, 5, 62), // burst
VSYNC(525), // vSync
HSYNC(3093, 0), // hSync
LEAP(3093, 3093), // leap
HSTART(108, 748), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
WIDTH(320), // width
BURST(57, 34, 5, 62), // burst
VSYNC(525), // vSync
HSYNC(3093, 0), // hSync
LEAP(3093, 3093), // leap
HSTART(108, 748), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
},
{ // fldRegs
{

16
src/libultra/vimodes/vimodepallan1.c
View File

@ -8,14 +8,14 @@ OSViMode osViModePalLan1 = {
// comRegs
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
VI_CTRL_PIXEL_ADV_3, // ctrl
WIDTH(320), // width
BURST(58, 30, 4, 69), // burst
VSYNC(625), // vSync
HSYNC(3177, 23), // hSync
LEAP(3183, 3181), // leap
HSTART(128, 768), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
WIDTH(320), // width
BURST(58, 30, 4, 69), // burst
VSYNC(625), // vSync
HSYNC(3177, 23), // hSync
LEAP(3183, 3181), // leap
HSTART(128, 768), // hStart
SCALE(2, 0), // xScale
VCURRENT(0), // vCurrent
},
{ // fldRegs
{