From f1d183d6feac23275306bfa2dee939d123702765 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Wed, 1 Dec 2021 00:08:57 +0000 Subject: libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 * Interrupt flags 2 Co-authored-by: Dragorn421 Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 --- src/libultra_code_O2/osContStartReadData.c | 55 ------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 src/libultra_code_O2/osContStartReadData.c (limited to 'src/libultra_code_O2/osContStartReadData.c') diff --git a/src/libultra_code_O2/osContStartReadData.c b/src/libultra_code_O2/osContStartReadData.c deleted file mode 100644 index a85a3337b..000000000 --- a/src/libultra_code_O2/osContStartReadData.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "global.h" - -s32 osContStartReadData(OSMesgQueue* mq) { - s32 ret; - - __osSiGetAccess(); - if (__osContLastPoll != 1) { - __osPackReadData(); - __osSiRawStartDma(OS_WRITE, &__osPifInternalBuff); - osRecvMesg(mq, NULL, OS_MESG_BLOCK); - } - ret = __osSiRawStartDma(OS_READ, &__osPifInternalBuff); - __osContLastPoll = CONT_CMD_READ_BUTTON; - __osSiRelAccess(); - return ret; -} - -void osContGetReadData(OSContPad* contData) { - u8* bufptr = (u8*)(&__osPifInternalBuff); - __OSContReadHeader read; - s32 i; - - for (i = 0; i < __osMaxControllers; i++, bufptr += sizeof(read), contData++) { - read = *((__OSContReadHeader*)bufptr); - contData->errno = (read.rxsize & 0xC0) >> 4; - if (contData->errno == 0) { - contData->button = read.button; - contData->stick_x = read.joyX; - contData->stick_y = read.joyY; - } - }; -} - -void __osPackReadData(void) { - u8* bufptr = (u8*)(&__osPifInternalBuff); - __OSContReadHeader read; - s32 i; - - for (i = 0; i < 0xF; i++) { - __osPifInternalBuff.ram[i] = 0; - } - __osPifInternalBuff.status = 1; - read.align = 0xFF; - read.txsize = 1; - read.rxsize = 4; - read.poll = CONT_CMD_READ_BUTTON; - read.button = 0xFFFF; - read.joyX = 0xFF; - read.joyY = 0xFF; - for (i = 0; i < __osMaxControllers; i++) { - *((__OSContReadHeader*)bufptr) = read; - bufptr += sizeof(read); - } - *((u8*)bufptr) = CONT_CMD_END; -} -- cgit v1.2.3