diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-12 19:55:47 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-12 19:55:47 +0000 |
| commit | 83b173ed8105144bac837eb67c3f49516726d758 (patch) | |
| tree | 6264ffede71572623703afd653190c3ada858240 /sys/dev/acpi | |
| parent | dfc3e94196cefc09f209c855ac675a89c1879c63 (diff) | |
spacing
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpibat.c | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/acpicpu.c | 38 |
2 files changed, 23 insertions, 23 deletions
diff --git a/sys/dev/acpi/acpibat.c b/sys/dev/acpi/acpibat.c index 21924b02d3d..219b27cf0d1 100644 --- a/sys/dev/acpi/acpibat.c +++ b/sys/dev/acpi/acpibat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibat.c,v 1.43 2007/11/12 04:32:37 deraadt Exp $ */ +/* $OpenBSD: acpibat.c,v 1.44 2007/11/12 19:55:37 deraadt Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -222,7 +222,7 @@ acpibat_refresh(void *arg) sc->sc_sens[4].status = SENSOR_S_OK; sc->sc_sens[4].flags = 0; if (sc->sc_bif.bif_last_capacity == BIF_UNKNOWN || - sc->sc_bst.bst_capacity == BST_UNKNOWN) { + sc->sc_bst.bst_capacity == BST_UNKNOWN) { sc->sc_sens[4].status = SENSOR_S_UNKNOWN; sc->sc_sens[4].flags = SENSOR_FUNKNOWN; strlcpy(sc->sc_sens[4].desc, "battery unknown", @@ -230,7 +230,7 @@ acpibat_refresh(void *arg) } else if (sc->sc_bst.bst_capacity >= sc->sc_bif.bif_last_capacity) strlcpy(sc->sc_sens[4].desc, "battery full", sizeof(sc->sc_sens[4].desc)); - else if (sc->sc_bst.bst_state & BST_DISCHARGE) + else if (sc->sc_bst.bst_state & BST_DISCHARGE) strlcpy(sc->sc_sens[4].desc, "battery discharging", sizeof(sc->sc_sens[4].desc)); else if (sc->sc_bst.bst_state & BST_CHARGE) @@ -286,7 +286,7 @@ acpibat_refresh(void *arg) int acpibat_getbif(struct acpibat_softc *sc) { - struct aml_value res; + struct aml_value res; int rv = EINVAL; if (aml_evalname(sc->sc_acpi, sc->sc_devnode, "_STA", 0, NULL, &res)) { diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c index 0990aec0063..5f302e5605c 100644 --- a/sys/dev/acpi/acpicpu.c +++ b/sys/dev/acpi/acpicpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpicpu.c,v 1.29 2007/11/12 04:31:16 deraadt Exp $ */ +/* $OpenBSD: acpicpu.c,v 1.30 2007/11/12 19:55:46 deraadt Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -42,35 +42,35 @@ void acpicpu_attach(struct device *, struct device *, void *); int acpicpu_notify(struct aml_node *, int, void *); void acpicpu_setperf(int); -#define ACPI_STATE_C0 0x00 -#define ACPI_STATE_C1 0x01 -#define ACPI_STATE_C2 0x02 -#define ACPI_STATE_C3 0x03 +#define ACPI_STATE_C0 0x00 +#define ACPI_STATE_C1 0x01 +#define ACPI_STATE_C2 0x02 +#define ACPI_STATE_C3 0x03 -#define FLAGS_NO_C2 0x01 -#define FLAGS_NO_C3 0x02 -#define FLAGS_BMCHECK 0x04 -#define FLAGS_NOTHROTTLE 0x08 -#define FLAGS_NOPSS 0x10 +#define FLAGS_NO_C2 0x01 +#define FLAGS_NO_C3 0x02 +#define FLAGS_BMCHECK 0x04 +#define FLAGS_NOTHROTTLE 0x08 +#define FLAGS_NOPSS 0x10 #define FLAGS_NOPCT 0x20 #define CPU_THT_EN (1L << 4) -#define CPU_MAXSTATE(sc) (1L << (sc)->sc_duty_wid) +#define CPU_MAXSTATE(sc) (1L << (sc)->sc_duty_wid) #define CPU_STATE(sc,pct) ((pct * CPU_MAXSTATE(sc) / 100) << (sc)->sc_duty_off) -#define CPU_STATEMASK(sc) ((CPU_MAXSTATE(sc) - 1) << (sc)->sc_duty_off) +#define CPU_STATEMASK(sc) ((CPU_MAXSTATE(sc) - 1) << (sc)->sc_duty_off) -#define ACPI_MAX_C2_LATENCY 100 -#define ACPI_MAX_C3_LATENCY 1000 +#define ACPI_MAX_C2_LATENCY 100 +#define ACPI_MAX_C3_LATENCY 1000 /* Make sure throttling bits are valid,a=addr,o=offset,w=width */ #define valid_throttle(o,w,a) (a && w && (o+w)<=31 && (o>4 || (o+w)<=4)) struct acpi_cstate { - int type; - int latency; - int power; - int address; + int type; + int latency; + int power; + int address; SLIST_ENTRY(acpi_cstate) link; }; @@ -166,7 +166,7 @@ acpicpu_add_cstate(struct acpicpu_softc *sc, int type, struct acpi_cstate *cx; dnprintf(10," C%d: latency:.%4x power:%.4x addr:%.8x\n", - type, latency, power, address); + type, latency, power, address); switch (type) { case ACPI_STATE_C2: |