# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286968171 -10800
# Node ID 45254807acc4913743bc42a49e3d1296f4efb2c0
# Parent  37b610eb7fe3af6d77273a111b1c449107fc6b6c
Revision: 201041
Kit: 201041

diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf	Thu Aug 19 09:36:39 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/audioinputcistub/Group/bld.inf	Wed Oct 13 14:09:31 2010 +0300
@@ -21,6 +21,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-//AudioInputCIStub.mmp
+AudioInputCIStub.mmp
 
 //  End of File  
\ No newline at end of file
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf	Thu Aug 19 09:36:39 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group/bld.inf	Wed Oct 13 14:09:31 2010 +0300
@@ -22,6 +22,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-//AudioOutputCIStub.mmp
+AudioOutputCIStub.mmp
 
 //  End of File  
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/data/cistubplugin.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/data/cistubplugin.rss	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,47 @@
+/*
+* 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: Stubplugin rss
+*
+*/
+
+
+
+#include <registryinfo.rh>
+#include <mmfplugininterfaceuids.hrh>
+#include "cistubplugin.hrh"
+
+
+RESOURCE REGISTRY_INFO theInfo
+	{
+	dll_uid = KUidCustomInterfacePluginDll;
+	interfaces = 
+		{
+		INTERFACE_INFO
+			{
+			interface_uid = KMmfUidS60CustomInterfaceStub;  
+			implementations = 
+				{
+				IMPLEMENTATION_INFO
+					{
+					implementation_uid = KUidCustomInterfaceStubPlugin; 
+					version_no = 1;
+					display_name = "Audio Play Routing Control Stub";
+					default_data = "10207cab" ; 
+					opaque_data = "";
+					}
+				};
+			}
+		};
+	}
+
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/group/bld.inf	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2008 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: 
+*
+*/
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+cistubplugin.mmp
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) 2008 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: CI Stub plugin mmp
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+TARGET		  	cistubplugin.dll
+TARGETTYPE	  	PLUGIN
+UID			 	0x10009D8D 0x10207C70
+CAPABILITY 		ALL -TCB
+VENDORID        VID_DEFAULT
+
+
+USERINCLUDE		../inc
+USERINCLUDE		../../inc
+OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include/ecom
+SYSTEMINCLUDE	/epoc32/include/mmf/server
+SYSTEMINCLUDE	/epoc32/include/mmf/common 
+
+LIBRARY			euser.lib
+LIBRARY			ecom.lib
+LIBRARY			efsrv.lib
+LIBRARY			RestrictedAudioOutputCI.lib
+LIBRARY			AudioOutputCI.lib
+LIBRARY			AudioInputCI.lib
+
+SOURCEPATH	  	../src
+
+SOURCE		  	cistubplugin.cpp
+SOURCE 			cistubpluginMain.cpp
+
+SOURCEPATH	  	../data
+START RESOURCE 	cistubplugin.rss
+TARGET 			cistubplugin.rsc
+END
+
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2008 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: CI stub plugin
+*
+*/
+
+
+
+// This file defines the API for AudiPlayRoutingControlCIStub.dll
+
+#ifndef CISTUBPLUGIN_H
+#define CISTUBPLUGIN_H
+
+#include <e32base.h>	// CBase
+#include <e32std.h>	 // TBuf
+#include <e32debug.h>
+#include <ecom.h>
+#include "RestrictedAudioOutputCIStub.h"
+#include "AudioOutputCI.h"
+#include "AudioInputCI.h"
+#include "AudioOutputMessageTypes.h"
+#include "AudioInputMessageTypes.h"
+
+class MyMCustomInterface
+    {
+public:
+    virtual TAny* CustomInterface(TUid aCustomeInterface) = 0;
+    virtual void Release() = 0;
+    virtual void PassDestructionKey(TUid aUid) = 0;
+    };
+
+class CCIStubPlugin : public CBase,public MyMCustomInterface
+    {
+public:
+
+    static MyMCustomInterface* NewL();
+    static CCIStubPlugin* NewLC();
+    ~CCIStubPlugin();
+    TAny* CustomInterface(TUid aInterfaceId);
+    void Release();
+    void PassDestructionKey(TUid aUid);
+
+private:
+    TUid iDtor_ID_Key;
+    CCIStubPlugin();
+    void ConstructL();
+    };
+
+#endif  // __AUDIPLAYROUTINGCONTROLHWDEVICE_H__
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.hrh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.hrh	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2008 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: ci stub plugin uids 
+*
+*/
+
+
+#ifndef CISTUBPLUGIN_HRH
+#define CISTUBPLUGIN_HRH
+
+
+#define  KMmfUidS60CustomInterfaceStub                                0x10207C49
+#define  KUidCustomInterfacePluginDll                                 0x10207C70
+#define  KUidCustomInterfaceStubPlugin                                0x10207C71
+
+#endif
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubplugin.cpp	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,95 @@
+/*
+ * 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: Generic Stub plugin that load required CI stub in WINSCW 
+ *
+ */
+
+
+
+#include "cistubplugin.h"	
+
+#ifdef _DEBUG
+#define DEBPRN0         RDebug::Printf( "*CI STUB PLUGIN* %s", __PRETTY_FUNCTION__);
+#define DEBPRN1(str)    RDebug::Printf( "%s %s", __PRETTY_FUNCTION__, str );
+#else
+#define DEBPRN0
+#define DEBPRN1(str)
+#endif
+
+#define KTenSeconds 3000000
+//  Member Functions
+
+
+CCIStubPlugin* CCIStubPlugin::NewLC()
+    {
+    DEBPRN0;
+    CCIStubPlugin* self = new (ELeave) CCIStubPlugin;
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    return self;
+    }
+
+MyMCustomInterface* CCIStubPlugin::NewL()
+    {
+    DEBPRN0;
+    CCIStubPlugin* self = CCIStubPlugin::NewLC();
+    CleanupStack::Pop(self);
+    return (MyMCustomInterface*) self;
+    }
+
+CCIStubPlugin::CCIStubPlugin()
+// note, CBase initialises all member variables to zero
+    {
+    DEBPRN0;
+    }
+
+void CCIStubPlugin::ConstructL()
+    {
+    DEBPRN0;
+    }
+
+CCIStubPlugin::~CCIStubPlugin()
+    {
+    DEBPRN0;
+    }
+
+TAny* CCIStubPlugin::CustomInterface(TUid aInterfaceId)
+    {
+    DEBPRN0;
+    if (aInterfaceId == KUidRestrictedAudioOutput)
+        {
+        return (TAny*)CRestrictedAudioOutputCI::NewL();
+        }
+    if(aInterfaceId == KUidAudioOutput)
+        {
+        return (TAny*)CAudioOutputCI::NewL();
+        }
+    if(aInterfaceId == KUidAudioInput)
+        {
+        return (TAny*)CAudioInputCI::NewL();
+        }
+    return NULL;
+    }
+
+void CCIStubPlugin::Release()
+    {
+    DEBPRN0;
+    REComSession::DestroyedImplementation(iDtor_ID_Key);
+    delete this;
+    }
+void CCIStubPlugin::PassDestructionKey(TUid aUid)
+    {
+    DEBPRN0;
+    iDtor_ID_Key = aUid;
+    }
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubpluginMain.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubpluginMain.cpp	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* 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: Stub plugin main
+*
+*/
+
+
+
+#include <implementationproxy.h>
+#include <ecom.h>
+#include "cistubplugin.h"
+#include "cistubplugin.hrh"
+
+
+// ImplementationTable
+
+const TImplementationProxy
+        ImplementationTable[] =
+            {
+            IMPLEMENTATION_PROXY_ENTRY(KUidCustomInterfaceStubPlugin, CCIStubPlugin::NewL),
+            };
+
+
+// ImplementationGroupProxy
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+    {
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+    return ImplementationTable;
+    }
+
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp
--- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp	Thu Aug 19 09:36:39 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/MmfDevSoundAdaptation.mmp	Wed Oct 13 14:09:31 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description: Audio Stubs -  Project specification file for MmfDevSoundAdaptation_Stub
-*  Version     : %version: bh1mmcf#33 %
+*  Version     : %version: bh1mmcf#32 %
 *
 */
 
@@ -27,13 +27,12 @@
 VENDORID        VID_DEFAULT
 
 SOURCEPATH      ../src
-#if defined(WINS)
- SOURCE          MmfDevSoundAdaptation.cpp
- SOURCE          MmfDevSoundAdaptationBody.cpp
- SOURCE          MmfHwDeviceStub.cpp
- SOURCE          ToneGenerator.cpp
- SOURCE          DevSoundUtility.cpp
- SOURCE          TonePlayCompleteTimer.cpp
+SOURCE          MmfDevSoundAdaptation.cpp
+SOURCE          MmfDevSoundAdaptationBody.cpp
+SOURCE          MmfHwDeviceStub.cpp
+SOURCE          ToneGenerator.cpp
+SOURCE          DevSoundUtility.cpp
+SOURCE          TonePlayCompleteTimer.cpp
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
@@ -67,7 +66,6 @@
 LIBRARY         SpeechEncoderConfigCI.lib
 
 deffile         MmfDevSoundAdaptation.def
-#endif
 nostrictdef
 
 // End of File
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf	Thu Aug 19 09:36:39 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group/bld.inf	Wed Oct 13 14:09:31 2010 +0300
@@ -25,6 +25,4 @@
 ../data/sample1.wav	/Epoc32/winscw/c/sample1.wav
 
 PRJ_MMPFILES
-#ifdef WINS
 ./MmfDevSoundAdaptation.mmp
-#endif
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf
--- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf	Thu Aug 19 09:36:39 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/bld.inf	Wed Oct 13 14:09:31 2010 +0300
@@ -22,6 +22,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-//RestrictedAudioOutputCIStub.mmp
+RestrictedAudioOutputCIStub.mmp
 
 //  End of File  
\ No newline at end of file
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="audiostubs" name="Audio Stubs">
+    <collection id="audiostubs_info" name="Audio Stubs Info">
+      <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs" filter="s60,sf_build">
+        <unit bldFile="devsoundextensions_stubs/group"/>
+      </component>
+      <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub" filter="s60,sf_build">
+        <unit bldFile="fmradiotunercontrolstub/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 audiostubs/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audiostubs/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 drm_stubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drm_stubs/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="drm_stubs" name="DRM Stubs">
+    <collection id="drm_stubs_info" name="DRM Stubs Info">
+      <component id="drm_stubs_build" name="DRM Stubs Build" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 drm_stubs/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drm_stubs/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 drm_stubs/sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drm_stubs/sysdef_1_5_1.dtd	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r 37b610eb7fe3 -r 45254807acc4 ocrsrv_stub/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ocrsrv_stub/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="ocrsrv_stub" name="OCR Services Stub">
+    <collection id="ocrsrv_stub_info" name="OCR Services Stub Info">
+      <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 ocrsrv_stub/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ocrsrv_stub/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 ocrsrv_stub/sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ocrsrv_stub/sysdef_1_5_1.dtd	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r 37b610eb7fe3 -r 45254807acc4 omasuplasnconverterstubimpl/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omasuplasnconverterstubimpl/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+    <collection id="omasuplasnconverterstubimpl_info" name="OMA SUPL ASN Converter Stub Implementation Info">
+      <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 omasuplasnconverterstubimpl/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omasuplasnconverterstubimpl/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 power_save_display_mode_stub/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/power_save_display_mode_stub/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
+    <collection id="power_save_display_mode_stub_info" name="Power Save Display Mode Stub Info">
+      <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 power_save_display_mode_stub/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/power_save_display_mode_stub/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 power_save_display_mode_stub/sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/power_save_display_mode_stub/sysdef_1_5_1.dtd	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r 37b610eb7fe3 -r 45254807acc4 systemswstubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/systemswstubs/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="systemswstubs" name="System Software Stubs">
+    <collection id="systemswstubs_info" name="System Software Stubs Info">
+      <component id="ddcaccessstub" name="DDC Access Stub" filter="s60,sf_build">
+        <unit bldFile="ddcaccessstub/group"/>
+      </component>
+      <component id="tvoutconfig" name="TV Out Config" filter="s60,sf_build">
+        <unit bldFile="TVOutConfig/group" filter="oem_build"/>
+      </component>
+      <component id="accessorypolicyreference" name="Accessory Policy Reference" filter="s60,sf_build">
+        <meta rel="config">
+          <defined condition="__ACCESSORY_FW"/>
+        </meta>
+        <unit bldFile="accessorypolicyreference/group" filter="oem_build"/>
+      </component>
+      <component id="asyreference" name="ASY Reference" class="plugin" filter="s60,sf_build">
+        <meta rel="config">
+          <defined condition="__ACCESSORY_FW"/>
+        </meta>
+        <unit bldFile="asyreference/group" filter="oem_build"/>
+      </component>
+      <component id="examplecommonisc" name="Example Common ISC" filter="s60,sf_build">
+        <unit bldFile="examplecommonisc/group" filter="oem_build"/>
+      </component>
+      <component id="exampledsy" name="Example DSY" filter="s60,sf_build">
+        <meta rel="config">
+          <defined condition="RD_STARTUP_CHANGE"/>
+        </meta>
+        <unit bldFile="exampledsy/group" filter="oem_build"/>
+      </component>
+      <component id="featuremanagerstub" name="Feature Manager Stub" filter="s60,sf_build">
+        <unit bldFile="featuremanagerstub/group" filter="oem_build"/>
+      </component>
+      <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin" filter="s60,sf_build">
+        <unit bldFile="hwrmstubplugins/group" filter="oem_build"/>
+      </component>
+      <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin" filter="s60,sf_build">
+        <unit bldFile="hwrmhapticsstubplugin/group" filter="oem_build"/>
+      </component>
+      <component id="sensorchannelsreference" name="Sensor Channels Reference" filter="s60,sf_build">
+        <unit bldFile="sensorchannelsreference/group" filter="oem_build"/>
+      </component>
+      <component id="ssyreference" name="SSY Reference" class="plugin" filter="s60,sf_build">
+        <meta rel="config">
+          <defined condition="RD_SENSOR_FW"/>
+        </meta>
+        <unit bldFile="ssyreference/group" filter="oem_build"/>
+      </component>
+      <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin" filter="s60,sf_build">
+        <unit bldFile="startupadaptationstub/group" filter="oem_build"/>
+      </component>
+      <component id="tiltcompensationstub" name="Tilt Compensation Stub" filter="s60,sf_build">
+        <unit bldFile="tiltcompensationstub/group" filter="oem_build"/>
+      </component>
+      <component id="tvoutbehaviour" name="TV Out Behaviour" filter="s60,sf_build">
+        <unit bldFile="tvoutbehaviour/group" filter="oem_build"/>
+      </component>
+      <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin" filter="s60,sf_build">
+        <unit bldFile="wiredbearerreference/group" filter="oem_build"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
\ No newline at end of file
diff -r 37b610eb7fe3 -r 45254807acc4 systemswstubs/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/systemswstubs/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
\ No newline at end of file
diff -r 37b610eb7fe3 -r 45254807acc4 tactileclickplugin_stub/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tactileclickplugin_stub/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="tactileclickplugin_stub" name="Tactile Click Plugin Stub">
+    <collection id="tactileclickplugin_stub_info" name="Tactile Click Plugin Stub Info">
+      <meta rel="config">
+        <defined condition="RD_TACTILE_FEEDBACK"/>
+      </meta>
+      <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 tactileclickplugin_stub/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tactileclickplugin_stub/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>
diff -r 37b610eb7fe3 -r 45254807acc4 tactileclickplugin_stub/sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tactileclickplugin_stub/sysdef_1_5_1.dtd	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r 37b610eb7fe3 -r 45254807acc4 wlanhwinit_stub/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wlanhwinit_stub/package_definition.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+    <collection id="wlanhwinit_stub_info" name="WLAN Hardware Init Stub Info">
+      <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build" filter="s60,sf_build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 37b610eb7fe3 -r 45254807acc4 wlanhwinit_stub/package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wlanhwinit_stub/package_map.xml	Wed Oct 13 14:09:31 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="adaptation/stubs"/>