mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 02:10:57 +00:00
Code Issues Projects Releases Wiki Activity

Remove some unused duplicated C files (#818)

Browse source
This commit is contained in:
Roman971 2021-05-20 19:49:34 +02:00 • committed by GitHub
parent c9ee9e43bd
commit 009b8ff672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libultra_code_O2/osContQuery.c
View file

@ -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);
}

66
src/libultra_code_O2/osReadMempak.c
View file

@ -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;
}