--- a/omap3530/beagleboard/rom/base_beagle.iby Fri Sep 03 21:24:33 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby Sat Sep 11 23:40:07 2010 +0100
@@ -115,7 +115,6 @@
// Use the new GCE compliant display driver
extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll \sys\bin\lcd.dll
device[VARID]=KERNEL_DIR\DEBUG_DIR\display.ldd \sys\bin\display0.ldd
- #file=ABI_DIR\DEBUG_DIR\_beagle_ekdata.dll \sys\bin\ekdata.dll
extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll \sys\bin\ekeyb.dll
#else
#ifdef TSHELL_SERIAL
@@ -145,4 +144,4 @@
extension[VARID]= \epoc32\release\ARMV5\BUILD_DIR\_beagle_usbv.dll \sys\bin\usbv.DLL
#endif
-//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll \sys\bin\ekeyb.dll
\ No newline at end of file
+//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll \sys\bin\ekeyb.dll
--- a/omap3530/beagleboard/rom/kernel.iby Fri Sep 03 21:24:33 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby Sat Sep 11 23:40:07 2010 +0100
@@ -47,6 +47,8 @@
#include <rom/omapshared/tps65950.iby>
+device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\_omap3530_EUART.PDD \sys\bin\euart.pdd
+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
@@ -82,5 +84,3 @@
#ifdef TEST_ROM
# include <rom\##VARIANT##\test.iby>
#endif
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/omap3530_drivers/usbcc/OstTraceDefinitions.h Sat Sep 11 23:40:07 2010 +0100
@@ -0,0 +1,24 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- a/omap3530/omap3530_drivers/usbcc/usbcc.mmp Fri Sep 03 21:24:33 2010 +0100
+++ b/omap3530/omap3530_drivers/usbcc/usbcc.mmp Sat Sep 11 23:40:07 2010 +0100
@@ -21,6 +21,7 @@
systeminclude +/include/assp/omap3530_assp
SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
+USERINCLUDE ./
target AsspTarget(usbcc,dll)
targettype kext
linkas usbcc.dll
--- a/omap3530/shared/monitor/monitor.cpp Fri Sep 03 21:24:33 2010 +0100
+++ b/omap3530/shared/monitor/monitor.cpp Sat Sep 11 23:40:07 2010 +0100
@@ -28,6 +28,9 @@
{
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 );
@@ -50,7 +53,7 @@
Omap3530Uart::TUart uart( portNumber );
TUint c=0;
-
+
while ( !uart.RxFifoEmpty() )
{
if ( CheckPower() )