Changeset a43f1d18 in mainline for uspace/lib/usb/src/host/device_keeper.c

Timestamp:

2011-04-09T18:26:22Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

2ad98fd

Parents:

f35b294 (diff), 97e7e8a (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 usb/development

File:

• uspace/lib/usb/src/host/device_keeper.c (modified) (2 diffs)

uspace/lib/usb/src/host/device_keeper.c

@@ -56 +56 @@
                 instance->devices[i].control_used = 0;
                 instance->devices[i].handle = 0;
+                instance->devices[i].speed = USB_SPEED_MAX;
                 list_initialize(&instance->devices[i].endpoints);
         }
+        // TODO: is this hack enough?
+        // (it is needed to allow smooth registration at default address)
+        instance->devices[0].occupied = true;
 }
 /*----------------------------------------------------------------------------*/
@@ -67 +71 @@
         assert(instance->devices[address].occupied);
         list_append(&ep->same_device_eps, &instance->devices[address].endpoints);
+        fibril_mutex_unlock(&instance->guard);
+}
+/*----------------------------------------------------------------------------*/
+void usb_device_keeper_del_ep(
+    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        assert(instance->devices[address].occupied);
+        list_remove(&ep->same_device_eps);
+        list_initialize(&ep->same_device_eps);
         fibril_mutex_unlock(&instance->guard);
 }