aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Smith <msmith@FreeBSD.org>2000-12-29 09:42:05 +0000
committerMike Smith <msmith@FreeBSD.org>2000-12-29 09:42:05 +0000
commit39a8493ac0faa457fd7040ca08c7d195101d615f (patch)
tree8b33dbef48982c1f6b7b9dc64257a2367fb91230
parent4ea7b32b357fb1b69c814bf068bc6a84f2217145 (diff)
Notes
-rw-r--r--sys/dev/acpica/acpi_pcib.c8
-rw-r--r--sys/dev/acpica/acpi_pcib_acpi.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 19df2a7cc3f6..2e2d873be51e 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -61,7 +61,7 @@ static int acpi_pcib_maxslots(device_t dev);
static u_int32_t acpi_pcib_read_config(device_t dev, int bus, int slot, int func, int reg, int bytes);
static void acpi_pcib_write_config(device_t dev, int bus, int slot, int func, int reg,
u_int32_t data, int bytes);
-static int acpi_pcib_route_interrupt(device_t bus, int device, int pin);
+static int acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
static device_method_t acpi_pcib_methods[] = {
/* Device interface */
@@ -245,7 +245,9 @@ acpi_pcib_write_config(device_t dev, int bus, int slot, int func, int reg, u_int
}
static int
-acpi_pcib_route_interrupt(device_t bus, int device, int pin)
+acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
{
- return(255); /* XXX implement */
+ /* XXX this is not the right way to do this! */
+ pci_cfgregopen();
+ return(pci_cfgintr(pci_get_bus(dev), pci_get_slot(dev), pin));
}
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 19df2a7cc3f6..2e2d873be51e 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -61,7 +61,7 @@ static int acpi_pcib_maxslots(device_t dev);
static u_int32_t acpi_pcib_read_config(device_t dev, int bus, int slot, int func, int reg, int bytes);
static void acpi_pcib_write_config(device_t dev, int bus, int slot, int func, int reg,
u_int32_t data, int bytes);
-static int acpi_pcib_route_interrupt(device_t bus, int device, int pin);
+static int acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
static device_method_t acpi_pcib_methods[] = {
/* Device interface */
@@ -245,7 +245,9 @@ acpi_pcib_write_config(device_t dev, int bus, int slot, int func, int reg, u_int
}
static int
-acpi_pcib_route_interrupt(device_t bus, int device, int pin)
+acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
{
- return(255); /* XXX implement */
+ /* XXX this is not the right way to do this! */
+ pci_cfgregopen();
+ return(pci_cfgintr(pci_get_bus(dev), pci_get_slot(dev), pin));
}