--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.cpp Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.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"
@@ -22,17 +22,14 @@
@file
*/
+#include "usbms_stub.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
-#include "usbms_stub.h"
#include "UsbmanInternalConstants.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "usbms_stubTraces.h"
-#endif
+#define _USB_PANIC(CAT, CODE) User::Panic(CAT, CODE)
// Panic category
_LIT( Kstub3CcPanicCategory, "UsbstubCc" );
@@ -83,6 +80,11 @@
Cancel();
iTimer.Close();
+
+#ifndef __WINS__
+// iLdd.Close();
+#endif
+
}
@@ -191,15 +193,8 @@
*/
void CUsbstub3ClassController::RunL()
{
- if(iStatus != KErrNone)
- {
- OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL,
- "CUsbstub3ClassController::RunL panic with error %d",
- EPanicUnexpectedState);
-
- __ASSERT_DEBUG(EFalse, User::Panic(Kstub3CcPanicCategory, EPanicUnexpectedStatus));
- }
-
+
+ __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedStatus) );
switch (iState)
{
case EUsbServiceStarting:
@@ -208,10 +203,8 @@
case EUsbServiceStopping:
iState = EUsbServiceIdle;
break;
- default:
- OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1,
- "CUsbstub3ClassController::RunL panic with error %d", EPanicUnexpectedState);
- User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedState);
+ default:
+ _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
@@ -236,11 +229,8 @@
case EUsbServiceStopping:
iState = EUsbServiceStarted;
break;
- default:
- OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_DOCANCEL,
- "CUsbstub3ClassController::DoCancel panic with error %d",
- EPanicUnexpectedState);
- User::Panic(Kstub3CcPanicCategory, EPanicUnexpectedState);
+ default:
+ _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -255,10 +245,7 @@
*/
TInt CUsbstub3ClassController::RunError(TInt /*aError*/)
{
- OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNERROR,
- "CUsbstub3ClassController::RunError panic with error %d",
- EUnusedFunction);
- __ASSERT_DEBUG( EFalse, User::Panic(Kstub3CcPanicCategory, EUnusedFunction));
+ __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub3CcPanicCategory, EUnusedFunction) );
return KErrNone;
}
@@ -268,7 +255,7 @@
* endpoint and, if found, configuring the interface.
*/
{
- return 0;
+return 0;
}