--- a/wlan_bearer/wlanldd/wlan_common/umac_common/inc/UmacContextImpl.inl Tue May 25 16:07:06 2010 +0300
+++ b/wlan_bearer/wlanldd/wlan_common/umac_common/inc/UmacContextImpl.inl Fri Jun 04 12:12:29 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 77 %
+* %version: 79 %
*/
#include "umacconnectcontext.h"
@@ -420,7 +420,7 @@
//
// ---------------------------------------------------------------------------
//
-inline const TUint16 WlanContextImpl::ScanResponseFrameBodyLength() const
+inline TUint16 WlanContextImpl::ScanResponseFrameBodyLength() const
{
return iConnectContext.iScanResponseFrameBodyLength;
}
@@ -1610,9 +1610,13 @@
//
inline TPowerMgmtModeChange WlanContextImpl::OnFrameTx(
WHA::TQueueId aQueueId,
- TUint16 aEtherType )
+ TUint16 aEtherType,
+ T802Dot11FrameControlTypeMask aDot11FrameType )
{
- return iDynamicPowerModeCntx.OnFrameTx( aQueueId, aEtherType );
+ return iDynamicPowerModeCntx.OnFrameTx(
+ aQueueId,
+ aEtherType,
+ aDot11FrameType );
}
// ---------------------------------------------------------------------------
@@ -1636,6 +1640,15 @@
//
// ---------------------------------------------------------------------------
//
+inline TPowerMgmtModeChange WlanContextImpl::OnPsModeErrorIndication()
+ {
+ return iDynamicPowerModeCntx.OnPsModeErrorIndication();
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
inline void WlanContextImpl::SetPowerModeManagementParameters(
TUint32 aToLightPsTimeout,
TUint16 aToLightPsFrameThreshold,
@@ -1693,6 +1706,15 @@
//
// ---------------------------------------------------------------------------
//
+inline void WlanContextImpl::RestorePwrModeMgmtParameters()
+ {
+ iDynamicPowerModeCntx.RestoreActiveModeParameters();
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
inline TBool WlanContextImpl::OnActiveToLightPsTimerTimeout()
{
return iDynamicPowerModeCntx.OnActiveToLightPsTimerTimeout();
@@ -2059,6 +2081,15 @@
//
// ---------------------------------------------------------------------------
//
+inline TBool WlanContextImpl::InVoiceCallState() const
+ {
+ return iNullSendController.InVoiceCallState();
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
inline TBool WlanContextImpl::InsertNewRcpiIntoPredictor(
TInt64 aTimestamp,
WHA::TRcpi aRcpi )
@@ -2100,6 +2131,18 @@
aRcpiWarnLevel );
}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+inline void WlanContextImpl::ClearBssMembershipFeatureList()
+ {
+ os_memset(
+ &iOurBssMembershipFeatureArray,
+ KUnallocated,
+ sizeof( iOurBssMembershipFeatureArray ) );
+ }
+
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------