Changeset 1eb272d in mainline

Timestamp:

2010-12-12T09:14:38Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

94c19b8

Parents:

ee0d8a8 (diff), b9eb93f (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 into smekideki

Files:

• boot/Makefile.common (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (3 diffs)
• uspace/drv/uhci/transfers.c (modified) (3 diffs)
• uspace/lib/usb/src/usbdrv.c (modified) (7 diffs)

boot/Makefile.common

@@ -113 +113 @@
         rootvirt \
         test1 \
-        test2 \
-        vhc
+        test2
 
 RD_DRV_CFG = 

boot/arch/amd64/Makefile.inc

@@ -43 +43 @@
         uhci \
         usbhub \
-        usbkbd
+        usbkbd \
+        vhc
         
 RD_DRV_CFG += \

uspace/Makefile

@@ -90 +90 @@
         drv/rootvirt \
         drv/test1 \
-        drv/test2 \
-        drv/vhc
+        drv/test2
 
 ## Networking
@@ -118 +117 @@
         DIRS += drv/isa
         DIRS += drv/ns8250
+        DIRS += drv/uhci
+        DIRS += drv/usbhub
+        DIRS += drv/usbkbd
+        DIRS += drv/vhc
 endif
 
@@ -128 +131 @@
         DIRS += drv/usbhub
         DIRS += drv/usbkbd
+        DIRS += drv/vhc
 endif
 

uspace/drv/uhci/transfers.c

@@ -36 +36 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer OUT [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -49 +49 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -62 +62 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer IN [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer IN [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),

uspace/lib/usb/src/usbdrv.c

@@ -36 +36 @@
 #include <usbhc_iface.h>
 #include <errno.h>
+#include <str_error.h>
 
 /** Information about pending transaction on HC. */
@@ -90 +91 @@
 {
         ipcarg_t address;
-        int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS,
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_ADDRESS,
             dev->handle, &address);
 
         if (rc != EOK) {
+                printf("usb_drv_get_my_address over %d failed: %s\n", phone, str_error(rc));
                 return rc;
         }
@@ -107 +110 @@
 int usb_drv_reserve_default_address(int phone)
 {
-        return async_req_0_0(phone, IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
+        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
 }
 
@@ -117 +121 @@
 int usb_drv_release_default_address(int phone)
 {
-        return async_req_0_0(phone, IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
+        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
 }
 
@@ -128 +133 @@
 {
         ipcarg_t address;
-        int rc = async_req_0_1(phone, IPC_M_USBHC_REQUEST_ADDRESS, &address);
+        int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_REQUEST_ADDRESS, &address);
         if (rc != EOK) {
                 return rc;
@@ -146 +152 @@
     devman_handle_t handle)
 {
-        int rc = async_req_2_0(phone, IPC_M_USBHC_BIND_ADDRESS,
+        int rc = async_req_3_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_BIND_ADDRESS,
             address, handle);
 
@@ -160 +167 @@
 int usb_drv_release_address(int phone, usb_address_t address)
 {
-        return async_req_1_0(phone, IPC_M_USBHC_RELEASE_ADDRESS, address);
+        return async_req_2_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RELEASE_ADDRESS, address);
 }