Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Apply indent(1).
details: https://anonhg.NetBSD.org/src/rev/1fa4fe4442a8
branches: trunk
changeset: 486065:1fa4fe4442a8
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri May 12 16:42:41 2000 +0000
description:
Apply indent(1).
diffstat:
sys/dev/pci/viaenv.c | 534 +++++++++++++++++++++++++-----------------------
sys/dev/pci/viapm.c | 142 ++++++------
sys/dev/pci/viapmvar.h | 13 +-
3 files changed, 354 insertions(+), 335 deletions(-)
diffs (truncated from 886 to 300 lines):
diff -r 1977f666f151 -r 1fa4fe4442a8 sys/dev/pci/viaenv.c
--- a/sys/dev/pci/viaenv.c Fri May 12 16:41:59 2000 +0000
+++ b/sys/dev/pci/viaenv.c Fri May 12 16:42:41 2000 +0000
@@ -1,19 +1,19 @@
-/* $NetBSD: viaenv.c,v 1.1 2000/05/08 16:40:43 joda Exp $ */
+/* $NetBSD: viaenv.c,v 1.2 2000/05/12 16:42:41 thorpej Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
*
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of author nor the names of any contributors may
* be used to endorse or promote products derived from this
@@ -56,113 +56,122 @@
#define DPRINTF(X)
#endif
-#define VIANUMSENSORS 10 /* three temp, two fan, five voltage */
+#define VIANUMSENSORS 10 /* three temp, two fan, five voltage */
struct viaenv_softc {
- struct device sc_dev;
- bus_space_tag_t sc_iot;
- bus_space_handle_t sc_ioh;
- struct callout sc_callout;
- unsigned int sc_flags;
+ struct device sc_dev;
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_ioh;
+ struct callout sc_callout;
+ unsigned int sc_flags;
- int sc_fan_div[2]; /* fan RPM divisor */
+ int sc_fan_div[2]; /* fan RPM divisor */
- struct envsys_tre_data sc_data[VIANUMSENSORS];
- struct envsys_basic_info sc_info[VIANUMSENSORS];
-
- struct proc *sc_thread;
+ struct envsys_tre_data sc_data[VIANUMSENSORS];
+ struct envsys_basic_info sc_info[VIANUMSENSORS];
- struct lock sc_lock;
- struct simplelock sc_interlock;
+ struct proc *sc_thread;
+
+ struct lock sc_lock;
};
-
#define SCFLAG_OPEN 1
static int
-viaenv_match(struct device *parent, struct cfdata *match, void *aux);
+ viaenv_match(struct device * parent, struct cfdata * match, void *aux);
static void
-viaenv_attach(struct device *parent, struct device *self, void *aux);
+ viaenv_attach(struct device * parent, struct device * self, void *aux);
struct cfattach viaenv_ca = {
sizeof(struct viaenv_softc), viaenv_match, viaenv_attach
};
static int
-viaenv_match(struct device *parent, struct cfdata *match, void *aux)
+viaenv_match(struct device * parent, struct cfdata * match, void *aux)
{
- struct viapm_attach_args *va = aux;
-
- if (va->va_type == VIAPM_HWMON)
- return 1;
- return 0;
+ struct viapm_attach_args *va = aux;
+
+ if (va->va_type == VIAPM_HWMON)
+ return 1;
+ return 0;
}
-/* XXX there doesn't seem to exist much hard documentation on how to
- convert the raw values to usable units, this code is more or less
- stolen from the Linux driver, but changed to suit our conditions */
+/*
+ * XXX there doesn't seem to exist much hard documentation on how to
+ * convert the raw values to usable units, this code is more or less
+ * stolen from the Linux driver, but changed to suit our conditions
+ */
-/* lookup-table to translate raw values to uK, this is the same table
-used by the Linux driver (modulo units); there is a fifth degree
-polynomial that supposedly been used to generate this table, but I
-haven't been able to figure out how -- it doesn't give the same values */
+/*
+ * lookup-table to translate raw values to uK, this is the same table
+ * used by the Linux driver (modulo units); there is a fifth degree
+ * polynomial that supposedly been used to generate this table, but I
+ * haven't been able to figure out how -- it doesn't give the same values
+ */
-static long val_to_temp[] = {
- 20225, 20435, 20645, 20855, 21045, 21245, 21425, 21615, 21785, 21955,
- 22125, 22285, 22445, 22605, 22755, 22895, 23035, 23175, 23315, 23445,
- 23565, 23695, 23815, 23925, 24045, 24155, 24265, 24365, 24465, 24565,
- 24665, 24765, 24855, 24945, 25025, 25115, 25195, 25275, 25355, 25435,
- 25515, 25585, 25655, 25725, 25795, 25865, 25925, 25995, 26055, 26115,
- 26175, 26235, 26295, 26355, 26405, 26465, 26515, 26575, 26625, 26675,
- 26725, 26775, 26825, 26875, 26925, 26975, 27025, 27065, 27115, 27165,
- 27205, 27255, 27295, 27345, 27385, 27435, 27475, 27515, 27565, 27605,
- 27645, 27685, 27735, 27775, 27815, 27855, 27905, 27945, 27985, 28025,
- 28065, 28105, 28155, 28195, 28235, 28275, 28315, 28355, 28405, 28445,
- 28485, 28525, 28565, 28615, 28655, 28695, 28735, 28775, 28825, 28865,
- 28905, 28945, 28995, 29035, 29075, 29125, 29165, 29205, 29245, 29295,
- 29335, 29375, 29425, 29465, 29505, 29555, 29595, 29635, 29685, 29725,
- 29765, 29815, 29855, 29905, 29945, 29985, 30035, 30075, 30125, 30165,
- 30215, 30255, 30305, 30345, 30385, 30435, 30475, 30525, 30565, 30615,
- 30655, 30705, 30755, 30795, 30845, 30885, 30935, 30975, 31025, 31075,
- 31115, 31165, 31215, 31265, 31305, 31355, 31405, 31455, 31505, 31545,
- 31595, 31645, 31695, 31745, 31805, 31855, 31905, 31955, 32005, 32065,
- 32115, 32175, 32225, 32285, 32335, 32395, 32455, 32515, 32575, 32635,
- 32695, 32755, 32825, 32885, 32955, 33025, 33095, 33155, 33235, 33305,
- 33375, 33455, 33525, 33605, 33685, 33765, 33855, 33935, 34025, 34115,
- 34205, 34295, 34395, 34495, 34595, 34695, 34805, 34905, 35015, 35135,
- 35245, 35365, 35495, 35615, 35745, 35875, 36015, 36145, 36295, 36435,
- 36585, 36745, 36895, 37065, 37225, 37395, 37575, 37755, 37935, 38125,
- 38325, 38525, 38725, 38935, 39155, 39375, 39605, 39835, 40075, 40325,
- 40575, 40835, 41095, 41375, 41655, 41935,
+static long val_to_temp[] = {
+ 20225, 20435, 20645, 20855, 21045, 21245, 21425, 21615, 21785, 21955,
+ 22125, 22285, 22445, 22605, 22755, 22895, 23035, 23175, 23315, 23445,
+ 23565, 23695, 23815, 23925, 24045, 24155, 24265, 24365, 24465, 24565,
+ 24665, 24765, 24855, 24945, 25025, 25115, 25195, 25275, 25355, 25435,
+ 25515, 25585, 25655, 25725, 25795, 25865, 25925, 25995, 26055, 26115,
+ 26175, 26235, 26295, 26355, 26405, 26465, 26515, 26575, 26625, 26675,
+ 26725, 26775, 26825, 26875, 26925, 26975, 27025, 27065, 27115, 27165,
+ 27205, 27255, 27295, 27345, 27385, 27435, 27475, 27515, 27565, 27605,
+ 27645, 27685, 27735, 27775, 27815, 27855, 27905, 27945, 27985, 28025,
+ 28065, 28105, 28155, 28195, 28235, 28275, 28315, 28355, 28405, 28445,
+ 28485, 28525, 28565, 28615, 28655, 28695, 28735, 28775, 28825, 28865,
+ 28905, 28945, 28995, 29035, 29075, 29125, 29165, 29205, 29245, 29295,
+ 29335, 29375, 29425, 29465, 29505, 29555, 29595, 29635, 29685, 29725,
+ 29765, 29815, 29855, 29905, 29945, 29985, 30035, 30075, 30125, 30165,
+ 30215, 30255, 30305, 30345, 30385, 30435, 30475, 30525, 30565, 30615,
+ 30655, 30705, 30755, 30795, 30845, 30885, 30935, 30975, 31025, 31075,
+ 31115, 31165, 31215, 31265, 31305, 31355, 31405, 31455, 31505, 31545,
+ 31595, 31645, 31695, 31745, 31805, 31855, 31905, 31955, 32005, 32065,
+ 32115, 32175, 32225, 32285, 32335, 32395, 32455, 32515, 32575, 32635,
+ 32695, 32755, 32825, 32885, 32955, 33025, 33095, 33155, 33235, 33305,
+ 33375, 33455, 33525, 33605, 33685, 33765, 33855, 33935, 34025, 34115,
+ 34205, 34295, 34395, 34495, 34595, 34695, 34805, 34905, 35015, 35135,
+ 35245, 35365, 35495, 35615, 35745, 35875, 36015, 36145, 36295, 36435,
+ 36585, 36745, 36895, 37065, 37225, 37395, 37575, 37755, 37935, 38125,
+ 38325, 38525, 38725, 38935, 39155, 39375, 39605, 39835, 40075, 40325,
+ 40575, 40835, 41095, 41375, 41655, 41935,
};
/* use above table to convert values to temperatures in micro-Kelvins */
static int
val_to_uK(unsigned int val)
{
- int i = val / 4;
- int j = val % 4;
- assert(i >= 0 && i <= 255);
- if(j == 0 || i == 255)
- return val_to_temp[i] * 10000;
- /* is linear interpolation ok? */
- return (val_to_temp[i] * (4 - j) +
- val_to_temp[i+1] * j) * 2500 /* really: / 4 * 10000 */;
+ int i = val / 4;
+ int j = val % 4;
+
+ assert(i >= 0 && i <= 255);
+
+ if (j == 0 || i == 255)
+ return val_to_temp[i] * 10000;
+
+ /* is linear interpolation ok? */
+ return (val_to_temp[i] * (4 - j) +
+ val_to_temp[i + 1] * j) * 2500 /* really: / 4 * 10000 */ ;
}
static int
val_to_rpm(unsigned int val, int div)
{
- if(val == 0)
- return 0;
- return 1350000 / val / div;
+
+ if (val == 0)
+ return 0;
+
+ return 1350000 / val / div;
}
static long
val_to_uV(unsigned int val, int index)
{
- long mult[] = { 1250000, 1250000, 1670000, 2600000, 6300000 };
- assert(index >= 0 && index <= 4);
- return (25LL * val + 133) * mult[index] / 2628;
+ long mult[] = {1250000, 1250000, 1670000, 2600000, 6300000};
+
+ assert(index >= 0 && index <= 4);
+
+ return (25LL * val + 133) * mult[index] / 2628;
}
#define VIAENV_TSENS3 0x1f
@@ -183,239 +192,244 @@
static void
viaenv_thread(void *arg)
{
- struct viaenv_softc *sc = arg;
- u_int8_t v, v2;
- int i;
+ struct viaenv_softc *sc = arg;
+ u_int8_t v, v2;
+ int i;
+
+ while (1) {
+ lockmgr(&sc->sc_lock, LK_EXCLUSIVE, NULL);
+
+ /* temperature */
+ v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TIRQ);
+ v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS1);
+ DPRINTF(("TSENS1 = %d\n", (v2 << 2) | (v >> 6)));
+ sc->sc_data[0].cur.data_us = val_to_uK((v2 << 2) | (v >> 6));
+ sc->sc_data[0].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
- while(1) {
- lockmgr(&sc->sc_lock, LK_EXCLUSIVE, &sc->sc_interlock);
- /* temperature */
- v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TIRQ);
- v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS1);
- DPRINTF(("TSENS1 = %d\n", (v2 << 2) | (v >> 6)));
- sc->sc_data[0].cur.data_us = val_to_uK((v2 << 2) | (v >> 6));
- sc->sc_data[0].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
+ v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TLOW);
+ v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS2);
+ DPRINTF(("TSENS2 = %d\n", (v2 << 2) | ((v >> 4) & 0x3)));
+ sc->sc_data[1].cur.data_us =
+ val_to_uK((v2 << 2) | ((v >> 4) & 0x3));
+ sc->sc_data[1].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
- v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TLOW);
- v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS2);
- DPRINTF(("TSENS2 = %d\n", (v2 << 2) | ((v >> 4) & 0x3)));
- sc->sc_data[1].cur.data_us = val_to_uK((v2 << 2) | ((v >> 4) & 0x3));
- sc->sc_data[1].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
+ v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS3);
+ DPRINTF(("TSENS3 = %d\n", (v2 << 2) | (v >> 6)));
+ sc->sc_data[2].cur.data_us = val_to_uK((v2 << 2) | (v >> 6));
+ sc->sc_data[2].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
- v2 = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_TSENS3);
- DPRINTF(("TSENS3 = %d\n", (v2 << 2) | (v >> 6)));
- sc->sc_data[2].cur.data_us = val_to_uK((v2 << 2) | (v >> 6));
- sc->sc_data[2].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
+ v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_FANCONF);
- v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_FANCONF);
-
- sc->sc_fan_div[0] = 1 << ((v >> 4) & 0x3);
- sc->sc_fan_div[1] = 1 << ((v >> 6) & 0x3);
+ sc->sc_fan_div[0] = 1 << ((v >> 4) & 0x3);
+ sc->sc_fan_div[1] = 1 << ((v >> 6) & 0x3);
- /* fan */
- for(i = 3; i <= 4; i++) {
- v = bus_space_read_1(sc->sc_iot, sc->sc_ioh, VIAENV_FAN1 + i - 3);
- DPRINTF(("FAN%d = %d / %d\n", i - 3, v, sc->sc_fan_div[i - 3]));
- sc->sc_data[i].cur.data_us = val_to_rpm(v, sc->sc_fan_div[i - 3]);
- sc->sc_data[i].validflags = ENVSYS_FVALID | ENVSYS_FCURVALID;
+ /* fan */
+ for (i = 3; i <= 4; i++) {
+ v = bus_space_read_1(sc->sc_iot, sc->sc_ioh,
+ VIAENV_FAN1 + i - 3);
+ DPRINTF(("FAN%d = %d / %d\n", i - 3, v,
+ sc->sc_fan_div[i - 3]));
+ sc->sc_data[i].cur.data_us = val_to_rpm(v,
+ sc->sc_fan_div[i - 3]);
+ sc->sc_data[i].validflags =
+ ENVSYS_FVALID | ENVSYS_FCURVALID;
Home |
Main Index |
Thread Index |
Old Index