Changeset e28d228 in mainline for uspace/drv/vhc/addrmgm.c

Timestamp:

2010-12-04T17:54:34Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

35537a7

Parents:

54b141a (diff), 9ca0013 (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 with vojtechhorky/

File:

• uspace/drv/vhc/addrmgm.c (modified) (4 diffs)

uspace/drv/vhc/addrmgm.c

@@ -49 +49 @@
 typedef struct {
         usb_address_t address;
+        devman_handle_t devman_handle;
         bool available;
 } address_info_t;
@@ -69 +70 @@
                 dev_address[i].address = i + 1;
                 dev_address[i].available = true;
+                dev_address[i].devman_handle = 0;
         }
 
@@ -120 +122 @@
 }
 
+int bind_address(device_t *dev, usb_address_t address, devman_handle_t handle)
+{
+        if (address == DEFAULT_ADDRESS) {
+                return EPERM;
+        }
+
+        int rc = EPERM;
+
+        fibril_mutex_lock(&address_guard);
+        usb_address_t i;
+        for (i = 0; i < ADDRESS_COUNT; i++) {
+                if (dev_address[i].address == address) {
+                        if (dev_address[i].available) {
+                                rc = ENOENT;
+                                break;
+                        }
+
+                        dev_address[i].devman_handle = handle;
+                        rc = EOK;
+                        break;
+                }
+        }
+        fibril_mutex_unlock(&address_guard);
+
+        return rc;
+}
+
+int tell_address(device_t *dev, devman_handle_t handle, usb_address_t *address)
+{
+        int rc = ENOENT;
+
+        fibril_mutex_lock(&address_guard);
+        usb_address_t i;
+        for (i = 0; i < ADDRESS_COUNT; i++) {
+                if (dev_address[i].devman_handle == handle) {
+                        *address = dev_address[i].address;
+                        rc = EOK;
+                        break;
+                }
+        }
+        fibril_mutex_unlock(&address_guard);
+
+        return rc;
+}
+
 int release_address(device_t *dev, usb_address_t address)
 {
@@ -138 +185 @@
 
                         dev_address[i].available = true;
+                        dev_address[i].devman_handle = 0;
                         rc = EOK;
                         break;