Changeset 3df2907 in mainline for uspace

Timestamp:

2012-02-27T12:58:00Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

31718d1

Parents:

09c954b (diff), b64fbc9 (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 mainline changes

Location:

uspace

Files:

• drv/bus/usb/uhci/transfer_list.c (modified) (4 diffs)
• drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)
• drv/infrastructure/root/root.c (modified) (4 diffs)
• lib/c/arch/ia64/include/ddi.h (modified) (7 diffs)

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -110 +110 @@
         assert(instance);
         assert(uhci_batch);
-        usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name,
-            uhci_batch->usb_batch);
+        usb_log_debug2("Batch %p adding to queue %s.\n",
+            uhci_batch->usb_batch, instance->name);
 
         fibril_mutex_lock(&instance->guard);
@@ -139 +139 @@
         list_append(&uhci_batch->link, &instance->batch_list);
 
-        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
-            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
-            instance->name);
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
+            " scheduled in queue %s.\n", uhci_batch->usb_batch,
+            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch), instance->name);
         fibril_mutex_unlock(&instance->guard);
 }
@@ -205 +205 @@
         assert(fibril_mutex_is_locked(&instance->guard));
 
-        usb_log_debug2("Queue %s: removing batch(%p).\n",
-            instance->name, uhci_batch->usb_batch);
+        usb_log_debug2("Batch %p removing from queue %s.\n",
+            uhci_batch->usb_batch, instance->name);
 
         /* Assume I'm the first */
@@ -228 +228 @@
         list_remove(&uhci_batch->link);
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
-            "from %s, next: %x.\n",
-            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
+            "from %s, next: %x.\n", uhci_batch->usb_batch,
+            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
             qpos, instance->name, uhci_batch->qh->next);
 }

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -174 +174 @@
                         assert(uhci_batch->usb_batch->ep != NULL);
 
-                        usb_log_debug("Batch(%p) found error TD(%zu):%"
+                        usb_log_debug("Batch %p found error TD(%zu->%p):%"
                             PRIx32 ".\n", uhci_batch->usb_batch, i,
-                            uhci_batch->tds[i].status);
+                            &uhci_batch->tds[i], uhci_batch->tds[i].status);
                         td_print_status(&uhci_batch->tds[i]);
 

uspace/drv/infrastructure/root/root.c

@@ -158 +158 @@
         if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
                 ddf_msg(LVL_ERROR, "Memory allocation failed.");
-                return ENOMEM;
-        }
+                free(platform);
+                return ENOMEM;
+        }
+
+        free(platform);
 
         /* Add function. */
@@ -169 +172 @@
         if (fun == NULL) {
                 ddf_msg(LVL_ERROR, "Error creating function %s", name);
+                free(match_id);
                 return ENOMEM;
         }
@@ -176 +180 @@
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     name);
+                free(match_id);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -208 +213 @@
          * vital for the system.
          */
-        add_virtual_root_fun(dev);
+        (void) add_virtual_root_fun(dev);
 
         /* Register root device's children. */

uspace/lib/c/arch/ia64/include/ddi.h

@@ -62 +62 @@
 
         asm volatile ("mf\n" ::: "memory");
+        asm volatile ("mf.a\n" ::: "memory");
 }
 
@@ -76 +77 @@
 
         asm volatile ("mf\n" ::: "memory");
+        asm volatile ("mf.a\n" ::: "memory");
 }
 
@@ -90 +92 @@
 
         asm volatile ("mf\n" ::: "memory");
+        asm volatile ("mf.a\n" ::: "memory");
 }
 
@@ -106 +109 @@
                 v = *port;
         }
+
+        asm volatile ("mf.a\n" ::: "memory");
 
         return v;
@@ -125 +130 @@
         }
 
+        asm volatile ("mf.a\n" ::: "memory");
+
         return v;
 }
@@ -134 +141 @@
         asm volatile ("mf\n" ::: "memory");
 
-        if (port < (ioport32_t *) port) {
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 uintptr_t prt = (uintptr_t) port;
 
@@ -143 +150 @@
         }
 
+        asm volatile ("mf.a\n" ::: "memory");
+
         return v;
 }