FCL/sf/os/wlan: comparison wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian

equal deleted inserted replaced

-:c40eb8fe8501
+:6524e815f76f
 * Description:  This class implements BgScan AWS communication.
 *
 */
 /*
-* %version: 2 %
+* %version: 3 %
 */
 #include <e32base.h>
-#include <e32atomics.h>
+#include <e32cmn.h>
+#include <e32std.h>
 #include "awsinterface.h"
+#include "wlanbgscanawscommsinterface.h"
 #include "awsenginebase.h"
 #include "wlanbgscancommandlistener.h"
 #include "wlanbgscancommand.h"
 #include "wlanbgscanawscomms.h"
 #include "wlanbgscan.h"
 /**
 * Index of the first item in an array.
 */
 const TInt KFirstItemIndex = 0;
+MWlanBgScanAwsComms* CWlanBgScanAwsCommsFactory::InstanceL( CWlanBgScan& aBgScan )
+{
+DEBUG( "CWlanBgScanAwsCommsFactory::Instance()" );
+return CWlanBgScanAwsComms::NewL( aBgScan );
+}
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::CWlanBgScanAwsComms
 // ---------------------------------------------------------------------------
 //
 CWlanBgScanAwsComms::CWlanBgScanAwsComms( CWlanBgScan& aBgScan ) :
 CActive( CActive::EPriorityStandard ),
 iBgScan( aBgScan ),
 iAws( NULL ),
-iAwsImplInfo( NULL ),
+iAwsImplUid( 0 ),
 iCommandHandler( NULL ),
 iAwsVersion( 0 ),
 iPendingCommand( EAwsCommandMax ),
 iAwsOk( EFalse )
 {
 DEBUG( "CWlanBgScanAwsComms::CWlanBgScanAwsComms()" );
 }
 // ---------------------------------------------------------------------------
-// CWlanBgScanAwsComms::ConstructL
+// CWlanBgScanAwsComms::~CWlanBgScanAwsComms()
 // ---------------------------------------------------------------------------
 //
-void CWlanBgScanAwsComms::ConstructL()
+CWlanBgScanAwsComms::~CWlanBgScanAwsComms()
 {
-DEBUG( "CWlanBgScanAwsComms::ConstructL()" );
+DEBUG( "CWlanBgScanAwsComms::~CWlanBgScanAwsComms()" );
-// create handler for incoming messages from AWS
+delete iAws;
-iCommandHandler = CWlanBgScanCommand::NewL( *this );
+iAws = NULL;
-CActiveScheduler::Add( this );
+delete iCommandHandler;
+iCommandHandler = NULL;
-// leaves if no AWS present in system
-StartAwsThreadL();
+iAwsMsgQueue.Close();
+Cancel();
-DEBUG( "CWlanBgScanAwsComms::ConstructL() - done" );
+iWlanEngineThread.Close();
+//iStartupLock.Close();
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::NewL
 // ---------------------------------------------------------------------------
 CleanupStack::Pop( self );
 return self;
 }
 // ---------------------------------------------------------------------------
-// CWlanBgScanAwsComms::~CWlanBgScanAwsComms()
+// CWlanBgScanAwsComms::ConstructL
 // ---------------------------------------------------------------------------
 //
-CWlanBgScanAwsComms::~CWlanBgScanAwsComms()
+void CWlanBgScanAwsComms::ConstructL()
 {
-DEBUG( "CWlanBgScanAwsComms::~CWlanBgScanAwsComms()" );
+DEBUG( "CWlanBgScanAwsComms::ConstructL()" );
-delete iAws;
+// Get handle to current (WLAN Engine) thread so that
-iAws = NULL;
+// the handle can be later used for completing the
+// request status from AWS thread.
-delete iAwsImplInfo;
+TThreadId id = RThread().Id();
-iAwsImplInfo = NULL;
+TInt err = iWlanEngineThread.Open( id );
+if( err != KErrNone )
-delete iCommandHandler;
+{
-iCommandHandler = NULL;
+DEBUG( "CWlanBgScanAwsComms::ConstructL() - Opening own thread handle failed" );
+User::Leave( KErrBadHandle );
-iAwsMsgQueue.Close();
+}
-Cancel();
+// create handler for incoming messages from AWS
+iCommandHandler = CWlanBgScanCommand::NewL( *this );
+CActiveScheduler::Add( this );
+DEBUG( "CWlanBgScanAwsComms::ConstructL() - Starting AWS thread" );
+// leaves if no AWS present in system
+StartAwsThreadL();
+DEBUG( "CWlanBgScanAwsComms::ConstructL() - done" );
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::CleanupEComArray
 // ---------------------------------------------------------------------------
 implInfoArray->Close();
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::StartAwsThreadL
+//
+// This method is executing in the context of the WLAN Engine thread.
 // ---------------------------------------------------------------------------
 //
 void CWlanBgScanAwsComms::StartAwsThreadL()
 {
 DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL()" );
 DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - no AWS implementation found" );
 User::Leave( KErrNotFound );
 }
 // first found AWS implementation will be taken into use
-iAwsImplInfo = static_cast<CImplementationInformation*>( awsImplArray[KFirstItemIndex] );
+CImplementationInformation* awsImplInfo = static_cast<CImplementationInformation*>( awsImplArray[KFirstItemIndex] );
-awsImplArray.Remove( KFirstItemIndex );
+iAwsImplUid = awsImplInfo->ImplementationUid().iUid;
-CleanupStack::PopAndDestroy( &awsImplArray ); //this causes a call to CleanupEComArray
+DEBUG( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - trying to instantiate AWS implementation:" );
+DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - ImplementationUid:  0x%08X", awsImplInfo->ImplementationUid().iUid );
+#ifdef _DEBUG
+TBuf8<KPrintLineLength> buf8;
+buf8.Copy( awsImplInfo->DisplayName() );
+#endif
+DEBUG1S( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - DisplayName:        ", buf8.Length(), buf8.Ptr() );
+DEBUG1(  "CWlanBgScanAwsComms::InstantiateAwsPluginL() - Version:            %i", awsImplInfo->Version() );
+DEBUG1S( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - DataType:           ", awsImplInfo->DataType().Length(), awsImplInfo->DataType().Ptr() );
+DEBUG1S( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - OpaqueData:         ", awsImplInfo->OpaqueData().Length(), awsImplInfo->OpaqueData().Ptr() );
+DEBUG1(  "CWlanBgScanAwsComms::InstantiateAwsPluginL() - RomOnly:            %i", awsImplInfo->RomOnly() );
+DEBUG1(  "CWlanBgScanAwsComms::InstantiateAwsPluginL() - RomBased:           %i", awsImplInfo->RomBased() );
+DEBUG1(  "CWlanBgScanAwsComms::InstantiateAwsPluginL() - VendorId:           0x%08X", awsImplInfo->VendorId().iId );
+DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - setting request status to pending" );
+iStatus = KRequestPending;
+DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - setting pending command to EAwsStartupCompleted" );
+iPendingCommand = EAwsStartupCompleted;
+DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - setting ao active" );
+SetActive();
 DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - creating AWS thread" );
 RThread thread;
-TInt err = thread.Create( iAwsImplInfo->DisplayName(),
+TInt err = thread.Create( awsImplInfo->DisplayName(),
 AwsThreadEntryPoint,
 KDefaultStackSize,
 KMinHeapSize,
 KMaxHeapSize,
 reinterpret_cast<TAny*>( this ) );
+CleanupStack::PopAndDestroy( &awsImplArray ); //this causes a call to CleanupEComArray
 if( err != KErrNone)
 {
 DEBUG1( "CWlanBgScanAwsComms::StartAwsThreadL() - error: thread creation failed with error %i", err );
-delete iAwsImplInfo;
-iAwsImplInfo = NULL;
 User::Leave( err );
 }
-DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - Resuming AWS thread" );
+DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - resuming AWS thread" );
 thread.Resume();
 thread.Close();
 DEBUG( "CWlanBgScanAwsComms::StartAwsThreadL() - done" );
 }
 // This method is executing in the context of the AWS thread.
 // -----------------------------------------------------------------------------
 //
 TInt CWlanBgScanAwsComms::AwsThreadEntryPoint( TAny* aThisPtr )
 {
-DEBUG("CWlanBgScanAwsComms::AwsThreadEntryPoint()");
+DEBUG( "CWlanBgScanAwsComms::AwsThreadEntryPoint()" );
 CWlanBgScanAwsComms* self = static_cast<CWlanBgScanAwsComms*>( aThisPtr );
 // create cleanup stack
 CTrapCleanup* cleanup = CTrapCleanup::New();
 User::Exit( KErrNoMemory );
 }
 __UHEAP_MARK;
-TRAPD( err, self->InstantiateAwsPluginL() );
+TRAPD( err, self->InstantiateAndRunAwsPluginL() );
 if ( err != KErrNone )
 {
-DEBUG1("CWlanBgScanAwsComms::AwsThreadEntryPoint() - AWS instantiation leaved with code %i", err);
+DEBUG1( "CWlanBgScanAwsComms::AwsThreadEntryPoint() - error: AWS instantiation leaved, completing request to WLAN Engine thread with code %i", err );
-}
+TRequestStatus *status = &self->iStatus;
+self->iWlanEngineThread.RequestComplete( status, err );
+}
 __UHEAP_MARKEND;
 delete cleanup;
 cleanup = NULL;
+DEBUG( "CWlanBgScanAwsComms::AwsThreadEntryPoint() - AWS thread exiting" );
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CWlanBgScanAwsComms::InstantiateAwsPluginL
+// CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL
 //
 // This method is executing in the context of the AWS thread.
 // -----------------------------------------------------------------------------
 //
-void CWlanBgScanAwsComms::InstantiateAwsPluginL()
+void CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL()
 {
-DEBUG("CWlanBgScanAwsComms::InstantiateAwsPluginL()");
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL()" );
-ASSERT( iAwsImplInfo );
 CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();
 CleanupStack::PushL( scheduler );
 CActiveScheduler::Install( scheduler );
-DEBUG( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - trying to instantiate AWS implementation:" );
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - active scheduler installed" );
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - ImplementationUid:  0x%08X", iAwsImplInfo->ImplementationUid().iUid );
-#ifdef _DEBUG
-TBuf8<KPrintLineLength> buf8;
-buf8.Copy( iAwsImplInfo->DisplayName() );
-#endif
-DEBUG1S("CWlanBgScanAwsComms::InstantiateAwsPluginL() - DisplayName:        ", buf8.Length(), buf8.Ptr() );
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - Version:            %i", iAwsImplInfo->Version() );
-DEBUG1S("CWlanBgScanAwsComms::InstantiateAwsPluginL() - DataType:           ", iAwsImplInfo->DataType().Length(), iAwsImplInfo->DataType().Ptr() );
-DEBUG1S("CWlanBgScanAwsComms::InstantiateAwsPluginL() - OpaqueData:         ", iAwsImplInfo->OpaqueData().Length(), iAwsImplInfo->OpaqueData().Ptr() );
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - RomOnly:            %i", iAwsImplInfo->RomOnly() );
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - RomBased:           %i", iAwsImplInfo->RomBased() );
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - VendorId:           0x%08X", iAwsImplInfo->VendorId().iId );
 CAwsEngineBase::TAwsEngineConstructionParameters params = { this, KBgScanVersion, iAwsVersion };
-iAws = CAwsEngineBase::NewL( iAwsImplInfo->ImplementationUid().iUid, &params );
+TRequestStatus *status = &iStatus;
-DEBUG1( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - AWS instantiated OK, iAwsVersion %u", iAwsVersion );
-iAwsOk = ETrue;
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - calling CAwsEngineBase::NewL()" );
+iAws = CAwsEngineBase::NewL( iAwsImplUid, &params ); // iAws deallocated in destructor
-__e32_memory_barrier();
-DEBUG( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - data members synchronized" );
+DEBUG1( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - AWS version %u instantiated", iAwsVersion );
-DEBUG( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - starting active scheduler - AWS is now in control of this thread" );
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - completing request to WLAN Engine thread" );
+iWlanEngineThread.RequestComplete( status, KErrNone );
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - starting active scheduler - AWS is now in control of this thread" );
 CActiveScheduler::Start();
 // Thread execution will stay in CActiveScheduler::Start() until active scheduler is stopped
-DEBUG("CWlanBgScanAwsComms::InstantiateAwsPluginL() - active scheduler stopped" );
+DEBUG("CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - active scheduler stopped" );
 // clean up
-delete iAws;
-iAws = NULL;
 CleanupStack::PopAndDestroy( scheduler );
-DEBUG( "CWlanBgScanAwsComms::InstantiateAwsPluginL() - exiting..." );
+DEBUG( "CWlanBgScanAwsComms::InstantiateAndRunAwsPluginL() - done" );
-User::Exit( KErrNone );
 }
 // ---------------------------------------------------------------------------
 // From class MAwsBgScanProvider.
 // CWlanBgScanAwsComms::SetInterval
 DEBUG( "CWlanBgScanAwsComms::SetInterval() - returning" );
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::SendOrQueueAwsCommand
+//
+// This method is executing in the context of the WLAN Engine thread.
 // ---------------------------------------------------------------------------
 //
 void CWlanBgScanAwsComms::SendOrQueueAwsCommand( TAwsMessage& aMessage )
 {
 DEBUG1( "CWlanBgScanAwsComms::SendOrQueueAwsCommand( command %u )", aMessage.iCmd );
 DEBUG( "CWlanBgScanAwsComms::SendOrQueueAwsCommand() - done" );
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::SendAwsCommand
+//
+// This method is executing in the context of the WLAN Engine thread.
 // ---------------------------------------------------------------------------
 //
 void CWlanBgScanAwsComms::SendAwsCommand( TAwsMessage& aMessage )
 {
 DEBUG1( "CWlanBgScanAwsComms::SendAwsCommand( command %u )", aMessage.iCmd );
 DEBUG( "CWlanBgScanAwsComms::SendAwsCommand() - done" );
 }
 // ---------------------------------------------------------------------------
 // CWlanBgScanAwsComms::RunL
+//
+// This method is executing in the context of the WLAN Engine thread.
 // ---------------------------------------------------------------------------
 //
 void CWlanBgScanAwsComms::RunL()
 {
 DEBUG2( "CWlanBgScanAwsComms::RunL() - command: %u, completion status: %d", iPendingCommand, iStatus.Int() );
+switch ( iPendingCommand )
+{
+case EAwsStartupCompleted:
+{
+DEBUG( "CWlanBgScanAwsComms::RunL() - AWS startup has been completed" );
+iBgScan.AwsStartupComplete( iStatus.Int() );
+break;
+}
+default:
+{
+DEBUG( "CWlanBgScanAwsComms::RunL() - AWS command has been completed" );
+iBgScan.AwsCommandComplete( iPendingCommand, iStatus.Int() );
+break;
+}
+}
 TAwsMessage cmd = { EAwsCommandMax, NULL };
 // if there are more commands, send the next one
 if( iAwsMsgQueue.Count() )
 DEBUG1( "CWlanBgScanAwsComms::DoSetInterval( aNewInterval: %u )", aNewInterval );
 iBgScan.DoSetInterval( aNewInterval );
 }
-// ---------------------------------------------------------------------------
-// CWlanBgScanAwsComms::IsAwsPresent
-// ---------------------------------------------------------------------------
-//
-TBool CWlanBgScanAwsComms::IsAwsPresent()
-{
-DEBUG1( "CWlanBgScanAwsComms::IsAwsPresent() - returning %d", iAwsOk );
-return iAwsOk;
-}

branch	RCL_3
changeset 3	6524e815f76f
parent 0	c40eb8fe8501
child 8	e0f767079796