summaryrefslogtreecommitdiff
path: root/arm9/lib/src
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-05-25 14:51:35 +0100
committerred031000 <rubenru09@aol.com>2020-05-25 14:51:35 +0100
commit933dc9d738e830e797e16f056b49a3c79bcd8352 (patch)
tree362f6e56c80e99c51c1a2b5b5571f0eb5c4042aa /arm9/lib/src
parente69b83243cb195429be9c40ec1ced2ed860458a2 (diff)
the warnings never end
Diffstat (limited to 'arm9/lib/src')
-rw-r--r--arm9/lib/src/FS_command.c4
-rw-r--r--arm9/lib/src/FS_file.c16
-rw-r--r--arm9/lib/src/FX_cp.c24
-rw-r--r--arm9/lib/src/FX_mtx22.c8
-rw-r--r--arm9/lib/src/GX_g2.c38
-rw-r--r--arm9/lib/src/GX_g3_util.c90
-rw-r--r--arm9/lib/src/MATH_crc.c14
-rw-r--r--arm9/lib/src/OS_arena.c4
8 files changed, 99 insertions, 99 deletions
diff --git a/arm9/lib/src/FS_command.c b/arm9/lib/src/FS_command.c
index 818a65ea..7e0d41c9 100644
--- a/arm9/lib/src/FS_command.c
+++ b/arm9/lib/src/FS_command.c
@@ -10,7 +10,7 @@ ARM_FUNC void FSi_ReleaseCommand(FSFile * p_file, FSResult ret)
p_file->stat &= ~(FS_FILE_STATUS_CANCEL | FS_FILE_STATUS_BUSY | FS_FILE_STATUS_SYNC | FS_FILE_STATUS_ASYNC | FS_FILE_STATUS_OPERATING);
p_file->error = ret;
OS_WakeupThread(p_file->queue);
- OS_RestoreInterrupts(bak_psr);
+ (void)OS_RestoreInterrupts(bak_psr);
}
ARM_FUNC FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command)
@@ -58,7 +58,7 @@ ARM_FUNC FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command)
while (FSi_IsArchiveSync(p_arc))
OS_SleepThread(&p_arc->sync_q);
ret = p_file->error;
- OS_RestoreInterrupts(bak_psr);
+ (void)OS_RestoreInterrupts(bak_psr);
}
}
else if (!FS_IsFileSyncMode(p_file))
diff --git a/arm9/lib/src/FS_file.c b/arm9/lib/src/FS_file.c
index 8bca5c8e..c1a6c54d 100644
--- a/arm9/lib/src/FS_file.c
+++ b/arm9/lib/src/FS_file.c
@@ -90,23 +90,23 @@ static BOOL FSi_FindPath(FSFile * p_dir, const char * path, FSFileID * p_file_id
ARM_FUNC int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async)
{
- const s32 pos = p_file->prop.file.pos;
- const s32 rest = p_file->prop.file.bottom - pos;
- const u32 org = len;
+ const s32 pos = (s32)p_file->prop.file.pos;
+ const s32 rest = (s32)(p_file->prop.file.bottom - pos);
+ const u32 org = (u32)len;
if (len > rest)
len = rest;
if (len < 0)
len = 0;
p_file->arg.readfile.dst = dst;
p_file->arg.readfile.len_org = org;
- p_file->arg.readfile.len = len;
+ p_file->arg.readfile.len = (u32)len;
if (!async)
p_file->stat |= FS_FILE_STATUS_SYNC;
- FSi_SendCommand(p_file, FS_COMMAND_READFILE);
+ (void)FSi_SendCommand(p_file, FS_COMMAND_READFILE);
if (!async)
{
if (FS_WaitAsync(p_file))
- len = p_file->prop.file.pos - pos;
+ len = (s32)(p_file->prop.file.pos - pos);
else
len = -1;
}
@@ -206,7 +206,7 @@ ARM_FUNC int FS_ReadFile(FSFile * p_file, void * dst, s32 len)
return FSi_ReadFileCore(p_file, dst, len, FALSE);
}
-ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, int offset, FSSeekFileMode origin)
+ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, s32 offset, FSSeekFileMode origin)
{
switch (origin)
{
@@ -226,7 +226,7 @@ ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, int offset, FSSeekFileMode origin)
offset = (s32)p_file->prop.file.top;
if (offset > (s32)p_file->prop.file.bottom)
offset = (s32)p_file->prop.file.bottom;
- p_file->prop.file.pos = offset;
+ p_file->prop.file.pos = (u32)offset;
return TRUE;
}
diff --git a/arm9/lib/src/FX_cp.c b/arm9/lib/src/FX_cp.c
index 3b6e6c96..83967ff3 100644
--- a/arm9/lib/src/FX_cp.c
+++ b/arm9/lib/src/FX_cp.c
@@ -17,7 +17,7 @@ ARM_FUNC fx32 FX_Sqrt(fx32 x){
if (x > 0)
{
reg_CP_SQRTCNT = 0x1;
- reg_CP_SQRT_PARAM = (fx64)x << 32;
+ reg_CP_SQRT_PARAM = (u64)((fx64)x << 32);
return FX_GetSqrtResult();
}
else
@@ -27,13 +27,13 @@ ARM_FUNC fx32 FX_Sqrt(fx32 x){
}
ARM_FUNC fx64c FX_GetDivResultFx64c(){
- while (reg_CP_DIVCNT & 0x8000);
- return reg_CP_DIV_RESULT;
+ while (reg_CP_DIVCNT & 0x8000) {}
+ return (fx64c)reg_CP_DIV_RESULT;
}
ARM_FUNC fx32 FX_GetDivResult(){
- while (reg_CP_DIVCNT & 0x8000);
- return (reg_CP_DIV_RESULT + (1 << (0x14 - 1))) >> 0x14;
+ while (reg_CP_DIVCNT & 0x8000) {}
+ return (fx32)((reg_CP_DIV_RESULT + (1 << (0x14 - 1))) >> 0x14);
}
ARM_FUNC void FX_InvAsync(fx32 x){
@@ -43,13 +43,13 @@ ARM_FUNC void FX_InvAsync(fx32 x){
}
ARM_FUNC fx32 FX_GetSqrtResult(){
- while (reg_CP_SQRTCNT & 0x8000);
- return (reg_CP_SQRT_RESULT + (1 << (0xA - 1))) >> 0xA;
+ while (reg_CP_SQRTCNT & 0x8000) {}
+ return (fx32)((reg_CP_SQRT_RESULT + (1 << (0xA - 1))) >> 0xA);
}
ARM_FUNC void FX_DivAsync(fx32 numerator, fx32 denominator){
reg_CP_DIVCNT = 0x1;
- reg_CP_DIV_NUMER = (fx64)numerator << 32;
+ reg_CP_DIV_NUMER = (u64)((fx64)numerator << 32);
reg_CP_DIV_DENOM = (u32)denominator;
}
@@ -57,14 +57,14 @@ ARM_FUNC fx32 FX_DivS32(fx32 numerator, fx32 denominator){
reg_CP_DIVCNT = 0x0;
*(REGType32v *)&reg_CP_DIV_NUMER = (u32)numerator; //32bit write for some reason
reg_CP_DIV_DENOM = (u32)denominator;
- while (reg_CP_DIVCNT & 0x8000);
- return *(REGType32v *)&reg_CP_DIV_RESULT;
+ while (reg_CP_DIVCNT & 0x8000) {}
+ return (fx32)(*(REGType32v *)&reg_CP_DIV_RESULT);
}
ARM_FUNC fx32 FX_ModS32(fx32 num, fx32 mod){
reg_CP_DIVCNT = 0x0;
*(REGType32v *)&reg_CP_DIV_NUMER = (u32)num; //32bit write for some reason
reg_CP_DIV_DENOM = (u32)mod;
- while (reg_CP_DIVCNT & 0x8000);
- return *(REGType32v *)&reg_CP_DIVREM_RESULT;
+ while (reg_CP_DIVCNT & 0x8000) {}
+ return (fx32)(*(REGType32v *)&reg_CP_DIVREM_RESULT);
}
diff --git a/arm9/lib/src/FX_mtx22.c b/arm9/lib/src/FX_mtx22.c
index 38387c64..a74bb25c 100644
--- a/arm9/lib/src/FX_mtx22.c
+++ b/arm9/lib/src/FX_mtx22.c
@@ -3,10 +3,10 @@
#include "fx.h"
ARM_FUNC void MTX_ScaleApply22(struct Mtx22 *mtx, struct Mtx22 *dst, fx32 x, fx32 y){
- dst->_[0] = ((fx64)x * mtx->_[0]) >> FX32_INT_SHIFT;
- dst->_[1] = ((fx64)x * mtx->_[1]) >> FX32_INT_SHIFT;
- dst->_[2] = ((fx64)y * mtx->_[2]) >> FX32_INT_SHIFT;
- dst->_[3] = ((fx64)y * mtx->_[3]) >> FX32_INT_SHIFT;
+ dst->_[0] = (fx32)(((fx64)x * mtx->_[0]) >> FX32_INT_SHIFT);
+ dst->_[1] = (fx32)(((fx64)x * mtx->_[1]) >> FX32_INT_SHIFT);
+ dst->_[2] = (fx32)(((fx64)y * mtx->_[2]) >> FX32_INT_SHIFT);
+ dst->_[3] = (fx32)(((fx64)y * mtx->_[3]) >> FX32_INT_SHIFT);
}
ARM_FUNC asm void MTX_Identity22_(struct Mtx22 *mtx){
diff --git a/arm9/lib/src/GX_g2.c b/arm9/lib/src/GX_g2.c
index 66273541..d17d4263 100644
--- a/arm9/lib/src/GX_g2.c
+++ b/arm9/lib/src/GX_g2.c
@@ -4,63 +4,63 @@
ARM_FUNC void G2x_SetBGyAffine_(u32 *ptr, struct Mtx22 *mtx, fx32 a, fx32 b, fx32 c, fx32 d){
fx32 temp0, temp1, temp2, temp3;
- ptr[0] = ((u16)(fx16)(mtx->_[0] >> 4) | (u16)(fx16)(mtx->_[1] >> 4)<< 0x10);
- ptr[1] = ((u16)(fx16)(mtx->_[2] >> 4) | (u16)(fx16)(mtx->_[3] >> 4)<< 0x10);
+ ptr[0] = (u32)((u16)(fx16)(mtx->_[0] >> 4) | (u16)(fx16)(mtx->_[1] >> 4)<< 0x10);
+ ptr[1] = (u32)((u16)(fx16)(mtx->_[2] >> 4) | (u16)(fx16)(mtx->_[3] >> 4)<< 0x10);
temp0 = c - a;
temp1 = d - b;
temp2 = mtx->_[0] * temp0 + mtx->_[1] * temp1 + (a << 0xC);
temp3 = mtx->_[2] * temp0 + mtx->_[3] * temp1 + (b << 0xC);
- ptr[2] = temp2 >> 4;
- ptr[3] = temp3 >> 4;
+ ptr[2] = (u32)(temp2 >> 4);
+ ptr[3] = (u32)(temp3 >> 4);
}
ARM_FUNC void G2x_SetBlendAlpha_(u32 *ptr, fx32 a, fx32 b, fx32 c, fx32 d){
- *ptr = ((a | 0x40) | (b << 0x8)) | ((c | (d << 0x8)) << 0x10);
+ *ptr = (u32)(((a | 0x40) | (b << 0x8)) | ((c | (d << 0x8)) << 0x10));
}
ARM_FUNC void G2x_SetBlendBrightness_(u16 *ptr, fx32 a, fx32 brightness){
if (brightness < 0)
{
- ptr[0] = a | 0xC0;
- ptr[2] = -brightness;
+ ptr[0] = (u16)(a | 0xC0);
+ ptr[2] = (u16)(-brightness);
}
else
{
- ptr[0] = a | 0x80;
- ptr[2] = brightness;
+ ptr[0] = (u16)(a | 0x80);
+ ptr[2] = (u16)brightness;
}
}
ARM_FUNC void G2x_SetBlendBrightnessExt_(u16 *ptr, fx32 a, fx32 b, fx32 c, fx32 d, fx32 brightness){
- ptr[1] = c | (d << 0x8);
+ ptr[1] = (u16)(c | (d << 0x8));
if (brightness < 0)
{
- ptr[0] = 0xC0 | a | (b << 0x8);
- ptr[2] = -brightness;
+ ptr[0] = (u16)(0xC0 | a | (b << 0x8));
+ ptr[2] = (u16)(-brightness);
}
else
{
- ptr[0] = 0x80 | a | (b << 0x8);
- ptr[2] = brightness;
+ ptr[0] = (u16)(0x80 | a | (b << 0x8));
+ ptr[2] = (u16)brightness;
}
}
-ARM_FUNC void *G2x_ChangeBlendBrightness_(u16 *ptr, fx32 brightness){
+ARM_FUNC void G2x_ChangeBlendBrightness_(u16 *ptr, fx32 brightness){
u32 temp = *ptr;
if (brightness < 0)
{
if ((temp & 0xC0) == 0x80)
{
- ptr[0] = temp & ~0xC0 | 0xC0;
+ ptr[0] = (u16)(temp & ~0xC0 | 0xC0);
}
- ptr[2] = -brightness;
+ ptr[2] = (u16)(-brightness);
}
else
{
if ((temp & 0xC0) == 0xC0)
{
- ptr[0] = temp & ~0xC0 | 0x80;
+ ptr[0] = (u16)(temp & ~0xC0 | 0x80);
}
- ptr[2] = brightness;
+ ptr[2] = (u16)brightness;
}
}
diff --git a/arm9/lib/src/GX_g3_util.c b/arm9/lib/src/GX_g3_util.c
index c40a3848..6e472471 100644
--- a/arm9/lib/src/GX_g3_util.c
+++ b/arm9/lib/src/GX_g3_util.c
@@ -11,7 +11,7 @@ ARM_FUNC void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near,
fovcot = FX_Div(fovcos, fovsin);
if (scale != 0x1000) //!= 1.0
fovcot = (fovcot * scale) / 0x1000;
- reg_CP_DIV_NUMER = (s64)fovcot << 0x20;
+ reg_CP_DIV_NUMER = (u64)((s64)fovcot << 0x20);
reg_CP_DIV_DENOM = (u32)ratio;
if (load)
{
@@ -38,12 +38,12 @@ ARM_FUNC void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near,
reg_CP_DIV_DENOM = (u32)(near - far);
if (load)
{
- *reg_ptr = temp1;
+ *reg_ptr = (vu32)temp1;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
- *reg_ptr = fovcot;
+ *reg_ptr = (vu32)fovcot;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
@@ -57,15 +57,15 @@ ARM_FUNC void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near,
temp0 = FX_GetDivResultFx64c();
if (scale != 0x1000)
temp0 = (temp0 * scale) / 0x1000;
- temp1 = ((far + near) * temp0 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
- temp2 = (((fx32)(((fx64)(near << 1) * far + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT)) * temp0 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
+ temp1 = (fx32)(((far + near) * temp0 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
+ temp2 = (fx32)((((fx32)(((fx64)(near << 1) * far + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT)) * temp0 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
if (load)
{
- *reg_ptr = temp1;
- *reg_ptr = -scale;
+ *reg_ptr = (vu32)temp1;
+ *reg_ptr = (vu32)(-scale);
*reg_ptr = 0x0;
*reg_ptr = 0x0;
- *reg_ptr = temp2;
+ *reg_ptr = (vu32)temp2;
*reg_ptr = 0x0;
}
if (mtx)
@@ -104,10 +104,10 @@ ARM_FUNC void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 nea
reg_CP_DIV_DENOM = (u32)(top - bottom);
if (scale != 0x1000)
temp1 = (temp1 * scale) / 0x1000;
- temp0 = (0x2000 * temp1 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
+ temp0 = (fx32)((0x2000 * temp1 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
if (load)
{
- *reg_ptr = temp0;
+ *reg_ptr = (vu32)temp0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
@@ -122,10 +122,10 @@ ARM_FUNC void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 nea
reg_CP_DIV_DENOM = (u32)(near - far);
if (scale != 0x1000)
temp2 = (temp2 * scale) / 0x1000;
- temp0 = (0x2000 * temp2 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
+ temp0 = (fx32)((0x2000 * temp2 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
if (load)
{
- *reg_ptr = temp0;
+ *reg_ptr = (vu32)temp0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
@@ -138,25 +138,25 @@ ARM_FUNC void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 nea
temp3 = FX_GetDivResultFx64c();
if (scale != 0x1000)
temp3 = (temp3 * scale) / 0x1000;
- temp0 = (0x2000 * temp3 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
+ temp0 = (fx32)((0x2000 * temp3 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
if (load)
{
- *reg_ptr = temp0;
+ *reg_ptr = (vu32)temp0;
*reg_ptr = 0x0;
}
if (mtx)
{
mtx->_[10] = temp0;
}
- temp0 = ((-(right + left)) * temp1 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
- temp4 = ((-(top + bottom)) * temp2 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
- temp5 = ((far + near) * temp3 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT;
+ temp0 = (fx32)(((-(right + left)) * temp1 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
+ temp4 = (fx32)(((-(top + bottom)) * temp2 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
+ temp5 = (fx32)(((far + near) * temp3 + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT);
if (load)
{
- *reg_ptr = temp0;
- *reg_ptr = temp4;
- *reg_ptr = temp5;
- *reg_ptr = scale;
+ *reg_ptr = (vu32)temp0;
+ *reg_ptr = (vu32)temp4;
+ *reg_ptr = (vu32)temp5;
+ *reg_ptr = (vu32)scale;
}
if (mtx)
{
@@ -181,24 +181,24 @@ ARM_FUNC void G3i_LookAt_(struct Vecx32 *a, struct Vecx32 *b, struct Vecx32 *c,
{
reg_G3_MTX_MODE = 0x2;
reg_ptr = (vu32 *)&reg_G3_MTX_LOAD_4x3;
- *reg_ptr = temp1.x;
- *reg_ptr = temp2.x;
- *reg_ptr = temp.x;
- *reg_ptr = temp1.y;
- *reg_ptr = temp2.y;
- *reg_ptr = temp.y;
- *reg_ptr = temp1.z;
- *reg_ptr = temp2.z;
- *reg_ptr = temp.z;
+ *reg_ptr = (vu32)temp1.x;
+ *reg_ptr = (vu32)temp2.x;
+ *reg_ptr = (vu32)temp.x;
+ *reg_ptr = (vu32)temp1.y;
+ *reg_ptr = (vu32)temp2.y;
+ *reg_ptr = (vu32)temp.y;
+ *reg_ptr = (vu32)temp1.z;
+ *reg_ptr = (vu32)temp2.z;
+ *reg_ptr = (vu32)temp.z;
}
c1 = -VEC_DotProduct(a, &temp1);
c2 = -VEC_DotProduct(a, &temp2);
c3 = -VEC_DotProduct(a, &temp);
if (load)
{
- *reg_ptr = c1;
- *reg_ptr = c2;
- *reg_ptr = c3;
+ *reg_ptr = (vu32)c1;
+ *reg_ptr = (vu32)c2;
+ *reg_ptr = (vu32)c3;
}
if (mtx)
{
@@ -224,35 +224,35 @@ ARM_FUNC void G3_RotX(fx32 sinphi, fx32 cosphi){
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
- *reg_ptr = cosphi;
- *reg_ptr = sinphi;
+ *reg_ptr = (vu32)cosphi;
+ *reg_ptr = (vu32)sinphi;
*reg_ptr = 0x0;
- *reg_ptr = -sinphi;
- *reg_ptr = cosphi;
+ *reg_ptr = (vu32)(-sinphi);
+ *reg_ptr = (vu32)cosphi;
}
ARM_FUNC void G3_RotY(fx32 sinphi, fx32 cosphi){
vu32 *reg_ptr;
reg_ptr = (vu32 *)&reg_G3_MTX_MULT_3x3;
- *reg_ptr = cosphi;
+ *reg_ptr = (vu32)cosphi;
*reg_ptr = 0x0;
- *reg_ptr = -sinphi;
+ *reg_ptr = (vu32)(-sinphi);
*reg_ptr = 0x0;
*reg_ptr = 0x1000;
*reg_ptr = 0x0;
- *reg_ptr = sinphi;
+ *reg_ptr = (vu32)sinphi;
*reg_ptr = 0x0;
- *reg_ptr = cosphi;
+ *reg_ptr = (vu32)cosphi;
}
ARM_FUNC void G3_RotZ(fx32 sinphi, fx32 cosphi){
vu32 *reg_ptr;
reg_ptr = (vu32 *)&reg_G3_MTX_MULT_3x3;
- *reg_ptr = cosphi;
- *reg_ptr = sinphi;
+ *reg_ptr = (vu32)cosphi;
+ *reg_ptr = (vu32)sinphi;
*reg_ptr = 0x0;
- *reg_ptr = -sinphi;
- *reg_ptr = cosphi;
+ *reg_ptr = (vu32)(-sinphi);
+ *reg_ptr = (vu32)cosphi;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
*reg_ptr = 0x0;
diff --git a/arm9/lib/src/MATH_crc.c b/arm9/lib/src/MATH_crc.c
index ec0ccad0..cf8cc64c 100644
--- a/arm9/lib/src/MATH_crc.c
+++ b/arm9/lib/src/MATH_crc.c
@@ -15,7 +15,7 @@ ARM_FUNC void MATHi_CRC8InitTable(struct MATHCRC8Table *table, u8 poly) {
r <<= 1;
}
}
- t[i] = r;
+ t[i] = (u8)r;
}
}
@@ -29,7 +29,7 @@ ARM_FUNC void MATHi_CRC8Update(const struct MATHCRC8Table *table, MATHCRC8Contex
r = t[(r ^ *data) & 0xff];
data++;
}
- *context = r;
+ *context = (MATHCRC8Context)r;
}
ARM_FUNC void MATHi_CRC16InitTable(struct MATHCRC16Table *table, u16 poly) {
@@ -46,7 +46,7 @@ ARM_FUNC void MATHi_CRC16InitTable(struct MATHCRC16Table *table, u16 poly) {
r <<= 1;
}
}
- t[i] = r;
+ t[i] = (u16)r;
}
}
@@ -64,7 +64,7 @@ ARM_FUNC void MATHi_CRC16InitTableRev(struct MATHCRC16Table *table, u16 poly) {
r >>= 1;
}
}
- t[i] = r;
+ t[i] = (u16)r;
}
}
@@ -78,7 +78,7 @@ ARM_FUNC void MATHi_CRC16Update(const struct MATHCRC16Table *table, MATHCRC16Con
r = (r << 8) ^ t[((r >> 8) ^ *data) & 0xff];
data++;
}
- *context = r;
+ *context = (MATHCRC16Context)r;
}
ARM_FUNC void MATHi_CRC16UpdateRev(const struct MATHCRC16Table *table, MATHCRC16Context *context, const void *input, u32 length) {
@@ -91,7 +91,7 @@ ARM_FUNC void MATHi_CRC16UpdateRev(const struct MATHCRC16Table *table, MATHCRC16
r = (r >> 8) ^ t[(r ^ *data) & 0xff];
data++;
}
- *context = r;
+ *context = (MATHCRC16Context)r;
}
ARM_FUNC void MATHi_CRC32InitTableRev(struct MATHCRC32Table *table, u32 poly) {
@@ -144,7 +144,7 @@ ARM_FUNC u16 MATH_CalcCRC16CCITT(const struct MATHCRC16Table *table, const void
}
ARM_FUNC u32 MATH_CalcCRC32(const struct MATHCRC32Table *table, const void *data, u32 dataLength) {
- MATHCRC32Context ctx = ~0;
+ MATHCRC32Context ctx = (MATHCRC32Context)(~0);
MATHi_CRC32UpdateRev(table, &ctx, data, dataLength);
return ~ctx;
}
diff --git a/arm9/lib/src/OS_arena.c b/arm9/lib/src/OS_arena.c
index 9e7d3223..ad3a4e16 100644
--- a/arm9/lib/src/OS_arena.c
+++ b/arm9/lib/src/OS_arena.c
@@ -43,8 +43,8 @@ ARM_FUNC void OS_InitArena(void) {
}
ARM_FUNC void OS_InitArenaEx(void) {
- OS_SetArenaHi(2, OS_GetInitArenaHi(OS_ARENA_MAINEX));
- OS_SetArenaLo(2, OS_GetInitArenaLo(OS_ARENA_MAINEX));
+ OS_SetArenaHi(OS_ARENA_MAINEX, OS_GetInitArenaHi(OS_ARENA_MAINEX));
+ OS_SetArenaLo(OS_ARENA_MAINEX, OS_GetInitArenaLo(OS_ARENA_MAINEX));
if (!OSi_MainExArenaEnabled || (OS_GetConsoleType() & OS_CONSOLE_SIZE_MASK) == OS_CONSOLE_SIZE_4MB) {
OS_SetProtectionRegion(1, HW_MAIN_MEM, 4MB);