Changeset b0f00a9 in mainline for uspace/drv/infrastructure/rootvirt/devices.def

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/infrastructure/rootvirt/devices.def (moved) (moved from uspace/drv/rootvirt/devices.def ) (2 diffs)

uspace/drv/infrastructure/rootvirt/devices.def

@@ -4 +4 @@
  * Unless the list is empty, the last item shall be followed by a comma.
  */
+
+/* Loopback network interface */
+{
+    .name = "lo",
+    .match_id = "virtual&loopback"
+},
+
 #ifdef CONFIG_TEST_DRIVERS
+
 {
         .name = "test1",
@@ -21 +29 @@
         .match_id = "virtual&test1"
 },
+{
+        .name = "test3",
+        .match_id = "virtual&test3"
+},
+
 #endif
+
+#ifdef CONFIG_RUN_VIRTUAL_USB_HC
+
+/* Virtual USB host controller. */
+{
+        .name = "usbhc",
+        .match_id = "usb&hc=vhc"
+},
+
+#endif