Changeset 2dbfe44 in mainline

Timestamp:

2015-07-04T01:57:38Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5f813c

Parents:

d51ba359

Message:

ohci: Switch to libusb malloc32 function

Location:

uspace/drv/bus/usb/ohci

Files:

• endpoint_list.c (modified) (1 diff)
• endpoint_list.h (modified) (1 diff)
• hc.c (modified) (1 diff)
• hw_struct/endpoint_descriptor.c (modified) (1 diff)
• hw_struct/endpoint_descriptor.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• ohci_batch.c (modified) (1 diff)
• ohci_endpoint.c (modified) (1 diff)
• utils/malloc32.h (deleted)

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

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

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

@@ -39 +39 @@
 #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.*/

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

@@ -48 +48 @@
 #include "ohci_endpoint.h"
 #include "ohci_batch.h"
-#include "utils/malloc32.h"
 
 #include "hc.h"

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

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

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h

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

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

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

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -41 +41 @@
 #include <usb/usb.h>
 #include <usb/debug.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "ohci_batch.h"
 #include "ohci_endpoint.h"
-#include "utils/malloc32.h"
 
 static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t);

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -35 +35 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <usb/host/utils/malloc32.h>
 
-#include "utils/malloc32.h"
 #include "ohci_endpoint.h"
 #include "hc.h"