Changeset 45cbf897 in mainline for uspace/drv/bus/usb

Timestamp:

2015-07-03T03:54:45Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fc61c8

Parents:

e6d7df1

Message:

ehci, libusbhost: Move malloc32 to libusbhost.

So it can be shared with other HCDs.
Make sure the memory is mapped before returning from malloc32.
Add poison.

Fixes non-cntl transfers for ehci

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.c (modified) (1 diff)
• ehci_endpoint.c (modified) (1 diff)
• endpoint_list.c (modified) (1 diff)
• endpoint_list.h (modified) (1 diff)
• hc.c (modified) (1 diff)
• hw_struct/queue_head.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -42 +42 @@
 #include <usb/usb.h>
 #include <usb/debug.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "ehci_batch.h"
 #include "ehci_endpoint.h"
-#include "utils/malloc32.h"
 
 /* The buffer pointer list in the qTD is long enough to support a maximum

uspace/drv/bus/usb/ehci/ehci_endpoint.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <usb/debug.h>
+#include <usb/host/utils/malloc32.h>
 
-#include "utils/malloc32.h"
 #include "ehci_endpoint.h"
 #include "hc.h"

uspace/drv/bus/usb/ehci/endpoint_list.c

@@ -40 +40 @@
 #include <usb/debug.h>
 
-#include "utils/malloc32.h"
 #include "endpoint_list.h"
 

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

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <sys/types.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "ehci_endpoint.h"
 #include "hw_struct/queue_head.h"
-#include "utils/malloc32.h"
 
 /** Structure maintains both EHCI queue and software list of active endpoints.*/

uspace/drv/bus/usb/ehci/hc.c

@@ -45 +45 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
-
-//#include "ehci_endpoint.h"
+#include <usb/host/utils/malloc32.h>
+
 #include "ehci_batch.h"
-#include "utils/malloc32.h"
 
 #include "hc.h"

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/host/endpoint.h>
-
-#include "../utils/malloc32.h"
+#include <usb/host/utils/malloc32.h>
+
 #include "link_pointer.h"
 #include "transfer_descriptor.h"

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c

@@ -39 +39 @@
 
 #include <usb/usb.h>
+#include <usb/host/utils/malloc32.h>
 
-#include "../utils/malloc32.h"
 #include "mem_access.h"
 #include "transfer_descriptor.h"