Changeset 1ccc32f in mainline

Timestamp:

2011-10-13T06:57:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

25696fea

Parents:

1a7756a (diff), 21881bd8 (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 with mainline

Files:

• kernel/generic/src/console/cmd.c (modified) (2 diffs)
• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)

kernel/generic/src/console/cmd.c

@@ -1177 +1177 @@
                 /* Execute the test */
                 test_quiet = true;
-                const char *ret = test->entry();
+                const char *test_ret = test->entry();
                 
                 /* Update and read thread accounting */
@@ -1185 +1185 @@
                 irq_spinlock_unlock(&TASK->lock, true);
                 
-                if (ret != NULL) {
-                        printf("%s\n", ret);
+                if (test_ret != NULL) {
+                        printf("%s\n", test_ret);
                         ret = false;
                         break;

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -242 +242 @@
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_HUB, 0, 0, &descriptor,
-            sizeof(usb_hub_descriptor_t), &received_size);
+            sizeof(usb_hub_descriptor_header_t), &received_size);
         if (opResult != EOK) {
                 usb_log_error("Failed to receive hub descriptor: %s.\n",