--- a/symbian3/split/sysdefs/system_model_os.xml	Tue Jan 19 15:39:43 2010 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Tue Jan 19 17:16:23 2010 +0000
@@ -1157,6 +1157,9 @@
 <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
 <unit bldFile="os\mm\mmlibs\mmutilitylib\group" mrp="mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
 </component>
+<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N">
+<unit bldFile="os/mm/mmlibs/mmfw/group" mrp="mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
 </collection>
 <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
 <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
@@ -1171,6 +1174,9 @@
 <component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development">
 <unit mrp="os\mm\mmplugins\lib3gpunittest\group\multimedia_unittest_3gplibrary_source.mrp"/>
 </component>
+<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="os/mm/mmplugins/mmfwplugins/group" mrp="mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+</component>
 </collection>
 <collection name="mm_info" long-name="Multimedia Info" level="app-if">
 <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
@@ -1207,8 +1213,8 @@
 <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development">
 <unit mrp="os\mm\mmdevicefw\mdfunittest\group\multimedia_unittest_mdf_source.mrp"/>
 </component>
-<component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory">
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group\multimedia_mmf_ASR.mrp"/>
+<component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory" plugin="N">
+<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
 <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
@@ -1243,16 +1249,11 @@
         <unit version="2" bldFile="omxil/omxilcore2/group" mrp="omxil/omxilcore2/group/multimedia_omx_il_core.mrp"/>
 		-->
 </component>
-<!-- not used in an active conifguration
-      <component id="omxilcompfw" name="OpenMAX IL Component Framework" introduced="Future" purpose="optional">
-        <unit bldFile="omxil/omxilcompfw/components/group" mrp="omxil/omxilcompfw/components/group/multimedia_omx_il_comp.mrp"/>
-      </component>
-	  -->
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional" plugin="N">
+<unit bldFile="os/mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
 <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional">
 <unit bldFile="os\mm\omxil\omxilrefcomps\ref_components\group" mrp="os\mm\omxil\omxilrefcomps\ref_components\group\multimedia_omx_il_comp_ref.mrp" version="1"/>
-<!-- not used in an active conifguration
-		<unit version="2" bldFile="mmdataplane/omxiltranslators/group_omx_ref_components" mrp="mmdataplane/omxiltranslators/group_omx_ref_components/multimedia_omx_il_comp_ref.mrp"/>
-		-->
 </component>
 <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development">
 <unit mrp="os\mm\omxil\omxilunittest\group\multimedia_unittest_omx_il.mrp"/>
@@ -1266,12 +1267,7 @@
 </collection>
 <collection name="devsound" long-name="Sound Device" level="devices">
 <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_api" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_api\multimedia_mdf_devsound_api.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
-        <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-      -->
+<unit bldFile="os/mm/devsound/devsoundapi/group" mrp="mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
 </component>
 <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional">
 <unit bldFile="os\mm\devsound\a3fdevsound\group" mrp="os\mm\devsound\a3fdevsound\group\multimedia_a3f_devsound.mrp"/>
@@ -1280,34 +1276,19 @@
 <unit bldFile="os\mm\devsound\a3facf\group" mrp="os\mm\devsound\a3facf\group\multimedia_a3f_acf.mrp"/>
 </component>
 <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_pluginsupport" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_pluginsupport\multimedia_mdf_devsound_pluginsupport.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
-        <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-      -->
+<unit bldFile="os/mm/devsound/devsoundpluginsupport/group" mrp="mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
 </component>
 <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin\multimedia_mdf_devsound_refplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
-        <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
-      -->
+<unit bldFile="os/mm/devsound/devsoundrefplugin/group" mrp="mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
 </component>
 <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\sounddevbt\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\sounddevbt\group\multimedia_mdf_devsound_refbtplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
-        <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-      -->
+<unit bldFile="os/mm/devsound/sounddevbt/group" mrp="mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
 </component>
 <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development">
 <unit bldFile="os\mm\devsound\a3ftrace\group" mrp="os\mm\devsound\a3ftrace\group\multimedia_a3f_traces.mrp"/>
 </component>
 <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="os\mm\devsound\a3fintegrationtest\group\multimedia_inttest_a3f_devsound_source.mrp"/>
+<unit mrp="os\mm\devsound\a3fintegrationtest\group\multimedia_inttest_a3f_devsound_source.mrp" />
 </component>
 <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="os\mm\devsound\a3fsrvstart\group" mrp="os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
@@ -1315,12 +1296,7 @@
 </collection>
 <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_hwdev" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_hwdev\multimedia_mdf_devsound_hwdev.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
-        <unit bldFile="devsound/hwdevapi/group" mrp="devsound/sounddevbt/group/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-      -->
+<unit bldFile="os/mm/devsound/hwdevapi/group" mrp="mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
 <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development">
 <unit bldFile="os\mm\mmhais\a3facl\group" mrp="os\mm\mmhais\a3facl\group\multimedia_a3f_acl.mrp"/>
@@ -1341,29 +1317,6 @@
 <unit mrp="os\mm\mmhais\dvbhunittest\hai\dvbh\group\multimedia_unittest_dvbhhai.mrp"/>
 </component>
 </collection>
-<!-- not used in an active configuration
-    <collection id="mmhostprocess" name="Multimedia Host Process" level="devices">
-      <component id="mmhpvideoclient" name="MMHP Video Client" introduced="Future" purpose="optional">
-        <unit bldFile="mmhostprocess/mmhpvideoclient/mmvideocomponents/group" mrp="mmhostprocess/mmhpvideoclient/mmvideocomponents/group/multimedia_mmhp_video_client.mrp"/>
-      </component>
-      <component id="mmhpaudioclient" name="MMHP Audio Client" introduced="Future" purpose="optional">
-        <unit bldFile="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group" mrp="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group/multimedia_mmhp_audio_client.mrp"/>
-      </component>
-      <component id="mmhpcameraclient" name="MMHP Camera Client" introduced="Future" purpose="optional">
-        <unit bldFile="mmhostprocess/mmhpcameraclient/mmcameracomponents/group" mrp="mmhostprocess/mmhpcameraclient/mmcameracomponents/group/multimedia_mmhp_camera_client.mrp"/>
-      </component>
-    </collection>
-	-->
-<!-- not used in an active configuraiton
-    <collection id="mmdataplane" name="Multimedia Data Plane Adaptation" level="hw-if">
-      <component id="omxilnodes" name="OpenMAX IL Data Plane Nodes" introduced="Future" purpose="optional" class="plugin">
-        <unit bldFile="mmdataplane/omxilnodes/group" mrp="mmdataplane/omxilnodes/group/multimedia_data_plane_nodes.mrp"/>
-      </component>
-      <component id="omxiltranslators" name="OpenMAX IL Translators" introduced="Future" purpose="optional" class="plugin">
-        <unit bldFile="mmdataplane/omxiltranslators/group_translators" mrp="mmdataplane/omxiltranslators/group_translators/multimedia_openmax_il_translators.mrp"/>
-      </component>
-    </collection>
-	-->
 <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
 <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
 <unit mrp="os\mm\mmapitest\mmsvs\group\mmsvs.mrp"/>
@@ -1643,9 +1596,6 @@
 </component>
 </collection>
 <collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="systemdocs" long-name="System Documentation" purpose="development" class="doc">
-<unit mrp="os\deviceplatformrelease\foundation_system\systemdocs\group\system.mrp"/>
-</component>
 <component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\deviceplatformrelease\foundation_system\system_model\system_model.mrp"/>
 </component>
@@ -1717,20 +1667,9 @@
 <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
 <unit bldFile="mw\appsupport\tzservices\tzlocrscfactory\group" mrp="mw\appsupport\tzservices\tzlocrscfactory\group\app-services_tzlocalizationrscfactory.mrp"/>
 </component>
-<!-- MattD: 20091124 - Dropping out the GT timezone DB to hopefully stop the ADTupdater crash. Note that Symbian2 does this by changing the bld.inf -->
-<!--
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw\appsupport\tzservices\tzdatabase\group" mrp="mw\appsupport\tzservices\tzdatabase\group\app-services_tzdb.mrp"/>
-</component>
--->
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional">
-<unit bldFile="mw\appsupport\tzservices\worldserver\group" mrp="mw\appsupport\tzservices\worldserver\group\app-services_worldserver.mrp"/>
-</component>
-<component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development">
-<unit bldFile="mw\appsupport\tzservices\worldservertest\TestWorldSrv" mrp="mw\appsupport\tzservices\worldservertest\TestWorldSrv\app-services_testworldsrv.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
+<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config" plugin="N">
+<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+</component>
 </collection>
 <collection name="contenthandling" long-name="Content Handling" level="plugin">
 <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
@@ -2001,9 +1940,6 @@
 </block>
 <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
 <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group\multimedia_mmf.mrp"/>
-</component>
 </collection>
 <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
 <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development">
@@ -2014,9 +1950,6 @@
 </component>
 </collection>
 <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-<component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development">
-<unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group\multimedia_mvs_agents.mrp"/>
-</component>
 <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development">
 <unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
 </component>