mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-13 02:10:57 +00:00
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
This commit is contained in:
parent
6136ee6deb
commit
174af7384d
890 changed files with 2628 additions and 5625 deletions
77
src/libultra_code_O2/__osPfsGetStatus.c
Normal file
77
src/libultra_code_O2/__osPfsGetStatus.c
Normal file
|
@ -0,0 +1,77 @@
|
|||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
OSPifRam pifMempakBuf;
|
||||
|
||||
s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel) {
|
||||
s32 ret = 0;
|
||||
OSMesg msg;
|
||||
OSContStatus data;
|
||||
|
||||
__osPfsInodeCacheBank = 250;
|
||||
|
||||
__osPfsRequestOneChannel(channel, CONT_CMD_REQUEST_STATUS);
|
||||
ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf);
|
||||
osRecvMesg(queue, &msg, OS_MESG_BLOCK);
|
||||
|
||||
ret = __osSiRawStartDma(OS_READ, &pifMempakBuf);
|
||||
osRecvMesg(queue, &msg, OS_MESG_BLOCK);
|
||||
|
||||
__osPfsGetOneChannelData(channel, &data);
|
||||
if (((data.status & CONT_CARD_ON) != 0) && ((data.status & CONT_CARD_PULL) != 0)) {
|
||||
return PFS_ERR_NEW_PACK;
|
||||
} else if (data.errno || ((data.status & CONT_CARD_ON) == 0)) {
|
||||
return PFS_ERR_NOPACK;
|
||||
} else if ((data.status & CONT_ADDR_CRC_ER) != 0) {
|
||||
return PFS_ERR_CONTRFAIL;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
void __osPfsRequestOneChannel(s32 channel, u8 poll) {
|
||||
u8* bufptr;
|
||||
__OSContRequestHeaderAligned req;
|
||||
s32 idx;
|
||||
|
||||
__osContLastPoll = CONT_CMD_END;
|
||||
|
||||
pifMempakBuf.status = CONT_CMD_READ_BUTTON;
|
||||
|
||||
bufptr = &pifMempakBuf;
|
||||
|
||||
req.txsize = 1;
|
||||
req.rxsize = 3;
|
||||
req.poll = poll;
|
||||
req.typeh = 0xFF;
|
||||
req.typel = 0xFF;
|
||||
req.status = 0xFF;
|
||||
|
||||
for (idx = 0; idx < channel; idx++) {
|
||||
*bufptr++ = 0;
|
||||
}
|
||||
|
||||
*((__OSContRequestHeaderAligned*)bufptr) = req;
|
||||
bufptr += sizeof(req);
|
||||
*((u8*)bufptr) = CONT_CMD_END;
|
||||
}
|
||||
|
||||
void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData) {
|
||||
u8* bufptr;
|
||||
__OSContRequestHeaderAligned req;
|
||||
s32 idx;
|
||||
|
||||
bufptr = &pifMempakBuf;
|
||||
|
||||
for (idx = 0; idx < channel; idx++) {
|
||||
bufptr++;
|
||||
}
|
||||
|
||||
req = *((__OSContRequestHeaderAligned*)bufptr);
|
||||
contData->errno = (req.rxsize & 0xC0) >> 4;
|
||||
if (contData->errno) {
|
||||
return;
|
||||
}
|
||||
|
||||
contData->type = (req.typel << 8) | req.typeh;
|
||||
contData->status = req.status;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue