Merge branch 'arrakis'
[barrelfish] / usr / pci / pci_service.c
index 0154c11..40829f6 100644 (file)
@@ -207,21 +207,6 @@ XXX: I/O-Cap??
         get_cap_response_cont(b, SYS_ERR_OK, cap, type, bar_nr);
     }
 }
-
-static void reregister_interrupt_handler(struct pci_binding *b,
-                                    uint32_t class_code, uint32_t sub_class,
-                                    uint32_t prog_if, uint32_t vendor_id,
-                                    uint32_t device_id,
-                                    uint32_t bus, uint32_t dev, uint32_t fun,
-                                    coreid_t coreid, uint32_t vector)
-{
-    errval_t err;
-    err = device_reregister_interrupt(coreid, vector,
-                      class_code, sub_class, prog_if, vendor_id, device_id,
-                      &bus, &dev, &fun);
-    err = b->tx_vtbl.reregister_interrupt_response(b, NOP_CONT, err);
-    assert(err_is_ok(err));
-}
 /*
 static void get_vbe_bios_cap(struct pci_binding *b)
 {
@@ -248,6 +233,21 @@ static void read_conf_header_handler(struct pci_binding *b, uint32_t dword)
     assert(err_is_ok(err));
 }
 
+static void reregister_interrupt_handler(struct pci_binding *b,
+                                    uint32_t class_code, uint32_t sub_class,
+                                    uint32_t prog_if, uint32_t vendor_id,
+                                    uint32_t device_id,
+                                    uint32_t bus, uint32_t dev, uint32_t fun,
+                                    coreid_t coreid, uint32_t vector)
+{
+    errval_t err;
+    err = device_reregister_interrupt(coreid, vector,
+                      class_code, sub_class, prog_if, vendor_id, device_id,
+                      &bus, &dev, &fun);
+    err = b->tx_vtbl.reregister_interrupt_response(b, NOP_CONT, err);
+    assert(err_is_ok(err));
+}
+
 static void write_conf_header_handler(struct pci_binding *b, uint32_t dword, uint32_t val)
 {
     struct client_state *cc = (struct client_state *) b->st;