usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ClassDescriptor.cpp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ClassDescriptor.cpp Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ClassDescriptor.cpp Wed Sep 01 12:35:00 2010 +0100
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -17,12 +17,12 @@
#include "ClassDescriptor.h"
#include "AcmPanic.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ClassDescriptorTraces.h"
+#include <usb/usblogger.h>
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "ECACM");
#endif
-
TDes8& TUsbCsClassDescriptor::Des()
/**
* This function packs the TUsbCsClassDescriptor class into a descriptor with
@@ -32,8 +32,6 @@
* this class and has the same lifetime.
*/
{
- OstTraceFunctionEntry0( TUSBCSCLASSDESCRIPTOR_DES_ENTRY );
-
TUint index = 0;
iBuffer.SetLength(KUsbClassSpecificBufferSize);
@@ -73,13 +71,9 @@
#endif
- if (index != KUsbClassSpecificBufferSize)
- {
- OstTrace1( TRACE_FATAL, TUSBCSCLASSDESCRIPTOR_DES, "TUsbCsClassDescriptor::Des;index=%d", (TInt)index );
- __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
- }
+ __ASSERT_DEBUG(index == KUsbClassSpecificBufferSize,
+ _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- OstTraceFunctionExit0( TUSBCSCLASSDESCRIPTOR_DES_EXIT );
return iBuffer;
}