izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
engineer124
2021-11-10 22:12:45 +11:00
parent b7858effd5
commit 5ca6f07f18
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libultra/voice/voiceinit.c
+1 -1
View File
@@ -9,7 +9,7 @@ s32 osVoiceInit(OSMesgQueue* siMessageQ, OSVoiceHandle* hd, s32 channel) {
u8* phi_s0;
u8 status = 0;
union {
s32 data32;
u32 data32;
u8 data[4];
} u;
s32 pad;
src/libultra/voice/voicestartreaddata.c
+1 -1
View File
@@ -5,7 +5,7 @@ s32 osVoiceStartReadData(OSVoiceHandle* hd) {
s32 errorCode;
u8 status;
union {
s32 data32;
u32 data32;
u8 data[4];
} u;
src/libultra/voice/voicestopread.c
+16 -7
View File
@@ -4,15 +4,18 @@
s32 osVoiceStopReadData(OSVoiceHandle* hd) {
s32 errorCode;
s32 i;
u8 sp3F;
s32 sp38;
u8 status;
union {
u32 data32;
u8 data[4];
} u;
errorCode = __osVoiceGetStatus(hd->mq, hd->port, &sp3F);
errorCode = __osVoiceGetStatus(hd->mq, hd->port, &status);
if (errorCode != 0) {
return errorCode;
}
if (sp3F & 2) {
if (status & 2) {
return CONT_ERR_VOICE_NO_RESPONSE;
}
@@ -20,13 +23,19 @@ s32 osVoiceStopReadData(OSVoiceHandle* hd) {
return CONT_ERR_INVALID;
}
sp38 = 0x700;
errorCode = __osVoiceContWrite4(hd->mq, hd->port, 0, &sp38);
/**
* data[0] = 0
* data[1] = 0
* data[2] = 7
* data[3] = 0
*/
u.data32 = 0x700;
errorCode = __osVoiceContWrite4(hd->mq, hd->port, 0, u.data);
if (errorCode == 0) {
i = 0;
do {
errorCode = __osVoiceCheckResult(hd, &sp3F);
errorCode = __osVoiceCheckResult(hd, &status);
if (errorCode & 0xFF00) {
if (((errorCode & 7) == 0) || ((errorCode & 7) == 7)) {
errorCode = 0;