diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-23 14:41:50 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-23 14:41:50 -0700 |
| commit | 09afb8d5528118e287d3b126dd9f8a4e803b5ea7 (patch) | |
| tree | 9763c68b8511f23f7801939cac736bf96a502d54 /src/libultra_code/osContInit.c | |
| parent | 2d97f0dd58dc3b3aaecc99010716f2ce21b9eed5 (diff) | |
| parent | 8e316933d596204aa42fcfc2587fee480b4e114e (diff) | |
Merge branch 'master' of https://github.com/zeldaret/oot
Diffstat (limited to 'src/libultra_code/osContInit.c')
| -rw-r--r-- | src/libultra_code/osContInit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libultra_code/osContInit.c b/src/libultra_code/osContInit.c index dcccfb765..33cc136b8 100644 --- a/src/libultra_code/osContInit.c +++ b/src/libultra_code/osContInit.c @@ -5,19 +5,19 @@ pif_data_buffer_t _osPifInternalBuff; u8 _osCont_lastPollType; -u8 _osCont_numControllers; //always 4 +u8 _osCont_numControllers; // always 4 -//Not sure if the following is a struct together with the last two variables +// Not sure if the following is a struct together with the last two variables u16 unk_80175812; u32 unk_80175814; -u8 unk_80175818[0x20]; +u8 unk_80175818[0x20]; u32 gOsContInitialized = 0; OSMesgQueue _osContMesgQueue; OSMesg _osContMesgBuff[4]; #define HALF_SECOND OS_USEC_TO_CYCLES(500000) -s32 osContInit(OSMesgQueue *mq, u8 *ctl_present_bitfield, OSContStatus *status) { //func_80100C10 +s32 osContInit(OSMesgQueue* mq, u8* ctl_present_bitfield, OSContStatus* status) { OSMesg mesg; s32 ret = 0; OSTime currentTime; @@ -47,8 +47,8 @@ s32 osContInit(OSMesgQueue *mq, u8 *ctl_present_bitfield, OSContStatus *status) return ret; } -void __osContGetInitData(u8 *ctl_present_bitfield, OSContStatus *status) { //func_80100D6C - PIF_IO_slot_t *slot_ptr; +void __osContGetInitData(u8* ctl_present_bitfield, OSContStatus* status) { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; u8 bitfield_temp; @@ -66,11 +66,11 @@ void __osContGetInitData(u8 *ctl_present_bitfield, OSContStatus *status) { //fun *ctl_present_bitfield = bitfield_temp; } -void __osPackRequestData(u8 command) { //func_80100E18 - PIF_IO_slot_t *slot_ptr; +void __osPackRequestData(u8 command) { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; - for(i = 0; i < 0xF; i++) { + for (i = 0; i < 0xF; i++) { _osPifInternalBuff.words[i] = 0; } _osPifInternalBuff.status_control = 1; |