Changes in / [d754f59:63862a0] in mainline

Location:

uspace/drv

Files:

• ehci-hcd/main.c (modified) (1 diff)
• ehci-hcd/pci.c (modified) (8 diffs)
• ohci/hw_struct/hcca.h (modified) (1 diff)

uspace/drv/ehci-hcd/main.c

@@ -88 +88 @@
         ret = pci_disable_legacy(device, reg_base, reg_size, irq);
         CHECK_RET_RETURN(ret,
-            "Failed to disable legacy USB: %s.\n", str_error(ret));
+            "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
         ddf_fun_t *hc_fun = ddf_fun_create(device, fun_exposed, "ehci-hc");

uspace/drv/ehci-hcd/pci.c

@@ -35 +35 @@
  */
 #include <errno.h>
-#include <str_error.h>
 #include <assert.h>
 #include <as.h>
@@ -241 +240 @@
         void *regs = NULL;
         int ret = pio_enable((void*)reg_base, reg_size, &regs);
-        CHECK_RET_RETURN(ret, "Failed to map registers %p: %s.\n",
-            (void *) reg_base, str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed(%d) to map registers %p.\n",
+            ret, (void *) reg_base);
 
         const uint32_t hcc_params =
@@ -257 +256 @@
         uint32_t usblegsup;
         ret = pci_read32(device, eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_RETURN(ret, "Failed to read USBLEGSUP: %s.\n", str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
         usb_log_debug("USBLEGSUP: %" PRIxn ".\n", usblegsup);
 
@@ -264 +263 @@
         usb_log_debug("Requesting OS control.\n");
         ret = pci_write8(device, eecp + USBLEGSUP_OFFSET + 3, 1);
-        CHECK_RET_RETURN(ret, "Failed to request OS EHCI control: %s.\n",
-            str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed(%d) to request OS EHCI control.\n", ret);
 
         size_t wait = 0;
@@ -285 +283 @@
                 ret = pci_write32(device, eecp + USBLEGSUP_OFFSET,
                     USBLEGSUP_OS_CONTROL);
-                CHECK_RET_RETURN(ret, "Failed to force OS control: %s.\n",
-                    str_error(ret));
+                CHECK_RET_RETURN(ret, "Failed(%d) to force OS control.\n", ret);
                 /* Check capability type here, A value of 01h
                  * identifies the capability as Legacy Support.
@@ -300 +297 @@
                             device, eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                         CHECK_RET_RETURN(ret,
-                            "Failed to get USBLEGCTLSTS: %s.\n", str_error(ret));
+                            "Failed(%d) to get USBLEGCTLSTS.\n", ret);
                         usb_log_debug("USBLEGCTLSTS: %" PRIxn ".\n",
                             usblegctlsts);
@@ -313 +310 @@
                             device, eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                         CHECK_RET_RETURN(ret,
-                            "Failed to get USBLEGCTLSTS 2: %s.\n",
-                            str_error(ret));
+                            "Failed(%d) to get USBLEGCTLSTS 2.\n", ret);
                         usb_log_debug("Zeroed USBLEGCTLSTS: %" PRIxn ".\n",
                             usblegctlsts);
@@ -323 +319 @@
         /* Read again Legacy Support register */
         ret = pci_read32(device, eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_RETURN(ret, "Failed to read USBLEGSUP: %s.\n", str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
         usb_log_debug("USBLEGSUP: %" PRIxn ".\n", usblegsup);
 

uspace/drv/ohci/hw_struct/hcca.h

@@ -37 +37 @@
 #include <stdint.h>
 
-/** Host controller communication area.
- * Shared memory used for communication between the controller and the driver.
- */
 typedef struct hcca {
         uint32_t int_ep[32];