diff options
Diffstat (limited to 'src/libultra_boot_O2')
35 files changed, 54 insertions, 71 deletions
diff --git a/src/libultra_boot_O2/_Ldtob.c b/src/libultra_boot_O2/_Ldtob.c index 57a49cc8c..68a9c5404 100644 --- a/src/libultra_boot_O2/_Ldtob.c +++ b/src/libultra_boot_O2/_Ldtob.c @@ -1,14 +1,11 @@ -#include <global.h> -#include <stdlib.h> -#include <string.h> -#include <ultra64/printf.h> +#include "global.h" #define BUFF_LEN 0x20 s16 _Ldunscale(s16*, _Pft*); void _Genld(_Pft*, u8, u8*, s16, s16); -const double D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L }; +const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L }; /* float properties */ #define _D0 0 @@ -161,8 +158,8 @@ void _Ldtob(_Pft* args, u8 type) { s16 _Ldunscale(s16* pex, _Pft* px) { - unsigned short* ps = (unsigned short*)px; - short xchar = (ps[_D0] & _DMASK) >> _DOFF; + u16* ps = (u16*)px; + s16 xchar = (ps[_D0] & _DMASK) >> _DOFF; if (xchar == _DMAX) { /* NaN or INF */ *pex = 0; return (s16)(ps[_D0] & _DFRAC || ps[_D1] || ps[_D2] || ps[_D3] ? NAN : INF); @@ -275,7 +272,7 @@ void _Genld(_Pft* px, u8 code, u8* p, s16 nsig, s16 xexp) { px->n2 = p - (u8*)&px->s[px->n1]; } if ((px->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { /* pad with leading zeros */ - int n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; + s32 n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; if (n < px->width) { px->nz0 = px->width - n; diff --git a/src/libultra_boot_O2/_Litob.c b/src/libultra_boot_O2/_Litob.c index 5b2329cd3..0f9452124 100644 --- a/src/libultra_boot_O2/_Litob.c +++ b/src/libultra_boot_O2/_Litob.c @@ -1,7 +1,4 @@ -#include <global.h> -#include <stdlib.h> -#include <string.h> -#include <ultra64/printf.h> +#include "global.h" #define BUFF_LEN 0x18 diff --git a/src/libultra_boot_O2/_Printf.c b/src/libultra_boot_O2/_Printf.c index a5f922d56..e8fa2c696 100644 --- a/src/libultra_boot_O2/_Printf.c +++ b/src/libultra_boot_O2/_Printf.c @@ -1,7 +1,4 @@ -#include <ultra64.h> -#include <ultra64/printf.h> -#include <stdarg.h> -#include <string.h> +#include "global.h" #define ATOI(i, a) \ for (i = 0; *a >= '0' && *a <= '9'; a++) \ @@ -17,8 +14,8 @@ } #define _PAD(m, src, extracond) \ if (extracond && m > 0) { \ - int i; \ - int j; \ + s32 i; \ + s32 j; \ for (j = m; j > 0; j -= i) { \ if ((u32)j > 32) \ i = 32; \ @@ -203,7 +200,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { break; case 'p': - px->v.ll = (long)va_arg(*pap, void*); + px->v.ll = (s64)va_arg(*pap, void*); px->s = (char*)&ac[px->n0]; _Litob(px, 'x'); break; diff --git a/src/libultra_boot_O2/__osDevMgrMain.c b/src/libultra_boot_O2/__osDevMgrMain.c index 9065b903c..e481c33fb 100644 --- a/src/libultra_boot_O2/__osDevMgrMain.c +++ b/src/libultra_boot_O2/__osDevMgrMain.c @@ -1,5 +1,5 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" +#include "ultra64/internal.h" void __osDevMgrMain(void* arg) { OSIoMesg* ioMesg; diff --git a/src/libultra_boot_O2/__osEPiRawReadIo.c b/src/libultra_boot_O2/__osEPiRawReadIo.c index b1e9b88d0..6aa0bf0b6 100644 --- a/src/libultra_boot_O2/__osEPiRawReadIo.c +++ b/src/libultra_boot_O2/__osEPiRawReadIo.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { s32 status; diff --git a/src/libultra_boot_O2/__osEPiRawStartDma.c b/src/libultra_boot_O2/__osEPiRawStartDma.c index cc28a6ca9..924648448 100644 --- a/src/libultra_boot_O2/__osEPiRawStartDma.c +++ b/src/libultra_boot_O2/__osEPiRawStartDma.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) { s32 status; diff --git a/src/libultra_boot_O2/__osEPiRawWriteIo.c b/src/libultra_boot_O2/__osEPiRawWriteIo.c index 08d817bfa..7c5701e0d 100644 --- a/src/libultra_boot_O2/__osEPiRawWriteIo.c +++ b/src/libultra_boot_O2/__osEPiRawWriteIo.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { s32 status; diff --git a/src/libultra_boot_O2/__osPiRawStartDma.c b/src/libultra_boot_O2/__osPiRawStartDma.c index 589a63b3b..d323a66b3 100644 --- a/src/libultra_boot_O2/__osPiRawStartDma.c +++ b/src/libultra_boot_O2/__osPiRawStartDma.c @@ -1,16 +1,15 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" -s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size) { - register int status; +s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size) { + register s32 status; status = HW_REG(PI_STATUS_REG, u32); while (status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { status = HW_REG(PI_STATUS_REG, u32); } - HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dram_addr); + HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr); - HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cart_addr) & 0x1fffffff); + HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cartAddr) & 0x1fffffff); switch (dir) { case OS_READ: diff --git a/src/libultra_boot_O2/__osSiDeviceBusy.c b/src/libultra_boot_O2/__osSiDeviceBusy.c index 86833fd36..ec2462f83 100644 --- a/src/libultra_boot_O2/__osSiDeviceBusy.c +++ b/src/libultra_boot_O2/__osSiDeviceBusy.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osSiDeviceBusy() { register u32 status; diff --git a/src/libultra_boot_O2/__osSiRawReadIo.c b/src/libultra_boot_O2/__osSiRawReadIo.c index fa26c8e2a..b68f475e9 100644 --- a/src/libultra_boot_O2/__osSiRawReadIo.c +++ b/src/libultra_boot_O2/__osSiRawReadIo.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osSiRawReadIo(void* a0, u32* a1) { if (__osSiDeviceBusy()) { diff --git a/src/libultra_boot_O2/__osSiRawWriteIo.c b/src/libultra_boot_O2/__osSiRawWriteIo.c index 7658b5a97..91d03f970 100644 --- a/src/libultra_boot_O2/__osSiRawWriteIo.c +++ b/src/libultra_boot_O2/__osSiRawWriteIo.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" s32 __osSiRawWriteIo(void* a0, u32 a1) { if (__osSiDeviceBusy()) { diff --git a/src/libultra_boot_O2/__osViGetCurrentContext.c b/src/libultra_boot_O2/__osViGetCurrentContext.c index fea88be8f..f83a2d0ee 100644 --- a/src/libultra_boot_O2/__osViGetCurrentContext.c +++ b/src/libultra_boot_O2/__osViGetCurrentContext.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" OSViContext* __osViGetCurrentContext() { return __osViCurr; diff --git a/src/libultra_boot_O2/__osViInit.c b/src/libultra_boot_O2/__osViInit.c index becce34ab..43f2abb02 100644 --- a/src/libultra_boot_O2/__osViInit.c +++ b/src/libultra_boot_O2/__osViInit.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" OSViContext vi[2] = { 0 }; OSViContext* __osViCurr = &vi[0]; diff --git a/src/libultra_boot_O2/__osViSwapContext.c b/src/libultra_boot_O2/__osViSwapContext.c index 4dcc4c870..8f202d17c 100644 --- a/src/libultra_boot_O2/__osViSwapContext.c +++ b/src/libultra_boot_O2/__osViSwapContext.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" void __osViSwapContext() { register OSViMode* s0; diff --git a/src/libultra_boot_O2/ldiv.c b/src/libultra_boot_O2/ldiv.c index 391fe79c4..8c53d3d4c 100644 --- a/src/libultra_boot_O2/ldiv.c +++ b/src/libultra_boot_O2/ldiv.c @@ -1,7 +1,6 @@ -#include <global.h> -#include <stdlib.h> +#include "global.h" -ldiv_t ldiv(long num, long denom) { +ldiv_t ldiv(s32 num, s32 denom) { ldiv_t ret; ret.quot = num / denom; @@ -14,7 +13,7 @@ ldiv_t ldiv(long num, long denom) { return ret; } -lldiv_t lldiv(long long num, long long denom) { +lldiv_t lldiv(s64 num, s64 denom) { lldiv_t ret; ret.quot = num / denom; diff --git a/src/libultra_boot_O2/osCartRomInit.c b/src/libultra_boot_O2/osCartRomInit.c index eef5be9fd..a46e0e09b 100644 --- a/src/libultra_boot_O2/osCartRomInit.c +++ b/src/libultra_boot_O2/osCartRomInit.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" OSPiHandle __CartRomHandle; diff --git a/src/libultra_boot_O2/osDriveRomInit.c b/src/libultra_boot_O2/osDriveRomInit.c index 4dd49a629..83b3c9fc6 100644 --- a/src/libultra_boot_O2/osDriveRomInit.c +++ b/src/libultra_boot_O2/osDriveRomInit.c @@ -1,5 +1,4 @@ -#include <global.h> -#include <ultra64/hardware.h> +#include "global.h" OSPiHandle __DriveRomHandle; diff --git a/src/libultra_boot_O2/osEPiReadIo.c b/src/libultra_boot_O2/osEPiReadIo.c index 964330c30..d05604a58 100644 --- a/src/libultra_boot_O2/osEPiReadIo.c +++ b/src/libultra_boot_O2/osEPiReadIo.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { register s32 ret; diff --git a/src/libultra_boot_O2/osEPiStartDma.c b/src/libultra_boot_O2/osEPiStartDma.c index 83fc694a3..f1dccc833 100644 --- a/src/libultra_boot_O2/osEPiStartDma.c +++ b/src/libultra_boot_O2/osEPiStartDma.c @@ -1,4 +1,5 @@ -#include <global.h> +#include "global.h" +#include "ultra64/internal.h" s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) { s32 ret; diff --git a/src/libultra_boot_O2/osEPiWriteIo.c b/src/libultra_boot_O2/osEPiWriteIo.c index 5d4f61a2f..0547e6999 100644 --- a/src/libultra_boot_O2/osEPiWriteIo.c +++ b/src/libultra_boot_O2/osEPiWriteIo.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { register s32 ret; diff --git a/src/libultra_boot_O2/osPiGetCmdQueue.c b/src/libultra_boot_O2/osPiGetCmdQueue.c index 1f097a926..a4454ec82 100644 --- a/src/libultra_boot_O2/osPiGetCmdQueue.c +++ b/src/libultra_boot_O2/osPiGetCmdQueue.c @@ -1,4 +1,5 @@ -#include <global.h> +#include "global.h" +#include "ultra64/internal.h" OSMesgQueue* osPiGetCmdQueue() { if (!__osPiDevMgr.initialized) { diff --git a/src/libultra_boot_O2/osViBlack.c b/src/libultra_boot_O2/osViBlack.c index 753619b8b..3e877a387 100644 --- a/src/libultra_boot_O2/osViBlack.c +++ b/src/libultra_boot_O2/osViBlack.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" // TODO: name magic constants void osViBlack(u8 active) { diff --git a/src/libultra_boot_O2/osViGetNextFramebuffer.c b/src/libultra_boot_O2/osViGetNextFramebuffer.c index a8b642603..86f8549ab 100644 --- a/src/libultra_boot_O2/osViGetNextFramebuffer.c +++ b/src/libultra_boot_O2/osViGetNextFramebuffer.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" void* osViGetNextFramebuffer() { s32 prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViModeFpalLan1.c b/src/libultra_boot_O2/osViModeFpalLan1.c index 357b5837a..f3e7421ba 100644 --- a/src/libultra_boot_O2/osViModeFpalLan1.c +++ b/src/libultra_boot_O2/osViModeFpalLan1.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" OSViMode osViModeFpalLan1 = { 0x2C, // type diff --git a/src/libultra_boot_O2/osViModeMpalLan1.c b/src/libultra_boot_O2/osViModeMpalLan1.c index 5e75ea39a..b872b897e 100644 --- a/src/libultra_boot_O2/osViModeMpalLan1.c +++ b/src/libultra_boot_O2/osViModeMpalLan1.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" OSViMode osViModeMpalLan1 = { 0x1E, // type diff --git a/src/libultra_boot_O2/osViModeNtscLan1.c b/src/libultra_boot_O2/osViModeNtscLan1.c index 267c5eaf0..80330f21e 100644 --- a/src/libultra_boot_O2/osViModeNtscLan1.c +++ b/src/libultra_boot_O2/osViModeNtscLan1.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" OSViMode osViModeNtscLan1 = { 2, // type diff --git a/src/libultra_boot_O2/osViSetMode.c b/src/libultra_boot_O2/osViSetMode.c index 6b7a5e21a..db3e7fc2a 100644 --- a/src/libultra_boot_O2/osViSetMode.c +++ b/src/libultra_boot_O2/osViSetMode.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" void osViSetMode(OSViMode* mode) { register u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSetSpecialFeatures.c b/src/libultra_boot_O2/osViSetSpecialFeatures.c index ab949ba31..63e8ab5f3 100644 --- a/src/libultra_boot_O2/osViSetSpecialFeatures.c +++ b/src/libultra_boot_O2/osViSetSpecialFeatures.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" void osViSetSpecialFeatures(u32 func) { register u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSetXScale.c b/src/libultra_boot_O2/osViSetXScale.c index 3c3103c46..e6a9ec6bb 100644 --- a/src/libultra_boot_O2/osViSetXScale.c +++ b/src/libultra_boot_O2/osViSetXScale.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" void osViSetXScale(f32 value) { register u32 nomValue; diff --git a/src/libultra_boot_O2/osViSetYScale.c b/src/libultra_boot_O2/osViSetYScale.c index 91f12fed2..cde3b56b0 100644 --- a/src/libultra_boot_O2/osViSetYScale.c +++ b/src/libultra_boot_O2/osViSetYScale.c @@ -1,6 +1,6 @@ -#include <global.h> +#include "global.h" -void osViSetYScale(float scale) { +void osViSetYScale(f32 scale) { register s32 prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSwapBuffer.c b/src/libultra_boot_O2/osViSwapBuffer.c index c671a50f0..13995291d 100644 --- a/src/libultra_boot_O2/osViSwapBuffer.c +++ b/src/libultra_boot_O2/osViSwapBuffer.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" void osViSwapBuffer(void* vaddr) { u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/pimgr.c b/src/libultra_boot_O2/pimgr.c index 581f66f48..4239f8f78 100644 --- a/src/libultra_boot_O2/pimgr.c +++ b/src/libultra_boot_O2/pimgr.c @@ -1,4 +1,5 @@ -#include <global.h> +#include "global.h" +#include "ultra64/internal.h" OSMgrArgs __osPiDevMgr = { 0 }; diff --git a/src/libultra_boot_O2/sprintf.c b/src/libultra_boot_O2/sprintf.c index 2ff0b33e0..96698b79e 100644 --- a/src/libultra_boot_O2/sprintf.c +++ b/src/libultra_boot_O2/sprintf.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" char* proutSprintf(char* dst, const char* fmt, size_t size) { return (char*)memcpy(dst, fmt, size) + size; diff --git a/src/libultra_boot_O2/string.c b/src/libultra_boot_O2/string.c index 529ba37d8..cea07c253 100644 --- a/src/libultra_boot_O2/string.c +++ b/src/libultra_boot_O2/string.c @@ -1,4 +1,4 @@ -#include <global.h> +#include "global.h" const u8* strchr(const u8* str, s32 ch) { u8 c = ch; diff --git a/src/libultra_boot_O2/vimgr.c b/src/libultra_boot_O2/vimgr.c index d2839078e..5525ec74f 100644 --- a/src/libultra_boot_O2/vimgr.c +++ b/src/libultra_boot_O2/vimgr.c @@ -1,4 +1,5 @@ -#include <global.h> +#include "global.h" +#include "ultra64/internal.h" typedef struct { u16 unk00; |