From 444cad0d103f9860ef4be1e59bec80b7690bb26c Mon Sep 17 00:00:00 2001 From: Julgodis <> Date: Sun, 26 Sep 2021 14:22:03 +0200 Subject: [PATCH] Format and removed unused .s files. --- .../__ct__8JUTVideoFPC16_GXRenderModeObj.s | 62 ------- .../JUTVideo/drawDoneCallback__8JUTVideoFv.s | 39 ----- .../JUTVideo/postRetraceProc__8JUTVideoFUl.s | 24 --- .../JUTVideo/preRetraceProc__8JUTVideoFUl.s | 164 ------------------ include/dolphin/vi/vi.h | 2 +- libs/JSystem/JUtility/JUTVideo.cpp | 66 ++----- 6 files changed, 16 insertions(+), 341 deletions(-) delete mode 100644 asm/JSystem/JUtility/JUTVideo/__ct__8JUTVideoFPC16_GXRenderModeObj.s delete mode 100644 asm/JSystem/JUtility/JUTVideo/drawDoneCallback__8JUTVideoFv.s delete mode 100644 asm/JSystem/JUtility/JUTVideo/postRetraceProc__8JUTVideoFUl.s delete mode 100644 asm/JSystem/JUtility/JUTVideo/preRetraceProc__8JUTVideoFUl.s diff --git a/asm/JSystem/JUtility/JUTVideo/__ct__8JUTVideoFPC16_GXRenderModeObj.s b/asm/JSystem/JUtility/JUTVideo/__ct__8JUTVideoFPC16_GXRenderModeObj.s deleted file mode 100644 index db0d7616e4c..00000000000 --- a/asm/JSystem/JUtility/JUTVideo/__ct__8JUTVideoFPC16_GXRenderModeObj.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802E4CF4: -/* 802E4CF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E4CF8 7C 08 02 A6 */ mflr r0 -/* 802E4CFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E4D00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E4D04 93 C1 00 08 */ stw r30, 8(r1) -/* 802E4D08 7C 7F 1B 78 */ mr r31, r3 -/* 802E4D0C 7C 9E 23 78 */ mr r30, r4 -/* 802E4D10 3C 60 80 3D */ lis r3, __vt__8JUTVideo@ha /* 0x803CC980@ha */ -/* 802E4D14 38 03 C9 80 */ addi r0, r3, __vt__8JUTVideo@l /* 0x803CC980@l */ -/* 802E4D18 90 1F 00 00 */ stw r0, 0(r31) -/* 802E4D1C 38 00 00 00 */ li r0, 0 -/* 802E4D20 90 1F 00 04 */ stw r0, 4(r31) -/* 802E4D24 48 06 77 F1 */ bl VIInit -/* 802E4D28 38 00 00 01 */ li r0, 1 -/* 802E4D2C 98 1F 00 2C */ stb r0, 0x2c(r31) -/* 802E4D30 38 00 00 02 */ li r0, 2 -/* 802E4D34 90 1F 00 30 */ stw r0, 0x30(r31) -/* 802E4D38 7F E3 FB 78 */ mr r3, r31 -/* 802E4D3C 7F C4 F3 78 */ mr r4, r30 -/* 802E4D40 48 00 04 59 */ bl setRenderMode__8JUTVideoFPC16_GXRenderModeObj -/* 802E4D44 38 60 00 01 */ li r3, 1 -/* 802E4D48 48 06 8A F9 */ bl VISetBlack -/* 802E4D4C 48 06 89 49 */ bl VIFlush -/* 802E4D50 38 00 00 00 */ li r0, 0 -/* 802E4D54 90 1F 00 08 */ stw r0, 8(r31) -/* 802E4D58 48 06 8B 65 */ bl VIGetRetraceCount -/* 802E4D5C 90 7F 00 0C */ stw r3, 0xc(r31) -/* 802E4D60 38 00 00 01 */ li r0, 1 -/* 802E4D64 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802E4D68 38 00 00 00 */ li r0, 0 -/* 802E4D6C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 802E4D70 48 05 D9 A5 */ bl OSGetTick -/* 802E4D74 90 6D 8F BC */ stw r3, sVideoLastTick__8JUTVideo(r13) -/* 802E4D78 3C 60 00 0A */ lis r3, 0x000A /* 0x000A3930@ha */ -/* 802E4D7C 38 03 39 30 */ addi r0, r3, 0x3930 /* 0x000A3930@l */ -/* 802E4D80 90 0D 8F C0 */ stw r0, sVideoInterval__8JUTVideo(r13) -/* 802E4D84 3C 60 80 2E */ lis r3, preRetraceProc__8JUTVideoFUl@ha /* 0x802E4E50@ha */ -/* 802E4D88 38 63 4E 50 */ addi r3, r3, preRetraceProc__8JUTVideoFUl@l /* 0x802E4E50@l */ -/* 802E4D8C 48 06 74 55 */ bl VISetPreRetraceCallback -/* 802E4D90 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 802E4D94 3C 60 80 2E */ lis r3, postRetraceProc__8JUTVideoFUl@ha /* 0x802E5144@ha */ -/* 802E4D98 38 63 51 44 */ addi r3, r3, postRetraceProc__8JUTVideoFUl@l /* 0x802E5144@l */ -/* 802E4D9C 48 06 74 89 */ bl VISetPostRetraceCallback -/* 802E4DA0 90 7F 00 20 */ stw r3, 0x20(r31) -/* 802E4DA4 38 00 00 00 */ li r0, 0 -/* 802E4DA8 90 1F 00 24 */ stw r0, 0x24(r31) -/* 802E4DAC 90 1F 00 28 */ stw r0, 0x28(r31) -/* 802E4DB0 38 7F 00 38 */ addi r3, r31, 0x38 -/* 802E4DB4 38 9F 00 34 */ addi r4, r31, 0x34 -/* 802E4DB8 38 A0 00 01 */ li r5, 1 -/* 802E4DBC 48 05 9B D9 */ bl OSInitMessageQueue -/* 802E4DC0 3C 60 80 2E */ lis r3, drawDoneCallback__8JUTVideoFv@ha /* 0x802E50BC@ha */ -/* 802E4DC4 38 63 50 BC */ addi r3, r3, drawDoneCallback__8JUTVideoFv@l /* 0x802E50BC@l */ -/* 802E4DC8 48 07 77 E5 */ bl GXSetDrawDoneCallback -/* 802E4DCC 7F E3 FB 78 */ mr r3, r31 -/* 802E4DD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E4DD4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802E4DD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E4DDC 7C 08 03 A6 */ mtlr r0 -/* 802E4DE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E4DE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTVideo/drawDoneCallback__8JUTVideoFv.s b/asm/JSystem/JUtility/JUTVideo/drawDoneCallback__8JUTVideoFv.s deleted file mode 100644 index 35d397642af..00000000000 --- a/asm/JSystem/JUtility/JUTVideo/drawDoneCallback__8JUTVideoFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802E50BC: -/* 802E50BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E50C0 7C 08 02 A6 */ mflr r0 -/* 802E50C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E50C8 80 8D 8F D0 */ lwz r4, sManager__6JUTXfb(r13) -/* 802E50CC 28 04 00 00 */ cmplwi r4, 0 -/* 802E50D0 41 82 00 64 */ beq lbl_802E5134 -/* 802E50D4 38 60 00 00 */ li r3, 0 -/* 802E50D8 98 6D 8F C4 */ stb r3, data_80451544(r13) -/* 802E50DC 80 04 00 10 */ lwz r0, 0x10(r4) -/* 802E50E0 2C 00 00 01 */ cmpwi r0, 1 -/* 802E50E4 40 82 00 50 */ bne lbl_802E5134 -/* 802E50E8 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 802E50EC 2C 00 00 01 */ cmpwi r0, 1 -/* 802E50F0 40 82 00 44 */ bne lbl_802E5134 -/* 802E50F4 90 64 00 1C */ stw r3, 0x1c(r4) -/* 802E50F8 A8 A4 00 16 */ lha r5, 0x16(r4) -/* 802E50FC 7C A0 07 35 */ extsh. r0, r5 -/* 802E5100 41 80 00 0C */ blt lbl_802E510C -/* 802E5104 54 A0 10 3A */ slwi r0, r5, 2 -/* 802E5108 7C 64 00 2E */ lwzx r3, r4, r0 -lbl_802E510C: -/* 802E510C 28 03 00 00 */ cmplwi r3, 0 -/* 802E5110 41 82 00 24 */ beq lbl_802E5134 -/* 802E5114 7C A0 07 35 */ extsh. r0, r5 -/* 802E5118 41 80 00 10 */ blt lbl_802E5128 -/* 802E511C 54 A0 10 3A */ slwi r0, r5, 2 -/* 802E5120 7C 64 00 2E */ lwzx r3, r4, r0 -/* 802E5124 48 00 00 08 */ b lbl_802E512C -lbl_802E5128: -/* 802E5128 38 60 00 00 */ li r3, 0 -lbl_802E512C: -/* 802E512C 48 06 86 99 */ bl VISetNextFrameBuffer -/* 802E5130 48 06 85 65 */ bl VIFlush -lbl_802E5134: -/* 802E5134 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E5138 7C 08 03 A6 */ mtlr r0 -/* 802E513C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5140 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTVideo/postRetraceProc__8JUTVideoFUl.s b/asm/JSystem/JUtility/JUTVideo/postRetraceProc__8JUTVideoFUl.s deleted file mode 100644 index 4de7ed27ecb..00000000000 --- a/asm/JSystem/JUtility/JUTVideo/postRetraceProc__8JUTVideoFUl.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802E5144: -/* 802E5144 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E5148 7C 08 02 A6 */ mflr r0 -/* 802E514C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E5150 80 8D 8F B8 */ lwz r4, sManager__8JUTVideo(r13) -/* 802E5154 28 04 00 00 */ cmplwi r4, 0 -/* 802E5158 41 82 00 30 */ beq lbl_802E5188 -/* 802E515C 81 84 00 28 */ lwz r12, 0x28(r4) -/* 802E5160 28 0C 00 00 */ cmplwi r12, 0 -/* 802E5164 41 82 00 0C */ beq lbl_802E5170 -/* 802E5168 7D 89 03 A6 */ mtctr r12 -/* 802E516C 4E 80 04 21 */ bctrl -lbl_802E5170: -/* 802E5170 48 06 87 4D */ bl VIGetRetraceCount -/* 802E5174 7C 64 1B 78 */ mr r4, r3 -/* 802E5178 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802E517C 38 63 00 38 */ addi r3, r3, 0x38 -/* 802E5180 38 A0 00 00 */ li r5, 0 -/* 802E5184 48 05 98 71 */ bl OSSendMessage -lbl_802E5188: -/* 802E5188 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E518C 7C 08 03 A6 */ mtlr r0 -/* 802E5190 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5194 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTVideo/preRetraceProc__8JUTVideoFUl.s b/asm/JSystem/JUtility/JUTVideo/preRetraceProc__8JUTVideoFUl.s deleted file mode 100644 index 96956fd495d..00000000000 --- a/asm/JSystem/JUtility/JUTVideo/preRetraceProc__8JUTVideoFUl.s +++ /dev/null @@ -1,164 +0,0 @@ -lbl_802E4E50: -/* 802E4E50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E4E54 7C 08 02 A6 */ mflr r0 -/* 802E4E58 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E4E5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E4E60 80 8D 8F B8 */ lwz r4, sManager__8JUTVideo(r13) -/* 802E4E64 28 04 00 00 */ cmplwi r4, 0 -/* 802E4E68 41 82 02 0C */ beq lbl_802E5074 -/* 802E4E6C 81 84 00 24 */ lwz r12, 0x24(r4) -/* 802E4E70 28 0C 00 00 */ cmplwi r12, 0 -/* 802E4E74 41 82 00 0C */ beq lbl_802E4E80 -/* 802E4E78 7D 89 03 A6 */ mtctr r12 -/* 802E4E7C 4E 80 04 21 */ bctrl -lbl_802E4E80: -/* 802E4E80 48 05 D8 95 */ bl OSGetTick -/* 802E4E84 80 0D 8F BC */ lwz r0, sVideoLastTick__8JUTVideo(r13) -/* 802E4E88 7C 00 18 50 */ subf r0, r0, r3 -/* 802E4E8C 90 0D 8F C0 */ stw r0, sVideoInterval__8JUTVideo(r13) -/* 802E4E90 90 6D 8F BC */ stw r3, sVideoLastTick__8JUTVideo(r13) -/* 802E4E94 83 ED 8F D0 */ lwz r31, sManager__6JUTXfb(r13) -/* 802E4E98 28 1F 00 00 */ cmplwi r31, 0 -/* 802E4E9C 40 82 00 14 */ bne lbl_802E4EB0 -/* 802E4EA0 38 60 00 01 */ li r3, 1 -/* 802E4EA4 48 06 89 9D */ bl VISetBlack -/* 802E4EA8 48 06 87 ED */ bl VIFlush -/* 802E4EAC 48 00 01 C8 */ b lbl_802E5074 -lbl_802E4EB0: -/* 802E4EB0 88 0D 8F CC */ lbz r0, data_8045154C(r13) -/* 802E4EB4 7C 00 07 75 */ extsb. r0, r0 -/* 802E4EB8 40 82 00 14 */ bne lbl_802E4ECC -/* 802E4EBC 38 00 00 00 */ li r0, 0 -/* 802E4EC0 90 0D 8F C8 */ stw r0, frameBuffer(r13) -/* 802E4EC4 38 00 00 01 */ li r0, 1 -/* 802E4EC8 98 0D 8F CC */ stb r0, data_8045154C(r13) -lbl_802E4ECC: -/* 802E4ECC 80 8D 8F C8 */ lwz r4, frameBuffer(r13) -/* 802E4ED0 28 04 00 00 */ cmplwi r4, 0 -/* 802E4ED4 41 82 00 1C */ beq lbl_802E4EF0 -/* 802E4ED8 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802E4EDC 80 C3 00 04 */ lwz r6, 4(r3) -/* 802E4EE0 80 6D 8F A8 */ lwz r3, sDirectPrint__14JUTDirectPrint(r13) -/* 802E4EE4 A0 A6 00 04 */ lhz r5, 4(r6) -/* 802E4EE8 A0 C6 00 06 */ lhz r6, 6(r6) -/* 802E4EEC 4B FF F6 81 */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs -lbl_802E4EF0: -/* 802E4EF0 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802E4EF4 88 03 00 2C */ lbz r0, 0x2c(r3) -/* 802E4EF8 28 00 00 01 */ cmplwi r0, 1 -/* 802E4EFC 40 82 00 38 */ bne lbl_802E4F34 -/* 802E4F00 80 83 00 30 */ lwz r4, 0x30(r3) -/* 802E4F04 2C 04 00 00 */ cmpwi r4, 0 -/* 802E4F08 40 81 00 08 */ ble lbl_802E4F10 -/* 802E4F0C 38 84 FF FF */ addi r4, r4, -1 -lbl_802E4F10: -/* 802E4F10 90 83 00 30 */ stw r4, 0x30(r3) -/* 802E4F14 30 04 FF FF */ addic r0, r4, -1 -/* 802E4F18 7C 00 21 10 */ subfe r0, r0, r4 -/* 802E4F1C 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802E4F20 98 03 00 2C */ stb r0, 0x2c(r3) -/* 802E4F24 38 60 00 01 */ li r3, 1 -/* 802E4F28 48 06 89 19 */ bl VISetBlack -/* 802E4F2C 48 06 87 69 */ bl VIFlush -/* 802E4F30 48 00 01 44 */ b lbl_802E5074 -lbl_802E4F34: -/* 802E4F34 28 1F 00 00 */ cmplwi r31, 0 -/* 802E4F38 40 82 00 14 */ bne lbl_802E4F4C -/* 802E4F3C 38 60 00 01 */ li r3, 1 -/* 802E4F40 48 06 89 01 */ bl VISetBlack -/* 802E4F44 48 06 87 51 */ bl VIFlush -/* 802E4F48 48 00 01 2C */ b lbl_802E5074 -lbl_802E4F4C: -/* 802E4F4C 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 802E4F50 2C 00 00 03 */ cmpwi r0, 3 -/* 802E4F54 41 82 00 0C */ beq lbl_802E4F60 -/* 802E4F58 2C 00 00 02 */ cmpwi r0, 2 -/* 802E4F5C 40 82 00 80 */ bne lbl_802E4FDC -lbl_802E4F60: -/* 802E4F60 88 0D 8F C4 */ lbz r0, data_80451544(r13) -/* 802E4F64 28 00 00 00 */ cmplwi r0, 0 -/* 802E4F68 40 82 01 0C */ bne lbl_802E5074 -/* 802E4F6C A8 1F 00 16 */ lha r0, 0x16(r31) -/* 802E4F70 7C 03 07 35 */ extsh. r3, r0 -/* 802E4F74 B0 1F 00 18 */ sth r0, 0x18(r31) -/* 802E4F78 40 80 00 14 */ bge lbl_802E4F8C -/* 802E4F7C 38 60 00 01 */ li r3, 1 -/* 802E4F80 48 06 88 C1 */ bl VISetBlack -/* 802E4F84 48 06 87 11 */ bl VIFlush -/* 802E4F88 48 00 00 EC */ b lbl_802E5074 -lbl_802E4F8C: -/* 802E4F8C A8 7F 00 18 */ lha r3, 0x18(r31) -/* 802E4F90 7C 60 07 35 */ extsh. r0, r3 -/* 802E4F94 41 80 00 10 */ blt lbl_802E4FA4 -/* 802E4F98 54 60 10 3A */ slwi r0, r3, 2 -/* 802E4F9C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802E4FA0 48 00 00 08 */ b lbl_802E4FA8 -lbl_802E4FA4: -/* 802E4FA4 38 60 00 00 */ li r3, 0 -lbl_802E4FA8: -/* 802E4FA8 48 06 88 1D */ bl VISetNextFrameBuffer -/* 802E4FAC 48 06 86 E9 */ bl VIFlush -/* 802E4FB0 38 60 00 00 */ li r3, 0 -/* 802E4FB4 48 06 88 8D */ bl VISetBlack -/* 802E4FB8 A8 7F 00 18 */ lha r3, 0x18(r31) -/* 802E4FBC 7C 60 07 35 */ extsh. r0, r3 -/* 802E4FC0 41 80 00 10 */ blt lbl_802E4FD0 -/* 802E4FC4 54 60 10 3A */ slwi r0, r3, 2 -/* 802E4FC8 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 802E4FCC 48 00 00 08 */ b lbl_802E4FD4 -lbl_802E4FD0: -/* 802E4FD0 38 00 00 00 */ li r0, 0 -lbl_802E4FD4: -/* 802E4FD4 90 0D 8F C8 */ stw r0, frameBuffer(r13) -/* 802E4FD8 48 00 00 9C */ b lbl_802E5074 -lbl_802E4FDC: -/* 802E4FDC 2C 00 00 01 */ cmpwi r0, 1 -/* 802E4FE0 40 82 00 94 */ bne lbl_802E5074 -/* 802E4FE4 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 802E4FE8 2C 00 00 00 */ cmpwi r0, 0 -/* 802E4FEC 40 82 00 84 */ bne lbl_802E5070 -/* 802E4FF0 A8 1F 00 16 */ lha r0, 0x16(r31) -/* 802E4FF4 7C 00 07 35 */ extsh. r0, r0 -/* 802E4FF8 41 80 00 70 */ blt lbl_802E5068 -/* 802E4FFC B0 1F 00 18 */ sth r0, 0x18(r31) -/* 802E5000 A8 7F 00 18 */ lha r3, 0x18(r31) -/* 802E5004 7C 60 07 35 */ extsh. r0, r3 -/* 802E5008 41 80 00 10 */ blt lbl_802E5018 -/* 802E500C 54 60 10 3A */ slwi r0, r3, 2 -/* 802E5010 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802E5014 48 00 00 08 */ b lbl_802E501C -lbl_802E5018: -/* 802E5018 38 60 00 00 */ li r3, 0 -lbl_802E501C: -/* 802E501C 38 80 00 01 */ li r4, 1 -/* 802E5020 48 07 82 E5 */ bl GXCopyDisp -/* 802E5024 48 07 6E A9 */ bl GXFlush -/* 802E5028 38 00 00 02 */ li r0, 2 -/* 802E502C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802E5030 A8 7F 00 18 */ lha r3, 0x18(r31) -/* 802E5034 7C 60 07 35 */ extsh. r0, r3 -/* 802E5038 41 80 00 10 */ blt lbl_802E5048 -/* 802E503C 54 60 10 3A */ slwi r0, r3, 2 -/* 802E5040 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 802E5044 48 00 00 08 */ b lbl_802E504C -lbl_802E5048: -/* 802E5048 38 00 00 00 */ li r0, 0 -lbl_802E504C: -/* 802E504C 90 0D 8F C8 */ stw r0, frameBuffer(r13) -/* 802E5050 48 06 87 E1 */ bl VIGetNextFrameBuffer -/* 802E5054 28 03 00 00 */ cmplwi r3, 0 -/* 802E5058 41 82 00 18 */ beq lbl_802E5070 -/* 802E505C 38 60 00 00 */ li r3, 0 -/* 802E5060 48 06 87 E1 */ bl VISetBlack -/* 802E5064 48 00 00 0C */ b lbl_802E5070 -lbl_802E5068: -/* 802E5068 38 60 00 01 */ li r3, 1 -/* 802E506C 48 06 87 D5 */ bl VISetBlack -lbl_802E5070: -/* 802E5070 48 06 86 25 */ bl VIFlush -lbl_802E5074: -/* 802E5074 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E5078 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E507C 7C 08 03 A6 */ mtlr r0 -/* 802E5080 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5084 4E 80 00 20 */ blr diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h index c7d223978ba..350f64483d6 100644 --- a/include/dolphin/vi/vi.h +++ b/include/dolphin/vi/vi.h @@ -1,8 +1,8 @@ #ifndef VI_H #define VI_H -#include "dolphin/types.h" #include "dolphin/gx/GX.h" +#include "dolphin/types.h" typedef void (*VIRetraceCallback)(u32); diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index 7190c062a83..87cb3f9d1b8 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -19,45 +19,35 @@ struct JUTDirectPrint { static JUTDirectPrint* sDirectPrint; }; -// -// Forward References: -// - -extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj(); -extern "C" void destroyManager__8JUTVideoFv(); -extern "C" void __ct__8JUTVideoFPC16_GXRenderModeObj(); -extern "C" void __dt__8JUTVideoFv(); -extern "C" void preRetraceProc__8JUTVideoFUl(); -extern "C" void drawDoneStart__8JUTVideoFv(); -extern "C" void dummyNoDrawWait__8JUTVideoFv(); -extern "C" void drawDoneCallback__8JUTVideoFv(); -extern "C" void postRetraceProc__8JUTVideoFUl(); -extern "C" void setRenderMode__8JUTVideoFPC16_GXRenderModeObj(); -extern "C" void waitRetraceIfNeed__8JUTVideoFv(); -extern "C" u8 sManager__8JUTVideo[4]; -extern "C" u8 sVideoLastTick__8JUTVideo[4]; -extern "C" u8 sVideoInterval__8JUTVideo[4]; - // // External References: // -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void changeFrameBuffer__14JUTDirectPrintFPvUsUs(); extern "C" void GXSetDrawDone(); extern "C" void GXCopyDisp(void*, BOOL); -extern "C" u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; -extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */]; // // Declarations: // -/* ############################################################################################## */ /* 80451538-8045153C 000A38 0004+00 4/4 18/18 1/1 .sbss sManager__8JUTVideo */ JUTVideo* JUTVideo::sManager; +/* 8045153C-80451540 000A3C 0004+00 2/2 1/1 0/0 .sbss sVideoLastTick__8JUTVideo */ +OSTick JUTVideo::sVideoLastTick; + +/* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss sVideoInterval__8JUTVideo */ + +OSTick JUTVideo::sVideoInterval; +/* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss None */ +static bool data_80451544; + +/* 80451548-8045154C 000A48 0004+00 1/1 0/0 0/0 .sbss frameBuffer$2222 */ +static void* frameBuffer; + +/* 8045154C-80451550 000A4C 0004+00 1/1 0/0 0/0 .sbss None */ +static s8 data_8045154C; + /* 802E4C54-802E4CAC 2DF594 0058+00 0/0 1/1 0/0 .text * createManager__8JUTVideoFPC16_GXRenderModeObj */ JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) { @@ -75,22 +65,6 @@ void JUTVideo::destroyManager() { } } -/* ############################################################################################## */ -/* 803CC980-803CC990 029AA0 000C+04 2/2 0/0 0/0 .data __vt__8JUTVideo */ -SECTION_DATA extern void* __vt__8JUTVideo[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8JUTVideoFv, - /* padding */ - NULL, -}; - -/* 8045153C-80451540 000A3C 0004+00 2/2 1/1 0/0 .sbss sVideoLastTick__8JUTVideo */ -OSTick JUTVideo::sVideoLastTick; - -/* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss sVideoInterval__8JUTVideo */ -OSTick JUTVideo::sVideoInterval; - /* 802E4CF4-802E4DE8 2DF634 00F4+00 1/1 0/0 0/0 .text __ct__8JUTVideoFPC16_GXRenderModeObj */ JUTVideo::JUTVideo(GXRenderModeObj const* param_0) { mRenderObj = NULL; @@ -120,16 +94,6 @@ JUTVideo::~JUTVideo() { VISetPostRetraceCallback(mPostRetraceCallback); } -/* ############################################################################################## */ -/* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss None */ -static bool data_80451544; - -/* 80451548-8045154C 000A48 0004+00 1/1 0/0 0/0 .sbss frameBuffer$2222 */ -static void* frameBuffer; - -/* 8045154C-80451550 000A4C 0004+00 1/1 0/0 0/0 .sbss None */ -static s8 data_8045154C; - /* 802E4E50-802E5088 2DF790 0238+00 1/1 0/0 0/0 .text preRetraceProc__8JUTVideoFUl */ void JUTVideo::preRetraceProc(u32 retrace_count) { if (!sManager) {