27c27
< * $FreeBSD: head/sys/dev/acpica/Osd/OsdInterrupt.c 127135 2004-03-17 17:50:55Z njl $
---
> * $FreeBSD: head/sys/dev/acpica/Osd/OsdInterrupt.c 128226 2004-04-14 03:41:06Z njl $
34,35c34,35
< #include "acpi.h"
<
---
> #include <sys/param.h>
> #include <sys/kernel.h>
37d36
< #include <machine/resource.h>
38a38
> #include <machine/resource.h>
40a41
> #include "acpi.h"
46a48
>
47a50
> static UINT32 InterruptOverride = 0;
49,54d51
< static UINT32 InterruptOverride = 0;
<
< /*
< * XXX this does not correctly free resources in the case of partically successful
< * attachment.
< */
56c53,54
< AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine, void *Context)
---
> AcpiOsInstallInterruptHandler(UINT32 InterruptNumber,
> OSD_HANDLER ServiceRoutine, void *Context)
67,68c65,66
< if ((InterruptNumber < 0) || (InterruptNumber > 255))
< return_ACPI_STATUS(AE_BAD_PARAMETER);
---
> if (InterruptNumber < 0 || InterruptNumber > 255)
> return_ACPI_STATUS (AE_BAD_PARAMETER);
70,73c68,71
< return_ACPI_STATUS(AE_BAD_PARAMETER);
< if (InterruptHandler != NULL && InterruptHandler != ServiceRoutine) {
< device_printf(sc->acpi_dev, "can't register more than one ACPI interrupt\n");
< return_ACPI_STATUS(AE_BAD_PARAMETER);
---
> return_ACPI_STATUS (AE_BAD_PARAMETER);
> if (InterruptHandler != NULL) {
> device_printf(sc->acpi_dev, "interrupt handler already installed\n");
> return_ACPI_STATUS (AE_ALREADY_EXISTS);
78,79c76,77
< * This isn't strictly true, as we ought to be able to handle > 1 interrupt. The ACPI
< * spec doesn't call for this though.
---
> * If the MADT contained an interrupt override directive for the SCI,
> * we use that value instead of the one from the FADT.
81,85d78
< if (sc->acpi_irq != NULL) {
< device_printf(sc->acpi_dev, "attempt to register more than one interrupt handler\n");
< return_ACPI_STATUS(AE_ALREADY_EXISTS);
< }
< sc->acpi_irq_rid = 0;
91a85,87
>
> /* Set up the interrupt resource. */
> sc->acpi_irq_rid = 0;
93,96c89,93
< if ((sc->acpi_irq = bus_alloc_resource_any(sc->acpi_dev, SYS_RES_IRQ,
< &sc->acpi_irq_rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
< device_printf(sc->acpi_dev, "could not allocate SCI interrupt\n");
< return_ACPI_STATUS(AE_ALREADY_EXISTS);
---
> sc->acpi_irq = bus_alloc_resource_any(sc->acpi_dev, SYS_RES_IRQ,
> &sc->acpi_irq_rid, RF_SHAREABLE | RF_ACTIVE);
> if (sc->acpi_irq == NULL) {
> device_printf(sc->acpi_dev, "could not allocate interrupt\n");
> goto error;
98,101c95,98
< if (bus_setup_intr(sc->acpi_dev, sc->acpi_irq, INTR_TYPE_MISC, (driver_intr_t *)InterruptWrapper,
< Context, &sc->acpi_irq_handle)) {
< device_printf(sc->acpi_dev, "could not set up SCI interrupt\n");
< return_ACPI_STATUS(AE_ALREADY_EXISTS);
---
> if (bus_setup_intr(sc->acpi_dev, sc->acpi_irq, INTR_TYPE_MISC,
> InterruptWrapper, Context, &sc->acpi_irq_handle)) {
> device_printf(sc->acpi_dev, "could not set up interrupt\n");
> goto error;
103,104c100,113
<
< return_ACPI_STATUS(AE_OK);
---
>
> return_ACPI_STATUS (AE_OK);
>
> error:
> if (sc->acpi_irq_handle)
> bus_teardown_intr(sc->acpi_dev, sc->acpi_irq, sc->acpi_irq_handle);
> sc->acpi_irq_handle = NULL;
> if (sc->acpi_irq)
> bus_release_resource(sc->acpi_dev, SYS_RES_IRQ, 0, sc->acpi_irq);
> sc->acpi_irq = NULL;
> bus_delete_resource(sc->acpi_dev, SYS_RES_IRQ, 0);
> InterruptHandler = NULL;
>
> return_ACPI_STATUS (AE_ALREADY_EXISTS);
108c117
< AcpiOsRemoveInterruptHandler (UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine)
---
> AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine)
114,115c123,124
< if ((InterruptNumber < 0) || (InterruptNumber > 255))
< return_ACPI_STATUS(AE_BAD_PARAMETER);
---
> if (InterruptNumber < 0 || InterruptNumber > 255)
> return_ACPI_STATUS (AE_BAD_PARAMETER);
117c126
< return_ACPI_STATUS(AE_BAD_PARAMETER);
---
> return_ACPI_STATUS (AE_BAD_PARAMETER);
123c132
< return_ACPI_STATUS(AE_NOT_EXIST);
---
> return_ACPI_STATUS (AE_NOT_EXIST);
129a139
> InterruptHandler = NULL;
131c141
< return_ACPI_STATUS(AE_OK);
---
> return_ACPI_STATUS (AE_OK);
141c151
< return_ACPI_STATUS(AE_ALREADY_EXISTS);
---
> return_ACPI_STATUS (AE_ALREADY_EXISTS);
143c153
< return_ACPI_STATUS(AE_OK);
---
> return_ACPI_STATUS (AE_OK);
146,148d155
< /*
< * Interrupt handler wrapper.
< */