diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-12-21 11:33:22 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-12-21 11:33:22 +0000 |
commit | c4fd2adacae9774ac0f21588f6d393d96edaf5e3 (patch) | |
tree | 181d81371fbd9d26dc520c21c83fa52d95af6f7d /sys/dev/acpi | |
parent | 8b253d20c3587616798d92367e20f3e9b148d70d (diff) |
spacing
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r-- | sys/dev/acpi/acpiec.c | 10 | ||||
-rw-r--r-- | sys/dev/acpi/acpimadt.c | 4 | ||||
-rw-r--r-- | sys/dev/acpi/acpiprt.c | 28 | ||||
-rw-r--r-- | sys/dev/acpi/acpivar.h | 4 | ||||
-rw-r--r-- | sys/dev/acpi/amltypes.h | 26 |
5 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c index 719eb433d12..7599a20c83f 100644 --- a/sys/dev/acpi/acpiec.c +++ b/sys/dev/acpi/acpiec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiec.c,v 1.13 2006/12/21 05:53:35 marco Exp $ */ +/* $OpenBSD: acpiec.c,v 1.14 2006/12/21 11:33:21 deraadt Exp $ */ /* * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org> * @@ -55,7 +55,7 @@ void acpiec_sci_event(struct acpiec_softc *); void acpiec_get_events(struct acpiec_softc *); -int acpiec_gpehandler(struct acpi_softc *, int, void *); +int acpiec_gpehandler(struct acpi_softc *, int, void *); struct aml_node *aml_find_name(struct acpi_softc *, struct aml_node *, const char *); @@ -63,7 +63,7 @@ struct aml_node *aml_find_name(struct acpi_softc *, struct aml_node *, /* EC Status bits */ #define EC_STAT_SMI_EVT 0x40 /* SMI event pending */ #define EC_STAT_SCI_EVT 0x20 /* SCI event pending */ -#define EC_STAT_BURST 0x10 /* Controller in burst mode */ +#define EC_STAT_BURST 0x10 /* Controller in burst mode */ #define EC_STAT_CMD 0x08 /* data is command */ #define EC_STAT_IBF 0x02 /* input buffer full */ #define EC_STAT_OBF 0x01 /* output buffer full */ @@ -97,7 +97,7 @@ struct acpiec_softc { struct acpi_softc *sc_acpi; struct aml_node *sc_devnode; u_int32_t sc_gpe; - struct acpiec_event sc_events[ACPIEC_MAX_EVENTS]; + struct acpiec_event sc_events[ACPIEC_MAX_EVENTS]; int sc_locked; int sc_handling_events; }; @@ -488,7 +488,7 @@ acpiec_getcrs(struct acpiec_softc *sc, struct acpi_attach_args *aa) return (1); } - return (0); + return (0); } int diff --git a/sys/dev/acpi/acpimadt.c b/sys/dev/acpi/acpimadt.c index b10b3a48177..d26a21f2347 100644 --- a/sys/dev/acpi/acpimadt.c +++ b/sys/dev/acpi/acpimadt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpimadt.c,v 1.3 2006/11/25 16:59:31 niklas Exp $ */ +/* $OpenBSD: acpimadt.c,v 1.4 2006/12/21 11:33:21 deraadt Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -193,7 +193,7 @@ acpimadt_attach(struct device *parent, struct device *self, void *aux) switch(entry->madt_lapic.apic_type) { case ACPI_MADT_LAPIC: case ACPI_MADT_IOAPIC: - break; + break; case ACPI_MADT_OVERRIDE: printf("OVERRIDE: bus %x, source %x, global_int %x, flags %x\n", diff --git a/sys/dev/acpi/acpiprt.c b/sys/dev/acpi/acpiprt.c index e7116555fe7..5366d46f13d 100644 --- a/sys/dev/acpi/acpiprt.c +++ b/sys/dev/acpi/acpiprt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiprt.c,v 1.9 2006/12/21 11:23:41 deraadt Exp $ */ +/* $OpenBSD: acpiprt.c,v 1.10 2006/12/21 11:33:21 deraadt Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -118,15 +118,15 @@ acpiprt_getirq(union acpi_resource *crs, void *arg) typ=AML_CRSTYPE(crs); switch (typ) { case SR_IRQ: - *irq = ffs(aml_letohost16(crs->sr_irq.irq_mask)) - 1; - break; + *irq = ffs(aml_letohost16(crs->sr_irq.irq_mask)) - 1; + break; case LR_EXTIRQ: - *irq = aml_letohost32(crs->lr_extirq.irq[0]); - break; - default: - printf("Unknown interrupt : %x\n", typ); - } - return (0); + *irq = aml_letohost32(crs->lr_extirq.irq[0]); + break; + default: + printf("Unknown interrupt : %x\n", typ); + } + return (0); } void @@ -159,11 +159,11 @@ acpiprt_prt_add(struct acpiprt_softc *sc, struct aml_value *v) pp = v->v_package[2]; if (pp->type == AML_OBJTYPE_NAMEREF) { - node = aml_searchname(sc->sc_devnode, pp->v_nameref); - if (node == NULL) { - printf("Invalid device!\n"); - return; - } + node = aml_searchname(sc->sc_devnode, pp->v_nameref); + if (node == NULL) { + printf("Invalid device!\n"); + return; + } pp = node->value; } if (pp->type == AML_OBJTYPE_OBJREF) { diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h index 54c907edf07..9f06042cbe6 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.30 2006/12/21 11:23:41 deraadt Exp $ */ +/* $OpenBSD: acpivar.h,v 1.31 2006/12/21 11:33:21 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -183,7 +183,7 @@ struct acpi_softc { struct aml_node *sc_bfs; struct aml_node *sc_gts; struct aml_node *sc_wak; - int sc_state; + int sc_state; struct acpiec_softc *sc_ec; /* XXX assume single EC */ struct acpi_ac_head sc_ac; diff --git a/sys/dev/acpi/amltypes.h b/sys/dev/acpi/amltypes.h index 7f7181a2522..9084d6ef85c 100644 --- a/sys/dev/acpi/amltypes.h +++ b/sys/dev/acpi/amltypes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amltypes.h,v 1.21 2006/12/21 11:23:41 deraadt Exp $ */ +/* $OpenBSD: amltypes.h,v 1.22 2006/12/21 11:33:21 deraadt Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -240,7 +240,7 @@ struct aml_node; /* AML Object Value */ struct aml_value { int type; - int length; + int length; int refcnt; int stack; struct aml_node *node; @@ -269,17 +269,17 @@ struct aml_value { int ref3; } vfield; struct { - u_int8_t proc_id; - u_int32_t proc_addr; - u_int8_t proc_len; + u_int8_t proc_id; + u_int32_t proc_addr; + u_int8_t proc_len; } vprocessor; struct { int index; struct aml_value *ref; } vobjref; struct { - u_int8_t pwr_level; - u_int16_t pwr_order; + u_int8_t pwr_level; + u_int16_t pwr_order; } vpowerrsrc; struct acpi_mutex *vmutex; } _; @@ -312,15 +312,15 @@ struct aml_node { struct aml_node *sibling; char name[5]; - u_int16_t opcode; - u_int8_t *start; - u_int8_t *end; - // const char *name; - // const char *mnem; + u_int16_t opcode; + u_int8_t *start; + u_int8_t *end; + // const char *name; + // const char *mnem; struct aml_value *value; - int depth; + int depth; }; #define AML_FALSE (0) |