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:
Random
2020-10-03 17:22:44 +02:00
committed by GitHub
parent 6136ee6deb
commit 174af7384d
890 changed files with 2628 additions and 5625 deletions
+67
View File
@@ -0,0 +1,67 @@
#include "ultra64.h"
#include "global.h"
s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 force) {
s32 ret = 0;
s32 i;
u8* ptr;
s32 retry = 2;
u8 crc;
if ((force != PFS_FORCE) && (address < PFS_LABEL_AREA) && (address != 0)) {
return 0;
}
__osSiGetAccess();
do {
ptr = (u8*)(&pifMempakBuf);
if (__osContLastPoll != CONT_CMD_WRITE_MEMPACK || __osPfsLastChannel != channel) {
__osContLastPoll = CONT_CMD_WRITE_MEMPACK;
__osPfsLastChannel = channel;
// clang-format off
for (i = 0; i < channel; i++) { *ptr++ = 0; }
// clang-format on
pifMempakBuf.status = 1;
((__OSContRamHeader*)ptr)->unk_00 = 0xff;
((__OSContRamHeader*)ptr)->txsize = 35;
((__OSContRamHeader*)ptr)->rxsize = 1;
((__OSContRamHeader*)ptr)->poll = CONT_CMD_WRITE_MEMPACK;
((__OSContRamHeader*)ptr)->datacrc = 0xff;
ptr[sizeof(__OSContRamHeader)] = CONT_CMD_END;
} else {
ptr += channel;
}
((__OSContRamHeader*)ptr)->hi = address >> 3;
((__OSContRamHeader*)ptr)->lo = ((address << 5) | __osContAddressCrc(address));
bcopy(buffer, ((__OSContRamHeader*)ptr)->data, BLOCKSIZE);
ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf);
crc = __osContDataCrc(buffer);
osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &pifMempakBuf);
osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK);
ret = ((((__OSContRamHeader*)ptr)->rxsize & 0xC0) >> 4);
if (!ret) {
if (crc != ((__OSContRamHeader*)ptr)->datacrc) {
if ((ret = __osPfsGetStatus(mq, channel))) {
break;
} else {
ret = PFS_ERR_CONTRFAIL;
}
}
} else {
ret = PFS_ERR_NOPACK;
}
} while ((ret == PFS_ERR_CONTRFAIL) && (retry-- >= 0));
__osSiRelAccess();
return ret;
}