summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2/osViSetXScale.c
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2021-02-14 00:49:40 +0000
committerGitHub <noreply@github.com>2021-02-13 19:49:40 -0500
commitf9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch)
tree9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/libultra_boot_O2/osViSetXScale.c
parentd615ec4f31563b939f8c0dce1c20c79e137c2043 (diff)
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments * few more warnings gone * Ran formatter * z_view warning gone * -> 1 * f31 -> 31 * Remove function casts * Few more small improvements * Separate declaration and assignment in func_80091738 and Item_Give Co-authored-by: Thar0 <maximilianc64@gmail.com>
Diffstat (limited to 'src/libultra_boot_O2/osViSetXScale.c')
-rw-r--r--src/libultra_boot_O2/osViSetXScale.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libultra_boot_O2/osViSetXScale.c b/src/libultra_boot_O2/osViSetXScale.c
index e6a9ec6bb..21b4f7aea 100644
--- a/src/libultra_boot_O2/osViSetXScale.c
+++ b/src/libultra_boot_O2/osViSetXScale.c
@@ -2,16 +2,13 @@
void osViSetXScale(f32 value) {
register u32 nomValue;
- register u32 saveMask;
-
- saveMask = __osDisableInt();
+ register u32 prevInt = __osDisableInt();
__osViNext->x.factor = value;
-
__osViNext->state |= 0x2;
nomValue = __osViNext->modep->comRegs.xScale & 0xfff;
__osViNext->x.scale = (u32)(__osViNext->x.factor * nomValue) & 0xFFF;
- __osRestoreInt(saveMask);
+ __osRestoreInt(prevInt);
}