# HG changeset patch # User hgs # Date 1280475289 -10800 # Node ID 48a00b70dc491ffdcf6bbcb6301f55310ea3db5d # Parent 86cf7a1b7eb9a03583e6078e9599ce6c8e0a46bd 201029 diff -r 86cf7a1b7eb9 -r 48a00b70dc49 accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp --- a/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp Fri Jul 16 11:04:43 2010 +0300 +++ b/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp Fri Jul 30 10:34:49 2010 +0300 @@ -600,7 +600,8 @@ TCEA861TEdidDescriptorBlockList* lastnode = iParsedInfo->iDescriptorBlocks; - for( TInt index = aIndex; index < KEdidParserSizeOfEdidBlock; index++ ) + TInt index = aIndex; + while( index < KEdidParserSizeOfEdidBlock ) { // Offset. If this is a newer version of CEA-861, // then this is skipped (we are already past the offset) @@ -635,6 +636,7 @@ else { // this is only padding, no need to do anything + index++; } // after the descriptors there is padding to fill Extension block to 128 bytes. diff -r 86cf7a1b7eb9 -r 48a00b70dc49 accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -66,6 +66,7 @@ LIBRARY accclient.lib LIBRARY efsrv.lib LIBRARY fbscli.lib +LIBRARY sysutil.lib #ifdef TRACE_INTO_FILE LIBRARY flogger.lib diff -r 86cf7a1b7eb9 -r 48a00b70dc49 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Fri Jul 16 11:04:43 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Fri Jul 30 10:34:49 2010 +0300 @@ -25,6 +25,7 @@ #include #include #include +#include #include "pdeconstants.h" #include "tvoutconfigforhdmi.h" @@ -770,7 +771,65 @@ } Mem::FillZ( ( TAny* )&aTimings.iProductName, ( sizeof( TChar ) * KProductNameChars ) ); Mem::FillZ( ( TAny* )&aTimings.iProductDescription, ( sizeof( TChar ) * KProductDescriptorsChars ) ); - aTimings.iSourceType = THdmiDviTimings::ESourceTypeUnknown; + + TInt err = KErrNone; + CDeviceTypeInformation* deviceTypeInfo = NULL; + TRAP(err, deviceTypeInfo = SysUtil::GetDeviceTypeInfoL()); + + if(KErrNone == err) + { + #define MAX(a, b) (((a)>(b)) ? (a) : (b)) + #define MIN(a, b) (((a)<(b)) ? (a) : (b)) + + TPtrC16 bufPtrModelCode; + TPtrC16 bufPtrManufacturerName; + TUint loopCount; + TUint maxLen; + TUint maxCharsLen; + TUint minNameCharsLen; + TUint minDescritopCharsLen; + + deviceTypeInfo->GetManufacturerName(bufPtrManufacturerName); + deviceTypeInfo->GetModelCode(bufPtrModelCode); + maxLen = MAX(bufPtrModelCode.Length(),bufPtrManufacturerName.Length()); + maxCharsLen = MAX(KProductNameChars,KProductDescriptorsChars); + minNameCharsLen = MIN(KProductNameChars, bufPtrModelCode.Length()); + minDescritopCharsLen = MIN(KProductDescriptorsChars, bufPtrManufacturerName.Length()); + + INFO_1( "maxLen : %d", maxLen); + INFO_1( "maxCharsLen : %d", maxCharsLen); + INFO_1( "minNameCharsLen : %d", minNameCharsLen); + INFO_1( "minDescritopCharsLen : %d", minDescritopCharsLen); + + for(loopCount = 0; loopCount < maxLen; loopCount++) + { + if(loopCount >= maxCharsLen) + { + break; + } + else + { + if(loopCount < minNameCharsLen) + { + aTimings.iProductName[loopCount] = bufPtrModelCode[loopCount]; + INFO_1( "aTimings.iProductName : %d", aTimings.iProductName[loopCount].GetLowerCase()); + } + if(loopCount < minDescritopCharsLen) + { + aTimings.iProductDescription[loopCount] = bufPtrManufacturerName[loopCount]; + INFO_1( "aTimings.iProductDescription : %d", aTimings.iProductDescription[loopCount].GetLowerCase()); + } + } + } + INFO("Before Deleting Pointer deviceTypeInfo"); + delete deviceTypeInfo; + INFO("After Deleting Pointer deviceTypeInfo"); + aTimings.iSourceType = THdmiDviTimings::ESourceTypePCGeneral; + } + else + { + aTimings.iSourceType = THdmiDviTimings::ESourceTypeUnknown; + } } //------------------------------------------------------------------------------ @@ -1556,6 +1615,30 @@ else // It is DVI connector { TInt modecount = aHdmiConfigs.Count(); + + if( !modecount ) + { + THdmiDviTimings timings; + + INFO( "==No EDID available from the Sink. Setting DMT 4" ); + // No EDID data available from the sink + // Default VGA resolution should be selected + const TTimingItem* item = TimingByIndex( KDefaultDMTModeIndex, ETimingModeDMT ); + if( item ) + { + Mem::FillZ( ( TAny* )&timings, sizeof( timings ) ); + FillHdmiDviTimings( *item, timings ); + timings.iTvPhysicalImageAspectRatioNumerator = 4; + timings.iTvPhysicalImageAspectRatioDenominator = 3; + retVal = aHdmiConfigs.Append( timings ); + ERROR_1( retVal, "Failed to append DMT timing: %S in array", item->iTimingName ); + if( retVal == KErrNone ) + { + modecount = 1; + ceaMode = EFalse; + } + } + } while( modecount-- ) { diff -r 86cf7a1b7eb9 -r 48a00b70dc49 accessoryservices/remotecontrolfw/server/group/remconserver.mmp --- a/accessoryservices/remotecontrolfw/server/group/remconserver.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/accessoryservices/remotecontrolfw/server/group/remconserver.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 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" @@ -30,6 +30,10 @@ UID 0x0 0x101f9067 VENDORID 0x70000001 +// Non-default stack size to allow for plugins which use Qt APIs. +// (The value is a standard for Symbian Qt apps, generated by qmake.) +EPOCSTACKSIZE 0x14000 + SOURCEPATH ../src SOURCE activehelper.cpp SOURCE bearermanager.cpp diff -r 86cf7a1b7eb9 -r 48a00b70dc49 commonservices/commonengine/config/export.mk --- a/commonservices/commonengine/config/export.mk Fri Jul 16 11:04:43 2010 +0300 +++ b/commonservices/commonengine/config/export.mk Fri Jul 30 10:34:49 2010 +0300 @@ -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" @@ -17,11 +17,11 @@ # commonengine's actual configuration export makefile -MAKEFILE = /sf/os/devicesrv/commonservices/commonengine/config/export.mk +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/commonservices/commonengine/config/export.mk $(call push,MAKEFILE_STACK,$(MAKEFILE)) -CONFFILES = $(MAKEFILEDIR)../conf/commonengine.confml /epoc32/rom/config/confml_data/s60/ \ - $(MAKEFILEDIR)../conf/commonengine_1020503B.crml /epoc32/rom/config/confml_data/s60/ +CONFFILES = $(MAKEFILEDIR)../conf/commonengine.confml $(EPOCROOT)/epoc32/rom/config/confml_data/s60/ \ + $(MAKEFILEDIR)../conf/commonengine_1020503B.crml $(EPOCROOT)/epoc32/rom/config/confml_data/s60/ commonengine_config :: commonengine_config-conf commonengine_config-conf :: diff -r 86cf7a1b7eb9 -r 48a00b70dc49 commonservices/commonengine/makefile --- a/commonservices/commonengine/makefile Fri Jul 16 11:04:43 2010 +0300 +++ b/commonservices/commonengine/makefile Fri Jul 30 10:34:49 2010 +0300 @@ -2,7 +2,7 @@ #Define this platform as default if nothing is defined -MAKEFILE = /sf/os/devicesrv/commonservices/commonengine/makefile +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/commonservices/commonengine/makefile commonengine_all :: commonengine_config diff -r 86cf7a1b7eb9 -r 48a00b70dc49 devicesrv_pub/common_platform_security_definitions_api/config/export.mk --- a/devicesrv_pub/common_platform_security_definitions_api/config/export.mk Fri Jul 16 11:04:43 2010 +0300 +++ b/devicesrv_pub/common_platform_security_definitions_api/config/export.mk Fri Jul 30 10:34:49 2010 +0300 @@ -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" @@ -18,14 +18,14 @@ # common_platform_security_definitions_api's actual configuration export makefile -MAKEFILE = /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/config/export.mk +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/config/export.mk $(call push,MAKEFILE_STACK,$(MAKEFILE)) -INCFILES = $(MAKEFILEDIR)../inc/data_caging_path_literals.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/data_caging_paths_for_iby.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/data_caging_paths.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/data_caging_paths_strings.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/data_caged_locations.mk /epoc32/include/ +INCFILES = $(MAKEFILEDIR)../inc/data_caging_path_literals.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/data_caging_paths_for_iby.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/data_caging_paths.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/data_caging_paths_strings.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/data_caged_locations.mk $(EPOCROOT)/epoc32/include/ common_platform_security_config :: common_platform_security_config-inc diff -r 86cf7a1b7eb9 -r 48a00b70dc49 devicesrv_pub/common_platform_security_definitions_api/makefile --- a/devicesrv_pub/common_platform_security_definitions_api/makefile Fri Jul 16 11:04:43 2010 +0300 +++ b/devicesrv_pub/common_platform_security_definitions_api/makefile Fri Jul 30 10:34:49 2010 +0300 @@ -2,7 +2,7 @@ #Define this platform as default if nothing is defined -MAKEFILE = /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile common_platform_security_all :: common_platform_security_config diff -r 86cf7a1b7eb9 -r 48a00b70dc49 devicesrv_pub/platform_path_definitions_api/config/export.mk --- a/devicesrv_pub/platform_path_definitions_api/config/export.mk Fri Jul 16 11:04:43 2010 +0300 +++ b/devicesrv_pub/platform_path_definitions_api/config/export.mk Fri Jul 30 10:34:49 2010 +0300 @@ -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" @@ -18,12 +18,12 @@ # platform_path_definitions_api's actual configuration export makefile -MAKEFILE = /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/config/export.mk +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/config/export.mk $(call push,MAKEFILE_STACK,$(MAKEFILE)) -INCFILES = $(MAKEFILEDIR)../inc/platform_paths.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/non_foundation_paths.hrh /epoc32/include/ \ - $(MAKEFILEDIR)../inc/iconlocations.hrh /epoc32/include/ +INCFILES = $(MAKEFILEDIR)../inc/platform_paths.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/non_foundation_paths.hrh $(EPOCROOT)/epoc32/include/ \ + $(MAKEFILEDIR)../inc/iconlocations.hrh $(EPOCROOT)/epoc32/include/ platform_path_config :: platform_path_config-inc platform_path_config-inc :: diff -r 86cf7a1b7eb9 -r 48a00b70dc49 devicesrv_pub/platform_path_definitions_api/makefile --- a/devicesrv_pub/platform_path_definitions_api/makefile Fri Jul 16 11:04:43 2010 +0300 +++ b/devicesrv_pub/platform_path_definitions_api/makefile Fri Jul 30 10:34:49 2010 +0300 @@ -2,7 +2,7 @@ #Define this platform as default if nothing is defined -MAKEFILE = /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile +MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile platform_path_all :: platform_path_config diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp --- a/hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -41,8 +41,8 @@ OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY ws32.lib LIBRARY ecom.lib LIBRARY hwrmhapticspacketizer.lib LIBRARY hwrmhapticseffectdatagetterfw.lib +SMPSAFE diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp --- a/hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp Fri Jul 30 10:34:49 2010 +0300 @@ -61,6 +61,7 @@ // server components if ( err == KErrNone ) { + aStatus = KRequestPending; SendReceive( EHWRMHapticsService, aStatus ); } else @@ -115,7 +116,9 @@ TRequestStatus& aStatus ) const { COMPONENT_TRACE( ( _L( "RHWRMHapticsSession::ExecuteAsyncOperation - commandId(%d), aStatus(%d)" ), aCommand, aStatus.Int() ) ); - + + aStatus = KRequestPending; + SendReceive( aCommand, aArgs, aStatus ); COMPONENT_TRACE( ( _L( "RHWRMHapticsSession::ExecuteAsyncOperation - return" ) ) ); diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp --- a/hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -36,3 +36,4 @@ LIBRARY euser.lib LIBRARY ecom.lib +SMPSAFE diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp --- a/hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -36,3 +36,5 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY centralrepository.lib + +SMPSAFE diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp --- a/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -59,3 +59,4 @@ LANG SC +SMPSAFE diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp --- a/hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -36,4 +36,6 @@ LIBRARY bafl.lib LIBRARY estor.lib +SMPSAFE + // end of file diff -r 86cf7a1b7eb9 -r 48a00b70dc49 hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp --- a/hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp Fri Jul 16 11:04:43 2010 +0300 +++ b/hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp Fri Jul 30 10:34:49 2010 +0300 @@ -46,3 +46,5 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY hwrmhapticspluginmanager.lib + +SMPSAFE diff -r 86cf7a1b7eb9 -r 48a00b70dc49 resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp --- a/resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp Fri Jul 16 11:04:43 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp Fri Jul 30 10:34:49 2010 +0300 @@ -81,7 +81,10 @@ // Cancel property separately, as the following Cancel() call doesn't seem to // cause DoCancel to fire. - iProperty.Cancel(); + if( iProperty.Handle() ) + { + iProperty.Cancel(); + } Cancel(); diff -r 86cf7a1b7eb9 -r 48a00b70dc49 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss --- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Fri Jul 16 11:04:43 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Fri Jul 30 10:34:49 2010 +0300 @@ -114,6 +114,10 @@ //prio 0x7EE1 r_cmd_nmailagent //MBEN-83CFQE #endif //FF_EMAIL_FRAMEWORK + //prio 0x7EE0 + ,r_cmd_activitymonmediamgr, //FMAO-867HYW + //prio 0x7EDF + r_cmd_mediamgr //FMAO-867HYW }; } @@ -293,6 +297,20 @@ } #endif //FF_EMAIL_FRAMEWORK +// --------------------------------------------------------------------------- +// r_cmd_activitymonmediamgr +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonmediamgr + { + priority = 0x7EE0; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } // --------------------------------------------------------------------------- // r_cmd_autosync @@ -329,6 +347,17 @@ monitor_info = r_mon_3_restarts_ignore; } +// --------------------------------------------------------------------------- +// r_cmd_mediamgr +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_mediamgr + { + priority = 0x7EDF; + name = "z:\\sys\\bin\\MediaManager.exe"; + execution_behaviour = ESsmFireAndForget; + background = 1; // To background + } // --------------------------------------------------------------------------- // r_cmd_msgnotifier