kerneltest/f32test/shostmassstorage/testclient/usbtestmsclient/cusbmassstoragesession.cpp
--- a/kerneltest/f32test/shostmassstorage/testclient/usbtestmsclient/cusbmassstoragesession.cpp Tue Oct 26 11:12:58 2010 +0100
+++ b/kerneltest/f32test/shostmassstorage/testclient/usbtestmsclient/cusbmassstoragesession.cpp Tue Oct 26 12:49:20 2010 +0100
@@ -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"
@@ -12,7 +12,7 @@
//
// Description:
// Implements a Session of a Symbian OS server for the RUsbMassStorage API
-//
+//
//
@@ -33,136 +33,127 @@
#include "cusbmassstorageserver.h"
#include "debug.h"
-#include "msdebug.h"
/**
Construct a Symbian OS session object.
- @param aServer Service the session will be a member of
- @param aMessage The message from the client.
- @return A new CUsbMassStorageSession object
+ @param aServer Service the session will be a member of
+ @param aMessage The message from the client.
+ @return A new CUsbMassStorageSession object
*/
CUsbMassStorageSession* CUsbMassStorageSession::NewL(CUsbMassStorageServer& aServer)
- {
- __MSFNSLOG
- CUsbMassStorageSession* r = new (ELeave) CUsbMassStorageSession(aServer);
- CleanupStack::PushL(r);
- r->ConstructL();
- CleanupStack::Pop();
- return r;
- }
+ {
+ CUsbMassStorageSession* r = new (ELeave) CUsbMassStorageSession(aServer);
+ CleanupStack::PushL(r);
+ r->ConstructL();
+ CleanupStack::Pop();
+ return r;
+ }
/**
Constructor.
- @param aServer Service the session will be a member of
+ @param aServer Service the session will be a member of
*/
CUsbMassStorageSession::CUsbMassStorageSession(CUsbMassStorageServer& aServer)
- : iUsbMsServer(aServer)
- {
- __MSFNLOG
- }
+ : iUsbMsServer(aServer)
+ {
+ }
/**
2nd Phase Construction.
*/
void CUsbMassStorageSession::ConstructL()
- {
- __MSFNLOG
- iUsbMsServer.IncrementSessionCount();
+ {
+ iUsbMsServer.IncrementSessionCount();
if (iUsbMsServer.SessionCount() > 1)
{
__PRINT1(_L("\tiSessionCount: %d\n"), iUsbMsServer.SessionCount());
// Only one session is allowed
User::Leave(KErrInUse);
}
- }
+ }
/**
Destructor.
*/
CUsbMassStorageSession::~CUsbMassStorageSession()
- {
- __MSFNLOG
- iUsbMsServer.DecrementSessionCount();
- }
+ {
+ iUsbMsServer.DecrementSessionCount();
+ }
/**
Called when a message is received from the client.
- @param aMessage Message received from the client
+ @param aMessage Message received from the client
*/
void CUsbMassStorageSession::ServiceL(const RMessage2& aMessage)
- {
- __MSFNLOG
- DispatchMessageL(aMessage);
- }
+ {
+ DispatchMessageL(aMessage);
+ }
/**
Handles the request (in the form of a the message) received from the client
@internalTechnology
- @param aMessage The received message
+ @param aMessage The received message
*/
void CUsbMassStorageSession::DispatchMessageL(const RMessage2& aMessage)
- {
- __MSFNLOG
- TInt ret = KErrNone;
+ {
+ TInt ret = KErrNone;
- switch (aMessage.Function())
- {
- case EUsbMsStart:
- ret = Start(aMessage);
- break;
- case EUsbMsStop:
- ret = Stop();
- break;
- case EUsbMsShutdown:
- ret = Shutdown();
- break;
+ switch (aMessage.Function())
+ {
+ case EUsbMsStart:
+ ret = Start(aMessage);
+ break;
+ case EUsbMsStop:
+ ret = Stop();
+ break;
+ case EUsbMsShutdown:
+ ret = Shutdown();
+ break;
- default:
- aMessage.Panic(KUsbMsCliPncCat, EUsbMsPanicIllegalIPC);
- break;
- }
+ default:
+ aMessage.Panic(KUsbMsCliPncCat, EUsbMsPanicIllegalIPC);
+ break;
+ }
- aMessage.Complete(ret);
- }
+ aMessage.Complete(ret);
+ }
/**
Client request to start the device.
- @return Any error that occurred or KErrNone
+ @return Any error that occurred or KErrNone
*/
TInt CUsbMassStorageSession::Start(const RMessage2& aMessage)
- {
- __MSFNLOG
- __PRINT(_L("CUsbMassStorageSession::Start\n"));
+ {
+ __PRINT(_L("CUsbMassStorageSession::Start\n"));
- TMassStorageConfig msConfig;
- TRAPD(err, GetMsConfigL(aMessage, msConfig));
- if (err != KErrNone)
- {
- __PRINT(_L("Failed to get mass storage configuration data\n"));
- return err;
- }
+ TMassStorageConfig msConfig;
+ TRAPD(err, GetMsConfigL(aMessage, msConfig));
+ if (err != KErrNone)
+ {
+ __PRINT(_L("Failed to get mass storage configuration data\n"));
+ return err;
+ }
- return iUsbMsServer.Controller().Start(msConfig);
- }
+ return iUsbMsServer.Controller().Start(msConfig);
+ }
/**
Client request to stop the device.
- @return Any error that occurred or KErrNone
+ @return Any error that occurred or KErrNone
*/
TInt CUsbMassStorageSession::Stop()
{
- __MSFNLOG
TInt err = iUsbMsServer.Controller().Stop();
- return err;
- }
+ return err;
+ }
/**
Client request to shut down the server
@@ -171,18 +162,16 @@
*/
TInt CUsbMassStorageSession::Shutdown()
{
- __MSFNLOG
CActiveScheduler::Stop();
- return KErrNone;
- }
+ return KErrNone;
+ }
/**
Get mass storage configuration data from the received message
*/
void CUsbMassStorageSession::GetMsConfigL(const RMessage2& aMessage, TMassStorageConfig& aMsStorage)
- {
- __MSFNLOG
- aMessage.ReadL(0,aMsStorage.iVendorId);
- aMessage.ReadL(1,aMsStorage.iProductId);
- aMessage.ReadL(2,aMsStorage.iProductRev);
- }
+ {
+ aMessage.ReadL(0,aMsStorage.iVendorId);
+ aMessage.ReadL(1,aMsStorage.iProductId);
+ aMessage.ReadL(2,aMsStorage.iProductRev);
+ }