# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266500511 0
# Node ID 2f0dd241788a5d69082a0cd5e584b3d63ca28d8b
# Parent  be4b446b3f5fe67c1e333e8b75f14b0f1f0dc9cb
Add two missing components to stubs

diff -r be4b446b3f5f -r 2f0dd241788a symbian3/adaptation/stubs/package_definition.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Thu Feb 18 13:25:39 2010 +0000
+++ b/symbian3/adaptation/stubs/package_definition.xml	Thu Feb 18 13:41:51 2010 +0000
@@ -1,133 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #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) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation">
-<block name="stubs">
-<collection name="s60">
-<component name="audiostubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/group" mrp=""/>
-</component>
-<component name="drm_stubs">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group" mrp=""/>
-</component>
-<component name="ocrsrv_stub">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group" mrp=""/>
-</component>
-<component name="omasuplasnconverterstubimpl">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group" mrp=""/>
-</component>
-<component name="posmsgpluginreferenceimpl">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group" mrp=""/>
-</component>
-<component name="power_save_display_mode_stub">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group" mrp=""/>
-</component>
-<component name="systemswstubs">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/group" mrp=""/>
-</component>
-<component name="tactileclickplugin_stub">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group" mrp=""/>
-</component>
-<component name="wlanhwinit_stub">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+      <block name="stubs" level="high" long-name="Stubs" levels="stub">
+        <collection name="s60_stubs" level="stub">
+          <component name="audiostubs" long-name="Audio Stubs">
+            <unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
+          </component>
+          <component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
+            <unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
+          </component>
+          <component name="drm_stubs" long-name="DRM Stubs">
+            <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
+          </component>
+          <component name="ocrsrv_stub" long-name="OCR Services Stub">
+            <unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
+          </component>
+          <component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
+            <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+          </component>
+          <component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+          </component>
+          <component name="srsfenginestub" long-name="SRSF Engine Stub">
+            <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
+          </component>
+          <component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
+            <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
+          </component>
+          <component name="systemswstubs" long-name="System Software Stubs">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
+          </component>
+          <component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
+          </component>
+          <component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
+            <unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>
diff -r be4b446b3f5f -r 2f0dd241788a symbian3/adaptation/stubs/package_definition_3.0.xml
--- a/symbian3/adaptation/stubs/package_definition_3.0.xml	Thu Feb 18 13:25:39 2010 +0000
+++ b/symbian3/adaptation/stubs/package_definition_3.0.xml	Thu Feb 18 13:41:51 2010 +0000
@@ -2,32 +2,38 @@
 <SystemDefinition schema="3.0.0">
   <package id="stubs" name="Stubs" levels="stub">
     <collection id="s60_stubs" level="stub">
-     <component id="audiostubs">
-      <unit bldFile="/adaptation/stubs/audiostubs/group"/>
+     <component id="audiostubs" name="Audio Stubs">
+      <unit bldFile="audiostubs/group"/>
      </component>
-     <component id="drm_stubs">
-      <unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+     <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+      <unit bldFile="btaudioadaptation_stub/group"/>
      </component>
-     <component id="ocrsrv_stub">
-      <unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+     <component id="drm_stubs" name="DRM Stubs">
+      <unit bldFile="drm_stubs/group"/>
      </component>
-     <component id="omasuplasnconverterstubimpl">
-      <unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+     <component id="ocrsrv_stub" name="OCR Services Stub">
+      <unit bldFile="ocrsrv_stub/group"/>
+     </component>
+     <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+      <unit bldFile="omasuplasnconverterstubimpl/group"/>
      </component>
-     <component id="posmsgpluginreferenceimpl">
-      <unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+     <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
+      <unit bldFile="posmsgpluginreferenceimpl/group"/>
      </component>
-     <component id="power_save_display_mode_stub">
-      <unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+     <component id="srsfenginestub" name="SRSF Engine Stub">
+      <unit bldFile="power_save_display_mode_stub/group"/>
+     </component>
+     <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
+      <unit bldFile="power_save_display_mode_stub/group"/>
      </component>
-     <component id="systemswstubs">
-      <unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+     <component id="systemswstubs" name="System Software Stubs">
+      <unit bldFile="systemswstubs/group"/>
      </component>
-     <component id="tactileclickplugin_stub">
-      <unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+     <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
+      <unit bldFile="tactileclickplugin_stub/group"/>
      </component>
-     <component id="wlanhwinit_stub">
-      <unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+     <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+      <unit bldFile="wlanhwinit_stub/group"/>
      </component>
     </collection>
   </package>
diff -r be4b446b3f5f -r 2f0dd241788a symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Feb 18 13:25:39 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Feb 18 13:41:51 2010 +0000
@@ -100,7 +100,7 @@
 ]>
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^3">
-    <layer id="adaptation" name="Adaptation" levels="hw-if">
+    <layer id="adaptation" name="Adaptation" levels="low mw high">
       <package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
       <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
       <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>