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

Timestamp:

2010-10-22T14:57:03Z (16 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7a7bfeb3

Parents:

954ea70

Message:

VHCD handles new methods

Not completely, though. Will finish later.

File:

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

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

@@ -84 +84 @@
             &answer_data);
         
-        rc = async_data_write_start(trans->phone, buffer, len);
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                goto leave;
+        if (len > 0) {
+                rc = async_data_write_start(trans->phone, buffer, len);
+                if (rc != EOK) {
+                        async_wait_for(req, NULL);
+                        goto leave;
+                }
         }
         
@@ -98 +100 @@
 leave:
         free(trans);
-        free(buffer);
+        if (buffer != NULL) {
+                free(buffer);
+        }
 }
 
 /** Handle data from host to function.
  */
-static void handle_data_to_function(ipc_callid_t iid, ipc_call_t icall, int callback_phone)
-{
-        usb_transfer_type_t transf_type = IPC_GET_ARG3(icall);
+static void handle_data_to_function(ipc_callid_t iid, ipc_call_t icall,
+    bool setup_transaction, int callback_phone)
+{
+        size_t expected_len = IPC_GET_ARG3(icall);
         usb_target_t target = {
                 .address = IPC_GET_ARG1(icall),
@@ -111 +116 @@
         };
         
-        dprintf("pretending transfer to function (dev=%d:%d, type=%s)",
-            target.address, target.endpoint,
-            usb_str_transfer_type(transf_type));
+        dprintf("pretending transfer to function (dev=%d:%d)",
+            target.address, target.endpoint);
         
         if (callback_phone == -1) {
@@ -123 +127 @@
             = create_transaction_handle(callback_phone);
         
-        size_t len;
-        void * buffer;
-        int rc = async_data_write_accept(&buffer, false,
-            1, USB_MAX_PAYLOAD_SIZE,
-            0, &len);
-        
-        if (rc != EOK) {
-                ipc_answer_0(iid, rc);
-                return;
+        size_t len = 0;
+        void * buffer = NULL;
+        if (expected_len > 0) {
+                int rc = async_data_write_accept(&buffer, false,
+                    1, USB_MAX_PAYLOAD_SIZE,
+                    0, &len);
+                
+                if (rc != EOK) {
+                        ipc_answer_0(iid, rc);
+                        return;
+                }
         }
         
@@ -139 +145 @@
         
         dprintf("adding transaction to HC", NAME);
-        hc_add_transaction_to_device(transf_type, target,
+        hc_add_transaction_to_device(setup_transaction, target,
             buffer, len,
             out_callback, trans);
@@ -151 +157 @@
 static void handle_data_from_function(ipc_callid_t iid, ipc_call_t icall, int callback_phone)
 {
-        usb_transfer_type_t transf_type = IPC_GET_ARG3(icall);
         usb_target_t target = {
                 .address = IPC_GET_ARG1(icall),
                 .endpoint = IPC_GET_ARG2(icall)
         };
-        size_t len = IPC_GET_ARG4(icall);
-        
-        dprintf("pretending transfer from function (dev=%d:%d, type=%s)",
-            target.address, target.endpoint,
-            usb_str_transfer_type(transf_type));
+        size_t len = IPC_GET_ARG3(icall);
+        
+        dprintf("pretending transfer from function (dev=%d:%d)",
+            target.address, target.endpoint);
         
         if (callback_phone == -1) {
@@ -170 +174 @@
             = create_transaction_handle(callback_phone);
         
-        void * buffer = malloc(len);
+        void * buffer = NULL;
+        if (len > 0) {
+                buffer = malloc(len);
+        }
         
         transaction_details_t * trans = malloc(sizeof(transaction_details_t));
@@ -177 +184 @@
         
         dprintf("adding transaction to HC", NAME);
-        hc_add_transaction_from_device(transf_type, target,
+        hc_add_transaction_from_device(target,
             buffer, len,
             in_callback, trans);
@@ -219 +226 @@
                         
                         case IPC_M_USB_HCD_SEND_DATA:
-                                handle_data_to_function(callid, call, host_phone);
+                                handle_data_to_function(callid, call,
+                                    false, host_phone);
                                 break;
                         
@@ -230 +238 @@
                                 break;
                         
+                        
+                        case IPC_M_USB_HCD_INTERRUPT_OUT:
+                                handle_data_to_function(callid, call,
+                                    false, host_phone);
+                                break;
+                                
+                        case IPC_M_USB_HCD_INTERRUPT_IN:
+                                handle_data_from_function(callid, call, host_phone);
+                                break;
+                        
+                        case IPC_M_USB_HCD_CONTROL_WRITE_SETUP:
+                                handle_data_to_function(callid, call,
+                                    true, host_phone);
+                                break;
+                                
+                        case IPC_M_USB_HCD_CONTROL_WRITE_DATA:
+                                handle_data_to_function(callid, call,
+                                    false, host_phone);
+                                break;
+                                
+                        case IPC_M_USB_HCD_CONTROL_WRITE_STATUS:
+                                handle_data_from_function(callid, call, host_phone);
+                                break;
+                        
+                        case IPC_M_USB_HCD_CONTROL_READ_SETUP:
+                                handle_data_to_function(callid, call,
+                                    true, host_phone);
+                                break;
+                                
+                        case IPC_M_USB_HCD_CONTROL_READ_DATA:
+                        case IPC_M_USB_HCD_CONTROL_READ_STATUS:
+                        
                         default:
                                 ipc_answer_0(callid, EINVAL);