spacing

2 files changed, 34 insertions, 37 deletions

diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index 9a0562c4af6..82af3a13568 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esm.c,v 1.19 2005/11/28 22:11:07 jordan Exp $ */
+/*	$OpenBSD: esm.c,v 1.20 2005/11/28 22:13:48 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -96,7 +96,7 @@ struct esm_softc {
 	int			sc_retries;
 	struct timeout		sc_timeout;
 
-	int 			sc_wdog_period;
+	int			sc_wdog_period;
 };
 
 struct cfattach esm_ca = {
@@ -146,14 +146,14 @@ esm_probe(void *aux)
 	pdellstr = (const char *)ISA_HOLE_VADDR(DELL_SYSSTR_ADDR);
 	DPRINTF("Dell String: %s\n", pdellstr);
 	if (strncmp(pdellstr, "Dell System", 11))
-		return (0); 
+		return (0);
 
 	pdellid = (struct dell_sysid *)ISA_HOLE_VADDR(DELL_SYSID_ADDR);
 	if ((sysid = pdellid->sys_id) == DELL_SYSID_EXT)
 		sysid = pdellid->ext_id;
 	DPRINTF("SysId: %x\n", sysid);
 
- 	switch(sysid) {
+	switch (sysid) {
 	case DELL_SYSID_2300:
 	case DELL_SYSID_4300:
 	case DELL_SYSID_4350:
@@ -245,7 +245,6 @@ esm_attach(struct device *parent, struct device *self, void *aux)
 	}
 }
 
-
 int
 esm_watchdog(void *arg, int period)
 {
@@ -361,7 +360,6 @@ esm_refresh(void *arg)
 	}
 tick:
 	timeout_add(&sc->sc_timeout, hz / 100);
-	
 }
 
 int
@@ -759,7 +757,7 @@ esm_make_sensors(struct esm_softc *sc, struct esm_devmap *devmap,
 
 		if ((val->v_status & ESM2_VS_VALID) != ESM2_VS_VALID)
 			continue;
-		
+
 		es = malloc(sizeof(struct esm_sensor), M_DEVBUF, M_NOWAIT);
 		if (es == NULL)
 			return;
@@ -771,7 +769,7 @@ esm_make_sensors(struct esm_softc *sc, struct esm_devmap *devmap,
 
 		switch (es->es_type) {
 		case ESM_S_DRIVES:
-			/* 
+			/*
 			 * this esm sensor represents 4 kernel sensors, so we
 			 * go through these hoops to deal with it.
 			 */
@@ -814,7 +812,6 @@ esm_make_sensors(struct esm_softc *sc, struct esm_devmap *devmap,
 	}
 }
 
-
 int
 esm_bmc_ready(struct esm_softc *sc, int port, u_int8_t mask, u_int8_t val,
     int wait)
diff --git a/sys/arch/i386/i386/esmreg.h b/sys/arch/i386/i386/esmreg.h
index ffd8f2c02ce..873e35dd162 100644
--- a/sys/arch/i386/i386/esmreg.h
+++ b/sys/arch/i386/i386/esmreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esmreg.h,v 1.7 2005/11/28 22:11:07 jordan Exp $ */
+/*	$OpenBSD: esmreg.h,v 1.8 2005/11/28 22:13:49 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -52,41 +52,41 @@
 #define  ESM2_HWDC_READ_PROPERTY		0x02
 #define  ESM2_HWDC_WRITE_PROPERTY		0x03
 
-#define ESM2_CMD_SMB_BUF	   	0x20
-#define ESM2_CMD_SMB_BUF_XMIT_RECV 	0x21
-#define ESM2_CMD_SMB_XMIT_RECV	   	0x22
+#define ESM2_CMD_SMB_BUF		0x20
+#define ESM2_CMD_SMB_BUF_XMIT_RECV	0x21
+#define ESM2_CMD_SMB_XMIT_RECV		0x22
 #define  ESM2_SMB_SENSOR_VALUE			0x04
 #define  ESM2_SMB_SENSOR_THRESHOLDS		0x19
 
 #define ESM2_MAX_CMD_LEN	0x20
 #define ESM2_UUID_LEN		0x08
 
-#define DELL_SYSSTR_ADDR        0xFE076L
-#define DELL_SYSID_ADDR         0xFE840L
-
-#define DELL_SYSID_2300         0x81
-#define DELL_SYSID_4300         0x7C
-#define DELL_SYSID_4350         0x84
-#define DELL_SYSID_6300         0x7F
-#define DELL_SYSID_6350         0x83
-#define DELL_SYSID_2400         0x9B
-#define DELL_SYSID_2450         0xA6
-#define DELL_SYSID_4400         0x9A
-#define DELL_SYSID_6400         0x9C
-#define DELL_SYSID_6450         0xA2
-#define DELL_SYSID_2500         0xD9
-#define DELL_SYSID_2550         0xD1
-#define DELL_SYSID_PV530F       0xCD
-#define DELL_SYSID_PV735N       0xE2
-#define DELL_SYSID_PV750N       0xEE
-#define DELL_SYSID_PV755N       0xEF
-#define DELL_SYSID_PA200        0xCB
-#define DELL_SYSID_EXT          0xFE
+#define DELL_SYSSTR_ADDR	0xFE076L
+#define DELL_SYSID_ADDR		0xFE840L
+
+#define DELL_SYSID_2300		0x81
+#define DELL_SYSID_4300		0x7C
+#define DELL_SYSID_4350		0x84
+#define DELL_SYSID_6300		0x7F
+#define DELL_SYSID_6350		0x83
+#define DELL_SYSID_2400		0x9B
+#define DELL_SYSID_2450		0xA6
+#define DELL_SYSID_4400		0x9A
+#define DELL_SYSID_6400		0x9C
+#define DELL_SYSID_6450		0xA2
+#define DELL_SYSID_2500		0xD9
+#define DELL_SYSID_2550		0xD1
+#define DELL_SYSID_PV530F	0xCD
+#define DELL_SYSID_PV735N	0xE2
+#define DELL_SYSID_PV750N	0xEE
+#define DELL_SYSID_PV755N	0xEF
+#define DELL_SYSID_PA200	0xCB
+#define DELL_SYSID_EXT		0xFE
 
 struct dell_sysid {
-	u_int16_t    		ext_id;
-	u_int8_t     		bios_ver[3];
-	u_int8_t     		sys_id;
+	u_int16_t		ext_id;
+	u_int8_t		bios_ver[3];
+	u_int8_t		sys_id;
 } __packed;
 
 struct esm_wdog_prop {