Changeset 806a779 in mainline

Timestamp:

2018-01-10T18:07:44Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

94a0904

Parents:

8bab0d2

Message:

usb: little changes to make compiler happy

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci_batch.c (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (1 diff)
• lib/usbhid/src/hiddescriptor.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -62 +62 @@
         assert(ehci_batch);
         dma_buffer_free(&ehci_batch->dma_buffer);
+        usb_log_debug2("Batch(%p): disposed", ehci_batch);
         free(ehci_batch);
-        usb_log_debug2("Batch(%p): disposed", ehci_batch);
 }
 

uspace/lib/usbdev/src/devdrv.c

@@ -440 +440 @@
          * it makes no sense to speak about alternate interfaces when
          * controlling a device. */
-        rc = usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
+        usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
             usb_dev->descriptors.full_config,
             usb_dev->descriptors.full_config_size, usb_dev->interface_no);

uspace/lib/usbhid/src/hiddescriptor.c

@@ -175 +175 @@
 
         if(report_item->usages_count > 0){
-                usages = malloc(sizeof(int32_t) * report_item->usages_count);
+                usages = malloc(sizeof(uint32_t) * report_item->usages_count);
                 memcpy(usages, report_item->usages, sizeof(int32_t) *
                                 report_item->usages_count);