removed cIOS202 & EHCI module support

This commit is contained in:
ekeeke31 2010-08-12 19:21:25 +00:00
parent b09509edb8
commit 56760ff8c3
2 changed files with 15 additions and 34 deletions

View File

@ -81,8 +81,7 @@ endif
export OFILES := $(addsuffix .o,$(BINFILES)) \ export OFILES := $(addsuffix .o,$(BINFILES)) \
$(PNGFILES:.png=.png.o) $(PCMFILES:.pcm=.pcm.o) $(OGGFILES:.ogg=.ogg.o) \ $(PNGFILES:.png=.png.o) $(PCMFILES:.pcm=.pcm.o) $(OGGFILES:.ogg=.ogg.o) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \ $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
$(sFILES:.s=.o) $(SFILES:.S=.o) \ $(sFILES:.s=.o) $(SFILES:.S=.o)
$(CURDIR)/source/gx/utils/ehcmodule.elf.o
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of include paths # build a list of include paths

View File

@ -33,15 +33,11 @@
#include "file_fat.h" #include "file_fat.h"
#include "filesel.h" #include "filesel.h"
#ifdef HW_RVL
#include "usb2storage.h"
#include "mload.h"
#endif
#include <fat.h> #include <fat.h>
#ifdef HW_RVL #ifdef HW_RVL
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
extern u32 __di_check_ahbprot(void);
#endif #endif
u32 Shutdown = 0; u32 Shutdown = 0;
@ -284,7 +280,6 @@ void shutdown(void)
gx_video_Shutdown(); gx_video_Shutdown();
#ifdef HW_RVL #ifdef HW_RVL
DI_Close(); DI_Close();
mload_close();
#endif #endif
} }
@ -298,21 +293,14 @@ u32 frameticker = 0;
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
#ifdef HW_RVL #ifdef HW_RVL
/* try to load IOS 202 */ /* if not already loaded, try to reload IOS 58 (USB2 support) */
if(IOS_GetVersion() != 202 && FindIOS(202)) if ((IOS_GetVersion() != 58) && FindIOS(58))
IOS_ReloadIOS(202); {
/* IOS should not be reloaded if HW_AHBPROT flags are set (DVD support) */
if(IOS_GetVersion() == 202) if (__di_check_ahbprot() != 1) IOS_ReloadIOS(58);
{
/* disable DVDX stub */
DI_LoadDVDX(false);
/* load EHCI module & enable USB2 driver */
if(mload_init() >= 0 && load_ehci_module())
USB2Enable(true);
} }
/* initialize DVD driver */ /* initialize DVD device */
DI_Init(); DI_Init();
#endif #endif
@ -320,7 +308,7 @@ int main (int argc, char *argv[])
gx_video_Init(); gx_video_Init();
#ifdef HW_DOL #ifdef HW_DOL
/* initialize DVD driver */ /* initialize DVD device */
DVD_Init (); DVD_Init ();
dvd_drive_detect(); dvd_drive_detect();
#endif #endif
@ -332,26 +320,20 @@ int main (int argc, char *argv[])
char pathname[MAXPATHLEN]; char pathname[MAXPATHLEN];
sprintf (pathname, DEFAULT_PATH); sprintf (pathname, DEFAULT_PATH);
DIR_ITER *dir = diropen(pathname); DIR_ITER *dir = diropen(pathname);
if (dir) if (dir) dirclose(dir);
dirclose(dir); else mkdir(pathname,S_IRWXU);
else
mkdir(pathname,S_IRWXU);
/* default SRAM & Savestate files directory */ /* default SRAM & Savestate files directory */
sprintf (pathname, "%s/saves",DEFAULT_PATH); sprintf (pathname, "%s/saves",DEFAULT_PATH);
dir = diropen(pathname); dir = diropen(pathname);
if (dir) if (dir) dirclose(dir);
dirclose(dir); else mkdir(pathname,S_IRWXU);
else
mkdir(pathname,S_IRWXU);
/* default Snapshot files directory */ /* default Snapshot files directory */
sprintf (pathname, "%s/snaps",DEFAULT_PATH); sprintf (pathname, "%s/snaps",DEFAULT_PATH);
dir = diropen(pathname); dir = diropen(pathname);
if (dir) if (dir) dirclose(dir);
dirclose(dir); else mkdir(pathname,S_IRWXU);
else
mkdir(pathname,S_IRWXU);
} }
/* initialize input engine */ /* initialize input engine */