Changeset 8fc61c8 in mainline

Timestamp:

2015-07-03T04:00:22Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ce25903

Parents:

45cbf897

Message:

uhci: Use malloc32 from libusbhost

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• hw_struct/queue_head.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• transfer_list.c (modified) (1 diff)
• uhci_batch.c (modified) (1 diff)
• utils/malloc32.h (deleted)

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

@@ -48 +48 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "uhci_batch.h"
-#include "utils/malloc32.h"
 #include "hc.h"
 

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

@@ -37 +37 @@
 #include <assert.h>
 #include <sys/types.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "link_pointer.h"
 #include "transfer_descriptor.h"
-#include "../utils/malloc32.h"
 
 /** This structure is defined in UHCI design guide p. 31 */

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

@@ -38 +38 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "link_pointer.h"
 #include "transfer_descriptor.h"
-#include "../utils/malloc32.h"
 
 /** Initialize Transfer Descriptor

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -40 +40 @@
 #include <usb/debug.h>
 #include <usb/host/usb_transfer_batch.h>
-
-#include "utils/malloc32.h"
+#include <usb/host/utils/malloc32.h>
+
 #include "hw_struct/link_pointer.h"
 #include "transfer_list.h"

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -42 +42 @@
 #include <usb/debug.h>
 #include <usb/host/endpoint.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "uhci_batch.h"
 #include "hw_struct/transfer_descriptor.h"
-#include "utils/malloc32.h"
 
 #define DEFAULT_ERROR_COUNT 3