Changeset cb569e6 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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/srv/bd/file_bd/file_bd.c (modified) (2 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -60 +60 @@
 static FILE *img;
 
-static dev_handle_t dev_handle;
+static devmap_handle_t devmap_handle;
 static fibril_mutex_t dev_lock;
 
@@ -82 +82 @@
                 return -1;
 
-        rc = devmap_device_register(argv[2], &dev_handle);
+        rc = devmap_device_register(argv[2], &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);