Changeset f58ef61 in mainline

Timestamp:

2011-09-15T14:47:42Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8b54fe6

Parents:

bbce2c2

Message:

usb: rename batch.h ⇒ usb_transfer_batch.h to match the structure name

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci_batch.h (modified) (1 diff)
• drv/bus/usb/ohci/root_hub.h (modified) (2 diffs)
• drv/bus/usb/uhci/hc.h (modified) (1 diff)
• drv/bus/usb/uhci/uhci_batch.h (modified) (1 diff)
• lib/usbhost/Makefile (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/include/usb/host/usb_transfer_batch.h (moved) (moved from uspace/lib/usbhost/include/usb/host/batch.h ) (1 diff)
• lib/usbhost/src/usb_transfer_batch.c (moved) (moved from uspace/lib/usbhost/src/batch.c ) (1 diff)

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

@@ -38 +38 @@
 #include <usbhc_iface.h>
 #include <usb/usb.h>
-#include <usb/host/batch.h>
+#include <usb/host/usb_transfer_batch.h>
 
 #include "hw_struct/transfer_descriptor.h"

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

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/dev/driver.h>
-#include <usb/host/batch.h>
+#include <usb/host/usb_transfer_batch.h>
 
 #include "ohci_regs.h"
@@ -66 +66 @@
         /** size of hub descriptor */
         size_t hub_descriptor_size;
-
 } rh_t;
 

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

@@ -39 +39 @@
 #include <ddi.h>
 
-#include <usb/host/batch.h>
 #include <usb/host/hcd.h>
 

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

@@ -35 +35 @@
 #define DRV_UHCI_BATCH_H
 
-#include <usb/host/batch.h>
+#include <usb/host/usb_transfer_batch.h>
 #include <adt/list.h>
 

uspace/lib/usbhost/Makefile

@@ -35 +35 @@
 
 SOURCES = \
-        src/batch.c \
         src/device_keeper.c \
         src/endpoint.c \
         src/iface.c \
-        src/usb_endpoint_manager.c
+        src/usb_endpoint_manager.c \
+        src/usb_transfer_batch.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -39 +39 @@
 #include <usb/host/device_keeper.h>
 #include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/batch.h>
+#include <usb/host/usb_transfer_batch.h>
 #include <usbhc_iface.h>
 

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -32 +32 @@
  * USB transfer transaction structures.
  */
-#ifndef LIBUSBHOST_HOST_BATCH_H
-#define LIBUSBHOST_HOST_BATCH_H
+#ifndef LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
+#define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
 #include <adt/list.h>

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/debug.h>
-#include <usb/host/batch.h>
+#include <usb/host/usb_transfer_batch.h>
 #include <usb/host/hcd.h>