PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

format style change: SpaceAfterCStyleCast: true

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2023-10-18 10:50:51 -03:00
parent daf712b034
commit 2bb0fa08cf
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -4,7 +4,7 @@ UseTab: Never
ColumnLimit: 120 ColumnLimit: 120
PointerAlignment: Left PointerAlignment: Left
BreakBeforeBraces: Attach BreakBeforeBraces: Attach
SpaceAfterCStyleCast: false SpaceAfterCStyleCast: true
Cpp11BracedListStyle: false Cpp11BracedListStyle: false
IndentCaseLabels: true IndentCaseLabels: true
BinPackArguments: true BinPackArguments: true

8
src/libultra/io/controller.c
View File

@ -45,9 +45,9 @@ void __osContGetInitData(u8* pattern, OSContStatus* data) {
u8 bits; u8 bits;
bits = 0; bits = 0;
ptr = (u8*)__osContPifRam.ramarray; ptr = (u8*) __osContPifRam.ramarray;
for (i = 0; i < __osMaxControllers; i++, ptr += sizeof(requestHeader), data++) { for (i = 0; i < __osMaxControllers; i++, ptr += sizeof(requestHeader), data++) {
requestHeader = *(__OSContRequestHeader*)ptr; requestHeader = *(__OSContRequestHeader*) ptr;
data->errno = (requestHeader.rxsize & 0xC0) >> 4; data->errno = (requestHeader.rxsize & 0xC0) >> 4;
if (data->errno == 0) { if (data->errno == 0) {
data->type = requestHeader.typel << 8 | requestHeader.typeh; data->type = requestHeader.typel << 8 | requestHeader.typeh;
@ -69,7 +69,7 @@ void __osPackRequestData(u8 poll) {
} }
__osContPifRam.pifstatus = CONT_CMD_READ_BUTTON; __osContPifRam.pifstatus = CONT_CMD_READ_BUTTON;
ptr = (u8*)__osContPifRam.ramarray; ptr = (u8*) __osContPifRam.ramarray;
requestHeader.align = 255; requestHeader.align = 255;
requestHeader.txsize = 1; requestHeader.txsize = 1;
requestHeader.rxsize = 3; requestHeader.rxsize = 3;
@ -80,7 +80,7 @@ void __osPackRequestData(u8 poll) {
requestHeader.align1 = 255; requestHeader.align1 = 255;
for (i = 0; i < __osMaxControllers; i++) { for (i = 0; i < __osMaxControllers; i++) {
*(__OSContRequestHeader*)ptr = requestHeader; *(__OSContRequestHeader*) ptr = requestHeader;
ptr += sizeof(requestHeader); ptr += sizeof(requestHeader);
} }
*ptr = 254; *ptr = 254;

2
src/libultra/io/pidma.c
View File

@ -28,7 +28,7 @@ s32 osPiStartDma(test* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s
arg0->unk0 = 0xC; arg0->unk0 = 0xC;
} }
arg0->unk2 = (s8)arg1; arg0->unk2 = (s8) arg1;
arg0->unk4 = arg6; arg0->unk4 = arg6;
arg0->unk8 = arg4; arg0->unk8 = arg4;
arg0->unkC = arg3; arg0->unkC = arg3;

6
src/libultra/libc/string.c
View File

@ -1,8 +1,8 @@
#include "global.h" #include "global.h"
void* memcpy(void* s1, const void* s2, size_t n) { void* memcpy(void* s1, const void* s2, size_t n) {
unsigned char* su1 = (unsigned char*)s1; unsigned char* su1 = (unsigned char*) s1;
const unsigned char* su2 = (const unsigned char*)s2; const unsigned char* su2 = (const unsigned char*) s2;
while (n > 0) { while (n > 0) {
*su1 = *su2; *su1 = *su2;
@ -21,7 +21,7 @@ size_t strlen(const char* s) {
sc++; sc++;
} }
return (size_t)(sc - s); return (size_t) (sc - s);
} }
const char* strchr(const char* s, int c) { const char* strchr(const char* s, int c) {

8
src/main/5A20.c
View File

@ -18,13 +18,13 @@ extern f32 func_8001FBE8(f32);
extern u64 osGetTime(void); extern u64 osGetTime(void);
f32 func_80004E20(f32 arg0, f32 arg1) { f32 func_80004E20(f32 arg0, f32 arg1) {
return arg0 - ((s32)(arg0 / arg1) * arg1); return arg0 - ((s32) (arg0 / arg1) * arg1);
} }
void func_80004E4C(void) { void func_80004E4C(void) {
D_8013B3A4 = (s32)osGetTime() % 30000; D_8013B3A4 = (s32) osGetTime() % 30000;
D_8013B3A8 = (s32)osGetTime() % 30000; D_8013B3A8 = (s32) osGetTime() % 30000;
D_8013B3AC = (s32)osGetTime() % 30000; D_8013B3AC = (s32) osGetTime() % 30000;
} }
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004EB0.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004EB0.s")

2
src/main/7B20.c
View File

@ -12,7 +12,7 @@ extern s32 D_8013C3D0;
extern s32 D_80144BD0; extern s32 D_80144BD0;
void func_80006F20(void) { void func_80006F20(void) {
D_80144BD0 = (s32)&D_8013C3D0; D_80144BD0 = (s32) &D_8013C3D0;
} }
s32 func_80006F38(s32 arg0) { s32 func_80006F38(s32 arg0) {

4
src/main/hud.c
View File

@ -254,7 +254,7 @@ s32 func_8008BCBC(s32 arg0) {
s32 ret; s32 ret;
if (arg0 < 0) { if (arg0 < 0) {
arg0 = (s64)-arg0; arg0 = (s64) -arg0;
} }
ret = 1; ret = 1;
@ -430,7 +430,7 @@ void func_80095350(UnkStruct_func_80095350* arg0) {
arg0->unk0 = 2; arg0->unk0 = 2;
arg0->unk2 = 0xC3; arg0->unk2 = 0xC3;
arg0->unkB6 = 0x270F; arg0->unkB6 = 0x270F;
func_800612B8((s32*)arg0 + 7, arg0->unk2, arg0); func_800612B8((s32*) arg0 + 7, arg0->unk2, arg0);
} }
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800953A0.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800953A0.s")

2
src/overlays/segment_DF4260/DF4260.c
View File

@ -28,7 +28,7 @@ void func_80187530_DF4270(s32 arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DF4260/func_80187A38_DF4778.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DF4260/func_80187A38_DF4778.s")
f32 func_80187A88_DF47C8(s32 arg0) { f32 func_80187A88_DF47C8(s32 arg0) {
f32 ret = (f32)arg0 * 0.5f; f32 ret = (f32) arg0 * 0.5f;
if (ret > 8.0f) { if (ret > 8.0f) {
ret = 8.0f; ret = 8.0f;