Changeset 355f7c2 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/connhost.c

Timestamp:

2010-10-25T07:44:02Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ca07cd3

Parents:

7a7bfeb3

Message:

Better debugging support in VHCD

Also, added some missing comments.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/connhost.c (modified) (14 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/connhost.c

@@ -56 +56 @@
 static void out_callback(void * buffer, size_t len, usb_transaction_outcome_t outcome, void * arg)
 {
-        dprintf("out_callback(buffer, %u, %d, %p)", len, outcome, arg);
-        (void)len;
+        dprintf(2, "out_callback(buffer, %u, %d, %p)", len, outcome, arg);
+        
         transaction_details_t * trans = (transaction_details_t *)arg;
         
@@ -63 +63 @@
         
         free(trans);
-        free(buffer);
+        if (buffer) {
+                free(buffer);
+        }
 }
 
@@ -70 +72 @@
 static void in_callback(void * buffer, size_t len, usb_transaction_outcome_t outcome, void * arg)
 {
-        dprintf("in_callback(buffer, %u, %d, %p)", len, outcome, arg);
+        dprintf(2, "in_callback(buffer, %u, %d, %p)", len, outcome, arg);
         transaction_details_t * trans = (transaction_details_t *)arg;
         
@@ -116 +118 @@
         };
         
-        dprintf("pretending transfer to function (dev=%d:%d)",
+        dprintf(1, "pretending transfer to function (dev=%d:%d)",
             target.address, target.endpoint);
         
@@ -144 +146 @@
         trans->handle = handle;
         
-        dprintf("adding transaction to HC", NAME);
         hc_add_transaction_to_device(setup_transaction, target,
             buffer, len,
@@ -150 +151 @@
         
         ipc_answer_1(iid, EOK, handle);
-        dprintf("transfer to function scheduled (handle %d)", handle);
+        dprintf(2, "transfer to function scheduled (handle %d)", handle);
 }
 
@@ -163 +164 @@
         size_t len = IPC_GET_ARG3(icall);
         
-        dprintf("pretending transfer from function (dev=%d:%d)",
+        dprintf(1, "pretending transfer from function (dev=%d:%d)",
             target.address, target.endpoint);
         
@@ -183 +184 @@
         trans->handle = handle;
         
-        dprintf("adding transaction to HC", NAME);
         hc_add_transaction_from_device(target,
             buffer, len,
@@ -189 +189 @@
         
         ipc_answer_1(iid, EOK, handle);
-        dprintf("transfer from function scheduled (handle %d)", handle);
+        dprintf(2, "transfer from function scheduled (handle %d)", handle);
 }
 
@@ -197 +197 @@
  * By host is typically meant top-level USB driver.
  *
+ * This function also takes care of proper phone hung-up.
+ *
  * @param phone_hash Incoming phone hash.
  * @param host_phone Callback phone to host.
@@ -204 +206 @@
         assert(host_phone > 0);
         
-        dprintf("phone%#x: host connected", phone_hash);
+        dprintf(0, "host connected through phone %#x", phone_hash);
         
         
@@ -217 +219 @@
                                 ipc_hangup(host_phone);
                                 ipc_answer_0(callid, EOK);
-                                dprintf("phone%#x: host hang-up", phone_hash);
+                                dprintf(0, "phone%#x: host hung-up",
+                                    phone_hash);
                                 return;
                         
@@ -223 +226 @@
                                 ipc_answer_0(callid, ELIMIT);
                                 break;
-
-                        
-                        case IPC_M_USB_HCD_SEND_DATA:
-                                handle_data_to_function(callid, call,
-                                    false, host_phone);
-                                break;
-                        
-                        case IPC_M_USB_HCD_RECEIVE_DATA:
-                                handle_data_from_function(callid, call, host_phone);
-                                break;
                         
                         case IPC_M_USB_HCD_TRANSACTION_SIZE:
@@ -271 +264 @@
                         
                         default:
+                                dprintf_inval_call(2, call, phone_hash);
                                 ipc_answer_0(callid, EINVAL);
                                 break;