Changeset bb97118 in mainline for uspace/drv

Timestamp:

2019-02-06T13:25:12Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

eb13ef8

Parents:

d066259

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 13:29:26)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)

Message:

Convert CAP_HANDLE_RAW and CAP_HANDLE_VALID into functions

Location:

uspace/drv

Files:

• bus/usb/ohci/hc.c (modified) (1 diff)
• bus/usb/uhci/hc.c (modified) (1 diff)
• bus/usb/xhci/hc.c (modified) (1 diff)
• char/msim-con/msim-con.c (modified) (1 diff)
• char/pc-lpt/pc-lpt.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/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);

uspace/drv/char/msim-con/msim-con.c

@@ -156 +156 @@
         return EOK;
 error:
-        if (CAP_HANDLE_VALID(con->irq_handle))
+        if (cap_handle_valid(con->irq_handle))
                 async_irq_unsubscribe(con->irq_handle);
         if (bound)

uspace/drv/char/pc-lpt/pc-lpt.c

@@ -173 +173 @@
         return EOK;
 error:
-        if (CAP_HANDLE_VALID(lpt->irq_handle))
+        if (cap_handle_valid(lpt->irq_handle))
                 async_irq_unsubscribe(lpt->irq_handle);
         if (bound)