Changeset 355f7c2 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/hubops.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/hubops.c (modified) (8 diffs)

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

@@ -43 +43 @@
 #include "hubintern.h"
 
+/** Produce a byte from bit values.
+ */
 #define MAKE_BYTE(b0, b1, b2, b3, b4, b5, b6, b7) \
         (( \
@@ -63 +65 @@
     void *buffer, size_t size, size_t *actual_size);
 
-
+/** Standard USB requests. */
 static usbvirt_standard_device_request_ops_t standard_request_ops = {
         .on_get_status = NULL,
@@ -78 +80 @@
 };
 
-
+/** Hub operations. */
 usbvirt_device_ops_t hub_ops = {
         .standard_request_ops = &standard_request_ops,
@@ -86 +88 @@
 };
 
+/** Callback for GET_DESCRIPTOR request. */
 static int on_get_descriptor(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data)
@@ -124 +127 @@
 }
 
+/** Get access to a port or return with EINVAL. */
 #define _GET_PORT(portvar, index) \
         do { \
@@ -274 +278 @@
 
 
-
-
+/** Callback for class request. */
 static int on_class_request(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data)
 {       
-        printf("%s: hub class request (%d)\n", NAME, (int) request->request);
+        dprintf(2, "hub class request (%d)\n", (int) request->request);
         
         uint8_t recipient = request->request_type & 31;
@@ -287 +290 @@
         do { \
                 if (!(cond)) { \
-                        printf("%s: WARN: invalid class request (%s not met).\n", \
+                        dprintf(0, "WARN: invalid class request (%s not met).\n", \
                             NAME, #cond); \
                         return EINVAL; \
@@ -347 +350 @@
 }
 
+/** Callback for data request. */
 static int on_data_request(struct usbvirt_device *dev,
     usb_endpoint_t endpoint,
     void *buffer, size_t size, size_t *actual_size)
 {
+        if (endpoint != HUB_STATUS_CHANGE_PIPE) {
+                return EINVAL;
+        }
+        
         uint8_t change_map = 0;