Mercurial Mercurial > oss > FCL > sf > mw > usbservices / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201035
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 17 Sep 2010 08:35:29 +0300
changeset 85 ad9d655827ef
parent 81 842c592edba7
child 88 c3d148cdbed2
Revision: 201035 Kit: 201037
package_definition.xml file | annotate | diff | comparison | revisions
package_map.xml file | annotate | diff | comparison | revisions
usbengines/usbwatcher/src/cusbwatcher.cpp file | annotate | diff | comparison | revisions 
--- a/package_definition.xml	Thu Sep 02 21:31:49 2010 +0300
+++ b/package_definition.xml	Fri Sep 17 08:35:29 2010 +0300
@@ -1,52 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
-    <collection id="usbclasses" name="USB Classes" level="framework">
-      <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
-        <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
-      </component>
-      <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality"  class="plugin">
-        <unit bldFile="usbclasses/usbbasicpersonality/group"/>
-      </component>
-      <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
-        <unit bldFile="usbclasses/usbmscpersonality/group"/>
-      </component>
-      <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
-        <unit bldFile="usbclasses/usbphoneasmodem/group"/>
-      </component>
-    </collection>
-    <collection id="usbengines" name="USB Engines" level="generic">
-      <component id="usbwatcher" filter="s60" name="USB Watcher">
-        <unit bldFile="usbengines/usbwatcher/group"/>
-      </component>
-      <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
-        <unit bldFile="usbengines/usblocodplugin/group"/>
-      </component>
-      <component id="usbdevcon" filter="s60" name="USB Device Control">
-        <unit bldFile="usbengines/usbdevcon/group"/>
-      </component>
-      <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
-        <unit bldFile="usbengines/usbremotepersonality/group"/>
-      </component>
-      <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher" introduced="^3">
-        <unit bldFile="usbengines/usbotgwatcher/group"/>
-      </component>
-    </collection>
-    <collection id="usbuis" name="USB UIs" level="specific">
-      <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
-        <unit bldFile="usbuis/imageprintuiprovider/group"/>
-      </component>
-      <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
-        <unit bldFile="usbuis/imageprintui/group"/>
-      </component>
-    </collection>
-    <collection id="usbservices_info" name="USB Services Info" level="plugin">
-      <component id="usbservices_plat" filter="s60" name="USB Services Platform Interfaces" class="api">
-        <unit bldFile="usbservices_plat/group"/>
-      </component>
-      <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
-        <unit bldFile="tsrc/group"/>
-      </component>
-    </collection>        
-  </package>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
+  <collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+   <component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/pictbridge_api/pictbridge_api.metaxml"/>
+    <unit bldFile="usbservices_plat/pictbridge_api/group"/>
+   </component>
+   <component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_responder_api/ptp_responder_api.metaxml"/>
+    <unit bldFile="usbservices_plat/ptp_responder_api/group"/>
+   </component>
+   <component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_transport_api/ptp_transport_api.metaxml"/>
+    <unit bldFile="usbservices_plat/ptp_transport_api/group"/>
+   </component>
+   <component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_device_control_plugin_api/usb_device_control_plugin_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_device_control_plugin_api/group"/>
+   </component>
+   <component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_notifier_api/usb_notifier_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_notifier_api/group"/>
+   </component>
+   <component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_personality_api_header/usb_personality_api_header.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_personality_api_header/group"/>
+   </component>
+   <component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_personality_plugin_api/usb_personality_plugin_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_personality_plugin_api/group"/>
+   </component>
+   <component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_secondary_display_api/usb_secondary_display_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_secondary_display_api/group"/>
+   </component>
+   <component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_watcher_api/usb_watcher_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_watcher_api/group"/>
+   </component>
+   <component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_watcher_info_api_header/usb_watcher_info_api_header.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_watcher_info_api_header/group"/>
+   </component>
+  </collection>
+  <collection id="usbengines" name="USB Engines" level="generic">
+   <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+    <unit bldFile="usbengines/usbotgwatcher/group" filter="!test"/>
+    <unit bldFile="usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group" filter="test,api_test"/>
+   </component>
+   <component id="usbwatcher" filter="s60" name="USB Watcher">
+    <unit bldFile="usbengines/usbwatcher/group"/>
+   </component>
+   <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+    <unit bldFile="usbengines/usblocodplugin/group"/>
+   </component>
+   <component id="usbdevcon" filter="s60" name="USB Device Control">
+    <unit bldFile="usbengines/usbdevcon/group"/>
+   </component>
+   <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+    <unit bldFile="usbengines/usbremotepersonality/group"/>
+   </component>
+  </collection>
+  <collection id="usbclasses" name="USB Classes" level="framework">
+   <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+    <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
+   </component>
+   <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+    <unit bldFile="usbclasses/usbbasicpersonality/group"/>
+   </component>
+   <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+    <unit bldFile="usbclasses/usbmscpersonality/group"/>
+   </component>
+   <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+    <unit bldFile="usbclasses/usbphoneasmodem/group"/>
+   </component>
+  </collection>
+  <collection id="usbuis" name="USB UIs" level="specific">
+   <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+    <unit bldFile="usbuis/usbuinotif" qt:proFile="usbuinotif.pro" filter="!test"/>
+    <unit bldFile="usbuis/usbuinotif/tsrc/usbuinotifapitest/group" filter="test,api_test" />
+   </component>
+   <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+    <unit bldFile="usbuis/imageprintuiprovider/group"/>
+   </component>
+   <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+    <unit bldFile="usbuis/imageprintui/group"/>
+   </component>
+   <component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
+      <unit bldFile="usbuis/usbsettingsapp" qt:proFile="USBSettingsApp.pro"/>
+    </component>
+   <component id="usbindicatorplugin" name="USB Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+      <unit bldFile="usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro"/>
+    </component>
+  </collection>
+  <collection id="usb_testtools" name="USB Test Tools" level="server">
+   <component id="usb_stubsrv" name="USB Stub Server" introduced="^4" filter="s60">
+      <unit bldFile="tsrc/testtools/stubsrv/group"/>
+    </component>
+  </collection>
+ </package>
 </SystemDefinition>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:35:29 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
--- a/usbengines/usbwatcher/src/cusbwatcher.cpp	Thu Sep 02 21:31:49 2010 +0300
+++ b/usbengines/usbwatcher/src/cusbwatcher.cpp	Fri Sep 17 08:35:29 2010 +0300
@@ -789,8 +789,10 @@
         }
     else
         {
-        LOG( "Tryign to call CUsbWatcher::Start in non-idle state " );
-        PANIC( KErrGeneral );
+        //Start may have been called because device lock was unlocking. The
+        //personality may be already starting, so nothing needs to be done.
+        LOG1( "Trying to call CUsbWatcher::Start in non-idle state %d",
+            iState );        
         }
     }
FCL/sf/mw/usbservices