Changeset c3dafe1 in mainline

Timestamp:

2011-05-31T20:11:58Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

049a16f

Parents:

06f9d8fb (diff), e6503e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development

Location:

uspace

Files:

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

uspace/app/vuhid/device.c

@@ -96 +96 @@
     const char *id)
 {
-        vuhid_interface_t *iface = ifaces[0];
-        while (iface != NULL) {
-                if (str_cmp(iface->id, id) == 0) {
-                        return iface;
+        if ((ifaces == NULL) || (id == NULL)) {
+                return NULL;
+        }
+        while (*ifaces != NULL) {
+                if (str_cmp((*ifaces)->id, id) == 0) {
+                        return *ifaces;
                 }
-                iface++;
-        }
-
-        return iface;
+                ifaces++;
+        }
+
+        return NULL;
 }
 
@@ -119 +121 @@
         }
 
-        // FIXME - we shall set vuhid_data to NULL in the main() rather
-        // than to depend on individual interfaces
         /* Already used interface. */
         if (iface->vuhid_data != NULL) {
@@ -166 +166 @@
          * Prepare new descriptors.
          */
-        printf("preparing descriptors...\n");
         size_t descr_count = 0;
         size_t total_descr_size = 0;
@@ -273 +272 @@
         }
 
-        printf("adding extra descriptors...\n");
         /* Allocation is okay, we can (actually have to now) overwrite the
          * original pointer.

uspace/drv/ehci-hcd/main.c

@@ -88 +88 @@
         ret = pci_disable_legacy(device, reg_base, reg_size, irq);
         CHECK_RET_RETURN(ret,
-            "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
+            "Failed to disable legacy USB: %s.\n", 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>
@@ -240 +241 @@
         void *regs = NULL;
         int ret = pio_enable((void*)reg_base, reg_size, &regs);
-        CHECK_RET_RETURN(ret, "Failed(%d) to map registers %p.\n",
-            ret, (void *) reg_base);
+        CHECK_RET_RETURN(ret, "Failed to map registers %p: %s.\n",
+            (void *) reg_base, str_error(ret));
 
         const uint32_t hcc_params =
@@ -256 +257 @@
         uint32_t usblegsup;
         ret = pci_read32(device, eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
-        usb_log_debug("USBLEGSUP: %" PRIxn ".\n", usblegsup);
+        CHECK_RET_RETURN(ret, "Failed to read USBLEGSUP: %s.\n", str_error(ret));
+        usb_log_debug("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
 
         /* Request control from firmware/BIOS, by writing 1 to highest byte.
@@ -263 +264 @@
         usb_log_debug("Requesting OS control.\n");
         ret = pci_write8(device, eecp + USBLEGSUP_OFFSET + 3, 1);
-        CHECK_RET_RETURN(ret, "Failed(%d) to request OS EHCI control.\n", ret);
+        CHECK_RET_RETURN(ret, "Failed to request OS EHCI control: %s.\n",
+            str_error(ret));
 
         size_t wait = 0;
@@ -283 +285 @@
                 ret = pci_write32(device, eecp + USBLEGSUP_OFFSET,
                     USBLEGSUP_OS_CONTROL);
-                CHECK_RET_RETURN(ret, "Failed(%d) to force OS control.\n", ret);
+                CHECK_RET_RETURN(ret, "Failed to force OS control: %s.\n",
+                    str_error(ret));
                 /* Check capability type here, A value of 01h
                  * identifies the capability as Legacy Support.
@@ -297 +300 @@
                             device, eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                         CHECK_RET_RETURN(ret,
-                            "Failed(%d) to get USBLEGCTLSTS.\n", ret);
-                        usb_log_debug("USBLEGCTLSTS: %" PRIxn ".\n",
+                            "Failed to get USBLEGCTLSTS: %s.\n", str_error(ret));
+                        usb_log_debug("USBLEGCTLSTS: %" PRIx32 ".\n",
                             usblegctlsts);
                         /* Zero SMI enables in legacy control register.
@@ -310 +313 @@
                             device, eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                         CHECK_RET_RETURN(ret,
-                            "Failed(%d) to get USBLEGCTLSTS 2.\n", ret);
-                        usb_log_debug("Zeroed USBLEGCTLSTS: %" PRIxn ".\n",
+                            "Failed to get USBLEGCTLSTS 2: %s.\n",
+                            str_error(ret));
+                        usb_log_debug("Zeroed USBLEGCTLSTS: %" PRIx32 ".\n",
                             usblegctlsts);
                 }
@@ -319 +323 @@
         /* Read again Legacy Support register */
         ret = pci_read32(device, eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
-        usb_log_debug("USBLEGSUP: %" PRIxn ".\n", usblegsup);
+        CHECK_RET_RETURN(ret, "Failed to read USBLEGSUP: %s.\n", str_error(ret));
+        usb_log_debug("USBLEGSUP: %" PRIx32 ".\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];