summaryrefslogtreecommitdiff
path: root/src/libultra_code_O2/pfsinitpak.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_code_O2/pfsinitpak.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_code_O2/pfsinitpak.c')
-rw-r--r--src/libultra_code_O2/pfsinitpak.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libultra_code_O2/pfsinitpak.c b/src/libultra_code_O2/pfsinitpak.c
index 377c4f6a5..59fb8eda9 100644
--- a/src/libultra_code_O2/pfsinitpak.c
+++ b/src/libultra_code_O2/pfsinitpak.c
@@ -26,11 +26,9 @@ s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) {
if ((ret = __osPfsCheckRamArea(pfs)) != 0) {
return ret;
}
-
if ((ret = __osPfsSelectBank(pfs, 0)) != 0) {
return ret;
}
-
if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) {
return (ret);
}
@@ -60,7 +58,7 @@ s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) {
bcopy(id, pfs->id, BLOCKSIZE);
- if (0) {}
+ if (1) {}
pfs->version = id->version;
pfs->banks = id->banks;
@@ -90,9 +88,8 @@ s32 __osPfsCheckRamArea(OSPfs* pfs) {
if ((ret = __osPfsSelectBank(pfs, PFS_ID_BANK_256K)) != 0) {
return ret;
}
-
if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, saveReg)) != 0) {
- return (ret);
+ return ret;
}
for (i = 0; i < BLOCKSIZE; i++) {
temp1[i] = i;
@@ -106,7 +103,5 @@ s32 __osPfsCheckRamArea(OSPfs* pfs) {
if (bcmp(temp1, temp2, BLOCKSIZE) != 0) {
return PFS_ERR_DEVICE;
}
- ret = __osContRamWrite(pfs->queue, pfs->channel, 0, saveReg, 0);
-
- return ret;
+ return __osContRamWrite(pfs->queue, pfs->channel, 0, saveReg, 0);
}