MFC r304459,r305527:

  r304459:
    INTRNG: Rework handling with resources. Partially revert r301453.
     - Read interrupt properties at bus enumeration time and store
       it into global mapping table.
     - At bus_activate_resource() time, given mapping entry is resolved and
       connected to real interrupt source. A copy of mapping entry is attached
       to given resource.
     - At bus_setup_intr() time, mapping entry stored in resource is used
       for delivery of requested interrupt configuration.
     - For MSI/MSIX interrupts, mapping entry is created within
       pci_alloc_msi()/pci_alloc_msix() call.
     - For legacy PCI interrupts, mapping entry must be created within
       pcib_route_interrupt() by pcib driver itself.
  r305527:
    Fix MIPS INTRNG (both FDT and non-FDT) behaviour broken by r304459

1 files changed, 0 insertions, 14 deletions

diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 30a5333..9139eda 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -276,17 +276,6 @@ enum intr_polarity {
 	INTR_POLARITY_LOW = 2
 };
 
-enum intr_map_data_type {
-	INTR_MAP_DATA_ACPI,
-	INTR_MAP_DATA_FDT,
-	INTR_MAP_DATA_GPIO,
-};
-
-struct intr_map_data {
-	enum intr_map_data_type	type;
-	void (*destruct)(struct intr_map_data *);
-};
-
 /**
  * CPU sets supported by bus_get_cpus().  Note that not all sets may be
  * supported for a given device.  If a request is not supported by a
@@ -463,9 +452,6 @@ int	bus_generic_release_resource(device_t bus, device_t child,
 				     int type, int rid, struct resource *r);
 int	bus_generic_resume(device_t dev);
 int	bus_generic_resume_child(device_t dev, device_t child);
-int	bus_generic_map_intr(device_t dev, device_t child, int *rid,
-			      rman_res_t *start, rman_res_t *end,
-			      rman_res_t *count, struct intr_map_data **imd);
 int	bus_generic_setup_intr(device_t dev, device_t child,
 			       struct resource *irq, int flags,
 			       driver_filter_t *filter, driver_intr_t *intr,