Catchup to default generic_fixes_and_updates
authorLukasz Forynski <lukasz.forynski@gmail.com>
Thu, 16 Sep 2010 23:05:40 +0100
branchgeneric_fixes_and_updates
changeset 72 dc96bdfcaddc
parent 70 39ed99121282 (diff)
parent 71 ed23a53a5ee2 (current diff)
child 73 adda5b1bc98e
Catchup to default
--- a/omap3530/beagleboard/src/variant.cpp	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/beagleboard/src/variant.cpp	Thu Sep 16 23:05:40 2010 +0100
@@ -212,6 +212,7 @@
 void Beagle::DebugInit()
 	{
 	Variant::UartInit();
+	iDebugInitialised = ETrue;
 	}
 
 void Beagle::DebugOutput(TUint aLetter)
--- a/omap3530/shared/monitor/monitor.cpp	Thu Sep 16 14:35:26 2010 +0100
+++ b/omap3530/shared/monitor/monitor.cpp	Thu Sep 16 23:05:40 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 );