Skip to content

Commit cd67bc5

Browse files
ExtremsExtrems
committed
Migrate GameCube port to libogc2
1 parent e8a6086 commit cd67bc5

File tree

8 files changed

+26
-113
lines changed

8 files changed

+26
-113
lines changed

‎Makefile.gc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ifeq ($(strip $(DEVKITPPC)),)
77
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
88
endif
99

10-
include $(DEVKITPPC)/gamecube_rules
10+
include $(DEVKITPRO)/libogc2/gamecube_rules
1111

1212
#---------------------------------------------------------------------------------
1313
# TARGET is the name of the output

‎gx/fileio/file_load.c

-53
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ static u8 dvdInited = 0;
8181
static u8 dvdMounted = 0;
8282

8383
#ifndef HW_RVL
84-
static u8 dvdBuffer[2048] ATTRIBUTE_ALIGN(32);
85-
8684
static bool dvdStartup()
8785
{
8886
DVD_Mount();
@@ -93,56 +91,6 @@ static bool dvdIsInserted()
9391
{
9492
return true;
9593
}
96-
97-
static bool dvdReadSectors(u32 offset,u32 len,void *buffer)
98-
{
99-
vu32* const dvd = (u32*)0xCC006000;
100-
offset = offset << 9;
101-
len = len << 11;
102-
103-
/* DVD transfer must be done into a 32-byte aligned buffer */
104-
while (len >= 2048)
105-
{
106-
DCInvalidateRange((void *)dvdBuffer, 2048);
107-
dvd[0] = 0x2E;
108-
dvd[1] = 0;
109-
dvd[2] = 0xA8000000;
110-
dvd[3] = offset;
111-
dvd[4] = 2048;
112-
dvd[5] = (u32) dvdBuffer;
113-
dvd[6] = 2048;
114-
dvd[7] = 3;
115-
while (dvd[7] & 1);
116-
if (dvd[0] & 4) return false;
117-
memcpy (buffer, dvdBuffer, 2048);
118-
len -= 2048;
119-
buffer += 2048;
120-
offset += 512;
121-
}
122-
123-
/* Process remaining bytes (normally not needed since libiso9960 already deals with this but you never know) */
124-
if (len)
125-
{
126-
/* DVD transfer length should be aligned to 32 bytes */
127-
u32 dmasize = (len + 0x1f) & ~0x1f;
128-
129-
DCInvalidateRange((void *)dvdBuffer, dmasize);
130-
dvd[0] = 0x2E;
131-
dvd[1] = 0;
132-
dvd[2] = 0xA8000000;
133-
dvd[3] = offset;
134-
dvd[4] = dmasize;
135-
dvd[5] = (u32) dvdBuffer;
136-
dvd[6] = dmasize;
137-
dvd[7] = 3;
138-
while (dvd[7] & 1);
139-
if (dvd[0] & 4) return false;
140-
141-
memcpy (buffer, dvdBuffer, len);
142-
}
143-
144-
return true;
145-
}
14694
#endif
14795

14896
/***************************************************************************
@@ -165,7 +113,6 @@ static int MountDVD(void)
165113
/* patch libogc DVD interface which appears to be broken on Gamecube */
166114
dvd->startup = (FN_MEDIUM_STARTUP)dvdStartup;
167115
dvd->isInserted = (FN_MEDIUM_ISINSERTED)dvdIsInserted;
168-
dvd->readSectors = (FN_MEDIUM_READSECTORS)dvdReadSectors;
169116
#endif
170117
dvdInited = 1;
171118
}

‎gx/fileio/file_slot.c

+11-36
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,9 @@ static u8 brm_format[0x40] =
7070
*****************************************************************************/
7171
static int CardMount(int slot)
7272
{
73-
int tries = 0;
74-
#ifdef HW_RVL
75-
*(unsigned long *) (0xCD006800) |= 1 << 13; /*** Disable Encryption ***/
76-
#else
77-
*(unsigned long *) (0xCC006800) |= 1 << 13; /*** Disable Encryption ***/
78-
#endif
79-
while (tries < 10)
80-
{
81-
VIDEO_WaitVSync ();
82-
if (CARD_Mount(slot, SysArea, NULL) == CARD_ERROR_READY)
83-
return 1;
84-
else
85-
EXI_ProbeReset ();
86-
tries++;
87-
}
73+
while (CARD_ProbeEx(slot, NULL, NULL) == CARD_ERROR_BUSY);
74+
if (CARD_Mount(slot, SysArea, NULL) == CARD_ERROR_READY)
75+
return 1;
8876
return 0;
8977
}
9078

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

311299
/* Initialise the CARD system */
312-
memset(&SysArea, 0, CARD_WORKAREA);
313300
CARD_Init("GENP", "00");
314301

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

375362
/* Initialise the CARD system */
376-
memset(&SysArea, 0, CARD_WORKAREA);
377363
CARD_Init("GENP", "00");
378364

379365
/* CARD slot */
@@ -477,7 +463,6 @@ int slot_load(int slot, int device)
477463

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

483468
/* CARD slot */
@@ -530,12 +515,7 @@ int slot_load(int slot, int device)
530515
}
531516

532517
/* Read file sectors */
533-
while (filesize > 0)
534-
{
535-
CARD_Read(&CardFile, &in[done], SectorSize, done);
536-
done += SectorSize;
537-
filesize -= SectorSize;
538-
}
518+
CARD_Read(&CardFile, &in[done], filesize, done);
539519

540520
/* Close file */
541521
CARD_Close(&CardFile);
@@ -715,7 +695,6 @@ int slot_save(int slot, int device)
715695

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

721700
/* CARD slot */
@@ -763,6 +742,7 @@ int slot_save(int slot, int device)
763742

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

767747
/* Adjust file size */
768748
filesize = filesize + 4 + 2112;
@@ -820,20 +800,15 @@ int slot_save(int slot, int device)
820800
time(&rawtime);
821801
card_stat CardStatus;
822802
CARD_GetStatus(device, CardFile.filenum, &CardStatus);
823-
CardStatus.icon_addr = 0x0;
824-
CardStatus.icon_fmt = 2;
825-
CardStatus.icon_speed = 1;
803+
CardStatus.icon_addr = 0;
804+
CardStatus.icon_fmt = CARD_ICON_RGB;
805+
CardStatus.icon_speed = CARD_SPEED_FAST;
826806
CardStatus.comment_addr = 2048;
827-
CardStatus.time = rawtime;
807+
CardStatus.time = rawtime - 946684800;
828808
CARD_SetStatus(device, CardFile.filenum, &CardStatus);
829809

830810
/* Write file sectors */
831-
while (filesize > 0)
832-
{
833-
CARD_Write(&CardFile, &out[done], SectorSize, done);
834-
filesize -= SectorSize;
835-
done += SectorSize;
836-
}
811+
CARD_Write(&CardFile, &out[done], filesize, done);
837812

838813
/* Close file */
839814
CARD_Close(&CardFile);

‎gx/gui/gui.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ int GUI_UpdateMenu(gui_menu *menu)
791791
if (button->state & BUTTON_OVER_SFX)
792792
{
793793
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
794-
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
794+
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
795795
}
796796
}
797797
else if (selected < (max_buttons + 2))
@@ -801,7 +801,7 @@ int GUI_UpdateMenu(gui_menu *menu)
801801
if (button->state & BUTTON_OVER_SFX)
802802
{
803803
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
804-
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
804+
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
805805
}
806806
}
807807

@@ -832,7 +832,7 @@ int GUI_UpdateMenu(gui_menu *menu)
832832
if (button->state & BUTTON_SELECT_SFX)
833833
{
834834
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_select_pcm,button_select_pcm_size,
835-
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
835+
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
836836
}
837837
}
838838
}
@@ -1183,7 +1183,7 @@ int GUI_OptionWindow(gui_menu *parent, char *title, char *infos, char *items[],
11831183
if (selected >= 0)
11841184
{
11851185
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
1186-
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
1186+
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
11871187
}
11881188
}
11891189

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

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

14601460
/* option callback */
14611461
if (cb)
@@ -1700,7 +1700,7 @@ void GUI_OptionBox2(gui_menu *parent, char *text_1, char *text_2, s16 *option_1,
17001700
modified = 0;
17011701
/* play sound effect */
17021702
ASND_SetVoice(ASND_GetFirstUnusedVoice(),VOICE_MONO_16BIT,22050,0,(u8 *)button_over_pcm,button_over_pcm_size,
1703-
((int)config.sfx_volume * 255) / 100,((int)config.sfx_volume * 255) / 100,NULL);
1703+
((int)config.sfx_volume * MAX_VOLUME) / 100,((int)config.sfx_volume * MAX_VOLUME) / 100,NULL);
17041704
}
17051705
}
17061706

‎gx/gui/menu.c

+3-11
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ static void update_screen_w(void)
702702

703703
static void update_bgm(void)
704704
{
705-
SetVolumeOgg(((int)config.bgm_volume * 255) / 100);
705+
SetVolumeOgg(((int)config.bgm_volume * MAX_VOLUME) / 100);
706706
}
707707

708708
static void prefmenu ()
@@ -876,16 +876,8 @@ static void prefmenu ()
876876
#ifdef HW_RVL
877877
DI_StopMotor();
878878
#else
879-
vu32* const dvd = (u32*)0xCC006000;
880-
dvd[0] = 0x2e;
881-
dvd[1] = 0;
882-
dvd[2] = 0xe3000000;
883-
dvd[3] = 0;
884-
dvd[4] = 0;
885-
dvd[5] = 0;
886-
dvd[6] = 0;
887-
dvd[7] = 1;
888-
while (dvd[7] & 1);
879+
dvdcmdblk blk;
880+
DVD_StopMotor(&blk);
889881
#endif
890882
}
891883

‎gx/gx_audio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,6 @@ void gx_audio_Stop(void)
218218
{
219219
PauseOgg(0);
220220
PlayOgg((char *)Bg_music_ogg, Bg_music_ogg_size, 0, OGG_INFINITE_TIME);
221-
SetVolumeOgg(((int)config.bgm_volume * 255) / 100);
221+
SetVolumeOgg(((int)config.bgm_volume * MAX_VOLUME) / 100);
222222
}
223223
}

‎gx/gx_video.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ static u8 screenDisplayList[32] ATTRIBUTE_ALIGN(32) =
359359
static void vi_callback(u32 cnt)
360360
{
361361
/* get audio DMA remaining length */
362-
vu16* const _dspReg = (u16*)0xCC005000;
363-
u16 remain = _dspReg[29];
362+
u16 remain = AUDIO_GetDMABytesLeft() / 32;
364363

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

1888-
/* Initialize font first (to ensure IPL font buffer is allocated in MEM1 as DMA from EXI bus to MEM2 is apparently not possible) */
1887+
/* 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) */
18891888
FONT_Init();
18901889

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

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

18981897
/* Clear framebuffer to black */
18991898
VIDEO_ClearFrameBuffer(vmode, xfb[0], COLOR_BLACK);

‎gx/utils/oggplayer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ int PlayOgg(char * buf, int buflen, int time_pos, int mode)
452452

453453
private_ogg.mode = mode;
454454
private_ogg.eof = 0;
455-
private_ogg.volume = 127;
455+
private_ogg.volume = MID_VOLUME;
456456
private_ogg.flag = 0;
457457
private_ogg.seek_time = -1;
458458

0 commit comments

Comments
 (0)