Changeset ff6dd73 in mainline

Timestamp:

2011-08-31T17:49:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

70fb822

Parents:

b991d37

Message:

ohci: rename file batch ⇒ ohci_batch in reparation for further changes

Location:

uspace/drv/bus/usb/ohci

Files:

• Makefile (modified) (1 diff)
• hc.h (modified) (1 diff)
• ohci.c (modified) (1 diff)
• ohci_batch.c (moved) (moved from uspace/drv/bus/usb/ohci/batch.c ) (1 diff)
• ohci_batch.h (moved) (moved from uspace/drv/bus/usb/ohci/batch.h )
• root_hub.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/Makefile

@@ -44 +44 @@
 
 SOURCES = \
-        batch.c \
         endpoint_list.c \
         hc.c \
         main.c \
         ohci.c \
+        ohci_batch.c \
         ohci_endpoint.c \
         pci.c \

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

@@ -45 +45 @@
 #include <usb/host/hcd.h>
 
-#include "batch.h"
+#include "ohci_batch.h"
 #include "ohci_regs.h"
 #include "root_hub.h"

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

@@ -91 +91 @@
             &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
 
-        usb_address_t addr = usb_device_keeper_find(manager, handle);
+        const usb_address_t addr = usb_device_keeper_find(manager, handle);
         if (addr < 0) {
                 return addr;

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

@@ -38 +38 @@
 #include <usb/debug.h>
 
-#include "batch.h"
+#include "ohci_batch.h"
 #include "ohci_endpoint.h"
 #include "utils/malloc32.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 "ohci_regs.h"
-#include "batch.h"
 
 #define HUB_DESCRIPTOR_MAX_SIZE (7 + 2 + 2)