Changeset d5e7668 in mainline for uspace/lib/usbvirt/src/ctrlpipe.c

Timestamp:

2010-12-13T14:56:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

266d0871

Parents:

76daaf9f

Message:

virtusb: named callbacks for pipe zero

File:

• uspace/lib/usbvirt/src/ctrlpipe.c (modified) (5 diffs)

uspace/lib/usbvirt/src/ctrlpipe.c

@@ -76 +76 @@
 }
 
+#define _GET_BIT(byte, bit) \
+        (((byte) & (1 << (bit))) ? '1' : '0')
+#define _GET_BITS(byte) \
+        _GET_BIT(byte, 7), _GET_BIT(byte, 6), _GET_BIT(byte, 5), \
+        _GET_BIT(byte, 4), _GET_BIT(byte, 3), _GET_BIT(byte, 2), \
+        _GET_BIT(byte, 1), _GET_BIT(byte, 0)
+
+static int find_and_run_handler(usbvirt_device_t *device,
+    usbvirt_control_transfer_handler_t *handlers,
+    usb_device_request_setup_packet_t *setup_packet,
+    uint8_t *data)
+{
+        int rc = EFORWARD;
+        usbvirt_control_transfer_handler_t *suitable_handler
+            = find_handler(handlers, setup_packet);
+        if (suitable_handler != NULL) {
+                const char *callback_name = "user handler";
+                if (suitable_handler->name != NULL) {
+                        callback_name = suitable_handler->name;
+                }
+                device->lib_debug(device, 1, USBVIRT_DEBUGTAG_CONTROL_PIPE_ZERO,
+                    "pipe #0 - calling %s " \
+                        "[%c.%c%c.%c%c%c%c%c, R%d, V%d, I%d, L%d]",
+                    callback_name,
+                    _GET_BITS(setup_packet->request_type),
+                    setup_packet->request, setup_packet->value,
+                    setup_packet->index, setup_packet->length);
+                rc = suitable_handler->callback(device, setup_packet, data);
+        }
+
+        return rc;
+}
+#undef _GET_BITS
+#undef _GET_BIT
 
 
@@ -82 +116 @@
 int control_pipe(usbvirt_device_t *device, usbvirt_control_transfer_t *transfer)
 {
-        device->lib_debug(device, 1, USBVIRT_DEBUGTAG_CONTROL_PIPE_ZERO,
+        device->lib_debug(device, 2, USBVIRT_DEBUGTAG_CONTROL_PIPE_ZERO,
             "op on control pipe zero (request_size=%u)", transfer->request_size);
         
@@ -91 +125 @@
         usb_device_request_setup_packet_t *request
             = (usb_device_request_setup_packet_t *) transfer->request;
-        printf("Request: %d,%d\n", request->request_type, request->request);
-        
+
         /*
          * First, see whether user provided its own callback.
@@ -98 +131 @@
         int rc = EFORWARD;
         if (device->ops) {
-                usbvirt_control_transfer_handler_t *user_handler
-                    = find_handler(device->ops->control_transfer_handlers,
-                    request);
-                if (user_handler != NULL) {
-                        rc = user_handler->callback(device, request,
-                            transfer->data);
-                }
+                rc = find_and_run_handler(device,
+                    device->ops->control_transfer_handlers,
+                    request, transfer->data);
         }
 
@@ -112 +141 @@
          */
         if (rc == EFORWARD) {
-                usbvirt_control_transfer_handler_t *lib_handler
-                    = find_handler(control_pipe_zero_local_handlers,
-                    request);
-                if (lib_handler != NULL) {
-                        rc = lib_handler->callback(device, request,
-                            transfer->data);
-                }
+                rc = find_and_run_handler(device,
+                    control_pipe_zero_local_handlers,
+                    request, transfer->data);
         }