# HG changeset patch # User William Roberts # Date 1279813474 -3600 # Node ID d2e116a91587f7be18cd186a96218f0104eceb39 # Parent 8305db47a4ceb822b2a9e57095bb5c298da441ca# Parent 6a6c778aaf919ed933c81e680e4cd6be3d8aba1f Catchup to latest Symbian^4 diff -r 8305db47a4ce -r d2e116a91587 boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp --- a/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp Sat Jun 12 22:47:04 2010 +0100 +++ b/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp Thu Jul 22 16:44:34 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 2009 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component boardsupport_metadata source \sf\os\boardsupport\boardsupport_info\boardsupport_metadata source \sf\os\boardsupport\package_definition.xml diff -r 8305db47a4ce -r d2e116a91587 build.config.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build.config.xml Thu Jul 22 16:44:34 2010 +0100 @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/hal/config.hcf --- a/emulator/emulatorbsp/hal/config.hcf Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/hal/config.hcf Thu Jul 22 16:44:34 2010 +0100 @@ -86,3 +86,4 @@ EPointer3DExitCloseProximityThreshold : set = 0 EDisplayMemoryHandle=GetDisplayMemoryHandle ENumCpus=GetNumCpus +EDigitiserOrientation : set = DigitiserOrientation diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/hcr/hcrconfig.h --- a/emulator/emulatorbsp/hcr/hcrconfig.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/hcr/hcrconfig.h Thu Jul 22 16:44:34 2010 +0100 @@ -25,7 +25,7 @@ changes in the hardware consumer component. @publishedPartner -@prototype +@deprecated Emulator Deprecated */ #ifndef HCR_CONFIG_H diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/display_chan.h --- a/emulator/emulatorbsp/inc/display_chan.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/display_chan.h Thu Jul 22 16:44:34 2010 +0100 @@ -16,7 +16,7 @@ /** @file @publishedPartner - @prototype + @deprecated Emulator Deprecated */ #ifndef __DISPLAY_CHAN_H__ diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/display_dev.h --- a/emulator/emulatorbsp/inc/display_dev.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/display_dev.h Thu Jul 22 16:44:34 2010 +0100 @@ -16,7 +16,7 @@ /** @file @publishedPartner - @prototype + @deprecated Emulator Deprecated */ #ifndef __DISPLAY_DEV_H__ diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/displayhandler.h --- a/emulator/emulatorbsp/inc/displayhandler.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/displayhandler.h Thu Jul 22 16:44:34 2010 +0100 @@ -16,7 +16,7 @@ /** @file @publishedPartner - @prototype + @deprecated Emulator Deprecated */ #ifndef __DISPLAYHANDLER_H__ diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/gui.h --- a/emulator/emulatorbsp/inc/gui.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/gui.h Thu Jul 22 16:44:34 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1998-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" @@ -266,6 +266,7 @@ TInt iMaxScreenHeight; TInt iXYInputWidth; TInt iXYInputHeight; + TInt iXYOrientation; TInt iPhysicalScreenWidth; TInt iPhysicalScreenHeight; TInt iMaxPhysicalScreenWidth; diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/nand_fbr_offset.h --- a/emulator/emulatorbsp/inc/nand_fbr_offset.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/nand_fbr_offset.h Thu Jul 22 16:44:34 2010 +0100 @@ -24,6 +24,7 @@ /** Defines the sector offset at which the FBR appears in the first block @publishedPartner +@deprecated Emulator Deprecated */ const TInt KNandFbrSectorOffset=0; diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/nand_plat.h --- a/emulator/emulatorbsp/inc/nand_plat.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/nand_plat.h Thu Jul 22 16:44:34 2010 +0100 @@ -45,6 +45,7 @@ The following constants support relocation of the NAND FBR for this platform KNandFbrSectorOffset is the third of three constants required - it is defined in nand_fbr_offset.h @publishedPartner +@deprecated Emulator Deprecated */ const TInt KNandMinibootUsed = ETrue; const TInt KNandCoreldrRelocatable = ETrue; diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/inc/winsgui.h --- a/emulator/emulatorbsp/inc/winsgui.h Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/inc/winsgui.h Thu Jul 22 16:44:34 2010 +0100 @@ -29,6 +29,7 @@ /** Returns the current emulator GUI configuration @publishedPartner + @deprecated Emulator Deprecated */ IMPORT_C static TInt CurrentConfiguration(); }; diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/specific/gui.cpp --- a/emulator/emulatorbsp/specific/gui.cpp Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/specific/gui.cpp Thu Jul 22 16:44:34 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1995-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" @@ -4108,7 +4108,7 @@ return static_cast(aThis)->XYHalFunction(aFunction,a1,a2); } -TInt DMasterIni::XYHalFunction(TInt aFunction, TAny* a1, TAny* /*a2*/) +TInt DMasterIni::XYHalFunction(TInt aFunction, TAny* a1, TAny* a2) { TInt r=KErrNone; switch(aFunction) @@ -4129,6 +4129,28 @@ r=KErrNotSupported; } break; + + // a2 = TBool aSet (ETrue for setting, EFalse for retrieval) + // a1 = TDigitizerOrientation (set) + // a1 = &TDigitizerOrientation (get) + // Assume screen [0] here as this HAL function is only registered for + // screen 0 on the emulator platform. Function only called if display==0 + case EDigitiserOrientation: + if ((TBool)a2) + { + // Set the orientation attribute + // In case user thread, check it has WDD capability + if(!Kern::CurrentThreadHasCapability(ECapabilityWriteDeviceData,__PLATSEC_DIAGNOSTIC_STRING("Checked by Hal function EDigitiserOrientation"))) + return KErrPermissionDenied; + systemIni->iScreens[0]->iXYOrientation = (TInt)a1; + } + else + { + // Get the orientation attribute, safe copy it into user memory + kumemput32(a1, &(systemIni->iScreens[0]->iXYOrientation), sizeof(TInt)); + } + break; + default: r=KErrNotSupported; break; diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/test/bld.inf --- a/emulator/emulatorbsp/test/bld.inf Sat Jun 12 22:47:04 2010 +0100 +++ b/emulator/emulatorbsp/test/bld.inf Thu Jul 22 16:44:34 2010 +0100 @@ -28,10 +28,8 @@ // Drivers ../../../../kernelhwsrv/kerneltest/e32test/group/d_tick support ../../../../kernelhwsrv/kerneltest/e32test/group/bm_pdd support -../../../../kernelhwsrv/kerneltest/e32test/group/d_mstim support - -// Tests -../../../../kernelhwsrv/kerneltest/e32test/group/t_emul +../../../../kernelhwsrv/kerneltest/e32test/group/d_mstim support +d_frqchg support // Example RTOS personality ../../../../kernelhwsrv/kerneltest/e32test/personality/example/example_personality_test support diff -r 8305db47a4ce -r d2e116a91587 emulator/emulatorbsp/test/d_frqchg.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emulator/emulatorbsp/test/d_frqchg.mmp Thu Jul 22 16:44:34 2010 +0100 @@ -0,0 +1,21 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* d_frqchg.mmp +*/ + +#include + +#include "../../../../kernelhwsrv/kerneltest/e32test/group/d_frqchg.mmh" + diff -r 8305db47a4ce -r d2e116a91587 release.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/release.txt Thu Jul 22 16:44:34 2010 +0100 @@ -0,0 +1,22 @@ + +1. BhaskarReddy + 1. DEFECT FIX: DEF142545: t_cputime fails on ST8500 +======================= + +2 BhaskarReddy + 1. DEFECT FIX: DEF140626: Building graphics4 (wserv auto tests) ROM with -D_DEBUG results in KERN-EXEC4 + +3 VyshnaviK + 1. DEFECT FIX: DEF141815: Baseport bld.inf files should specify an alias for all extension makefiles + +4 Prakash + 1.DEFECT FIX: DEF142298: ScreenDriver compile filed in MSF00209 TB101SF + +5 Prakash + 1.DEFECT FIX: DEF144722: Bridge image is not booting because of kHS random generaton preq submissions + +6 Vibhavari K + 1. DEF142250 T_LDRTST Kernel crash + +7 Prakash b + 1. DEF144776: Trace Conflict between base_e32_drivers_media and base_montblanc