# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277311112 -10800 # Node ID 2c28af13864053e9b202f98278fffae2a458f047 # Parent f7565e9c9ce804d143c554775e1cbfbd124e7e24 Revision: 201025 Kit: 2010125 diff -r f7565e9c9ce8 -r 2c28af138640 accessoryservices/group/bld.inf --- a/accessoryservices/group/bld.inf Fri Jun 11 14:56:08 2010 +0300 +++ b/accessoryservices/group/bld.inf Wed Jun 23 19:38:32 2010 +0300 @@ -26,6 +26,7 @@ #include "../accessoryremotecontrol/group/bld.inf" #include "../accessoryserver/group/bld.inf" #include "../pluggeddisplay/group/bld.inf" +#include "../remotecontrolfw/group/bld.inf" #include "../headsetstatusapi/Group/bld.inf" #include "../tspclientmapper/group/bld.inf" #include "../gid_pc_tool/group/bld.inf" diff -r f7565e9c9ce8 -r 2c28af138640 accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h Fri Jun 11 14:56:08 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/edidhandler.h Wed Jun 23 19:38:32 2010 +0300 @@ -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. * diff -r f7565e9c9ce8 -r 2c28af138640 accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h Fri Jun 11 14:56:08 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/hdmicablestateconnected.h Wed Jun 23 19:38:32 2010 +0300 @@ -444,6 +444,10 @@ // Flag to indicate the change of overscan TBool iOverScanSettingsChanged; + + // Current overscan value + TInt iHOverscanValue; + TInt iVOverscanValue; }; diff -r f7565e9c9ce8 -r 2c28af138640 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Fri Jun 11 14:56:08 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Wed Jun 23 19:38:32 2010 +0300 @@ -125,9 +125,6 @@ RArray analogConfigs; RArray hdmiConfigs; - // Update overscan values from cenrep - UpdateOverscanValues(); - // Set video parameters INFO( "--------------------------------------------------------------------" ); INFO( "SETTING CEA AND DMT TIMINGS:" ); @@ -1508,6 +1505,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 //------------------------------------------------------------------------------ diff -r f7565e9c9ce8 -r 2c28af138640 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Fri Jun 11 14:56:08 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Wed Jun 23 19:38:32 2010 +0300 @@ -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 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 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 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 f7565e9c9ce8 -r 2c28af138640 commonservices/group/bld.inf --- a/commonservices/group/bld.inf Fri Jun 11 14:56:08 2010 +0300 +++ b/commonservices/group/bld.inf Wed Jun 23 19:38:32 2010 +0300 @@ -22,9 +22,11 @@ PRJ_MMPFILES +#include "../activitymanager/group/bld.inf" #include "../commonengine/group/bld.inf" #include "../commonengineresources/group/bld.inf" #include "../PlatformEnv/group/bld.inf" +#include "../sysutil/group/bld.inf" PRJ_TESTMMPFILES diff -r f7565e9c9ce8 -r 2c28af138640 group/bld.inf --- a/group/bld.inf Fri Jun 11 14:56:08 2010 +0300 +++ b/group/bld.inf Wed Jun 23 19:38:32 2010 +0300 @@ -33,6 +33,7 @@ #include "../psmservices/group/bld.inf" #include "../resourcemgmt/group/bld.inf" #include "../sysstatemgmt/group/bld.inf" +#include "../systemhealthmanagement/systemhealthmgr/group/bld.inf" PRJ_TESTMMPFILES diff -r f7565e9c9ce8 -r 2c28af138640 psmservices/psmserver/inc/engine/psmstorage.h --- a/psmservices/psmserver/inc/engine/psmstorage.h Fri Jun 11 14:56:08 2010 +0300 +++ b/psmservices/psmserver/inc/engine/psmstorage.h Wed Jun 23 19:38:32 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" @@ -20,7 +20,7 @@ #define PSMSTORAGE_H #include -#include +#include #include /** diff -r f7565e9c9ce8 -r 2c28af138640 resourcemgmt/group/bld.inf --- a/resourcemgmt/group/bld.inf Fri Jun 11 14:56:08 2010 +0300 +++ b/resourcemgmt/group/bld.inf Wed Jun 23 19:38:32 2010 +0300 @@ -26,6 +26,9 @@ ../data/InternalHWRMFmTxPolicy.ini z:/private/101f7a02/customerhwrmfmtxpolicy.ini +#include "../hwresourcesmgr/group/bld.inf" +#include "../hwresourcesmgrconfig/bld.inf" +#include "../powerandmemorynotificationservice/group/bld.inf" #include "../hwrmfmtxwatcherplugin/group/bld.inf" #if defined(WINSCW) && !defined(__HWRM_TARGET_MODIFIER_PLUGIN) diff -r f7565e9c9ce8 -r 2c28af138640 sensorservices/sensorserver/src/util/sensrvproperty.cpp --- a/sensorservices/sensorserver/src/util/sensrvproperty.cpp Fri Jun 11 14:56:08 2010 +0300 +++ b/sensorservices/sensorserver/src/util/sensrvproperty.cpp Wed Jun 23 19:38:32 2010 +0300 @@ -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 f7565e9c9ce8 -r 2c28af138640 sysstatemgmt/group/bld.inf --- a/sysstatemgmt/group/bld.inf Fri Jun 11 14:56:08 2010 +0300 +++ b/sysstatemgmt/group/bld.inf Wed Jun 23 19:38:32 2010 +0300 @@ -31,6 +31,10 @@ #include "../ssmcustcmds/group/bld.inf" #include "../syslangutil/group/bld.inf" #include "../sysrestart/group/bld.inf" +#include "../systemstarter/group/bld.inf" +#include "../systemstatemgr/group/bld.inf" +#include "../systemstatereferenceplugins/group/bld.inf" +#include "../systemstateplugins/group/bld.inf" #include "../sysuiprovider/group/bld.inf" diff -r f7565e9c9ce8 -r 2c28af138640 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss --- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Fri Jun 11 14:56:08 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Wed Jun 23 19:38:32 2010 +0300 @@ -68,6 +68,10 @@ { // prio 0xFFF1 r_cmd_publishswp, + //prio 0x7EF9 + r_cmd_activitymonitor_hsrunningapp, + //prio 0x7EF8 + r_cmd_hsrunningappmonitor, //JJAA-85CDEA // prio 0x7EF7 r_cmd_activitymonitor1, // prio 0x7EF6 @@ -134,6 +138,21 @@ #endif // --------------------------------------------------------------------------- +// r_cmd_activitymonitor_hsrunningapp +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor_hsrunningapp + { + priority = 0x7EF9; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- // r_cmd_activitymonitor1 // --------------------------------------------------------------------------- // @@ -298,6 +317,18 @@ execution_behaviour = ESsmWaitForSignal; } +// --------------------------------------------------------------------------- +// r_cmd_hsrunningappmonitor +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_hsrunningappmonitor + { + priority = 0x7EF8; + name = "z:\\sys\\bin\\hsrunningappmonitor.exe"; + execution_behaviour = ESsmWaitForSignal; + monitor_info = r_mon_3_restarts_ignore; + } + // --------------------------------------------------------------------------- // r_cmd_msgnotifier diff -r f7565e9c9ce8 -r 2c28af138640 sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp --- a/sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp Fri Jun 11 14:56:08 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/cmd/src/cmdpublishsystemstate.cpp Wed Jun 23 19:38:32 2010 +0300 @@ -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; } }