Changeset ab87db5 in mainline for uspace/drv/bus/usb

Timestamp:

2019-02-23T17:16:01Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

Location:

uspace/drv/bus/usb

Files:

• ohci/hc.c (modified) (1 diff)
• uhci/hc.c (modified) (1 diff)
• vhc/conndev.c (modified) (1 diff)
• xhci/hc.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/hc.c

@@ -514 +514 @@
 
         /* Enable interrupts */
-        if (CAP_HANDLE_VALID(instance->base.irq_handle)) {
+        if (cap_handle_valid(instance->base.irq_handle)) {
                 OHCI_WR(instance->registers->interrupt_enable,
                     OHCI_USED_INTERRUPTS);

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

@@ -295 +295 @@
         pio_write_32(&registers->flbaseadd, pa);
 
-        if (CAP_HANDLE_VALID(instance->base.irq_handle)) {
+        if (cap_handle_valid(instance->base.irq_handle)) {
                 /* Enable all interrupts, but resume interrupt */
                 pio_write_16(&instance->registers->usbintr,

uspace/drv/bus/usb/vhc/conndev.c

@@ -83 +83 @@
                 return;
 
-        size_t len = IPC_GET_ARG2(data_request_call);
+        size_t len = ipc_get_arg2(&data_request_call);
         plugged_device_name[len] = 0;
 }

uspace/drv/bus/usb/xhci/hc.c

@@ -494 +494 @@
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA, erstba_phys);
 
-        if (CAP_HANDLE_VALID(hc->base.irq_handle)) {
+        if (cap_handle_valid(hc->base.irq_handle)) {
                 XHCI_REG_SET(intr0, XHCI_INTR_IE, 1);
                 XHCI_REG_SET(hc->op_regs, XHCI_OP_INTE, 1);