From 174af7384d1cfcbf15da02d9069bf02bdc433c20 Mon Sep 17 00:00:00 2001
From: Random <28494085+Random06457@users.noreply.github.com>
Date: Sat, 3 Oct 2020 17:22:44 +0200
Subject: libultra cleanup (#215)

* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes
---
 src/libultra_code_O2/__osContRamRead.c | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/libultra_code_O2/__osContRamRead.c

(limited to 'src/libultra_code_O2/__osContRamRead.c')

diff --git a/src/libultra_code_O2/__osContRamRead.c b/src/libultra_code_O2/__osContRamRead.c
new file mode 100644
index 000000000..07c72e54b
--- /dev/null
+++ b/src/libultra_code_O2/__osContRamRead.c
@@ -0,0 +1,60 @@
+#include "global.h"
+
+#define BLOCKSIZE 32
+
+s32 __osPfsLastChannel = -1;
+
+s32 __osContRamRead(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data) {
+    s32 ret;
+    s32 i;
+    u8* bufptr;
+    s32 retryCount = 2;
+
+    __osSiGetAccess();
+    do {
+        bufptr = &pifMempakBuf;
+        if ((__osContLastPoll != 2) || (__osPfsLastChannel != channel)) {
+
+            __osContLastPoll = 2;
+            __osPfsLastChannel = channel;
+            // clang-format off
+            for (i = 0; i < channel; i++) { *bufptr++ = 0; }
+            // clang-format on
+            pifMempakBuf.status = 1;
+            ((__OSContRamHeader*)bufptr)->unk_00 = 0xFF;
+            ((__OSContRamHeader*)bufptr)->txsize = 3;
+            ((__OSContRamHeader*)bufptr)->rxsize = 0x21;
+            ((__OSContRamHeader*)bufptr)->poll = CONT_CMD_READ_MEMPACK; // read mempak; send byte 0
+            ((__OSContRamHeader*)bufptr)->datacrc = 0xFF;               // read mempak; send byte 0
+            // Received bytes are 6-26 inclusive
+            bufptr[sizeof(__OSContRamHeader)] = CONT_CMD_END; // End of commands
+        } else {
+            bufptr += channel;
+        }
+        ((__OSContRamHeader*)bufptr)->hi = addr >> 3;                                    // send byte 1
+        ((__OSContRamHeader*)bufptr)->lo = (s8)(__osContAddressCrc(addr) | (addr << 5)); // send byte 2
+        __osSiRawStartDma(OS_WRITE, &pifMempakBuf);
+        osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK);
+        __osSiRawStartDma(OS_READ, &pifMempakBuf);
+        osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK);
+        ret = (((__OSContRamHeader*)bufptr)->rxsize & 0xC0) >> 4;
+        if (!ret) {
+            if (((__OSContRamHeader*)bufptr)->datacrc != __osContDataCrc(bufptr + 6)) {
+                ret = __osPfsGetStatus(ctrlrqueue, channel);
+                if (ret) {
+                    break;
+                }
+                ret = 4; // Retry
+            } else {
+                bcopy(bufptr + 6, data, BLOCKSIZE);
+            }
+        } else {
+            ret = 1; // Error
+        }
+        if (ret != 4) {
+            break;
+        }
+    } while (0 <= retryCount--);
+    __osSiRelAccess();
+    return ret;
+}
-- 
cgit v1.2.3