mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Changes in PR #15 (2)

Browse source 
- Documented z_msgevent.c
This commit is contained in:
Random 2020-03-20 17:15:39 +01:00
parent bf07193791
commit 1fe00fcce1
7 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/code/z_jpeg/func_8006E418.s
View file

@ -96,7 +96,7 @@ glabel func_8006E418
/* AE5620 8006E480 27A502B8 */ addiu $a1, $sp, 0x2b8 /* AE5620 8006E480 27A502B8 */ addiu $a1, $sp, 0x2b8
/* AE5624 8006E484 0C001874 */ jal osCreateMesgQueue /* AE5624 8006E484 0C001874 */ jal osCreateMesgQueue
/* AE5628 8006E488 24060001 */ li $a2, 1 /* AE5628 8006E488 24060001 */ li $a2, 1
/* AE562C 8006E48C 0C01EFC4 */ jal func_8007BF10 /* AE562C 8006E48C 0C01EFC4 */ jal MsgEvent_SendNullTask
/* AE5630 8006E490 00000000 */ nop /* AE5630 8006E490 00000000 */ nop
/* AE5634 8006E494 0C001A78 */ jal osGetTime /* AE5634 8006E494 0C001A78 */ jal osGetTime
/* AE5638 8006E498 00000000 */ nop /* AE5638 8006E498 00000000 */ nop

2
asm/non_matchings/code/z_play/func_800BEDD8.s
View file

@ -370,7 +370,7 @@ glabel func_800BEDD8
/* B364E4 800BF344 84430190 */ lh $v1, 0x190($v0) /* B364E4 800BF344 84430190 */ lh $v1, 0x190($v0)
/* B364E8 800BF348 5461000E */ bnel $v1, $at, .L800BF384 /* B364E8 800BF348 5461000E */ bnel $v1, $at, .L800BF384
/* B364EC 800BF34C 28610004 */ slti $at, $v1, 4 /* B364EC 800BF34C 28610004 */ slti $at, $v1, 4
/* B364F0 800BF350 0C01EFC4 */ jal func_8007BF10 /* B364F0 800BF350 0C01EFC4 */ jal MsgEvent_SendNullTask
/* B364F4 800BF354 00000000 */ nop /* B364F4 800BF354 00000000 */ nop
/* B364F8 800BF358 0C030DDC */ jal func_800C3770 /* B364F8 800BF358 0C030DDC */ jal func_800C3770
/* B364FC 800BF35C 8FA4003C */ lw $a0, 0x3c($sp) /* B364FC 800BF35C 8FA4003C */ lw $a0, 0x3c($sp)

2
include/functions.h
View file

@ -924,7 +924,7 @@ void MapMark_DrawConditionally(GlobalContext* globalCtx);
void PreNmiBuff_Init(PreNmiBuff* this); void PreNmiBuff_Init(PreNmiBuff* this);
void PreNmiBuff_SetReset(PreNmiBuff* this); void PreNmiBuff_SetReset(PreNmiBuff* this);
u32 PreNmiBuff_IsResetting(PreNmiBuff* this); u32 PreNmiBuff_IsResetting(PreNmiBuff* this);
// ? func_8007BF10(?); void MsgEvent_SendNullTask();
f32 func_8007BF90(Vec3f*, Vec3f*); f32 func_8007BF90(Vec3f*, Vec3f*);
// ? func_8007C028(?); // ? func_8007C028(?);
// ? func_8007C058(?); // ? func_8007C058(?);

10
include/sched.h
View file

@ -3,6 +3,16 @@
#include <global.h> #include <global.h>
#define OS_SC_NEEDS_RDP 0x0001
#define OS_SC_NEEDS_RSP 0x0002
#define OS_SC_DRAM_DLIST 0x0004
#define OS_SC_PARALLEL_TASK 0x0010
#define OS_SC_LAST_TASK 0x0020
#define OS_SC_SWAPBUFFER 0x0040
#define OS_SC_RCP_MASK 0x0003
#define OS_SC_TYPE_MASK 0x0007
typedef struct OSScTask typedef struct OSScTask
{ {
/* 0x00 */ struct OSScTask* next; /* 0x00 */ struct OSScTask* next;

8
include/ultra64/mbi.h
View file

@ -76,9 +76,11 @@
* *
**************************************************************************/ **************************************************************************/
#define M_GFXTASK 1 #define M_NULTASK 0
#define M_AUDTASK 2 #define M_GFXTASK 1
#define M_VIDTASK 3 #define M_AUDTASK 2
#define M_VIDTASK 3
#define M_NJPEGTASK 4
#define M_HVQTASK 6 #define M_HVQTASK 6
#define M_HVQMTASK 7 #define M_HVQMTASK 7

2
spec
View file

@ -340,7 +340,7 @@ beginseg
include "build/src/code/z_map_mark.o" include "build/src/code/z_map_mark.o"
include "build/src/code/z_moji.o" include "build/src/code/z_moji.o"
include "build/src/code/prenmi_buff.o" include "build/src/code/prenmi_buff.o"
include "build/src/code/code_8007BF10.o" include "build/src/code/z_msgevent.o"
include "build/src/code/code_8007BF90.o" include "build/src/code/code_8007BF90.o"
include "build/src/code/z_onepointdemo.o" include "build/src/code/z_onepointdemo.o"
include "build/data/z_onepointdemo.data.o" include "build/data/z_onepointdemo.data.o"

6
src/code/code_8007BF10.c → src/code/z_msgevent.c
View file

@ -2,7 +2,7 @@
#include <global.h> #include <global.h>
#include <sched.h> #include <sched.h>
void func_8007BF10() void MsgEvent_SendNullTask()
{ {
u32 pad[4]; u32 pad[4];
OSScTask task; OSScTask task;
@ -11,11 +11,11 @@ void func_8007BF10()
u32 pad2[1]; u32 pad2[1];
task.next = NULL; task.next = NULL;
task.flags = 3; task.flags = OS_SC_RCP_MASK;
task.msgQ = &queue; task.msgQ = &queue;
task.msg = NULL; task.msg = NULL;
task.framebuffer = NULL; task.framebuffer = NULL;
task.list.t.type = 0; task.list.t.type = M_NULTASK;
osCreateMesgQueue(task.msgQ, &msg, 1); osCreateMesgQueue(task.msgQ, &msg, 1);
osSendMesg(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK); osSendMesg(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK);
func_800C95F8(&gSchedContext); // osScKickEntryMsg func_800C95F8(&gSchedContext); // osScKickEntryMsg