diff --git a/hbc/meta.xml b/hbc/meta.xml index a91afa1..3412a17 100644 --- a/hbc/meta.xml +++ b/hbc/meta.xml @@ -2,8 +2,8 @@ Visual Boy Advance GX Tantric - 2.1.8 - 20100714 + 2.1.9 + 20100720 GBA/GBC/GB Emulator A port of Visual Boy Advance - M to the Wii. diff --git a/readme.txt b/readme.txt index 31e1788..89ca2d3 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ ¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤ - Visual Boy Advance GX - - Version 2.1.8 + Version 2.1.9 http://code.google.com/p/vba-wii (Under GPL License) @@ -16,7 +16,7 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube. * Rotation sensors, Solar sensors, and Rumble support * Optional special Wii controls built-in for some games * SRAM and State saving -* IPS/UPS/PPF patch support +* IPS/UPS patch support * Custom controller configurations * SD, USB, DVD, SMB, Zip, and 7z support * Compatibility based on VBA-M r927 @@ -28,6 +28,10 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube. |0O×øo· UPDATE HISTORY ·oø×O0| `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨' +[2.1.9 - July 20, 2010] + +* Reverted USB2 changes + [2.1.8 - July 14, 2010] * Ability to use both USB ports (requires updated IOS 202 - WARNING: older diff --git a/source/fileop.h b/source/fileop.h index 81218ad..dc3bbf3 100644 --- a/source/fileop.h +++ b/source/fileop.h @@ -18,7 +18,7 @@ #include #include -#define SAVEBUFFERSIZE (1024 * 512) +#define SAVEBUFFERSIZE (1024 * 1024 * 2) void InitDeviceThread(); void ResumeDeviceThread(); diff --git a/source/utils/ehcmodule.elf.o b/source/utils/ehcmodule.elf.o index 1a49e35..f88d988 100644 Binary files a/source/utils/ehcmodule.elf.o and b/source/utils/ehcmodule.elf.o differ diff --git a/source/utils/mload.c b/source/utils/mload.c index ce75594..5145e44 100644 --- a/source/utils/mload.c +++ b/source/utils/mload.c @@ -135,9 +135,6 @@ int mload_init() mloadVersion = IOS_IoctlvFormat(hid, mload_fd, MLOAD_GET_MLOAD_VERSION, ":"); iosBase = IOS_IoctlvFormat(hid, mload_fd, MLOAD_GET_IOS_BASE, ":"); - if(mloadVersion < 0x52) // unsupported IOS202 - return mload_close(); - return mload_fd; } diff --git a/source/vbagx.cpp b/source/vbagx.cpp index aea7e7e..18b35c9 100644 --- a/source/vbagx.cpp +++ b/source/vbagx.cpp @@ -220,31 +220,6 @@ static bool FindIOS(u32 ios) free(titles); return false; } - -#define ROUNDDOWN32(v) (((u32)(v)-0x1f)&~0x1f) - -static bool USBLANDetected() -{ - u8 dummy; - u8 i; - u16 vid, pid; - - USB_Initialize(); - u8 *buffer = (u8*)ROUNDDOWN32(((u32)SYS_GetArena2Hi() - (32*1024))); - memset(buffer, 0, 8 << 3); - - if(USB_GetDeviceList("/dev/usb/oh0", buffer, 8, 0, &dummy) < 0) - return false; - - for(i = 0; i < 8; i++) - { - memcpy(&vid, (buffer + (i << 3) + 4), 2); - memcpy(&pid, (buffer + (i << 3) + 6), 2); - if( (vid == 0x0b95) && (pid == 0x7720)) - return true; - } - return false; -} #endif /**************************************************************************** * USB Gecko Debugging @@ -315,8 +290,6 @@ int main(int argc, char *argv[]) #endif #ifdef HW_RVL - bool usblan = USBLANDetected(); - // try to load IOS 202 if(FindIOS(202)) IOS_ReloadIOS(202); @@ -326,33 +299,11 @@ int main(int argc, char *argv[]) if(IOS_GetVersion() == 202) { // enable DVD and USB2 + DI_LoadDVDX(false); + DI_Init(); + if(mload_init() >= 0 && load_ehci_module()) - { - int mode = 3; - - if(usblan) - { - int usblanport = GetUSB2LanPort(); - - if(usblanport >= 0) - { - if(usblanport == 1) - mode = 1; - else - mode = 2; - - USB2Storage_Close(); - mload_close(); - IOS_ReloadIOS(202); - mload_init(); - load_ehci_module(); - } - } - SetUSB2Mode(mode); USB2Enable(true); - DI_LoadDVDX(false); - DI_Init(); - } } #endif diff --git a/source/vbagx.h b/source/vbagx.h index 3be4b11..ec84c90 100644 --- a/source/vbagx.h +++ b/source/vbagx.h @@ -16,7 +16,7 @@ #include "utils/FreeTypeGX.h" #define APPNAME "Visual Boy Advance GX" -#define APPVERSION "2.1.8" +#define APPVERSION "2.1.9" #define APPFOLDER "vbagx" #define PREF_FILE_NAME "settings.xml" #define PAL_FILE_NAME "palettes.xml" diff --git a/update.xml b/update.xml index d8447cf..e482e15 100644 --- a/update.xml +++ b/update.xml @@ -1,4 +1,4 @@ - - + +