# HG changeset patch
# User arunabha
# Date 1284991140 -3600
# Node ID eb565a167770b6e7eec8e8fc941ec50279a41144
# Parent  ed23a53a5ee2e708c0d761cb716c5796bc6f2908# Parent  adda5b1bc98e5e44f13f15d5b6a964ad90043c59
Merge - catch-up with  generic_fixes_and_updates

diff -r ed23a53a5ee2 -r eb565a167770 omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Mon Sep 20 14:59:00 2010 +0100
@@ -105,22 +105,22 @@
 #include <../omapshared/tps65950.iby>
 
 #ifdef SYMBIAN_BASE_USE_GCE
-	// Use the new GCE compliant display driver  
+// Use the new GCE compliant display driver  
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll	\sys\bin\lcd.dll
 	device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\display.ldd			\sys\bin\display0.ldd
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll	\sys\bin\ekeyb.dll
 #else
-	#ifdef TSHELL_SERIAL
-		//Use VT100 Over Serial
-		#define EDISP_DRV	\EDISP_VT100.DLL
-	#else
-		extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd.dll				\sys\bin\lcd.dll
-		#ifdef TSHELL_SERIALMOUSE
-			extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_serialmouse.DLL	\sys\bin\eserialmouse.dll
-		#else
-			extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
-		#endif
-	#endif
+#ifdef TSHELL_SERIAL
+//Use VT100 Over Serial
+#define EDISP_DRV	\EDISP_VT100.DLL
+#else
+	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd.dll				\sys\bin\lcd.dll
+#ifdef TSHELL_SERIALMOUSE
+	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_serialmouse.DLL	\sys\bin\eserialmouse.dll
+#else
+	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
+#endif
+#endif
 #endif //SYMBIAN_BASE_USE_GCE
 
 device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_EUART.PDD				\sys\bin\euart.pdd
diff -r ed23a53a5ee2 -r eb565a167770 omap3530/beagleboard/rom/kernel.iby
--- a/omap3530/beagleboard/rom/kernel.iby	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby	Mon Sep 20 14:59:00 2010 +0100
@@ -48,19 +48,19 @@
 device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\ECOMM.LDD						\sys\bin\ecomm.ldd
 
 #ifdef TSHELL_SERIAL
-	//Use VT100 Over Serial
-	#	define EDISP_DRV	\EDISP_VT100.DLL
+//Use VT100 Over Serial
+#define EDISP_DRV	\EDISP_VT100.DLL
 #else
 	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_lcd.dll				\sys\bin\lcd.dll
-	#ifdef SERIALMOUSE
-		#ifdef BASE_ROM
-			extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse_tshell.DLL	\sys\bin\eserialmouse.dll
-		#else
-		extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse.DLL		\sys\bin\eserialmouse.dll
-		#endif
-	#else
-		extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
-	#endif
+#ifdef SERIALMOUSE
+#ifdef BASE_ROM
+	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse_tshell.DLL	\sys\bin\eserialmouse.dll
+#else
+	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse.DLL		\sys\bin\eserialmouse.dll
+#endif
+#else
+	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
+#endif
 #endif
 
 file[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_EKDATA.DLL				\sys\bin\ekdata.dll
@@ -81,5 +81,5 @@
 #define	EUSER_DLL	../../ARMV5/##BUILD##/_omap3530_euser.dll
 
 #ifdef TEST_ROM
-#	include <rom\##VARIANT##\test.iby>
+#include <rom\##VARIANT##\test.iby>
 #endif
diff -r ed23a53a5ee2 -r eb565a167770 omap3530/beagleboard/src/variant.cpp
--- a/omap3530/beagleboard/src/variant.cpp	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/beagleboard/src/variant.cpp	Mon Sep 20 14:59:00 2010 +0100
@@ -212,6 +212,7 @@
 void Beagle::DebugInit()
 	{
 	Variant::UartInit();
+	iDebugInitialised = ETrue;
 	}
 
 void Beagle::DebugOutput(TUint aLetter)
diff -r ed23a53a5ee2 -r eb565a167770 omap3530/shared/monitor/monitor.cpp
--- a/omap3530/shared/monitor/monitor.cpp	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/shared/monitor/monitor.cpp	Mon Sep 20 14:59:00 2010 +0100
@@ -28,13 +28,15 @@
 		{
 		Omap3530Uart::TUart uart( portNumber );
 
-		// wait for uart to fihish any transmission that could be started (i.e. crash info)
-		while(!uart.TxFifoEmpty());
-
 		// Ensure UART clocks are running
 		Prcm::SetClockState( uart.PrcmInterfaceClk(),Prcm::EClkOn );
 		Prcm::SetClockState( uart.PrcmFunctionClk(), Prcm::EClkOn );
 	
+		// Add new line and wait for uart to fihish any transmission (i.e. crash info from fifo)
+		uart.Write('\r');
+		uart.Write('\n');
+		while(!uart.TxFifoEmpty());
+		
 		// We don't know what state the UART is in, so reinitialize it
 		uart.Init();
 		uart.DefineMode( Omap3530Uart::TUart::EUart );