mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 21:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

same commit as r5169, but this time to trunk instead of stable

Browse Source 
(should fix wii homebrew (loading) on osx.)
and minor changes to the wrtc test

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5215 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2010-03-18 23:01:04 +00:00
parent f885eb2de0
commit 4f56d8144b
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
View File

@ -198,7 +198,7 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
default: default:
// PanicAlert("SetupWiiMem: Unknown country. Wii boot process will be switched to European settings."); // PanicAlert("SetupWiiMem: Unknown country. Wii boot process will be switched to European settings.");
filename = WII_EUR_SETTING_FILE; filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING;
break; break;
} }

44
Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
View File

@ -5,7 +5,7 @@
#include <ogcsys.h> #include <ogcsys.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <ogc/lwp_watchdog.h>
#include <iostream> #include <iostream>
#include <debug.h> #include <debug.h>
#include <math.h> #include <math.h>
@ -15,28 +15,7 @@ static void *xfb = NULL;
u32 first_frame = 1; u32 first_frame = 1;
GXRModeObj *rmode; GXRModeObj *rmode;
void Initialise(); inline void Initialise()
int main()
{
Initialise();
time_t wii_time;
wii_time = time(NULL);
srand(wii_time);
while(1)
{
wii_time = time(NULL);
std::cout<<"\x1b[10;0HWii RTC time is"<<ctime(&wii_time);
VIDEO_WaitVSync();
}
}
void Initialise()
{ {
// Initialise the video system // Initialise the video system
VIDEO_Init(); VIDEO_Init();
@ -70,3 +49,22 @@ void Initialise()
VIDEO_WaitVSync(); VIDEO_WaitVSync();
if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync(); if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
} }
int main()
{
Initialise();
time_t wii_time;
//settime(secs_to_ticks(time(NULL) - 0x386D4380));
wii_time = time(NULL);
std::cout << "\x1b[20;0HWii RTC time is " <<ctime(&wii_time) <<" "<< wii_time;
while(1)
{
wii_time = time(NULL);
std::cout << "\x1b[10;0HWii RTC time is " << ctime(&wii_time) <<" "<< wii_time;
VIDEO_WaitVSync();
}
}