diff -r 0659d0e1a03c -r 1d28c8722707 kerneltest/f32test/shostmassstorage/msman/client/rusbotgsession.cpp --- a/kerneltest/f32test/shostmassstorage/msman/client/rusbotgsession.cpp Wed Oct 20 13:58:28 2010 +0100 +++ b/kerneltest/f32test/shostmassstorage/msman/client/rusbotgsession.cpp Tue Nov 02 15:29:23 2010 +0000 @@ -1,4 +1,4 @@ -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -28,13 +28,11 @@ #include "msmanclientserver.h" #include "rusbotgsession.h" -#include "tmslog.h" #include "debug.h" TVersion RUsbOtgSession::Version() const { - __MSFNSLOG return(TVersion(KUsbOtgSrvMajorVersionNumber, KUsbOtgSrvMinorVersionNumber, KUsbOtgSrvBuildVersionNumber)); @@ -43,19 +41,15 @@ EXPORT_C RUsbOtgSession::RUsbOtgSession() { - __MSFNSLOG } EXPORT_C RUsbOtgSession::RUsbOtgSession(TInt /* aParam */) { - __MSFNSLOG } EXPORT_C TInt RUsbOtgSession::Connect() { - __MSFNSLOG - TInt retry = 2; for (;;) { @@ -80,8 +74,6 @@ TInt RUsbOtgSession::StartServer() { - __MSFNSLOG - const TUidType serverUid(KNullUid, KNullUid, KUsbOtgServerUid3); // Create the server process @@ -103,7 +95,7 @@ return status.Int(); } - server.SetPriority(EPriorityHigh); + server.SetPriority(EPriorityHigh); server.Resume(); // start the server // Test whether the process has ended and if it has ended, return how it ended. @@ -122,7 +114,6 @@ EXPORT_C TBool RUsbOtgSession::DeviceInserted() { - __MSFNSLOG TPckgBuf pckg; TIpcArgs args(&pckg); @@ -134,7 +125,6 @@ EXPORT_C void RUsbOtgSession::NotifyChange(TBool& /* aChanged */, TRequestStatus& aStatus) { - __MSFNSLOG TPckgBuf pckg; TIpcArgs args(&pckg); @@ -144,13 +134,11 @@ EXPORT_C TInt RUsbOtgSession::NotifyChangeCancel() { - __MSFNSLOG return SendReceive(EUsbOtgNotifyChangeCancel); } EXPORT_C TInt RUsbOtgSession::BusDrop() - { - __MSFNSLOG - return SendReceive(EUsbOtgBusDrop); - } + { + return SendReceive(EUsbOtgBusDrop); + }