From 009b8ff672c11d90530b494c5d3a8eb88de009b3 Mon Sep 17 00:00:00 2001
From: Roman971 <32455037+Roman971@users.noreply.github.com>
Date: Thu, 20 May 2021 19:49:34 +0200
Subject: Remove some unused duplicated C files (#818)

---
 src/libultra_code_O2/osContQuery.c  | 31 -----------------
 src/libultra_code_O2/osReadMempak.c | 66 -------------------------------------
 2 files changed, 97 deletions(-)
 delete mode 100644 src/libultra_code_O2/osContQuery.c
 delete mode 100644 src/libultra_code_O2/osReadMempak.c

(limited to 'src/libultra_code_O2')

diff --git a/src/libultra_code_O2/osContQuery.c b/src/libultra_code_O2/osContQuery.c
deleted file mode 100644
index ff7cd4385..000000000
--- a/src/libultra_code_O2/osContQuery.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "global.h"
-
-/**
- * osContStartQuery:
- * Starts to read the values for SI device status and type which are connected to the controller port and joyport
- * connector.
- */
-s32 osContStartQuery(OSMesgQueue* mq) {
-    s32 ret;
-    ret = 0;
-
-    __osSiGetAccess();
-    if (__osContLastPoll != CONT_CMD_REQUEST_STATUS) {
-        __osPackRequestData(CONT_CMD_REQUEST_STATUS);
-        ret = __osSiRawStartDma(OS_WRITE, &__osPifInternalBuff);
-        osRecvMesg(mq, NULL, OS_MESG_BLOCK);
-    }
-    ret = __osSiRawStartDma(OS_READ, &__osPifInternalBuff);
-    __osContLastPoll = CONT_CMD_REQUEST_STATUS;
-    __osSiRelAccess();
-    return ret;
-}
-
-/**
- * osContGetQuery:
- * Returns the values from osContStartQuery to status. Both functions must be paired for use.
- */
-void osContGetQuery(OSContStatus* data) {
-    u8 pattern;
-    __osContGetInitData(&pattern, data);
-}
diff --git a/src/libultra_code_O2/osReadMempak.c b/src/libultra_code_O2/osReadMempak.c
deleted file mode 100644
index bcbca66ab..000000000
--- a/src/libultra_code_O2/osReadMempak.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#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 = (u8*)&gPifMempakBuf;
-
-        if ((__osContLastPoll != 2) || (__osPfsLastChannel != channel)) {
-
-            __osContLastPoll = 2;
-            __osPfsLastChannel = channel;
-            // clang-format off
-            for (i = 0; i < channel; i++) { *bufptr++ = 0; }
-            // clang-format on
-            gPifMempakBuf.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, &gPifMempakBuf);
-        osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK);
-        __osSiRawStartDma(OS_READ, &gPifMempakBuf);
-        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