Skip to content

Commit

Permalink
Migrate GameCube port to libogc2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Extrems
Extrems committed Feb 8, 2024
1 parent e8a6086 commit cd67bc5
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 113 deletions.
2 changes: 1 addition & 1 deletion Makefile.gc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
endif

include $(DEVKITPPC)/gamecube_rules
include $(DEVKITPRO)/libogc2/gamecube_rules

#---------------------------------------------------------------------------------
# TARGET is the name of the output
Expand Down
53 changes: 0 additions & 53 deletions gx/fileio/file_load.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ static u8 dvdInited = 0;
static u8 dvdMounted = 0;

#ifndef HW_RVL
static u8 dvdBuffer[2048] ATTRIBUTE_ALIGN(32);

static bool dvdStartup()
{
DVD_Mount();
Expand All @@ -93,56 +91,6 @@ static bool dvdIsInserted()
{
return true;
}

static bool dvdReadSectors(u32 offset,u32 len,void *buffer)
{
vu32* const dvd = (u32*)0xCC006000;
offset = offset << 9;
len = len << 11;

/* DVD transfer must be done into a 32-byte aligned buffer */
while (len >= 2048)
{
DCInvalidateRange((void *)dvdBuffer, 2048);
dvd[0] = 0x2E;
dvd[1] = 0;
dvd[2] = 0xA8000000;
dvd[3] = offset;
dvd[4] = 2048;
dvd[5] = (u32) dvdBuffer;
dvd[6] = 2048;
dvd[7] = 3;
while (dvd[7] & 1);
if (dvd[0] & 4) return false;
memcpy (buffer, dvdBuffer, 2048);
len -= 2048;
buffer += 2048;
offset += 512;
}

/* Process remaining bytes (normally not needed since libiso9960 already deals with this but you never know) */
if (len)
{
/* DVD transfer length should be aligned to 32 bytes */
u32 dmasize = (len + 0x1f) & ~0x1f;

DCInvalidateRange((void *)dvdBuffer, dmasize);
dvd[0] = 0x2E;
dvd[1] = 0;
dvd[2] = 0xA8000000;
dvd[3] = offset;
dvd[4] = dmasize;
dvd[5] = (u32) dvdBuffer;
dvd[6] = dmasize;
dvd[7] = 3;
while (dvd[7] & 1);
if (dvd[0] & 4) return false;

memcpy (buffer, dvdBuffer, len);
}

return true;
}
#endif

/***************************************************************************
Expand All @@ -165,7 +113,6 @@ static int MountDVD(void)
/* patch libogc DVD interface which appears to be broken on Gamecube */
dvd->startup = (FN_MEDIUM_STARTUP)dvdStartup;
dvd->isInserted = (FN_MEDIUM_ISINSERTED)dvdIsInserted;
dvd->readSectors = (FN_MEDIUM_READSECTORS)dvdReadSectors;
#endif
dvdInited = 1;
}
Expand Down
47 changes: 11 additions & 36 deletions gx/fileio/file_slot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,9 @@ static u8 brm_format[0x40] =
*****************************************************************************/
static int CardMount(int slot)
{
int tries = 0;
#ifdef HW_RVL
*(unsigned long *) (0xCD006800) |= 1 << 13; /*** Disable Encryption ***/
#else
*(unsigned long *) (0xCC006800) |= 1 << 13; /*** Disable Encryption ***/
#endif
while (tries < 10)
{
VIDEO_WaitVSync ();
if (CARD_Mount(slot, SysArea, NULL) == CARD_ERROR_READY)
return 1;
else
EXI_ProbeReset ();
tries++;
}
while (CARD_ProbeEx(slot, NULL, NULL) == CARD_ERROR_BUSY);
if (CARD_Mount(slot, SysArea, NULL) == CARD_ERROR_READY)
return 1;
return 0;
}

Expand Down Expand Up @@ -309,7 +297,6 @@ void slot_autodetect(int slot, int device, t_slot *ptr)
sprintf(filename,"MD-%04X.srm", rominfo.realchecksum);

/* Initialise the CARD system */
memset(&SysArea, 0, CARD_WORKAREA);
CARD_Init("GENP", "00");

/* CARD slot */
Expand All @@ -325,7 +312,7 @@ void slot_autodetect(int slot, int device, t_slot *ptr)
/* Retrieve date & close */
card_stat CardStatus;
CARD_GetStatus(device, CardFile.filenum, &CardStatus);
time_t rawtime = CardStatus.time;
time_t rawtime = CardStatus.time + 946684800;
struct tm *timeinfo = localtime(&rawtime);
ptr->year = 1900 + timeinfo->tm_year;
ptr->month = timeinfo->tm_mon + 1;
Expand Down Expand Up @@ -373,7 +360,6 @@ int slot_delete(int slot, int device)
sprintf(filename,"MD-%04X.srm", rominfo.realchecksum);

/* Initialise the CARD system */
memset(&SysArea, 0, CARD_WORKAREA);
CARD_Init("GENP", "00");

/* CARD slot */
Expand Down Expand Up @@ -477,7 +463,6 @@ int slot_load(int slot, int device)

/* Initialise the CARD system */
char action[64];
memset(&SysArea, 0, CARD_WORKAREA);
CARD_Init("GENP", "00");

/* CARD slot */
Expand Down Expand Up @@ -530,12 +515,7 @@ int slot_load(int slot, int device)
}

/* Read file sectors */
while (filesize > 0)
{
CARD_Read(&CardFile, &in[done], SectorSize, done);
done += SectorSize;
filesize -= SectorSize;
}
CARD_Read(&CardFile, &in[done], filesize, done);

/* Close file */
CARD_Close(&CardFile);
Expand Down Expand Up @@ -715,7 +695,6 @@ int slot_save(int slot, int device)

/* Initialise the CARD system */
char action[64];
memset(&SysArea, 0, CARD_WORKAREA);
CARD_Init("GENP", "00");

/* CARD slot */
Expand Down Expand Up @@ -763,6 +742,7 @@ int slot_save(int slot, int device)

/* compress file */
compress2 ((Bytef *)&out[2112 + 4], &filesize, (Bytef *)buffer, done, 9);
done = 0;

/* Adjust file size */
filesize = filesize + 4 + 2112;
Expand Down Expand Up @@ -820,20 +800,15 @@ int slot_save(int slot, int device)
time(&rawtime);
card_stat CardStatus;
CARD_GetStatus(device, CardFile.filenum, &CardStatus);
CardStatus.icon_addr = 0x0;
CardStatus.icon_fmt = 2;
CardStatus.icon_speed = 1;
CardStatus.icon_addr = 0;
CardStatus.icon_fmt = CARD_ICON_RGB;
CardStatus.icon_speed = CARD_SPEED_FAST;
CardStatus.comment_addr = 2048;
CardStatus.time = rawtime;
CardStatus.time = rawtime - 946684800;
CARD_SetStatus(device, CardFile.filenum, &CardStatus);

/* Write file sectors */
while (filesize > 0)
{
CARD_Write(&CardFile, &out[done], SectorSize, done);
filesize -= SectorSize;
done += SectorSize;
}
CARD_Write(&CardFile, &out[done], filesize, done);

/* Close file */
CARD_Close(&CardFile);
Expand Down
12 changes: 6 additions & 6 deletions gx/gui/gui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ int GUI_UpdateMenu(gui_menu *menu)
if (button->state & BUTTON_OVER_SFX)
{
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
}
}
else if (selected < (max_buttons + 2))
Expand All @@ -801,7 +801,7 @@ int GUI_UpdateMenu(gui_menu *menu)
if (button->state & BUTTON_OVER_SFX)
{
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
}
}

Expand Down Expand Up @@ -832,7 +832,7 @@ int GUI_UpdateMenu(gui_menu *menu)
if (button->state & BUTTON_SELECT_SFX)
{
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_select_pcm,button_select_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
}
}
}
Expand Down Expand Up @@ -1183,7 +1183,7 @@ int GUI_OptionWindow(gui_menu *parent, char *title, char *infos, char *items[],
if (selected >= 0)
{
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
}
}

Expand Down Expand Up @@ -1455,7 +1455,7 @@ void GUI_OptionBox(gui_menu *parent, optioncallback cb, char *title, void *optio

/* play sound effect */
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);

/* option callback */
if (cb)
Expand Down Expand Up @@ -1700,7 +1700,7 @@ void GUI_OptionBox2(gui_menu *parent, char *text_1, char *text_2, s16 *option_1,
modified = 0;
/* play sound effect */
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
}
}

Expand Down
14 changes: 3 additions & 11 deletions gx/gui/menu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ static void update_screen_w(void)

static void update_bgm(void)
{
SetVolumeOgg(((int)config.bgm_volume * 255) / 100);
SetVolumeOgg(((int)config.bgm_volume * MAX_VOLUME) / 100);
}

static void prefmenu ()
Expand Down Expand Up @@ -876,16 +876,8 @@ static void prefmenu ()
#ifdef HW_RVL
DI_StopMotor();
#else
vu32* const dvd = (u32*)0xCC006000;
dvd[0] = 0x2e;
dvd[1] = 0;
dvd[2] = 0xe3000000;
dvd[3] = 0;
dvd[4] = 0;
dvd[5] = 0;
dvd[6] = 0;
dvd[7] = 1;
while (dvd[7] & 1);
dvdcmdblk blk;
DVD_StopMotor(&blk);
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion gx/gx_audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,6 @@ void gx_audio_Stop(void)
{
PauseOgg(0);
PlayOgg((char *)Bg_music_ogg, Bg_music_ogg_size, 0, OGG_INFINITE_TIME);
SetVolumeOgg(((int)config.bgm_volume * 255) / 100);
SetVolumeOgg(((int)config.bgm_volume * MAX_VOLUME) / 100);
}
}
7 changes: 3 additions & 4 deletions gx/gx_video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,7 @@ static u8 screenDisplayList[32] ATTRIBUTE_ALIGN(32) =
static void vi_callback(u32 cnt)
{
/* get audio DMA remaining length */
vu16* const _dspReg = (u16*)0xCC005000;
u16 remain = _dspReg[29];
u16 remain = AUDIO_GetDMABytesLeft() / 32;

/* adjust desired output samplerate if audio playback is not perfectly in sync with video */
if (remain > 0)
Expand Down Expand Up @@ -1885,15 +1884,15 @@ void gx_video_Init(void)
/* Configure VI */
VIDEO_Configure(vmode);

/* Initialize font first (to ensure IPL font buffer is allocated in MEM1 as DMA from EXI bus to MEM2 is apparently not possible) */
/* Initialize font first (to ensure IPL font buffer is allocated in MEM1 as DMA from EXI bus to MEM2 is apparently not possible with libogc) */
FONT_Init();

/* Allocate framebuffers */
xfb[0] = (u32 *) MEM_K0_TO_K1((u32 *) SYS_AllocateFramebuffer(&TV50hz_576i));
xfb[1] = (u32 *) MEM_K0_TO_K1((u32 *) SYS_AllocateFramebuffer(&TV50hz_576i));

/* Define a console */
console_init(xfb[0], 20, 64, 640, 574, 574 * 2);
console_init(xfb[0], 0, 0, vmode->fbWidth, vmode->xfbHeight, vmode->fbWidth * VI_DISPLAY_PIX_SZ);

/* Clear framebuffer to black */
VIDEO_ClearFrameBuffer(vmode, xfb[0], COLOR_BLACK);
Expand Down
2 changes: 1 addition & 1 deletion gx/utils/oggplayer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ int PlayOgg(char * buf, int buflen, int time_pos, int mode)

private_ogg.mode = mode;
private_ogg.eof = 0;
private_ogg.volume = 127;
private_ogg.volume = MID_VOLUME;
private_ogg.flag = 0;
private_ogg.seek_time = -1;

Expand Down

0 comments on commit cd67bc5

Please sign in to comment.