diff options
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/acpitimer.c | 12 | ||||
| -rw-r--r-- | sys/dev/acpi/acpiutil.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivar.h | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/files.acpi | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/hpet.c | 12 |
6 files changed, 22 insertions, 22 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 77cdcc04ec1..8cab4749990 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: acpi.c,v 1.2 2005/07/10 19:39:01 grange Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -169,7 +169,7 @@ acpiattach(struct device *parent, struct device *self, void *aux) * that actually does work */ #ifdef ACPI_ENABLE - bus_space_map(sc->sc_iot, sc->sc_fadt->smi_cmd, 1, 0, &ioh); + bus_space_map(sc->sc_iot, sc->sc_fadt->smi_cmd, 1, 0, &ioh); bus_space_write_1(sc->sc_iot, ioh, 0, sc->sc_fadt->acpi_enable); bus_space_unmap(sc->sc_iot, ioh, 1); #endif @@ -248,7 +248,7 @@ fail: int acpi_submatch(struct device *parent, void *match, void *aux) { - struct acpi_attach_args *aaa = (struct acpi_attach_args *)aux; + struct acpi_attach_args *aaa = (struct acpi_attach_args *)aux; struct cfdata *cf = match; if (aaa->aaa_table == NULL) @@ -376,7 +376,7 @@ acpi_load_dsdt(paddr_t pa, struct acpi_q **dsdt) size_t len; if (acpi_map(pa, sizeof(*hdr), &handle)) - return; + return; hdr = (struct acpi_table_header *)handle.va; len = hdr->length; acpi_unmap(&handle); diff --git a/sys/dev/acpi/acpitimer.c b/sys/dev/acpi/acpitimer.c index 2cf89d6efda..eefb691149a 100644 --- a/sys/dev/acpi/acpitimer.c +++ b/sys/dev/acpi/acpitimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitimer.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: acpitimer.c,v 1.2 2005/07/10 19:39:01 grange Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -114,11 +114,11 @@ acpitimerattach(struct device *parent, struct device *self, void *aux) address = psc->sc_fadt->pm_tmr_blk; } size = psc->sc_fadt->pm_tmr_len; - - if (bus_space_map(sc->sc_iot, address, size, 0, &sc->sc_ioh)) { - printf(": can't map i/o space\n"); - return; - } + + if (bus_space_map(sc->sc_iot, address, size, 0, &sc->sc_ioh)) { + printf(": can't map i/o space\n"); + return; + } printf(": %ld Hz, %d bits\n", ACPI_FREQUENCY, psc->sc_fadt->flags & FADT_TMR_VAL_EXT ? 32 : 24); diff --git a/sys/dev/acpi/acpiutil.c b/sys/dev/acpi/acpiutil.c index c364c97d03b..f1f0d369c76 100644 --- a/sys/dev/acpi/acpiutil.c +++ b/sys/dev/acpi/acpiutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiutil.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: acpiutil.c,v 1.2 2005/07/10 19:39:01 grange Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -36,7 +36,7 @@ acpi_checksum(const void *v, size_t len) s += p[i]; if (s) - printf("acpi: bad checksum at %p\n", v); + printf("acpi: bad checksum at %p\n", v); return (s); } diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h index 5065706cad5..c60bd52c6dc 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.2 2005/07/10 17:24:18 grange Exp $ */ +/* $OpenBSD: acpivar.h,v 1.3 2005/07/10 19:39:01 grange Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -83,7 +83,7 @@ struct acpi_softc { struct acpi_table { int offset; size_t size; - void *table; + void *table; }; #define ACPI_IOC_GETFACS _IOR('A', 0, struct acpi_facs) diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi index c03ba10e83e..3744b4d091b 100644 --- a/sys/dev/acpi/files.acpi +++ b/sys/dev/acpi/files.acpi @@ -1,4 +1,4 @@ -# $OpenBSD: files.acpi,v 1.1 2005/06/02 20:09:39 tholo Exp $ +# $OpenBSD: files.acpi,v 1.2 2005/07/10 19:39:01 grange Exp $ # # Config file and device description for machine-independent ACPI code. # Included by ports that need it. @@ -17,4 +17,4 @@ file dev/acpi/acpitimer.c acpitimer # High Precision Event Timer device hpet attach hpet at acpi -file dev/acpi/hpet.c hpet
\ No newline at end of file +file dev/acpi/hpet.c hpet diff --git a/sys/dev/acpi/hpet.c b/sys/dev/acpi/hpet.c index e79e7a42627..372d968cb3c 100644 --- a/sys/dev/acpi/hpet.c +++ b/sys/dev/acpi/hpet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpet.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: hpet.c,v 1.2 2005/07/10 19:39:01 grange Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -114,11 +114,11 @@ hpetattach(struct device *parent, struct device *self, void *aux) return; } - if (bus_space_map(sc->sc_iot, hpet->base_address.address, HPET_REG_SIZE, - 0, &sc->sc_ioh)) { - printf(": can't map i/o space\n"); - return; - } + if (bus_space_map(sc->sc_iot, hpet->base_address.address, + HPET_REG_SIZE, 0, &sc->sc_ioh)) { + printf(": can't map i/o space\n"); + return; + } period = bus_space_read_4(sc->sc_iot, sc->sc_ioh, HPET_CAPABILITIES + sizeof(u_int32_t)); |