Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish

[barrelfish] / usr / pci / pci_service.c

diff --git a/usr/pci/pci_service.c b/usr/pci/pci_service.c
index b0f4aab..94e450d 100644 (file)
--- a/usr/pci/pci_service.c
+++ b/usr/pci/pci_service.c
@@ -22,6 +22,8 @@
 #include <barrelfish/sys_debug.h>
 
 #include <if/pci_defs.h>
+#include <if/acpi_rpcclient_defs.h>
+
 #include <acpi_client/acpi_client.h>
 #include <mm/mm.h>
 //#include "pci_confspace.h"
@@ -211,14 +213,20 @@ static void get_irq_cap_handler(struct pci_binding *b, uint16_t idx){
     // TODO: This should be part of the routing step
     int irq = pci_setup_interrupt(st->bus, st->dev, st->fun);
     PCI_DEBUG("pci: init_device_handler_irq: init interrupt.\n");
-    PCI_DEBUG("pci: irq = %u, core = %hhu, vector = %u\n", irq, coreid,
-                      vector);
 
     pci_enable_interrupt_for_device(st->bus, st->dev, st->fun, st->pcie);
 
+    PCI_DEBUG("pci: Interrupt enabled.\n");
 
     err = sys_debug_create_irq_src_cap(cap, irq);
-    b->tx_vtbl.get_irq_cap_response(b, NOP_CONT, err, cap);
+    if (err_is_fail(err)) {
+        USER_PANIC_ERR(err, "create irq src cap failed.");
+    }
+
+    err = b->tx_vtbl.get_irq_cap_response(b, NOP_CONT, err, cap);
+    if (err_is_fail(err)) {
+        USER_PANIC_ERR(err, "cap response failed.");
+    }
 }
 
 static void get_bar_cap_handler(struct pci_binding *b, uint32_t idx,