Changes in uspace/drv/vhc/connhost.c [284c629:6427cf67] in mainline

File:

• uspace/drv/vhc/connhost.c (modified) (10 diffs)

uspace/drv/vhc/connhost.c

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/usb.h>
-#include <usb/hcd.h>
+#include <usb/addrkeep.h>
 
 #include "vhcd.h"
@@ -64 +64 @@
 
 static void universal_callback(void *buffer, size_t size,
-    usb_transaction_outcome_t outcome, void *arg)
+    int outcome, void *arg)
 {
         transfer_info_t *transfer = (transfer_info_t *) arg;
@@ -107 +107 @@
 
 static void control_abort_prematurely(control_transfer_info_t *transfer,
-    size_t size, usb_transaction_outcome_t outcome)
+    size_t size, int outcome)
 {
         switch (transfer->direction) {
@@ -127 +127 @@
 
 static void control_callback_two(void *buffer, size_t size,
-    usb_transaction_outcome_t outcome, void *arg)
+    int outcome, void *arg)
 {
         control_transfer_info_t *ctrl_transfer = (control_transfer_info_t *) arg;
 
-        if (outcome != USB_OUTCOME_OK) {
+        if (outcome != EOK) {
                 control_abort_prematurely(ctrl_transfer, outcome, size);
                 free(ctrl_transfer);
@@ -165 +165 @@
 
 static void control_callback_one(void *buffer, size_t size,
-    usb_transaction_outcome_t outcome, void *arg)
+    int outcome, void *arg)
 {
         control_transfer_info_t *transfer = (control_transfer_info_t *) arg;
 
-        if (outcome != USB_OUTCOME_OK) {
+        if (outcome != EOK) {
                 control_abort_prematurely(transfer, outcome, size);
                 free(transfer);
@@ -219 +219 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer OUT [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer OUT [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -239 +239 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer SETUP [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer SETUP [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -259 +259 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer IN [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer IN [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -382 +382 @@
 
 
-static int reserve_default_address(device_t *dev)
+static int reserve_default_address(device_t *dev, bool ignored)
 {
         usb_address_keeping_reserve_default(&addresses);
@@ -394 +394 @@
 }
 
-static int request_address(device_t *dev, usb_address_t *address)
+static int request_address(device_t *dev, bool ignored, usb_address_t *address)
 {
         usb_address_t addr = usb_address_keeping_request(&addresses);