# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1279030651 -3600
# Node ID a616a19c9ce0d60fb76f46f50dba8d1cfc1961bd
# Parent  0b0048910c20ce5bb909eef4473feb4ef40bba7b# Parent  5ced40f3c181862f046f038fff3da4fd93841a78
Re-merge workaround for bug 2620.

diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp
--- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -238,6 +238,7 @@
     TBool aUpdatedConnection )
     {
     COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionHandler::StartConnectionHandling()" );
+    #define UNMASK_LINE_OUT(selectionListBitmask)  (selectionListBitmask & (~KASLineOut))
 
     iGenericID = aGenericID;
     iConnectionUpdate = aUpdatedConnection;
@@ -309,6 +310,7 @@
     			if ( accCount > 1 )
     			    {
 	    			//if there is possible selection show UI
+	    			selectionListBitmask = UNMASK_LINE_OUT(selectionListBitmask);
 		    		SetupSelectionDialogL( selectionListBitmask );    			
     			    }
     			else
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/edidparser/bwins/edidparseru.def
--- a/accessoryservices/pluggeddisplay/edidparser/bwins/edidparseru.def	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/edidparser/bwins/edidparseru.def	Tue Jul 13 15:17:31 2010 +0100
@@ -55,4 +55,6 @@
 	?GetInterlacedVideoLatency@CCea861EdidParser@@QAEEXZ @ 54 NONAME ; unsigned char CCea861EdidParser::GetInterlacedVideoLatency(void)
 	?GetStandardTimings@CEdidParserBase@@QAEEH@Z @ 55 NONAME ; unsigned char CEdidParserBase::GetStandardTimings(int)
 	?HasIEEERegistration@CCea861EdidParser@@QAEHXZ @ 56 NONAME ; int CCea861EdidParser::HasIEEERegistration(void)
+	?UpdateCea861ExtensionL@CEdidParserBase@@QAEXHPAVCCea861EdidParser@@@Z @ 57 NONAME ; void CEdidParserBase::UpdateCea861ExtensionL(int, class CCea861EdidParser *)
+	?UpdateRawDataL@CEdidParserBase@@QAEXABVTDesC8@@@Z @ 58 NONAME ; void CEdidParserBase::UpdateRawDataL(class TDesC8 const &)
 
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/edidparser/eabi/edidparseru.def
--- a/accessoryservices/pluggeddisplay/edidparser/eabi/edidparseru.def	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/edidparser/eabi/edidparseru.def	Tue Jul 13 15:17:31 2010 +0100
@@ -57,4 +57,6 @@
 	_ZTV17CCea861EdidParser @ 56 NONAME ; #<VT>#
 	_ZN15CEdidParserBase18GetStandardTimingsEi @ 57 NONAME
 	_ZN17CCea861EdidParser19HasIEEERegistrationEv @ 58 NONAME
+	_ZN15CEdidParserBase14UpdateRawDataLERK6TDesC8 @ 59 NONAME
+	_ZN15CEdidParserBase22UpdateCea861ExtensionLEiP17CCea861EdidParser @ 60 NONAME
 
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/edidparser/inc/edidparserbase.h
--- a/accessoryservices/pluggeddisplay/edidparser/inc/edidparserbase.h	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/edidparser/inc/edidparserbase.h	Tue Jul 13 15:17:31 2010 +0100
@@ -378,6 +378,9 @@
      */
     IMPORT_C TUint8 GetChecksum();
 
+	IMPORT_C void UpdateRawDataL( const TDesC8& aBinaryData );
+	IMPORT_C void UpdateCea861ExtensionL( TInt aNumber, CCea861EdidParser* aParser );
+
 private:
 
     /**
@@ -558,6 +561,7 @@
      HBufC8*         iRawData;                  // Raw data that contains all EDID data
      TUint           iNumberOfExtensionBlocks;  // Number of extensionblocks for this base edid block
      TExtDataBlock   iExtensionData;            // Extension data
+     TInt            iRawdataLength;            // Raw data length
     };
 
 #endif // C_CEDIDPARSERBASE_H
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/edidparser/src/edidparserbase.cpp
--- a/accessoryservices/pluggeddisplay/edidparser/src/edidparserbase.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/edidparser/src/edidparserbase.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -52,8 +52,10 @@
 
     // Make a copy of base EDID data
     Mem::Copy( &iBaseEdidData, rawPtr.Ptr(), KEdidParserSizeOfEdidBlock );
-    
-    TRACE_EDID_DATA( *this );
+
+	iRawdataLength = aBinaryData.Length();
+	
+    //TRACE_EDID_DATA( *this );
     }
 
 // ---------------------------------------------------------------------------
@@ -761,6 +763,51 @@
     return parser;
     }
 
+EXPORT_C void CEdidParserBase::UpdateRawDataL( const TDesC8& aBinaryData )
+	{
+	FUNC_LOG;
+
+	if ( iRawData )
+		{
+		iRawData = iRawData->ReAllocL( iRawdataLength + aBinaryData.Length() );
+		
+		TPtr8 rawPtr = iRawData->Des();
+		rawPtr.Append( aBinaryData );		
+		}
+	else
+		{
+	    iRawData = HBufC8::NewL( aBinaryData.Length() );
+	    TPtr8 rawPtr = iRawData->Des();
+	    rawPtr.Copy( aBinaryData );
+		}	
+
+	iRawdataLength = iRawdataLength + aBinaryData.Length();
+	}
+
+EXPORT_C void CEdidParserBase::UpdateCea861ExtensionL( TInt aNumber, CCea861EdidParser* aParser )
+	{
+	FUNC_LOG;
+
+    TInt ext = GetExtensionType( aNumber );
+    switch( ext )
+        {
+        case ECea861Ext:
+            {
+            // CEA 861 extension
+			if( aParser )
+				{
+				aParser->ParseExtensionBlockL( iExtensionData );
+				}
+            break;
+            }
+        default:
+            {
+            // Not supported
+            break;
+            }
+        }
+	}
+
 // ---------------------------------------------------------------------------
 // CEdidParserBase::GetChecksum
 // ---------------------------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h	Tue Jul 13 15:17:31 2010 +0100
@@ -173,6 +173,16 @@
      */
     TInt GetHdcpSupportStatus( TBool& aHdcpSupport ) const;
 
+    /**
+     * Update overscan values from cenrep.
+     * 
+     * @param None.
+     * @return None.
+     */
+    void UpdateOverscanValues();
+    
+	void GetCurrentOverscanValue( TInt& aHOverscan, TInt& aVOverscan );
+
 private:
 
     /**
@@ -347,14 +357,6 @@
      */
     void CalculateOverscan( TPoint& aTLCorner, TPoint& aBRCorner ) const;
     
-    /**
-     * Update overscan values from cenrep.
-     * 
-     * @param None.
-     * @return None.
-     */
-    void UpdateOverscanValues();
-    
 	/**
 	 * Filter out the unsupported TV configurations.
 	 * 
@@ -411,6 +413,12 @@
     
     // Request ID
     TRequestTypeID iRequestID;
+
+	// Number of extensions to read
+	TInt inbrOfExtensions;
+
+	// Current EDID block
+	TInt iCurrentBlock;
     };
 
 #endif // C_EDIDHANDLER_H
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h	Tue Jul 13 15:17:31 2010 +0100
@@ -444,6 +444,10 @@
 
 	// Flag to indicate the change of overscan
 	TBool iOverScanSettingsChanged;
+
+    // Current overscan value
+	TInt iHOverscanValue;
+	TInt iVOverscanValue;
 	
     };
 
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -125,9 +125,6 @@
     RArray<TTvSettings> analogConfigs;
     RArray<THdmiDviTimings> hdmiConfigs;
     
-    // Update overscan values from cenrep
-    UpdateOverscanValues();
-
     // Set video parameters
     INFO( "--------------------------------------------------------------------" );
     INFO( "SETTING CEA AND DMT TIMINGS:" );
@@ -177,6 +174,9 @@
     iEdidParserPtr = NULL;
     delete iExtensionParserPtr;
     iExtensionParserPtr = NULL;
+
+	iCurrentBlock = 0;
+	inbrOfExtensions = 0;
     }
 
 //------------------------------------------------------------------------------
@@ -519,26 +519,81 @@
         {
         case EDdcReadRequest:
             {
-            if( KErrNone == iStatus.Int() )
-                {
-                TPtrC8
-                    dataBlockDes( iDataBlockPtr->iDataBlock, sizeof( *iDataBlockPtr ) );
-                iEdidParserPtr = CEdidParserBase::NewL( dataBlockDes );
-                TInt nbrOfExtensions = iEdidParserPtr->GetNumberOfExtensions();
-                for( TInt i = 0; i < nbrOfExtensions; ++i )
-                    {
-                    if( ECea861Ext == iEdidParserPtr->GetExtensionType( i + 1 ) )
-                        {
-                        INFO_1( "ECea861Ext extension data block number: %d", ( i+1 ) );
-                        iExtensionParserPtr
-                            = iEdidParserPtr->CreateCea861ExtensionParserL( i + 1 );
-                        break;
-                        }
-                    }
-                INFO_1( "Data block count in nbrOfExtensions: %d", nbrOfExtensions );
-                iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
-                iRetryCounter = KErrNone;
-                }
+			if( KErrNone == iStatus.Int() )
+				{				
+				if( iCurrentBlock == 0 )
+					{
+					TPtrC8 dataBlockDes( iDataBlockPtr->iDataBlock, sizeof( *iDataBlockPtr ) );
+					
+					iEdidParserPtr = CEdidParserBase::NewL( dataBlockDes );
+					inbrOfExtensions = iEdidParserPtr->GetNumberOfExtensions();
+
+					INFO_1( "No. of extensions from Block 0: %d", inbrOfExtensions );
+
+					if( inbrOfExtensions )
+						{
+						inbrOfExtensions--;
+						}
+ 					}
+				else
+					{
+					TPtrC8 dataBlockDes( iDataBlockPtr->iDataBlock, sizeof( *iDataBlockPtr ) );
+
+					INFO_1( "Updating the Rawdata for the Block %d...", iCurrentBlock );
+					iEdidParserPtr->UpdateRawDataL(dataBlockDes);
+					
+					iCurrentBlock++;
+					if( inbrOfExtensions >= 2 )
+						{
+ 						inbrOfExtensions = inbrOfExtensions - 2;
+						}
+					else
+						{
+						inbrOfExtensions--;
+						}
+  					}
+
+				if( inbrOfExtensions )
+					{
+					iRetryCounter = KErrNone;
+					
+					if( ReadEDIDDataL() != KErrNone )
+						{
+						ResetData();
+						iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetchFailed );
+						}
+					}
+				else
+					{
+					TInt extensions = iEdidParserPtr->GetNumberOfExtensions();
+
+					INFO_1( "No. of extensions from Block 0: %d", extensions );
+					
+					for( TInt i = 0; i < extensions; ++i )
+						{
+						if( ECea861Ext == iEdidParserPtr->GetExtensionType( i + 1 ) )
+							{
+							INFO_1( "ECea861Ext extension data block number: %d", ( i+1 ) );
+							if( !iExtensionParserPtr )
+								{
+								INFO( "First CEA 861 extension is being read..." );
+								iExtensionParserPtr
+									= iEdidParserPtr->CreateCea861ExtensionParserL( i + 1 );
+								}
+							else
+								{
+								INFO_1( "CEA 861 extension is being read... at the index %d", i+1 );
+								iEdidParserPtr->UpdateCea861ExtensionL( i + 1, iExtensionParserPtr );
+								}
+ 							}
+						}
+					}
+
+				TRACE_EDID_DATA( *iEdidParserPtr );
+				
+				iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
+				iRetryCounter = KErrNone;
+				}
             else
                 {
                 INFO_1( "CDdcPortAccess::Read failed, error code: %d", iStatus.Int() );
@@ -625,8 +680,19 @@
         {
         iDataBlockPtr = new(ELeave) TDataBlock;
         }
+	else if( inbrOfExtensions )
+		{
+		if( iDataBlockPtr )
+			{
+			delete iDataBlockPtr;
+			iDataBlockPtr = NULL;
+			}
+		iDataBlockPtr = new(ELeave) TDataBlock;
+		}
+
+	INFO_1( "Reading EDID block %d...", iCurrentBlock );
     
-    retVal = iDdcPortAccess->Read( EMonitorPort, 0, // First block contains EDID data if that exists
+    retVal = iDdcPortAccess->Read( EMonitorPort, iCurrentBlock, // First block contains EDID data if that exists
         iDataBlockPtr->iDataBlock,
         iStatus );
         
@@ -1508,6 +1574,16 @@
 	return retVal;
     }
 
+void CEDIDHandler::GetCurrentOverscanValue( TInt& aHOverscan, TInt& aVOverscan )
+	{
+	FUNC_LOG;
+	
+	aHOverscan = iHOverscan;
+	aVOverscan = iVOverscan;
+
+	INFO_2("Overscan used: %d, %d", iHOverscan, iVOverscan);
+	}
+
 //------------------------------------------------------------------------------
 // C++ constructor
 //------------------------------------------------------------------------------
@@ -1518,7 +1594,9 @@
     iFSM( aFSM ),
     iTVOutConfigForHDMI( aTVOutConfigForHDMI ),
     iRetryCounter( 0 ),
-    iRequestID( EUndefRequest )
+    iRequestID( EUndefRequest ),
+    inbrOfExtensions( 0 ),
+    iCurrentBlock( 0 )
     {
     FUNC_LOG;
     }
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -99,7 +99,9 @@
     if ( KCRUidTvoutSettings == aRepositoryId )
         {
         if ( KSettingsTvoutVerticalOverscan == aId  )
-            {
+            {            
+			INFO("Cenrep Value Changed");
+			iEDIDHandler.UpdateOverscanValues();
             Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged );
             }
         else
@@ -111,6 +113,7 @@
         {
         INFO_1("Unexpected Central Repository ID, aRepositoryId 0x%x", aRepositoryId);
         }
+
     }
 
 // ---------------------------------------------------------------------------
@@ -151,6 +154,11 @@
     FUNC_LOG;
     TInt retVal( KErrNone );
 	iOverScanSettingsChanged = EFalse;
+
+	// Get the current overscan value
+	iEDIDHandler.UpdateOverscanValues();
+	iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
+	
     iCopyProtectListenFailCounter.iCount = 0;
     iTVOutConfigForCopyProtect->ResetLatestRecordedCopyProtectionStatus();
     retVal = iEDIDHandler.FetchEDIDData();
@@ -393,6 +401,9 @@
                         }
                     else
                         {
+						// Update the current overscan value
+						iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
+						
                         TFSMEventId event = iTVOutConfigForHDMI.ListenHDMICableStatusIfNoMissedEvents();
                         if ( EIfTVOutConfigEventCableDisconnected == event )
                             {
@@ -704,7 +715,7 @@
                 iSubState = ESubStateConnected;
                 ListenCopyProtectionStatusChanges();
                 iTVOutConfigForSettingChanges->ListenSettingsChanges();
-				iCRWatchForVOverScan->Watch();
+				iCRWatchForVOverScan->Watch();				
                 }
             }
         else if ( EPDEIfAccessoryControlEventConnectFailed == aEvent )
@@ -956,6 +967,13 @@
             {
             INFO( "Event: EIfTVOutConfigEventSettingsChangesListenStarted" );
             // Everything is OK. Stay in the same state.
+			// Should not miss the cenrep value change
+			TInt newOverScanValue = 0;
+			iCRWatchForVOverScan->GetCurrentValue(newOverScanValue);
+			if( iVOverscanValue != newOverScanValue )
+				{
+				Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged );
+				}
             }
         else if ( EIfTVOutConfigEventSettingsChangesListenFailed == aEvent )
             {
@@ -981,17 +999,18 @@
         if ( EPDEIfCentralRepositoryWatchEventKeyChanged == aEvent )
             {
             INFO( "Event: EPDEIfCentralRepositoryWatchEventKeyChanged" );
-
+			
 			// Get the available config
 			THdmiDviTimings curConfig;
 			
 			iTVOutConfigForHDMI.GetTvOutConfig()->GetConfig( curConfig );
 
 			if( (TTvSettings::EHDMI == curConfig.iConnector) && (!curConfig.iUnderscanEnabled) )
-				{					
+				{									
 				// Clear the available config				
 				ClearAvailableTvOutConfig();
-
+				iCRWatchForVOverScan->Cancel();
+				
 				TInt retVal = iEDIDHandler.SetVideoParameters();
 				if ( KErrNone != retVal )
 					{
@@ -1002,6 +1021,9 @@
 					}
 				else
 					{
+					// Update the current overscan value
+					iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
+					
 					TFSMEventId event = iTVOutConfigForHDMI.ListenHDMICableStatusIfNoMissedEvents();
 					if ( EIfTVOutConfigEventCableDisconnected == event )
 						{
@@ -1016,7 +1038,7 @@
 						iSubState = ESubStateWaitForSettingsChanged;
 						}
 					}				
-				}
+				}			
             }
         else
             {
@@ -1053,16 +1075,43 @@
             if ( EIfTVOutConfigEventCableDisconnected == event )
                 {
                 INFO( "Retreating back to <Idle> since cable was disconnected while WF setting changes!" );        
+				
+                // Stop listening Copy Protection status
+                iTVOutConfigForCopyProtect->Cancel();
+                // Stop listen setting changes
                 iTVOutConfigForSettingChanges->Cancel();
-                iHDMICableStatusFSM.Transit( EHDMICableStateIdle );         
+				iCRWatchForVOverScan->Cancel();
+
+				if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+					{
+					iSubState = ESubStateIdlingDisable;
+					iTVOutConfigForHDMI.Disable();			  
+					}
+				else
+					{
+					iHDMICableStatusFSM.Transit( EHDMICableStateIdle ); 		
+					}
                 }            
              }
         else if ( EIfTVOutConfigEventCableDisconnected == aEvent )
             {
             INFO( "Event: EIfTVOutConfigEventCableDisconnected" );
             INFO( "Retreating back to <Idle> since cable was disconnected while WF setting changes!" );
-            iTVOutConfigForSettingChanges->Cancel();
-            iHDMICableStatusFSM.Transit( EHDMICableStateIdle );         
+			// Stop listening Copy Protection status
+			iTVOutConfigForCopyProtect->Cancel();
+			// Stop listen setting changes
+			iTVOutConfigForSettingChanges->Cancel();
+			iCRWatchForVOverScan->Cancel();
+			
+			if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+				{
+				iSubState = ESubStateIdlingDisable;
+				iTVOutConfigForHDMI.Disable();			  
+				}
+			else
+				{
+				iHDMICableStatusFSM.Transit( EHDMICableStateIdle ); 		
+				}
             }
         else if ( EIfTVOutConfigEventSettingsChanged == aEvent )
             {
@@ -1090,7 +1139,20 @@
             {
             INFO( "Event: EIfTVOutConfigEventSettingsChangesListenFailed" );
             INFO( "Going to state <Rejected> since setting changes listening failed!" );        
-            iHDMICableStatusFSM.Transit( EHDMICableStateRejected );         
+			// Stop listening Copy Protection status
+			iTVOutConfigForCopyProtect->Cancel();
+			// Stop listen setting changes
+			iCRWatchForVOverScan->Cancel();
+			
+			if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+				{
+				iSubState = ESubStateIdlingDisable;
+				iTVOutConfigForHDMI.Disable();			  
+				}
+			else
+				{
+				iHDMICableStatusFSM.Transit( EHDMICableStateRejected ); 		
+				}
             }
         else
             {
diff -r 5ced40f3c181 -r a616a19c9ce0 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -221,6 +221,7 @@
     if  ( iLastRecordedCopyProtectEnabledStatus != currentCopyProtectStatus )
         {
         INFO("Copy Protection status changed while not listening.");
+		iLastRecordedCopyProtectEnabledStatus = currentCopyProtectStatus;
         retStruct.iFSMEventId = EIfTVOutConfigEventSetCopyProtectStatusChanged;
         }
     else if ( !IsActive() )
diff -r 5ced40f3c181 -r a616a19c9ce0 commonservices/PlatformEnv/rom/PlatformEnv.iby
--- a/commonservices/PlatformEnv/rom/PlatformEnv.iby	Fri May 28 14:18:28 2010 +0100
+++ b/commonservices/PlatformEnv/rom/PlatformEnv.iby	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -22,10 +22,12 @@
 file=ABI_DIR\BUILD_DIR\PlatformEnv.dll       SHARED_LIB_DIR\PlatformEnv.dll
 
 #ifdef FF_USE_MASS_STORAGE_CONFIG
-patchdata PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage 5 // EDriveF
-patchdata PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 4 // EDriveE
+patchdata PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE
+patchdata PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1
 #endif // FF_USE_MASS_STORAGE_CONFIG
 
+patchdata PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START
+
 file=ABI_DIR\BUILD_DIR\disknotifyhandler.dll SHARED_LIB_DIR\disknotifyhandler.dll
 file=ABI_DIR\BUILD_DIR\sysversioninfo.dll    SHARED_LIB_DIR\sysversioninfo.dll
 file=ABI_DIR\BUILD_DIR\platformver.dll       SHARED_LIB_DIR\platformver.dll
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_api/inc/AccessoryConnection.h
--- a/devicesrv_plat/accessory_api/inc/AccessoryConnection.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_api/inc/AccessoryConnection.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,7 +21,7 @@
 #define RACCESSORYCONNECTION_H
 
 //  INCLUDES
-#include "accessoryconnectionbase.h"
+#include "AccessoryConnectionBase.h"
 
 // FORWARD DECLARATIONS
 class TAccPolGenericIDArray;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h
--- a/devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,9 +21,9 @@
 #define RACCESSORYCONNECTIONBASE_H
 
 //  INCLUDES
-#include <accessorysubsessionbase.h>
-#include <accpolnamerecord.h>
-#include <accessorytypes.h>
+#include <AccessorySubsessionBase.h>
+#include <AccPolNameRecord.h>
+#include <AccessoryTypes.h>
 
 // FORWARD DECLARATIONS
 class CAccPolSubblockNameArray;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_api/inc/AccessoryMode.h
--- a/devicesrv_plat/accessory_api/inc/AccessoryMode.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_api/inc/AccessoryMode.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,9 +21,9 @@
 #define RACCESSORYMODE_H
 
 //  INCLUDES
-#include <accessorysubsessionbase.h>
-#include <accpolaccessorymode.h>
-#include <accessorytypes.h>
+#include <AccessorySubsessionBase.h>
+#include <AccPolAccessoryMode.h>
+#include <AccessoryTypes.h>
 
 // FORWARD DECLARATIONS
 class RAccessoryServer;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h
--- a/devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,7 +21,7 @@
 #define RACCESSORYSINGLECONNECTION_H
 
 //  INCLUDES
-#include "accessoryconnectionbase.h"
+#include "AccessoryConnectionBase.h"
 
 
 // FORWARD DECLARATIONS
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_api/inc/AccessoryTypes.h
--- a/devicesrv_plat/accessory_api/inc/AccessoryTypes.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_api/inc/AccessoryTypes.h	Tue Jul 13 15:17:31 2010 +0100
@@ -20,10 +20,10 @@
 #define ACCESSORYTYPES_H
 
 //  INCLUDES
-#include <accpolgenericid.h>
-#include <accpolgenericidarray.h>
-#include <accpolaccessorymode.h>
-#include <accpolnamerecord.h>
+#include <AccPolGenericID.h>
+#include <AccPolGenericIDArray.h>
+#include <AccPolAccessoryMode.h>
+#include <AccPolNameRecord.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h
--- a/devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h	Tue Jul 13 15:17:31 2010 +0100
@@ -20,7 +20,7 @@
 #define RACCESSORYAUDIOCONTROL_H
 
 //  INCLUDES
-#include <accessorycontrol.h>
+#include <AccessoryControl.h>
 
 
 // CLASS DECLARATION
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h
--- a/devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,7 +21,7 @@
 #define RACCESSORYBTCONTROL_H
 
 //  INCLUDES
-#include <accessorycontrol.h>
+#include <AccessoryControl.h>
 #include <bttypes.h>//TBTDevAddr
 
 // DATA TYPES
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h
--- a/devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,7 +21,7 @@
 #define ACCMODESETTINGARRAY_H
 
 //  INCLUDES
-#include <accmodesetting.h>
+#include <AccModeSetting.h>
 
 // CONSTANTS
 // Maximum number of settings TAccModeSettingArray can store.
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_control_api/inc/AccessoryControl.h
--- a/devicesrv_plat/accessory_control_api/inc/AccessoryControl.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_control_api/inc/AccessoryControl.h	Tue Jul 13 15:17:31 2010 +0100
@@ -20,7 +20,7 @@
 #define RACCESSORYCONTROL_H
 
 //  INCLUDES
-#include <accessoryconnection.h>
+#include <AccessoryConnection.h>
 
 // FORWARD DECLARATIONS
 class TAccPolGenericID;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_control_api/inc/AccessorySettings.h
--- a/devicesrv_plat/accessory_control_api/inc/AccessorySettings.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_control_api/inc/AccessorySettings.h	Tue Jul 13 15:17:31 2010 +0100
@@ -22,11 +22,11 @@
 
 //  INCLUDES
 #include <e32std.h>
-#include <accpolaccessorymode.h>
-#include <accmodesetting.h>
-#include <accmodesettingarray.h>
-#include "accessorysubsessionbase.h"
-#include "accessoryserver.h"
+#include <AccPolAccessoryMode.h>
+#include <AccModeSetting.h>
+#include <AccModeSettingArray.h>
+#include "AccessorySubsessionBase.h"
+#include "AccessoryServer.h"
 
 // FORWARD DECLARATIONS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h
--- a/devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h	Tue Jul 13 15:17:31 2010 +0100
@@ -20,8 +20,8 @@
 #define ASYCMDTYPES_H
 
 // INCLUDES
-#include <accpolnamerecord.h>
-#include <accpolgenericid.h>
+#include <AccPolNameRecord.h>
+#include <AccPolGenericID.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h
--- a/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h	Tue Jul 13 15:17:31 2010 +0100
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <accpolgidheader.h> 
+#include <AccPolGIDHeader.h> 
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h
--- a/devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h	Tue Jul 13 15:17:31 2010 +0100
@@ -23,7 +23,7 @@
 #define CACCCONGENERICID_H
 
 //  INCLUDES
-#include <accpolgenericid.h>
+#include <AccPolGenericID.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h
--- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h	Tue Jul 13 15:17:31 2010 +0100
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <accpolcommonnamevaluepairs.h>
+#include <AccPolCommonNameValuePairs.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h
--- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h	Tue Jul 13 15:17:31 2010 +0100
@@ -26,8 +26,8 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <accpolnamerecord.h>
-#include <accpolvaluerecord.h>
+#include <AccPolNameRecord.h>
+#include <AccPolValueRecord.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h
--- a/devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h	Tue Jul 13 15:17:31 2010 +0100
@@ -21,8 +21,8 @@
 
 
 // INCLUDES
-#include <psvariables.h>
-#include <dossvrservices.h>
+#include <PSVariables.h>
+#include <DosSvrServices.h>
 
 
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h
--- a/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h	Tue Jul 13 15:17:31 2010 +0100
@@ -22,8 +22,8 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <accpolgenericid.h>
-#include <accpolnamevaluerecord.h>
+#include <AccPolGenericID.h>
+#include <AccPolNameValueRecord.h>
 
 // CONSTANTS
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h
--- a/devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -21,7 +21,7 @@
 
 #include <e32base.h>
 #include <bttypes.h> // THCIConnHandle, TBDAddress
-#include "dossvrservices.h" // TBTDeviceType
+#include <DosSvrServices.h> // TBTDeviceType
 
 class CDosExtensionBase;
 
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h
--- a/devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -20,7 +20,7 @@
 #ifndef __DOSEVENTMANAGER_H__
 #define __DOSEVENTMANAGER_H__
 
-#include "dossvrservices.h"
+#include <DosSvrServices.h>
 #include "doseventmanagerbase.h"
 
 /**
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h
--- a/devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-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"
@@ -21,7 +21,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include <mediatorservicedefs.h>
+#include <MediatorServiceDefs.h>
 
 // FORWARD DECLARATION
 class CMediatorCommandResponderBody;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h
--- a/devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-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"
@@ -20,7 +20,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <mediatorservicedefs.h>
+#include <MediatorServiceDefs.h>
 
 // FORWARD DECLARATIONS
 class CMediatorEventConsumerBody;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h
--- a/devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-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"
@@ -21,7 +21,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include <mediatorservicedefs.h>
+#include <MediatorServiceDefs.h>
 
 // FORWARD DECLARATION
 class CMediatorEventProviderBody;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h
--- a/devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-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"
@@ -21,7 +21,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include <mediatorservicedefs.h>
+#include <MediatorServiceDefs.h>
 
 // FORWARD DECLARATIONS
 class CMediatorNotificationsBody;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h
--- a/devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h	Tue Jul 13 15:17:31 2010 +0100
@@ -23,7 +23,7 @@
 #define CREMCONCALLHANDLINGTARGET_H
 
 //  INCLUDES
-#include <remconextensionapi.h>
+#include <RemConExtensionApi.h>
 #include <e32base.h>
 #include <remcon/remconinterfacebase.h>
 #include <remcon/remconinterfaceif.h>
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h
--- a/devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h	Tue Jul 13 15:17:31 2010 +0100
@@ -23,7 +23,7 @@
 #define CREMCONPOCTARGET_H
 
 //  INCLUDES
-#include <remconextensionapi.h>
+#include <RemConExtensionApi.h>
 #include <e32base.h>
 #include <remcon/remconinterfacebase.h>
 #include <remcon/remconinterfaceif.h>
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h
--- a/devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h	Tue Jul 13 15:17:31 2010 +0100
@@ -23,7 +23,7 @@
 #define CREMCONSYNCHRONIZATIONTARGET_H
 
 //  INCLUDES
-#include <remconextensionapi.h>
+#include <RemConExtensionApi.h>
 #include <e32base.h>
 #include <remcon/remconinterfacebase.h>
 #include <remcon/remconinterfaceif.h>
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h
--- a/devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h	Tue Jul 13 15:17:31 2010 +0100
@@ -24,7 +24,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <accmonitorinfo.h>
+#include <AccMonitorInfo.h>
 
 // FORWARD DECLARATIONS
 class MAccMonitorObserver;
diff -r 5ced40f3c181 -r a616a19c9ce0 devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h
--- a/devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h	Fri May 28 14:18:28 2010 +0100
+++ b/devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h	Tue Jul 13 15:17:31 2010 +0100
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <accmonitorcapabilities.h>
+#include <AccMonitorCapabilities.h>
 
 // FORWARD DECLARATIONS
 class CAccMonitorInfo;
@@ -212,7 +212,7 @@
     TInt iReserved2;
     };
     
-#include <accmonitorinfo.inl>    
+#include <AccMonitorInfo.inl>    
 
 #endif // ACCMONITORINFO_H
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/inc/dosclishareddata.h
--- a/dosservices/dosserver/inc/dosclishareddata.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/inc/dosclishareddata.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -23,7 +23,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 
 /**
 * Subsession that provides functionality to make a DOS side self test.
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/inc/doseventrcvservice.h
--- a/dosservices/dosserver/inc/doseventrcvservice.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/inc/doseventrcvservice.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -20,7 +20,7 @@
 #ifndef __DOSEVENTRCVSERVICE_H__
 #define __DOSEVENTRCVSERVICE_H__
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dosservice.h"
 
 class CDosWaitingEvent;
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/inc/doseventsender.h
--- a/dosservices/dosserver/inc/doseventsender.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/inc/doseventsender.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -22,7 +22,7 @@
 #ifndef __DOSEVENTSENDER_H__
 #define __DOSEVENTSENDER_H__
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 
 /**
 * Raises DosServer events from a different thread/proccess.
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/dosclieventlistener.cpp
--- a/dosservices/dosserver/src/dosclieventlistener.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/dosclieventlistener.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -17,7 +17,7 @@
 */
 
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dos_debug.h"
 #include <e32svr.h>
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/dosclieventnotifier.cpp
--- a/dosservices/dosserver/src/dosclieventnotifier.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/dosclieventnotifier.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -17,7 +17,7 @@
 */
 
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 
 //
 // ---------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/dosclieventrcv.cpp
--- a/dosservices/dosserver/src/dosclieventrcv.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/dosclieventrcv.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -17,7 +17,7 @@
 */
 
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dosclientserver.h"
 
 // ---------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/doscliextension.cpp
--- a/dosservices/dosserver/src/doscliextension.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/doscliextension.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -17,7 +17,7 @@
 */
 
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dosclientserver.h"
 #include "dos_debug.h"
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/doscliserver.cpp
--- a/dosservices/dosserver/src/doscliserver.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/doscliserver.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -18,7 +18,7 @@
 
 
 #include <e32svr.h>
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dosclientserver.h"
 #include "dosserver.h"
 #include "dos_debug.h"
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/dosserver/src/dosclisubsession.cpp
--- a/dosservices/dosserver/src/dosclisubsession.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/dosserver/src/dosclisubsession.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -17,7 +17,7 @@
 */
 
 
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include "dosclientserver.h"
 #include "dos_debug.h"
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h
--- a/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* 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"
@@ -19,7 +19,7 @@
 #ifndef __CTFDOSEVENTLISTENER_H__
 #define __CTFDOSEVENTLISTENER_H__
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 
 class CTFDosServerControl;
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h
--- a/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* 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"
@@ -19,7 +19,7 @@
 #ifndef __CTFDOSSERVERCONTROL_H__
 #define __CTFDOSSERVERCONTROL_H__
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 #include "ctfstub.h"
 #include "mtfdosservercontrol.h"
 #include "tfdosservertypes.h"
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp
--- a/dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* 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"
@@ -16,7 +16,7 @@
 */
 
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 #include "dsytesttooltrace.h"
 #include "tfdosservertypes.h"
 #include "ctfdoseventlistener.h"
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h
--- a/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2004-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"
@@ -20,7 +20,7 @@
 #ifndef __CTFDOSCONTROL_H__
 #define __CTFDOSCONTROL_H__
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 #include "dosclishareddata.h"
 #include <ctfstub.h>
 #include "mtfdoscontrol.h"
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h
--- a/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2004-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"
@@ -20,7 +20,7 @@
 #ifndef __CTFEVENTLISTENER_H__
 #define __CTFEVENTLISTENER_H__
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 
 
 
diff -r 5ced40f3c181 -r a616a19c9ce0 dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp
--- a/dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* 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"
@@ -16,7 +16,7 @@
 */
 
 
-#include <dossvrservices.h>
+#include <DosSvrServices.h>
 #include "siftrace.h"
 #include "tfdostypes.h"
 #include "ctfeventlistener.h"
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd
--- a/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd	Tue Jul 13 15:17:31 2010 +0100
@@ -19,15 +19,13 @@
 
 echo Cleaning up sensor data compensator stub...
 pushd ..\sensordatacompensatorpluginstub\group
-call bldmake bldfiles
-call abld test reallyclean
+call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test
 popd
 @echo Cleaning up sensor data compensator... Finished
 
 @echo Cleaning sensor data compensator stub part2...
 pushd ..\..\..\..\..\..\..\mw\appsupport\coreapplicationuis\sensordatacompensatorplugin\group
-call bldmake bldfiles
-call abld reallyclean
-call abld build
+call sbs REALLYCLEAN -c winscw -c armv5.generic
+call sbs -b bld.inf -c winscw -c armv5.generic
 popd
 @echo Cleaning for sensor data compensator part2... Finished
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd
--- a/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd	Tue Jul 13 15:17:31 2010 +0100
@@ -19,15 +19,13 @@
 
 echo Preparing for sensor data compensator stub...
 pushd ..\..\..\..\..\..\..\mw\appsupport\coreapplicationuis\sensordatacompensatorplugin\group
-call bldmake bldfiles
-call abld reallyclean
+call sbs REALLYCLEAN -c winscw -c armv5.generic
 popd
 @echo Preparing for sensor data compensator... Finished
 
 @echo Setting up sensor data compensator stub...
 pushd ..\sensordatacompensatorpluginstub\group
-call bldmake bldfiles
-call abld test reallyclean
-call abld test build
+call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test
+call sbs -b bld.inf -c winscw.test -c armv5.generic.test
 popd
 @echo Setting up sensor data compensator... Finished
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensorserver/src/util/sensrvproperty.cpp
--- a/sensorservices/sensorserver/src/util/sensrvproperty.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensorserver/src/util/sensrvproperty.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -356,9 +356,12 @@
     {
     API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetValue return %e" ), iRealValue ) );
 
-    __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
+    //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
 
-    aValue = iRealValue;
+    if( ESensrvRealProperty == iPropertyType )
+        aValue = iRealValue;
+    else if( ESensrvIntProperty == iPropertyType )
+        aValue = iIntValue;
     }
 
 // ---------------------------------------------------------------------------
@@ -467,9 +470,13 @@
     {
     API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetMaxValue return %e" ), iRealValueMax ) );
 
-    __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
+    //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
 
-    aMaxValue = iRealValueMax;
+    if( ESensrvRealProperty == iPropertyType )
+        aMaxValue = iRealValueMax;
+    else if ( ESensrvIntProperty == iPropertyType )
+        aMaxValue = iIntValueMax;
+    
     }
 
 // ---------------------------------------------------------------------------
@@ -480,9 +487,11 @@
     {
     API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetMinValue return %e" ), iRealValueMin ) );
 
-    __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
-
-    aMinValue = iRealValueMin;
+    //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 ));
+    if( ESensrvRealProperty == iPropertyType )
+        aMinValue = iRealValueMin;
+    else if( ESensrvIntProperty == iPropertyType )
+        aMinValue = iIntValueMin;
     }
 
 // ---------------------------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp
--- a/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -233,6 +233,7 @@
         User::After(7000000);
         }
     
+    tempChannelInfoList.Reset();
     delete tempChannelFinder;
     delete tempSensorChannel1;
     delete tempSensorChannel2;
@@ -313,6 +314,7 @@
     tempChannelFinder19->FindChannelsL( tempChannelInfoList, tempChannelInfo );
     tempChannelFinder20->FindChannelsL( tempChannelInfoList, tempChannelInfo );
     
+    tempChannelInfoList.Reset();
     delete tempChannelFinder1;
     delete tempChannelFinder2;
     delete tempChannelFinder3;
@@ -398,6 +400,7 @@
             }
         }
         
+    tempChannelInfoList.Reset();    
     delete tempChannelFinder;
     delete tempSensorChannel;
     
@@ -467,7 +470,7 @@
             }
             
         }        
-        
+    tempChannelInfoList.Reset();    
         //Checking for Magnetometer
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagnetometerXYZAxisData;
 
@@ -499,6 +502,7 @@
             }
                     
         } 
+    tempChannelInfoList.Reset();
             
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData;
 
@@ -530,7 +534,7 @@
             }
                             
         }
-            
+    tempChannelInfoList.Reset();        
     delete tempChannelFinder;
     delete tempSensorChannel1;
     delete tempSensorChannel2;
@@ -599,6 +603,7 @@
             }
             
         }        
+    tempChannelInfoList.Reset();
         
     //Checking for Magnetometer
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagnetometerXYZAxisData;
@@ -631,6 +636,7 @@
             }
                     
         } 
+    tempChannelInfoList.Reset();
             
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData;
 
@@ -673,6 +679,7 @@
         {
         returnValue = KErrNone;
         }
+    tempChannelInfoList.Reset();    
     delete tempSensorChannel1;
     delete tempSensorChannel2;
     delete tempSensorChannel3;
@@ -729,7 +736,8 @@
         //Close the channel
         tempSensorChannel1->CloseChannel();
         
-        }        
+        }
+    tempChannelInfoList.Reset();            
 
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdOrientationData;
 
@@ -763,6 +771,7 @@
             
         }
     delete tempChannelFinder;
+    tempChannelInfoList.Reset();
     //Wait for sensorserver to shutdown gracefully, it will take some time..
     User::After(30000000);    
     
@@ -799,7 +808,7 @@
             }
                 
         } 
- 
+    tempChannelInfoList.Reset();
     //Checking for Magnetometer
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagneticNorthData;
 
@@ -830,7 +839,7 @@
             ssyProcess.Close();
             }
         } 
-
+		tempChannelInfoList.Reset();
     delete tempChannelFinder;
     
     //Wait for the sensorserver to shutdown
@@ -868,6 +877,7 @@
             ssyProcess.Close();
             }
         }         
+    tempChannelInfoList.Reset();
         
     tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData;
 
@@ -899,7 +909,7 @@
             }
                         
         }
-        
+    tempChannelInfoList.Reset();    
     delete tempChannelFinder;
     
     User::After(3000000);
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd
--- a/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd	Tue Jul 13 15:17:31 2010 +0100
@@ -19,7 +19,6 @@
 
 @echo Cleaning SensorTestModuleStubs
 pushd ..\SensorTestModule\group\
-call bldmake bldfiles
-call abld test reallyclean
+call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test
 popd
 @echo Cleaning SensorTestModuleStubs Finished
\ No newline at end of file
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd
--- a/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd	Tue Jul 13 15:17:31 2010 +0100
@@ -19,8 +19,7 @@
 
 @echo Setting up SensorTestModuleStubs
 pushd ..\SensorTestModule\group\
-call bldmake bldfiles
-call abld test reallyclean
-call abld test build
+call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test
+call sbs -b bld.inf -c winscw.test -c armv5.generic.test
 popd
 @echo Setting up SensorTestModuleStubs Finished
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h
--- a/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h	Tue Jul 13 15:17:31 2010 +0100
@@ -71,6 +71,8 @@
         
         // @see CActive
         TInt RunError( TInt aError );
+	public:
+		void Start( );
         
     private: // Private data for base channel
     
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp
--- a/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -687,8 +687,11 @@
             
             // Complete transaction
             iStatus = KRequestPending;
-            SetActive();
-            CompleteTransaction( err );
+						if( !IsActive() )
+							{
+							SetActive();	
+							}
+						CompleteTransaction( err );
             break;
             }
         case ETCTransactionIdCloseChannel:
@@ -698,7 +701,10 @@
 
             // Complete transaction
             iStatus = KRequestPending;
-            SetActive();
+						if( !IsActive() )
+							{
+							SetActive();
+							}
             CompleteTransaction( KErrNone );
             break;
             }
@@ -709,7 +715,10 @@
 
             // Complete transaction
             iStatus = KRequestPending;
-            SetActive();
+						if( !IsActive() )
+							{
+							SetActive();	
+							}
             CompleteTransaction( KErrNone );
             break;
             }
@@ -720,7 +729,10 @@
 
             // Complete transaction
             iStatus = KRequestPending;
-            SetActive();
+						if( !IsActive() )
+							{
+							SetActive();	
+							}
             CompleteTransaction( KErrNone );
             break;
             }
@@ -741,7 +753,10 @@
             
             // Complete transaction
             iStatus = KRequestPending;
-            SetActive();
+						if( !IsActive() )
+							{
+							SetActive();	
+							}
             CompleteTransaction( KErrNone );
             break;
             }
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp
--- a/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -74,7 +74,10 @@
 	ret = iTimer.CreateLocal();
 	User::LeaveIfError( ret );
 	iTimerToHzLevel = aSetTimerToHzLevel;
-	TTimeIntervalMicroSeconds32 interval( KOneSecondInMicroSeconds / aSetTimerToHzLevel );
+	}
+void CTCSendEventTimer::Start()
+	{
+	TTimeIntervalMicroSeconds32 interval( KOneSecondInMicroSeconds / iTimerToHzLevel );
 		
 	if( !IsActive() )
 		{
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/tiltcompensationssy/src/tcstate.cpp
--- a/sensorservices/tiltcompensationssy/src/tcstate.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcstate.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -82,11 +82,14 @@
 // CTCState::IsSet
 // ----------------------------------------------------------------------------------
 //
-TBool CTCState::IsSet( TUint32 /*aFlag*/ )
+TBool CTCState::IsSet( TUint32 aFlag )
     {
     FUNC_LOG;
     
-    return ETrue;
+    if(iFlags & aFlag)    
+        return ETrue;
+    else
+        return EFalse;
     }
 
 // ----------------------------------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp
--- a/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -355,6 +355,7 @@
     if( !iTimerToSend )
         {
         iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this );
+		iTimerToSend->Start();
         }
     else if( iHasChanged )
         {
@@ -363,6 +364,10 @@
         iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this );
         iHasChanged = EFalse;
         }
+	else
+		{
+		iTimerToSend->Start();
+		}
     }
 
 // ----------------------------------------------------------------------------------
@@ -375,8 +380,7 @@
     
     if( iTimerToSend )
         {
-        delete iTimerToSend;
-        iTimerToSend = NULL;
+		iTimerToSend->Cancel();
         }
     }
 
diff -r 5ced40f3c181 -r a616a19c9ce0 sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist_ext.rss
--- a/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist_ext.rss	Fri May 28 14:18:28 2010 +0100
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist_ext.rss	Tue Jul 13 15:17:31 2010 +0100
@@ -565,9 +565,9 @@
      {
      priority = 0xFFA7;
      name = "z:\\sys\\bin\\taskswitcher.exe";
-     execution_behaviour = ESsmDeferredWaitForSignal;
+     execution_behaviour = ESsmDeferredWaitForSignal;     
      background = 1; // To background
-     monitor_info = r_mon_3_restarts_ignore;
+     monitor_info = r_mon_max_restarts_ignore;
      }
 
 // ---------------------------------------------------------------------------
diff -r 5ced40f3c181 -r a616a19c9ce0 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss
--- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Fri May 28 14:18:28 2010 +0100
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Tue Jul 13 15:17:31 2010 +0100
@@ -99,19 +99,15 @@
         // prio 0x7EEF
         r_cmd_activitymonitor8,
         // prio 0x7EEE
-        r_cmd_autosync,
-        // prio 0x7EED
-        r_cmd_activitymonitor9,
-        // prio 0x7EEC
-        r_cmd_mylocationsengine
+        r_cmd_autosync
 #ifdef FF_ATT_ADDRESS_BK
         //prio 0x7EEA
-        ,r_cmd_activitymonitor10,
+        ,r_cmd_activitymonitor9,
         //prio 0x7EE9
         r_cmd_aab
 #endif
 		// prio 0x7EE8
-		,r_cmd_activitymonitor11,
+		,r_cmd_activitymonitor10,
 		// prio 0x7EE7
 		r_cmd_calendar //CR:MMUN-82ZHAD
     	};
@@ -256,24 +252,9 @@
 // r_cmd_activitymonitor9
 // ---------------------------------------------------------------------------
 //
+#ifdef FF_ATT_ADDRESS_BK
 RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9
     {
-    priority = 0x7EED;
-    severity = ECmdCriticalSeverity;
-    execution_behaviour = ESsmWaitForSignal;
-    dllname = "ssmactivitycmd.dll";
-    ordinal = 1; // SsmActivityCmdNewL
-    retries = 2;
-    dll_data = r_dlldata_activitymonitor_timeout;
-    }
-	
-// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor10
-// ---------------------------------------------------------------------------
-//
-#ifdef FF_ATT_ADDRESS_BK
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
-    {
     priority = 0x7EEA;
     severity = ECmdCriticalSeverity;
     execution_behaviour = ESsmWaitForSignal;
@@ -285,10 +266,10 @@
 #endif
 
 // ---------------------------------------------------------------------------
-// r_cmd_activitymonitor11
+// r_cmd_activitymonitor10
 // ---------------------------------------------------------------------------
 //
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor11
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
     {
     priority = 0x7EE8;
     severity = ECmdCriticalSeverity;
@@ -364,17 +345,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// r_cmd_mylocationsengine
-// ---------------------------------------------------------------------------
-//	
-RESOURCE SSM_START_PROCESS_INFO r_cmd_mylocationsengine
-    {
-    priority = 0x7EEC;
-    name = "z:\\sys\\bin\\mylocationsengine.exe";
-    execution_behaviour = ESsmFireAndForget;
-    }
-
-// ---------------------------------------------------------------------------
 // r_cmd_pbk2
 // ---------------------------------------------------------------------------
 //
diff -r 5ced40f3c181 -r a616a19c9ce0 sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp
--- a/sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -294,6 +294,9 @@
 	if(iConnected)
 		{
 		iDomainManager.CancelTransition();
+		// Close domain manager connection
+		iDomainManager.Close();
+		iConnected = EFalse;
 		}
 	}
 
diff -r 5ced40f3c181 -r a616a19c9ce0 sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp	Fri May 28 14:18:28 2010 +0100
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp	Tue Jul 13 15:17:31 2010 +0100
@@ -26,6 +26,7 @@
 #include "ssmsecuritychecknotifier.h"
 #include "ssmdebug.h"
 #include "ssmuiproviderdll.h"
+#include "ssmrefcustomcmdcommon.h"
 #include <ssm/ssmstateawaresession.h>
 #include <e32def.h>
 #include <startupdomaindefs.h>
@@ -200,21 +201,27 @@
 	//Get the current state of the system
 	TSsmState currentState = ssmStateAwareSession.State();
 
+	//Close the state aware session
+	ssmStateAwareSession.Close();
+
 	TBool isDlgCancellable;
 
 	//Is system in start up state
 	if ( currentState.MainState() == ESsmStartup )
 		{
+		TInt securityPhaseVal = EStarterSecurityPhaseUninitialized;
+		TInt errorCode = RProperty::Get(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, securityPhaseVal);
+		DEBUGPRINT3A("Getting the KStarterSecurityPhase completed with errorcode %d and its value is %d", errorCode, securityPhaseVal);
+		User::LeaveIfError(errorCode);
+
 		//TSsmStartupSubStateExt::ESsmStateNonCritical
-		iAfterStartup = ( 0x34 == currentState.SubState() ) ? ETrue : EFalse;
+		iAfterStartup = ( 0x34 == currentState.SubState() && securityPhaseVal > EStarterSecurityPhaseSimNok ) ? ETrue : EFalse;
 		}
 	else
 		{
 		iAfterStartup = ETrue;
 		}
-	
-	//Close the state aware session
-	ssmStateAwareSession.Close();
+	DEBUGPRINT2A("iAfterStartup is %d", iAfterStartup);
 
 	//Notifier dialogue is not cancellable if system is in startup state and
 	//requested for PUK1 or PUK2 or UPUK code