Renamed a few variables and files

This commit is contained in:
Ryan Myers
2021-09-30 13:06:22 -04:00
parent 117dccc3d7
commit 947593ae55
6 changed files with 13 additions and 12 deletions
+3 -3
View File
@@ -5,8 +5,8 @@
#include "libultra_internal.h"
#include "stacks.h"
extern OSMesgQueue piAccessQueue; //piAccessQueue
extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled
extern OSMesgQueue __osPiAccessQueue;
extern u32 __osPiAccessQueueEnabled;
extern OSDevMgr __osPiDevMgr;
void __osDevMgrMain(void);
@@ -39,7 +39,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgC
__osPiDevMgr.thread = &piThread;
__osPiDevMgr.cmdQueue = cmdQ;
__osPiDevMgr.evtQueue = &piEventQueue;
__osPiDevMgr.acsQueue = &piAccessQueue;
__osPiDevMgr.acsQueue = &__osPiAccessQueue;
__osPiDevMgr.dma = osPiRawStartDma;
__osPiDevMgr.edma = osEPiRawStartDma;
+1
View File
@@ -3,6 +3,7 @@
#include "libultra_internal.h"
//TODO: Figure out a better way to declare this. It's currently randomly declared in another file
extern s32 (*__osHwIntTable[])(void);
void __osSetHWIntrRoutine(OSHWIntr interrupt, s32 (*handler)(void)) {
@@ -6,24 +6,24 @@
#include "libultra_internal.h"
#define PI_Q_BUF_LEN 1
extern u32 __osPiAccessQueueEnabled;//__osPiAccessQueueEnabled
extern OSMesg piAccessBuf[PI_Q_BUF_LEN];//piAccessBuf
extern OSMesgQueue piAccessQueue; //__osPiAccessQueue
extern u32 __osPiAccessQueueEnabled;
extern OSMesg piAccessBuf[PI_Q_BUF_LEN];
extern OSMesgQueue __osPiAccessQueue;
void __osPiCreateAccessQueue(void) {
__osPiAccessQueueEnabled = 1;
osCreateMesgQueue(&piAccessQueue, piAccessBuf, PI_Q_BUF_LEN);
osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK);
osCreateMesgQueue(&__osPiAccessQueue, piAccessBuf, PI_Q_BUF_LEN);
osSendMesg(&__osPiAccessQueue, NULL, OS_MESG_NOBLOCK);
}
void __osPiGetAccess(void) {
OSMesg dummyMesg;
if (!__osPiAccessQueueEnabled)
__osPiCreateAccessQueue();
osRecvMesg(&piAccessQueue, &dummyMesg, OS_MESG_BLOCK);
osRecvMesg(&__osPiAccessQueue, &dummyMesg, OS_MESG_BLOCK);
}
void __osPiRelAccess(void) {
osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK);
osSendMesg(&__osPiAccessQueue, NULL, OS_MESG_NOBLOCK);
}
/**********************************************************************/
+1 -1
View File
@@ -26,7 +26,7 @@ u16 D_8012D192;
s32 D_8012D194[2];
s32 D_8012D1A0[16];
s32 piAccessBuf[2]; //Should be static, but this works for now
s32 piAccessQueue[6];
s32 __osPiAccessQueue[6];
OSTimer D_8012D200;
OSTime __osCurrentTime;
s32 __osBaseCounter;
+1 -1
View File
@@ -24,7 +24,7 @@ LATE_DATA_FILES = [
BUILD_DIR + '/lib/src/al/alCopy.o',
BUILD_DIR + '/lib/src/libc/xprintf.o',
BUILD_DIR + '/lib/src/os/osTimer.o',
BUILD_DIR + '/lib/src/unknown_0D3020.o'
BUILD_DIR + '/lib/src/os/piacs.o'
]
BSS_LIB_ORDER_FILES = [