Changeset b4b534ac in mainline for uspace/drv/bus/usb/ohci/endpoint_list.h

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/ohci/endpoint_list.h (modified) (2 diffs)

uspace/drv/bus/usb/ohci/endpoint_list.h

@@ -35 +35 @@
 #define DRV_OHCI_ENDPOINT_LIST_H
 
+#include <adt/list.h>
+#include <assert.h>
 #include <fibril_synch.h>
+#include <sys/types.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "ohci_endpoint.h"
 #include "hw_struct/endpoint_descriptor.h"
-#include "utils/malloc32.h"
 
 /** Structure maintains both OHCI queue and software list of active endpoints.*/
@@ -65 +68 @@
         assert(instance);
         free32(instance->list_head);
+        instance->list_head = NULL;
 }