Changeset b317b0b in mainline for uspace/drv/usbhub

Timestamp:

2011-02-21T19:50:41Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

15b0432

Parents:

ace12560 (diff), 41b70d30 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (1 diff)
• port_status.h (modified) (1 diff)
• usbhub.c (modified) (3 diffs)
• usbhub.h (modified) (1 diff)
• usbhub_private.h (modified) (1 diff)
• utils.c (modified) (1 diff)

uspace/drv/usbhub/main.c

@@ -34 +34 @@
 #include <errno.h>
 #include <async.h>
-
-#include <usb/usbdrv.h>
-
 
 #include "usbhub.h"

uspace/drv/usbhub/port_status.h

@@ -35 +35 @@
 #include <bool.h>
 #include <sys/types.h>
-#include <usb/devreq.h>
+#include <usb/request.h>
 #include "usbhub_private.h"
 

uspace/drv/usbhub/usbhub.c

@@ -40 +40 @@
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
-#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
 #include <usb/recognise.h>
-#include <usb/devreq.h>
 #include <usb/request.h>
 #include <usb/classes/hub.h>
@@ -232 +230 @@
 
 /**
- * Convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again).
- * @param hc
- * @return
- */
-inline static int usb_hub_release_default_address(int hc){
-        int opResult;
-        dprintf(USB_LOG_LEVEL_INFO, "releasing default address");
-        opResult = usb_drv_release_default_address(hc);
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_WARNING, "failed to release default address");
-        }
-        return opResult;
-}
-
-/**
  * Reset the port with new device and reserve the default address.
  * @param hc
@@ -261 +243 @@
         //opResult = usb_drv_reserve_default_address(hc);
         opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
+
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");

uspace/drv/usbhub/usbhub.h

@@ -42 +42 @@
 #define NAME "usbhub"
 
-//#include "usb/hcdhubd.h"
-#include <usb/usbdrv.h>
 #include <usb/hub.h>
 

uspace/drv/usbhub/usbhub_private.h

@@ -47 +47 @@
 #include <usb/classes/hub.h>
 #include <usb/usb.h>
-#include <usb/usbdrv.h>
-
-//#include <usb/devreq.h>
 #include <usb/debug.h>
+#include <usb/request.h>
 
 //************

uspace/drv/usbhub/utils.c

@@ -38 +38 @@
 
 #include <usbhc_iface.h>
-#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
-#include <usb/devreq.h>
 #include <usb/classes/hub.h>