Changeset 97e87de in mainline

Timestamp:

2011-02-04T13:30:25Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

881c47b

Parents:

74d6e90

Message:

Add some more error checking

Location:

uspace/drv

Files:

• uhci-hcd/main.c (modified) (1 diff)
• uhci-hcd/uhci.c (modified) (2 diffs)
• uhci-rhd/port.c (modified) (1 diff)

uspace/drv/uhci-hcd/main.c

@@ -134 +134 @@
          */
         sleep(5);
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         return driver_main(&uhci_driver);

uspace/drv/uhci-hcd/uhci.c

@@ -156 +156 @@
         }
 
+        if (transfer_type == USB_TRANSFER_INTERRUPT
+          && size >= 64) {
+                usb_log_warning("Interrupt transfer too big %zu.\n", size);
+                return ENOTSUP;
+        }
+
+
         if (size >= 1024) {
                 usb_log_warning("Transfer too big.\n");
@@ -211 +218 @@
                                 &instance->transfers[i], it ? "SOMETHING" : "EMPTY");
 
-                if (it)
-                        usb_log_debug("First in queue: %p (%x).\n",
-                                it, it->status);
+                        if (it)
+                                usb_log_debug("First in queue: %p (%x).\n",
+                                        it, it->status);
 
                         while (instance->transfers[i].first &&

uspace/drv/uhci-rhd/port.c

@@ -215 +215 @@
                 port->number, usb_address, port->attached_device);
 
-        /* TODO: bind the address here */
-        ret = usb_drv_bind_address(port->hc_phone, usb_address, port->attached_device);
+        ret =
+          usb_drv_bind_address(port->hc_phone, usb_address, port->attached_device);
+        // TODO: proper error check here
+        assert(ret == EOK);
 
         return EOK;