--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h Fri Sep 17 08:35:29 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h Mon Oct 04 01:57:48 2010 +0300
@@ -21,8 +21,6 @@
// INCLUDES
#include <e32std.h>
#include <e32base.h>
-#include <cntdef.h>
-#include <cntdbobs.h>
#include <badesca.h>
#include <etel3rdparty.h>
#include <rmmcustomapi.h>
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugin.h Fri Sep 17 08:35:29 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugin.h Mon Oct 04 01:57:48 2010 +0300
@@ -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 "Eclipse Public License v1.0"
@@ -58,13 +58,13 @@
/**
* Read Supported Access points
*/
- void SupportedAccessPointL( RBuf8& aReply );
+ TInt SupportedAccessPoint( RBuf8& aReply );
/**
* Read Access points data
*/
- void ReadAccessPointL(TInt aAccessPoint, RBuf8& aReply );
+ TInt ReadAccessPoint(TInt aAccessPoint, RBuf8& aReply );
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/src/pamplugin.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/src/pamplugin.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -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 "Eclipse Public License v1.0"
@@ -102,24 +102,20 @@
if (aCmd.FindF(KNqapTestString) >= 0)
{
- SupportedAccessPointL( aReply );
- err = KErrNone;
+ err = SupportedAccessPoint( aReply );
}
else if (aCmd.FindF(KNqapInternetString) >= 0)
{
- ReadAccessPointL( KInternet, aReply );
- err = KErrNone;
+ err = ReadAccessPoint( KInternet, aReply );
}
else if (aCmd.FindF(KNqapWapString) >= 0)
{
- ReadAccessPointL( KWap, aReply );
- err = KErrNone;
+ err = ReadAccessPoint( KWap, aReply );
}
else if (aCmd.FindF(KNqapInternetAndWapString) >= 0)
{
- ReadAccessPointL( KWapInternet, aReply );
- err = KErrNone;
+ err = ReadAccessPoint( KWapInternet, aReply );
}
else if (aCmd.FindF(KNcnnString) >= 0)
{
@@ -133,10 +129,14 @@
}
if(err != KErrNone)
- HandleCommandCompleted(err, EReplyTypeUndefined);
- else
- HandleCommandCompleted(KErrNone, EReplyTypeOk);
-
+ {
+ HandleCommandCompleted(err, EReplyTypeUndefined);
+ }
+ else
+ {
+ HandleCommandCompleted(KErrNone, EReplyTypeOk);
+ }
+
TRACE_FUNC_EXIT
}
@@ -144,10 +144,12 @@
void CPamPlugin::NameReqCallback( const TDesC8& aName )
{
TRACE_FUNC_ENTRY
+
+ TInt err;
if ( aName == KNullDesC8() )
{
iReply->Zero();
- iReply->Create( KErrorString );
+ err = iReply->Create( KErrorString );
}
else
{
@@ -158,79 +160,113 @@
buf.Append( KCrlfString );
buf.Append( KOkString );
iReply->Zero();
- iReply->Create( buf );
+ err = iReply->Create( buf );
}
- HandleCommandCompleted(KErrNone, EReplyTypeOk);
+
+ if(err != KErrNone)
+ {
+ HandleCommandCompleted(err, EReplyTypeUndefined);
+ }
+ else
+ {
+ HandleCommandCompleted(KErrNone, EReplyTypeOk);
+ }
+
TRACE_FUNC_EXIT
}
/**
Used by AT*NQAP=?
*/
-void CPamPlugin::SupportedAccessPointL( RBuf8& aReply )
+TInt CPamPlugin::SupportedAccessPoint( RBuf8& aReply )
{
TRACE_FUNC_ENTRY
const TInt Kbufsize = 16;
const TInt Kresponcebufsize = 64;
+ TInt err = KErrNone;
- HBufC16* supportedAp = HBufC16::NewL( Kbufsize );
- iPAMEngine->SupportedAccessPoints( supportedAp );
- TBuf8<Kresponcebufsize> buf;
+ HBufC16* supportedAp = HBufC16::New( Kbufsize );
+ if (supportedAp)
+ {
+ iPAMEngine->SupportedAccessPoints( supportedAp );
+ TBuf8<Kresponcebufsize> buf;
- buf.Zero();
- buf.Append( KCrlfString );
- buf.Append( KNqapString );
- buf.Append( *supportedAp );
- buf.Append( KCrlfString );
- buf.Append( KOkString );
+ buf.Zero();
+ buf.Append( KCrlfString );
+ buf.Append( KNqapString );
+ buf.Append( *supportedAp );
+ buf.Append( KCrlfString );
+ buf.Append( KOkString );
- aReply.Zero();
- aReply.Create( buf );
+ delete supportedAp;
+ aReply.Zero();
+ err = aReply.Create( buf );
+ }
+ else
+ {
+ err = KErrNoMemory;
+ }
TRACE_FUNC_EXIT
- return;
+ return err;
}
/**
Used by AT*NQAP=<>
*/
-void CPamPlugin::ReadAccessPointL(TInt aAccessPoint, RBuf8& aReply )
+TInt CPamPlugin::ReadAccessPoint(TInt aAccessPoint, RBuf8& aReply )
{
TRACE_FUNC_ENTRY
const TInt KreplyBufferLength = 1024;
+ TInt error = KErrNone;
CDesC8ArrayFlat* apArray = new(ELeave) CDesC8ArrayFlat(4);
- CleanupStack::PushL( apArray );
-
- iPAMEngine->ReadAccessPointTableL( aAccessPoint, apArray );
-
- TInt apArrayLength = apArray->Count();
- if ( apArrayLength > 0)
- {
- HBufC8* buf = HBufC8::NewL( KreplyBufferLength );
- buf->Des().Zero();
- buf->Des().Append( KCrlfString );
- for (TInt i=0; i < apArrayLength; i++ )
- {
- // AT*NQAP=<n> responce
- buf->Des().Append( KNqapString );
- buf->Des().Append( (*apArray)[i] );
- buf->Des().Append( KCrlfString );
- }
- buf->Des().Append( KOkString );
- aReply.Zero();
- aReply.Create( *buf );
+ if (apArray)
+ {
+ TRAP(error, iPAMEngine->ReadAccessPointTableL( aAccessPoint, apArray ));
+ if (!error)
+ {
+ TInt apArrayLength = apArray->Count();
+ if ( apArrayLength > 0)
+ {
+ HBufC8* buf = HBufC8::New( KreplyBufferLength );
+ if (buf)
+ {
+ buf->Des().Zero();
+ buf->Des().Append( KCrlfString );
+ for (TInt i=0; i < apArrayLength; i++ )
+ {
+ // AT*NQAP=<n> responce
+ buf->Des().Append( KNqapString );
+ buf->Des().Append( (*apArray)[i] );
+ buf->Des().Append( KCrlfString );
+ }
+ buf->Des().Append( KOkString );
+ aReply.Zero();
+ error = aReply.Create( *buf );
+ delete buf;
+ }
+ else
+ {
+ error = KErrNoMemory;
+ }
+ }
+ else
+ {
+ aReply.Zero();
+ error = aReply.Create( KOkString );
+ }
+ }
+ delete apArray;
}
else
{
- aReply.Zero();
- aReply.Create( KOkString );
- }
- CleanupStack::PopAndDestroy( apArray );
+ error = KErrNoMemory;
+ }
TRACE_FUNC_EXIT
- return;
+ return error;
}
--- a/usbengines/usbdevcon/inc/cep0reader.h Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/inc/cep0reader.h Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -57,7 +57,7 @@
*
* @since S60 v.5.0
*/
- void ReadSetupPacket();
+ void ReadSetupPacketL();
/**
* Set request to read EP0 data
@@ -65,7 +65,7 @@
* @since S60 v.5.0
* @param aDataLength Max length of data to read
*/
- void Read(TUint aDataLength);
+ void ReadL(TUint aDataLength);
private:
--- a/usbengines/usbdevcon/inc/cep0writer.h Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/inc/cep0writer.h Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -59,7 +59,7 @@
* @param aBuffer Data to write
* @param aDataLength Max length of data to write
*/
- void Write(const RBuf8& aBuffer, TUint aDataLength);
+ void WriteL(const RBuf8& aBuffer, TUint aDataLength);
private:
--- a/usbengines/usbdevcon/inc/cstatemachine.h Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/inc/cstatemachine.h Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -69,7 +69,7 @@
* @param aBuffer Data read from EP0
* @param aStatus status of Read request, completed
*/
- void ReadEP0(RBuf8& aBuffer, const TRequestStatus& aStatus);
+ void ReadEP0L(RBuf8& aBuffer, const TRequestStatus& aStatus);
/**
* Call back from CEP0Writer
@@ -77,14 +77,14 @@
* @since S60 v.5.0
* @param aStatus status of Write request, completed
*/
- void WroteEP0(const TRequestStatus& aStatus);
+ void WroteEP0L(const TRequestStatus& aStatus);
/**
* Starts machine
*
* @since S60 v.5.0
*/
- void Start();
+ void StartL();
/**
* Stops machine
@@ -125,7 +125,7 @@
* @since S60 v.5.0
* @param aSetupPacket Will be processed
*/
- void ProcessSetupPacket(RBuf8& aSetupPacket);
+ void ProcessSetupPacketL(RBuf8& aSetupPacket);
/**
* Checks wheather data required to be sent from host to device
--- a/usbengines/usbdevcon/src/cep0reader.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/src/cep0reader.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -86,8 +86,10 @@
// Standard active object error function.
// ----------------------------------------------------------------------------
//
-TInt CEP0Reader::RunError( TInt /*aError*/ )
+TInt CEP0Reader::RunError( TInt aError )
{
+ FTRACE(FPrint(
+ _L("[USBDEVCON]\tCEP0Reader::RunError, aError = %d"), aError));
return KErrNone;
}
@@ -100,14 +102,14 @@
FLOG( _L( "[USBDEVCON]\tCEP0Reader::RunL Data received:" ) );
- iObserver.ReadEP0(iBuffer, iStatus);
+ iObserver.ReadEP0L(iBuffer, iStatus);
}
// ---------------------------------------------------------------------------
// Issue request to read setup packet
// ---------------------------------------------------------------------------
//
-void CEP0Reader::ReadSetupPacket()
+void CEP0Reader::ReadSetupPacketL()
{
FLOG( _L( "[USBDEVCON]\tCEP0Reader::ReadSetupPacket" ) );
@@ -118,7 +120,7 @@
}
iBuffer.Close();
- iBuffer.Create(KSetupPacketLength);
+ iBuffer.CreateL(KSetupPacketLength);
iLdd.ReadPacket(iStatus, EEndpoint0, iBuffer, KSetupPacketLength);
SetActive();
@@ -129,7 +131,7 @@
// Issue request to read data
// ---------------------------------------------------------------------------
//
-void CEP0Reader::Read(TUint aDataLength)
+void CEP0Reader::ReadL(TUint aDataLength)
{
FLOG( _L( "[USBDEVCON]\tCEP0Reader::Read" ) );
@@ -140,7 +142,7 @@
}
iBuffer.Close();
- iBuffer.Create(aDataLength);
+ iBuffer.CreateL(aDataLength);
iLdd.Read(iStatus, EEndpoint0, iBuffer, aDataLength);
SetActive();
--- a/usbengines/usbdevcon/src/cep0writer.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/src/cep0writer.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -91,23 +91,25 @@
FLOG( _L( "[USBDEVCON]\tCEP0Writer::RunL" ) );
- iObserver.WroteEP0(iStatus);
+ iObserver.WroteEP0L(iStatus);
}
// ----------------------------------------------------------------------------
// Standard active object error function.
// ----------------------------------------------------------------------------
//
-TInt CEP0Writer::RunError( TInt /*aError*/ )
+TInt CEP0Writer::RunError( TInt aError )
{
- return KErrNone;
+ FTRACE(FPrint(
+ _L("[USBDEVCON]\tCEP0Reader::RunError, aError = %d"), aError));
+ return KErrNone;
}
// ---------------------------------------------------------------------------
// Issue request to write data
// ---------------------------------------------------------------------------
//
-void CEP0Writer::Write(const RBuf8& aBuffer, TUint aDataLength)
+void CEP0Writer::WriteL(const RBuf8& aBuffer, TUint aDataLength)
{
FLOG( _L( "[USBDEVCON]\tCEP0Writer::Write" ) );
@@ -121,7 +123,7 @@
_L("[USBDEVCON]\tCEP0Writer::Write. aBuffer Length = %d aDataLength = %d" ),aBuffer.Length(), aDataLength));
iBuffer.Close();
- iBuffer.Create(aBuffer, aDataLength);
+ iBuffer.CreateL(aBuffer, aDataLength);
iLdd.Write(iStatus, EEndpoint0, iBuffer, aDataLength, ETrue);
SetActive();
--- a/usbengines/usbdevcon/src/cstatemachine.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/src/cstatemachine.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -91,7 +91,7 @@
// Starts state machine
// ---------------------------------------------------------------------------
//
-void CStateMachine::Start()
+void CStateMachine::StartL()
{
FLOG( _L( "[USBDEVCON]\tCStateMachine::Start" ) );
@@ -103,7 +103,7 @@
}
iState = ESetupStage;
- iEP0Reader->ReadSetupPacket();
+ iEP0Reader->ReadSetupPacketL();
}
@@ -146,7 +146,7 @@
// Something has been read from EP0
// ---------------------------------------------------------------------------
//
-void CStateMachine::ReadEP0(RBuf8& aBuffer, const TRequestStatus& aStatus)
+void CStateMachine::ReadEP0L(RBuf8& aBuffer, const TRequestStatus& aStatus)
{
FTRACE(FPrint(
@@ -156,7 +156,7 @@
if(KErrNone != aStatus.Int())
{
// restart
- Start();
+ StartL();
return;
}
@@ -171,11 +171,11 @@
if(aBuffer.Length() != KSetupPacketLength) // SetupPacket is always 8 bytes
{
- Start();
+ StartL();
return;
}
- ProcessSetupPacket(aBuffer);
+ ProcessSetupPacketL(aBuffer);
break;
}
@@ -200,7 +200,7 @@
// all done, go to idle state
iState = ESetupStage;
- iEP0Reader->ReadSetupPacket();
+ iEP0Reader->ReadSetupPacketL();
break;
@@ -218,7 +218,7 @@
// Processing setup packet
// ---------------------------------------------------------------------------
//
-void CStateMachine::ProcessSetupPacket(RBuf8& aSetupPacket)
+void CStateMachine::ProcessSetupPacketL(RBuf8& aSetupPacket)
{
FLOG( _L( "[USBDEVCON]\tCStateMachine::ProcessSetupPacket" ) );
@@ -233,11 +233,11 @@
// save request, until receiving following data
iBuffer.Close();
- iBuffer.Create(aSetupPacket);
+ iBuffer.CreateL(aSetupPacket);
// switch to Data state
iState = EDataStage;
- iEP0Reader->Read(datalength);
+ iEP0Reader->ReadL(datalength);
return;
@@ -259,7 +259,7 @@
// listen to EP0
iState = ESetupStage;
- iEP0Reader->ReadSetupPacket();
+ iEP0Reader->ReadSetupPacketL();
return;
}
@@ -272,7 +272,7 @@
_L("[USBDEVCON]\tCStateMachine::ProcessSetupPacket. Data from device is required: %d bytes" ),datalength));
iState = EStatusStage;
- iEP0Writer->Write(iBuffer, datalength);
+ iEP0Writer->WriteL(iBuffer, datalength);
return;
@@ -283,7 +283,7 @@
// all is done, listen to EP0, in setup stage
iState = ESetupStage;
- iEP0Reader->ReadSetupPacket();
+ iEP0Reader->ReadSetupPacketL();
}
@@ -292,7 +292,7 @@
// Something has been written to EP0
// ---------------------------------------------------------------------------
//
-void CStateMachine::WroteEP0(const TRequestStatus& aStatus)
+void CStateMachine::WroteEP0L(const TRequestStatus& aStatus)
{
FTRACE(FPrint(
@@ -302,7 +302,7 @@
if(KErrNone != aStatus.Int())
{
// restart
- Start();
+ StartL();
}
switch(iState)
@@ -315,7 +315,7 @@
// successfully wrote data to EP0
// go to idle
iState = ESetupStage;
- iEP0Reader->ReadSetupPacket();
+ iEP0Reader->ReadSetupPacketL();
break;
}
--- a/usbengines/usbdevcon/src/cusbdevcon.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbdevcon/src/cusbdevcon.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -295,7 +295,7 @@
User::LeaveIfError(iLdd.SetDeviceControl());
// start state machine
- iStateMachine->Start();
+ iStateMachine->StartL();
}
--- a/usbengines/usblocodplugin/group/usblocodplugin.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usblocodplugin/group/usblocodplugin.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -45,6 +45,6 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Kernel API
-LIBRARY ECom.lib // ECOM framework API
+LIBRARY ecom.lib // ECOM framework API
LIBRARY usbman.lib // RUSB API (USB Manager)
--- a/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/group/USBLocodPluginTest.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/group/USBLocodPluginTest.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -41,7 +41,7 @@
SOURCE LocodBearerPluginObs.cpp
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
LIBRARY stiftestengine.lib
LIBRARY ecom.lib
--- a/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/src/USBLocodPluginTest.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/src/USBLocodPluginTest.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "USBLocodPluginTest.h"
#include <SettingServerClient.h>
--- a/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/src/USBLocodPluginTestBlocks.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usblocodplugin/tsrc/USBLocodPluginTest/src/USBLocodPluginTestBlocks.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -21,7 +21,7 @@
// [INCLUDE FILES] - do not remove
#include <e32svr.h>
#include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "USBLocodPluginTest.h"
// EXTERNAL DATA STRUCTURES
--- a/usbengines/usbotgwatcher/group/usbotgwatcher.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbotgwatcher/group/usbotgwatcher.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -68,6 +68,6 @@
LIBRARY usbdescriptors.lib
LIBRARY usbdi_utils.lib
#endif
-LIBRARY hbcore.lib
+LIBRARY HbCore.lib
DEBUGLIBRARY flogger.lib
--- a/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/UsbOtgWatcherTest.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/UsbOtgWatcherTest.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -85,7 +85,7 @@
//standart lib for stif testing
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
LIBRARY stiftestengine.lib
//lib for stubbing
--- a/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/UsbOtgWatcherTest_exe.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/UsbOtgWatcherTest_exe.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -34,7 +34,7 @@
SOURCE UsbOtgWatcherTest_exe.cpp
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
EPOCSTACKSIZE 40960
--- a/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/src/UsbOtgWatcherTest.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/src/UsbOtgWatcherTest.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -16,7 +16,7 @@
*/
// INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include <SettingServerClient.h>
#include "UsbOtgWatcherTest.h"
#include "testdebug.h"
--- a/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/src/UsbOtgWatcherTestBlocks.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/src/UsbOtgWatcherTestBlocks.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -18,7 +18,7 @@
// [INCLUDE FILES] - do not remove
#include <e32svr.h>
#include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "UsbOtgWatcherTest.h"
#include "testdebug.h"
#include "panic.h"
--- a/usbengines/usbremotepersonality/src/cremotepersonalityhandler.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbremotepersonality/src/cremotepersonalityhandler.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -280,7 +280,7 @@
_L("[USBREMOTEPERSONALITY]\tCRemotePersonalityHandler::GetPersonalities Response length is %d bytes" ), responseLength));
aPersonalities.Close();
- aPersonalities.Create(responseLength);
+ aPersonalities.CreateL(responseLength);
// Panic on Append never can be rised in this method, due to aPersonalities length exactly equal the appending data length.
aPersonalities.Append(responseLength);
@@ -462,7 +462,7 @@
}
aLastResult.Close();
- aLastResult.Create(1); // Length of response to GetLastResult request is 1 byte always.
+ aLastResult.CreateL(1); // Length of response to GetLastResult request is 1 byte always.
// Panic on Append never can be rised here, due to aPersonalities length exactly equal the appending data length.
aLastResult.Append(static_cast<TInt8>(iLastResult));
--- a/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/group/USBRemotePersonalityTest.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/group/USBRemotePersonalityTest.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -39,7 +39,7 @@
SOURCE USBRemotePersonalityTestBlocks.cpp
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
LIBRARY stiftestengine.lib
LIBRARY ecom.lib
LIBRARY usbman.lib
--- a/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/group/USBRemotePersonalityTest_exe.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/group/USBRemotePersonalityTest_exe.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -33,7 +33,7 @@
SOURCE USBRemotePersonalityTest_exe.cpp
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
EPOCSTACKSIZE 40960
--- a/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/src/USBRemotePersonalityTest.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/src/USBRemotePersonalityTest.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "USBRemotePersonalityTest.h"
#include <SettingServerClient.h>
--- a/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/src/USBRemotePersonalityTestBlocks.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/src/USBRemotePersonalityTestBlocks.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -21,7 +21,7 @@
// [INCLUDE FILES] - do not remove
#include <e32svr.h>
#include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "USBRemotePersonalityTest.h"
// EXTERNAL DATA STRUCTURES
--- a/usbengines/usbwatcher/group/usbwatcherserver.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbengines/usbwatcher/group/usbwatcherserver.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -55,6 +55,6 @@
LIBRARY centralrepository.lib // Central Repository (USB Personality API)
LIBRARY featmgr.lib
LIBRARY usbotgwatcher.lib //OTG
-LIBRARY hbcore.lib
+LIBRARY HbCore.lib
DEBUGLIBRARY flogger.lib // File logging
--- a/usbuis/imageprintui/group/imageprintui.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/imageprintui/group/imageprintui.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -74,16 +74,16 @@
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib
LIBRARY eikcoctl.lib avkon.lib
LIBRARY bafl.lib // Basic Application Framework
-LIBRARY AknSkins.lib // Skinned icons
+LIBRARY aknskins.lib // Skinned icons
LIBRARY aknicon.lib
-LIBRARY commonengine.lib // Series 60 common components library
+LIBRARY CommonEngine.lib // Series 60 common components library
LIBRARY pictbridge.lib
LIBRARY eikcdlg.lib eikctl.lib estor.lib efsrv.lib
-LIBRARY ServiceHandler.lib
+LIBRARY servicehandler.lib
LIBRARY DRMCommon.lib
-LIBRARY ImageConversion.lib
+LIBRARY imageconversion.lib
LIBRARY PlatformEnv.lib // PathInfo
-LIBRARY CommonUI.lib
+LIBRARY commonui.lib
--- a/usbuis/imageprintui/loc/imageprintui.loc Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/imageprintui/loc/imageprintui.loc Mon Oct 04 01:57:48 2010 +0300
@@ -308,4 +308,5 @@
// and user has select print from menu option
// l: popup_note_wait_window
// r: 3.2
-#define qtn_usb_wait_connect_cable "Connect USB cable"
\ No newline at end of file
+#define qtn_usb_wait_connect_cable "Connect USB cable"
+
--- a/usbuis/imageprintuiprovider/group/imageprintuiprovider.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/imageprintuiprovider/group/imageprintuiprovider.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -54,8 +54,8 @@
LIBRARY euser.lib cone.lib
-LIBRARY ECom.lib
-LIBRARY ServiceHandler.lib
+LIBRARY ecom.lib
+LIBRARY servicehandler.lib
LIBRARY estor.lib
LIBRARY apgrfx.lib
LIBRARY apparc.lib
@@ -64,11 +64,11 @@
LIBRARY bafl.lib
LIBRARY avkon.lib
LIBRARY DRMCommon.lib
-LIBRARY ImageConversion.lib
+LIBRARY imageconversion.lib
LIBRARY eikcdlg.lib
LIBRARY eikctl.lib
LIBRARY PlatformEnv.lib
-LIBRARY commonengine.lib
+LIBRARY CommonEngine.lib
DEBUGLIBRARY flogger.lib
--- a/usbuis/usbuinotif/tsrc/usbuinotifapitest/group/usbuinotifapitest.mmp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/usbuinotif/tsrc/usbuinotifapitest/group/usbuinotifapitest.mmp Mon Oct 04 01:57:48 2010 +0300
@@ -39,7 +39,7 @@
SOURCE usbuinotifapitestblocks.cpp
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
+LIBRARY StifTestInterface.lib
LIBRARY stiftestengine.lib
LIBRARY centralrepository.lib
LIBRARY usbman.lib
--- a/usbuis/usbuinotif/tsrc/usbuinotifapitest/src/usbuinotifapitest.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/usbuinotif/tsrc/usbuinotifapitest/src/usbuinotifapitest.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -16,7 +16,7 @@
*/
// INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "usbuinotifapitest.h"
#include <SettingServerClient.h>
--- a/usbuis/usbuinotif/tsrc/usbuinotifapitest/src/usbuinotifapitestblocks.cpp Fri Sep 17 08:35:29 2010 +0300
+++ b/usbuis/usbuinotif/tsrc/usbuinotifapitest/src/usbuinotifapitestblocks.cpp Mon Oct 04 01:57:48 2010 +0300
@@ -19,7 +19,7 @@
#include <e32svr.h>
#include <StifParser.h>
#include <ecom/ecom.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
#include "usbuinotifapitest.h"
// EXTERNAL DATA STRUCTURES