finalize 2.2.7

hbc/meta.xml

@@ -2,8 +2,8 @@
 <app version="1">
   <name>Visual Boy Advance GX</name>
   <coder>Tantric</coder>
-  <version>2.2.6</version>
-  <release_date>20120706</release_date>
+  <version>2.2.7</version>
+  <release_date>20120707</release_date>
   <short_description>GBA/GBC/GB Emulator</short_description>
   <long_description>A port of Visual Boy Advance - M to the Wii.</long_description>
   <ahb_access />

readme.txt

@@ -27,6 +27,10 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
 |0O×øo·                         UPDATE HISTORY                        ·oø×O0|
 `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
 
+[2.2.7 - July 7, 2012]
+
+* Fixed PAL support
+
 [2.2.6 - July 6, 2012]
 
 * Support for newer Wiimotes

source/input.cpp

@@ -181,8 +181,6 @@ SetupPads()
 	PAD_Init();
 
 	#ifdef HW_RVL
-	WPAD_Init();
-
 	// read wiimote accelerometer and IR data
 	WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
 	WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight);

source/vbagx.cpp

@@ -251,11 +251,13 @@ static mutex_t gecko_mutex = 0;
 
 static ssize_t __out_write(struct _reent *r, int fd, const char *ptr, size_t len)
 {
-	u32 level;
+	if (!gecko || len == 0)
+		return len;
 	
-	if (!ptr || len <= 0 || !gecko)
+	if(!ptr || len < 0)
 		return -1;
 
+	u32 level;
 	LWP_MutexLock(gecko_mutex);
 	level = IRQ_Disable();
 	usb_sendbuffer(1, ptr, len);
@@ -287,15 +289,20 @@ const devoptab_t gecko_out = {
 	NULL		// device statvfs_r
 };
 
-void USBGeckoOutput()
+static void USBGeckoOutput()
 {
-	LWP_MutexInit(&gecko_mutex, false);
 	gecko = usb_isgeckoalive(1);
+	LWP_MutexInit(&gecko_mutex, false);
 
 	devoptab_list[STD_OUT] = &gecko_out;
 	devoptab_list[STD_ERR] = &gecko_out;
 }
 
+extern "C" { 
+	s32 __STM_Close();
+	s32 __STM_Init();
+}
+
 /****************************************************************************
 * main
 *
@@ -315,47 +322,49 @@ int main(int argc, char *argv[])
 		if(SupportedIOS(preferred))
 			IOS_ReloadIOS(preferred);
 	}
-#endif
-	
-	//USBGeckoOutput(); // uncomment to enable USB gecko output
-	__exception_setreload(8);
-
-	#ifdef HW_DOL
+	#else
 	ipl_set_config(6); // disable Qoob modchip
 	#endif
 	
-#ifdef HW_RVL
-	StartNetworkThread();
-	DI_Init();
-#endif
+	USBGeckoOutput(); // uncomment to enable USB gecko output
+	__exception_setreload(8);
 	
-	InitDeviceThread();
 	InitializeVideo();
 	ResetVideo_Menu (); // change to menu video mode
-	SetupPads();
-	
-	// Initialize DVD subsystem (GameCube only)
-	#ifdef HW_DOL
-	DVD_Init ();
-	#endif
 	
 	#ifdef HW_RVL
 	// Wii Power/Reset buttons
-	WPAD_SetPowerButtonCallback((WPADShutdownCallback)ShutdownCB);
+	__STM_Close();
+	__STM_Init();
+	__STM_Close();
+	__STM_Init();
 	SYS_SetPowerCallback(ShutdownCB);
 	SYS_SetResetCallback(ResetCB);
+	
+	WPAD_Init();
+	WPAD_SetPowerButtonCallback((WPADShutdownCallback)ShutdownCB);
+	DI_Init();
+	USBStorage_Initialize();
+	StartNetworkThread();
+	#else
+	DVD_Init (); // Initialize DVD subsystem (GameCube only)
 	#endif
 	
+	SetupPads();
+	InitDeviceThread();
 	MountAllFAT(); // Initialize libFAT for SD and USB
 	
+	#ifdef HW_RVL
+	// store path app was loaded from
+	if(argc > 0 && argv[0] != NULL)
+		CreateAppPath(argv[0]);
+	#endif
+
 	InitialiseSound();
 	InitialisePalette();
 	DefaultSettings (); // Set defaults
 	InitFreeType((u8*)font_ttf, font_ttf_size); // Initialize font system
 #ifdef HW_RVL
-	if(argc > 0 && argv[0] != NULL)
-		CreateAppPath(argv[0]); // store path app was loaded from
-
 	InitMem2Manager();
 	savebuffer = (unsigned char *)mem2_malloc(SAVEBUFFERSIZE);
 	browserList = (BROWSERENTRY *)mem2_malloc(sizeof(BROWSERENTRY)*MAX_BROWSER_SIZE);

source/vbagx.h

@@ -16,7 +16,7 @@
 #include "utils/FreeTypeGX.h"
 
 #define APPNAME 		"Visual Boy Advance GX"
-#define APPVERSION 		"2.2.6"
+#define APPVERSION 		"2.2.7"
 #define APPFOLDER 		"vbagx"
 #define PREF_FILE_NAME 	"settings.xml"
 #define PAL_FILE_NAME 	"palettes.xml"

source/video.cpp

@@ -401,10 +401,10 @@ InitializeVideo ()
 	VIDEO_Init();
 
 	// Allocate the video buffers
-	xfb[0] = (u32 *) memalign(32, 640*574*2);
-	xfb[1] = (u32 *) memalign(32, 640*574*2);
-	DCInvalidateRange(xfb[0], 640*574*2);
-	DCInvalidateRange(xfb[1], 640*574*2);
+	xfb[0] = (u32 *) memalign(32, 640*576*2);
+	xfb[1] = (u32 *) memalign(32, 640*576*2);
+	DCInvalidateRange(xfb[0], 640*576*2);
+	DCInvalidateRange(xfb[1], 640*576*2);
 	xfb[0] = (u32 *) MEM_K0_TO_K1 (xfb[0]);
 	xfb[1] = (u32 *) MEM_K0_TO_K1 (xfb[1]);
 

update.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="2.2.6">
-<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.2.6.zip"></file>
+<app version="2.2.7">
+<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.2.7.zip"></file>
 </app>