Changeset 3f0a7971 in mainline for uspace/srv/bd/gxe_bd/gxe_bd.c

Timestamp:

2010-11-18T22:34:23Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (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

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (4 diffs)

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -93 +93 @@
 static gxe_bd_t *dev;
 
-static dev_handle_t dev_handle[MAX_DISKS];
+static devmap_handle_t devmap_handle[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
@@ -143 +143 @@
         for (i = 0; i < MAX_DISKS; i++) {
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &dev_handle[i]);
+                rc = devmap_device_register(name, &devmap_handle[i]);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -161 +161 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;
@@ -174 +174 @@
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (dev_handle[i] == dh)
+                if (devmap_handle[i] == dh)
                         disk_id = i;