Changeset 474afc9 in mainline for uspace/lib/usb/src

Timestamp:

2011-02-04T22:40:13Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4d73d71

Parents:

89acf204 (diff), e29e09cf (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:

development branch changes

Location:

uspace/lib/usb/src

Files:

• addrkeep.c (modified) (1 diff)
• pipes.c (modified) (2 diffs)
• recognise.c (modified) (1 diff)
• usbdrv.c (modified) (1 diff)

uspace/lib/usb/src/addrkeep.c

@@ -33 +33 @@
  * @brief Address keeping.
  */
-#include <usb/addrkeep.h>
+#include <usb/hcd.h>
 #include <errno.h>
 #include <assert.h>

uspace/lib/usb/src/pipes.c

@@ -90 +90 @@
 
 leave:
-        ipc_hangup(hc_phone);
+        async_hangup(hc_phone);
         return rc;
 }
@@ -211 +211 @@
         }
 
-        int rc = ipc_hangup(pipe->hc_phone);
+        int rc = async_hangup(pipe->hc_phone);
         if (rc != EOK) {
                 return rc;

uspace/lib/usb/src/recognise.c

@@ -33 +33 @@
  * @brief Functions for recognising kind of attached devices.
  */
+#include <sys/types.h>
 #include <usb_iface.h>
 #include <usb/usbdrv.h>

uspace/lib/usb/src/usbdrv.c

@@ -80 +80 @@
             IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
 
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         if (rc != EOK) {