Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-27 07:10:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up vi header

Browse Source
This commit is contained in:
HeartPiece 2023-10-18 14:56:14 +11:00
parent 990fe7e24d
commit 190849806f
2 changed files with 108 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
include/Dolphin/vi.h
View File

@ -1,18 +1,22 @@
#ifndef _DOLPHIN_VI_H
#define _DOLPHIN_VI_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif // ifdef __cplusplus
#include "types.h"
////// VIDEO INTERFACE DEFINES /////
// Display pixel size.
#define VI_DISPLAY_PIX_SZ 2
// Interlacing types
#define VI_INTERLACE 0
#define VI_NON_INTERLACE 1
#define VI_PROGRESSIVE 2
// Video output formats
#define VI_NTSC 0
#define VI_PAL 1
#define VI_MPAL 2
@ -20,63 +24,93 @@ extern "C" {
#define VI_DEBUG_PAL 4
#define VI_EURGB60 5
// Conversion to TVMode used in enums
#define VI_TVMODE(FMT, INT) (((FMT) << 2) + (INT))
typedef enum {
VI_TVMODE_NTSC_INT = VI_TVMODE(VI_NTSC, VI_INTERLACE),
VI_TVMODE_NTSC_DS = VI_TVMODE(VI_NTSC, VI_NON_INTERLACE),
VI_TVMODE_NTSC_PROG = VI_TVMODE(VI_NTSC, VI_PROGRESSIVE),
VI_TVMODE_PAL_INT = VI_TVMODE(VI_PAL, VI_INTERLACE),
VI_TVMODE_PAL_DS = VI_TVMODE(VI_PAL, VI_NON_INTERLACE),
VI_TVMODE_EURGB60_INT = VI_TVMODE(VI_EURGB60, VI_INTERLACE),
VI_TVMODE_EURGB60_DS = VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE),
VI_TVMODE_MPAL_INT = VI_TVMODE(VI_MPAL, VI_INTERLACE),
VI_TVMODE_MPAL_DS = VI_TVMODE(VI_MPAL, VI_NON_INTERLACE),
VI_TVMODE_DEBUG_INT = VI_TVMODE(VI_DEBUG, VI_INTERLACE),
VI_TVMODE_DEBUG_PAL_INT = VI_TVMODE(VI_DEBUG_PAL, VI_INTERLACE),
VI_TVMODE_DEBUG_PAL_DS = VI_TVMODE(VI_DEBUG_PAL, VI_NON_INTERLACE)
} VITVMode;
typedef enum { VI_XFBMODE_SF = 0, VI_XFBMODE_DF } VIXFBMode;
// Fields
#define VI_FIELD_ABOVE 1
#define VI_FIELD_BELOW 0
// Maximum screen space
// Max screen dimensions
// NTSC
#define VI_MAX_WIDTH_NTSC 720
#define VI_MAX_HEIGHT_NTSC 480
// PAL
#define VI_MAX_WIDTH_PAL 720
#define VI_MAX_HEIGHT_PAL 574
// MPAL
#define VI_MAX_WIDTH_MPAL 720
#define VI_MAX_HEIGHT_MPAL 480
// EU RGB60 (same as NTSC)
#define VI_MAX_WIDTH_EURGB60 VI_MAX_WIDTH_NTSC
#define VI_MAX_HEIGHT_EURGB60 VI_MAX_HEIGHT_NTSC
typedef void (*VIRetraceCallback)(u32 retraceCount);
// Conversion to padded FB width from screen width
#define VIPadFrameBufferWidth(width) ((u16)(((u16)(width) + 15) & ~15))
////////////////////////////////////
/////// VIDEO INTERFACE TYPES //////
// Retrace callback function type.
typedef void (*VIRetraceCallback)(u32 retraceCount);
// TV Modes
typedef enum {
// NTSC
VI_TVMODE_NTSC_INT = VI_TVMODE(VI_NTSC, VI_INTERLACE), // 0
VI_TVMODE_NTSC_DS = VI_TVMODE(VI_NTSC, VI_NON_INTERLACE), // 1
VI_TVMODE_NTSC_PROG = VI_TVMODE(VI_NTSC, VI_PROGRESSIVE), // 2
// PAL
VI_TVMODE_PAL_INT = VI_TVMODE(VI_PAL, VI_INTERLACE), // 4
VI_TVMODE_PAL_DS = VI_TVMODE(VI_PAL, VI_NON_INTERLACE), // 5
// MPAL
VI_TVMODE_MPAL_INT = VI_TVMODE(VI_MPAL, VI_INTERLACE), // 8
VI_TVMODE_MPAL_DS = VI_TVMODE(VI_MPAL, VI_NON_INTERLACE), // 9
// Debug
VI_TVMODE_DEBUG_INT = VI_TVMODE(VI_DEBUG, VI_INTERLACE), // 12
// Debug PAL
VI_TVMODE_DEBUG_PAL_INT = VI_TVMODE(VI_DEBUG_PAL, VI_INTERLACE), // 16
VI_TVMODE_DEBUG_PAL_DS = VI_TVMODE(VI_DEBUG_PAL, VI_NON_INTERLACE), // 17
// EU RGB60
VI_TVMODE_EURGB60_INT = VI_TVMODE(VI_EURGB60, VI_INTERLACE), // 20
VI_TVMODE_EURGB60_DS = VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE), // 21
} VITVMode;
// External frame buffer modes (single and double?)
typedef enum {
VI_XFBMODE_SF = 0,
VI_XFBMODE_DF = 1,
} VIXFBMode;
////////////////////////////////////
///// VIDEO INTERFACE FUNCTIONS ////
// Basic VI functions.
void VIInit(void);
void VIFlush(void);
void VIWaitForRetrace(void);
void VIConfigure(const struct _GXRenderModeObj* rm);
void VIConfigurePan(u16 PanPosX, u16 PanPosY, u16 PanSizeX, u16 PanSizeY);
void VISetNextFrameBuffer(void* fb);
void* VIGetCurrentFrameBuffer();
// Configure functions.
void VIConfigure(const struct _GXRenderModeObj* obj);
// Retrace callbacks.
VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback callback);
VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback callback);
void VISetBlack(BOOL black);
// Getters and setters
void VISetNextFrameBuffer(void* fb);
void* VIGetCurrentFrameBuffer();
void VISetBlack(BOOL isBlack);
u32 VIGetRetraceCount(void);
u32 VIGetNextField(void);
u32 VIGetCurrentLine(void);
@ -84,6 +118,14 @@ u32 VIGetTvFormat(void);
u32 VIGetDTVStatus(void);
// Unused/stripped in P2.
void VIConfigurePan(u16 panPosX, u16 panPosY, u16 panSizeX, u16 panSizeY);
void* VIGetNextFrameBuffer();
void VISetNextRightFrameBuffer(void* fb);
void VISet3D(); // unsure on arguments
////////////////////////////////////
#ifdef __cplusplus
};
#endif // ifdef __cplusplus

67
src/Dolphin/vi/vi.c
View File

@ -1,11 +1,12 @@
#include "Dolphin/vi.h"
#include "Dolphin/gx.h"
/*
* --INFO--
* Address: ........
* Size: 000008
*/
void getEncoderType(void)
static void getEncoderType(void)
{
// UNUSED FUNCTION
}
@ -15,7 +16,7 @@ void getEncoderType(void)
* Address: ........
* Size: 00005C
*/
void cntlzd(void)
static void cntlzd(void)
{
// UNUSED FUNCTION
}
@ -35,7 +36,7 @@ void VISetRegs(void)
* Address: 800D07E8
* Size: 000274
*/
void __VIRetraceHandler(void)
static void __VIRetraceHandler(void)
{
/*
.loc_0x0:
@ -240,7 +241,7 @@ void __VIRetraceHandler(void)
* Address: 800D0A5C
* Size: 000044
*/
void VISetPreRetraceCallback(void)
VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback callback)
{
/*
.loc_0x0:
@ -269,7 +270,7 @@ void VISetPreRetraceCallback(void)
* Address: 800D0AA0
* Size: 000044
*/
void VISetPostRetraceCallback(void)
VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback callback)
{
/*
.loc_0x0:
@ -298,7 +299,7 @@ void VISetPostRetraceCallback(void)
* Address: 800D0AE4
* Size: 0000A0
*/
void getTiming(void)
static void getTiming(void)
{
/*
.loc_0x0:
@ -502,7 +503,7 @@ void __VIInit(void)
* Address: ........
* Size: 000160
*/
void AdjustPosition(void)
static void AdjustPosition(void)
{
// UNUSED FUNCTION
}
@ -512,7 +513,7 @@ void AdjustPosition(void)
* Address: ........
* Size: 00003C
*/
void ImportAdjustingValues(void)
static void ImportAdjustingValues(void)
{
// UNUSED FUNCTION
}
@ -913,7 +914,7 @@ void VIWaitForRetrace(void)
* Address: ........
* Size: 00007C
*/
void setInterruptRegs(void)
static void setInterruptRegs(void)
{
// UNUSED FUNCTION
}
@ -923,7 +924,7 @@ void setInterruptRegs(void)
* Address: ........
* Size: 000098
*/
void setPicConfig(void)
static void setPicConfig(void)
{
// UNUSED FUNCTION
}
@ -933,7 +934,7 @@ void setPicConfig(void)
* Address: ........
* Size: 0000BC
*/
void setBBIntervalRegs(void)
static void setBBIntervalRegs(void)
{
// UNUSED FUNCTION
}
@ -943,7 +944,7 @@ void setBBIntervalRegs(void)
* Address: ........
* Size: 00009C
*/
void setScalingRegs(void)
static void setScalingRegs(void)
{
// UNUSED FUNCTION
}
@ -953,7 +954,7 @@ void setScalingRegs(void)
* Address: ........
* Size: 000080
*/
void calcFbbs(void)
static void calcFbbs(void)
{
// UNUSED FUNCTION
}
@ -963,7 +964,7 @@ void calcFbbs(void)
* Address: 800D1288
* Size: 0002D4
*/
void setFbbRegs(void)
static void setFbbRegs(void)
{
/*
.loc_0x0:
@ -1178,7 +1179,7 @@ void setFbbRegs(void)
* Address: ........
* Size: 0000CC
*/
void setHorizontalRegs(void)
static void setHorizontalRegs(void)
{
// UNUSED FUNCTION
}
@ -1188,7 +1189,7 @@ void setHorizontalRegs(void)
* Address: 800D155C
* Size: 0001A0
*/
void setVerticalRegs(void)
static void setVerticalRegs(void)
{
/*
.loc_0x0:
@ -1314,7 +1315,7 @@ void setVerticalRegs(void)
* Address: ........
* Size: 000094
*/
void PrintDebugPalCaution(void)
static void PrintDebugPalCaution(void)
{
// UNUSED FUNCTION
}
@ -1324,7 +1325,7 @@ void PrintDebugPalCaution(void)
* Address: 800D16FC
* Size: 000828
*/
void VIConfigure(void)
void VIConfigure(const GXRenderModeObj* obj)
{
/*
.loc_0x0:
@ -1966,7 +1967,7 @@ void VIConfigure(void)
* Address: ........
* Size: 000394
*/
void VIConfigurePan(void)
void VIConfigurePan(u16 panPosX, u16 panPosY, u16 panSizeX, u16 panSizeY)
{
// UNUSED FUNCTION
}
@ -2072,7 +2073,7 @@ void VIFlush(void)
* Address: 800D2054
* Size: 00006C
*/
void VISetNextFrameBuffer(void)
void VISetNextFrameBuffer(void* fb)
{
/*
.loc_0x0:
@ -2111,7 +2112,7 @@ void VISetNextFrameBuffer(void)
* Address: ........
* Size: 000008
*/
void VIGetNextFrameBuffer(void)
void* VIGetNextFrameBuffer()
{
// UNUSED FUNCTION
}
@ -2121,7 +2122,7 @@ void VIGetNextFrameBuffer(void)
* Address: 800D20C0
* Size: 000008
*/
void VIGetCurrentFrameBuffer(void)
void* VIGetCurrentFrameBuffer(void)
{
/*
.loc_0x0:
@ -2135,7 +2136,7 @@ void VIGetCurrentFrameBuffer(void)
* Address: ........
* Size: 00006C
*/
void VISetNextRightFrameBuffer(void)
void VISetNextRightFrameBuffer(void* fb)
{
// UNUSED FUNCTION
}
@ -2145,7 +2146,7 @@ void VISetNextRightFrameBuffer(void)
* Address: 800D20C8
* Size: 00007C
*/
void VISetBlack(void)
void VISetBlack(BOOL isBlack)
{
/*
.loc_0x0:
@ -2198,7 +2199,7 @@ void VISet3D(void)
* Address: 800D2144
* Size: 000008
*/
void VIGetRetraceCount(void)
u32 VIGetRetraceCount(void)
{
/*
.loc_0x0:
@ -2212,7 +2213,7 @@ void VIGetRetraceCount(void)
* Address: 800D214C
* Size: 00003C
*/
void GetCurrentDisplayPosition(void)
static void GetCurrentDisplayPosition(void)
{
/*
.loc_0x0:
@ -2241,7 +2242,7 @@ void GetCurrentDisplayPosition(void)
* Address: ........
* Size: 000050
*/
void getCurrentHalfLine(void)
static void getCurrentHalfLine(void)
{
// UNUSED FUNCTION
}
@ -2251,7 +2252,7 @@ void getCurrentHalfLine(void)
* Address: 800D2188
* Size: 000068
*/
void getCurrentFieldEvenOdd(void)
static void getCurrentFieldEvenOdd(void)
{
/*
.loc_0x0:
@ -2293,7 +2294,7 @@ void getCurrentFieldEvenOdd(void)
* Address: 800D21F0
* Size: 00009C
*/
void VIGetNextField(void)
u32 VIGetNextField(void)
{
/*
.loc_0x0:
@ -2348,7 +2349,7 @@ void VIGetNextField(void)
* Address: 800D228C
* Size: 000098
*/
void VIGetCurrentLine(void)
u32 VIGetCurrentLine(void)
{
/*
.loc_0x0:
@ -2402,7 +2403,7 @@ void VIGetCurrentLine(void)
* Address: 800D2324
* Size: 000068
*/
void VIGetTvFormat(void)
u32 VIGetTvFormat(void)
{
/*
.loc_0x0:
@ -2442,7 +2443,7 @@ void VIGetTvFormat(void)
* Address: 800D238C
* Size: 00003C
*/
void VIGetDTVStatus(void)
u32 VIGetDTVStatus(void)
{
/*
.loc_0x0: