summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2/pimgr.c
diff options
context:
space:
mode:
authorshawlucas <lgs84@cornell.edu>2020-03-23 14:41:50 -0700
committershawlucas <lgs84@cornell.edu>2020-03-23 14:41:50 -0700
commit09afb8d5528118e287d3b126dd9f8a4e803b5ea7 (patch)
tree9763c68b8511f23f7801939cac736bf96a502d54 /src/libultra_boot_O2/pimgr.c
parent2d97f0dd58dc3b3aaecc99010716f2ce21b9eed5 (diff)
parent8e316933d596204aa42fcfc2587fee480b4e114e (diff)
Merge branch 'master' of https://github.com/zeldaret/oot
Diffstat (limited to 'src/libultra_boot_O2/pimgr.c')
-rw-r--r--src/libultra_boot_O2/pimgr.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/libultra_boot_O2/pimgr.c b/src/libultra_boot_O2/pimgr.c
index c15d7b919..581f66f48 100644
--- a/src/libultra_boot_O2/pimgr.c
+++ b/src/libultra_boot_O2/pimgr.c
@@ -1,6 +1,6 @@
#include <global.h>
-OSMgrArgs __osPiDevMgr = {0};
+OSMgrArgs __osPiDevMgr = { 0 };
OSPiHandle __Dom1SpeedParam;
OSPiHandle __Dom2SpeedParam;
@@ -11,31 +11,27 @@ OSMesg piEventBuf[2];
OSThread __osThreadSave;
OSPiHandle* __osPiTable = NULL;
-OSPiHandle* __osCurrentHandle[] =
-{
+OSPiHandle* __osCurrentHandle[] = {
&__Dom1SpeedParam,
&__Dom2SpeedParam,
};
-
-void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgCnt)
-{
+void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt) {
u32 int_disabled;
OSPri newPri;
OSPri currentPri;
- if (!__osPiDevMgr.initialized)
- {
+ if (!__osPiDevMgr.initialized) {
osCreateMesgQueue(cmdQ, cmdBuf, cmdMsgCnt);
osCreateMesgQueue(&piEventQueue, piEventBuf, 1);
- if (!__osPiAccessQueueEnabled)
+ if (!__osPiAccessQueueEnabled) {
__osPiCreateAccessQueue();
+ }
osSetEventMesg(OS_EVENT_PI, &piEventQueue, (OSMesg)0x22222222);
newPri = -1;
currentPri = osGetThreadPri(NULL);
- if (currentPri < pri)
- {
+ if (currentPri < pri) {
newPri = currentPri;
osSetThreadPri(NULL, pri);
}
@@ -49,12 +45,13 @@ void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgC
__osPiDevMgr.piDmaCallback = __osPiRawStartDma;
__osPiDevMgr.epiDmaCallback = __osEPiRawStartDma;
- osCreateThread(&piThread, 0, __osDevMgrMain, (void *)&__osPiDevMgr, piStackThread + sizeof(piStackThread), pri);
+ osCreateThread(&piThread, 0, __osDevMgrMain, (void*)&__osPiDevMgr, piStackThread + sizeof(piStackThread), pri);
osStartThread(&piThread);
__osRestoreInt(int_disabled);
- if (newPri != -1)
+ if (newPri != -1) {
osSetThreadPri(NULL, newPri);
+ }
}
}