From owner-acpi-jp@jp.freebsd.org  Wed Jun  7 00:59:55 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA38231;
	Wed, 7 Jun 2000 00:59:55 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from tasogare.imasy.or.jp (daemon@tasogare.imasy.or.jp [202.227.24.5])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id AAA38226
	for <acpi-jp@jp.freebsd.org>; Wed, 7 Jun 2000 00:59:54 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (isdnb43.imasy.or.jp [202.227.24.171])
	by tasogare.imasy.or.jp (8.10.1+3.3W/3.7W-tasogare/smtpfeed 1.04) with ESMTP id e56FxnP06141
	for <acpi-jp@jp.freebsd.org>; Wed, 7 Jun 2000 00:59:49 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
To: acpi-jp@jp.freebsd.org
In-Reply-To: <20000607004216S.iwasaki@jp.FreeBSD.org>
References: <20000607004216S.iwasaki@jp.FreeBSD.org>
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000607005946Y.iwasaki@jp.FreeBSD.org>
Date: Wed, 07 Jun 2000 00:59:46 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 530
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 390
Subject: [acpi-jp 390] style fix: amldb/debug.h & region.c
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

$B$J$s$+%"%C$H$$$&4V$K=*$o$j$^$7$?!#$+$k!<$/8+$F$/$l$k$H4r$7$$$G$9!#(B
# $B$3$l$G0B?4$7$F%$%Y%s%H;22C$G$-$k(B :-)

Index: amldb/debug.h
===================================================================
RCS file: /home/cvs/ACPI/usr.sbin/acpi/amldb/debug.h,v
retrieving revision 1.4
diff -u -r1.4 debug.h
--- amldb/debug.h	2000/06/03 14:39:18	1.4
+++ amldb/debug.h	2000/06/06 14:22:29
@@ -29,7 +29,6 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
-void acpi_dbgr(struct aml_environ *,struct aml_environ *);
+void	acpi_dbgr(struct aml_environ *, struct aml_environ *);
 
-#endif
-
+#endif /* !_DEBUG_H_ */
Index: amldb/region.c
===================================================================
RCS file: /home/cvs/ACPI/usr.sbin/acpi/amldb/region.c,v
retrieving revision 1.9
diff -u -r1.9 region.c
--- amldb/region.c	2000/06/03 14:39:18	1.9
+++ amldb/region.c	2000/06/06 14:28:42
@@ -30,8 +30,13 @@
  * Region I/O subroutine
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
+
+#include <i386/acpi/aml/aml_amlmem.h>
+#include <i386/acpi/aml/aml_name.h>
+#include <i386/acpi/aml/aml_common.h>
+
 #include <assert.h>
 #include <err.h>
 #include <stdlib.h>
@@ -39,32 +44,29 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <i386/acpi/aml/aml_amlmem.h>
-#include <i386/acpi/aml/aml_name.h>
-#include <i386/acpi/aml/aml_common.h>
-
 #include "debug.h"
 
 int	acpi_debug_prompt_regoutput = 0;
 int	acpi_debug_prompt_reginput = 1;
 
-static void acpi_simulation_regload(const char *dumpfile);
+static void	acpi_simulation_regload(const char *dumpfile);
 
 struct ACPIRegionContent {
-	TAILQ_ENTRY(ACPIRegionContent)	links;
-	int			regtype;
-	u_int32_t		addr;
-	u_int8_t		value;
+	TAILQ_ENTRY(ACPIRegionContent) links;
+	int		regtype;
+	u_int32_t	addr;
+	u_int8_t	value;
 };
 
 TAILQ_HEAD(ACPIRegionContentList, ACPIRegionContent);
-struct ACPIRegionContentList	RegionContentList;
+struct	ACPIRegionContentList RegionContentList;
 
-static int acpi_simulation_initialized = 0;
+static int	acpi_simulation_initialized = 0;
 
 static void
 acpi_simulation_init()
 {
+
 	acpi_simulation_initialized = 1;
 	TAILQ_INIT(&RegionContentList);
 	acpi_simulation_regload("region.ini");
@@ -73,64 +75,63 @@
 static int
 acpi_simulate_regcontent_add(int regtype, u_int32_t addr, u_int8_t value)
 {
-	struct ACPIRegionContent	*rc;
+	struct	ACPIRegionContent *rc;
 
 	rc = malloc(sizeof(struct ACPIRegionContent));
 	if (rc == NULL) {
-		return -1;	/* malloc fail */
+		return (-1);	/* malloc fail */
 	}
 	rc->regtype = regtype;
 	rc->addr = addr;
 	rc->value = value;
 
 	TAILQ_INSERT_TAIL(&RegionContentList, rc, links);
-	return 0;
+	return (0);
 }
 
 static int
 acpi_simulate_regcontent_read(int regtype, u_int32_t addr, u_int8_t *valuep)
 {
-	struct ACPIRegionContent	*rc;
+	struct	ACPIRegionContent *rc;
 
 	if (!acpi_simulation_initialized) {
 		acpi_simulation_init();
 	}
-
 	TAILQ_FOREACH(rc, &RegionContentList, links) {
 		if (rc->regtype == regtype && rc->addr == addr) {
 			*valuep = rc->value;
-			return 1;	/* found */
+			return (1);	/* found */
 		}
 	}
 
-	return acpi_simulate_regcontent_add(regtype, addr, 0);
+	return (acpi_simulate_regcontent_add(regtype, addr, 0));
 }
 
 static int
 acpi_simulate_regcontent_write(int regtype, u_int32_t addr, u_int8_t *valuep)
 {
-	struct ACPIRegionContent	*rc;
+	struct	ACPIRegionContent *rc;
 
 	if (!acpi_simulation_initialized) {
 		acpi_simulation_init();
 	}
-
 	TAILQ_FOREACH(rc, &RegionContentList, links) {
 		if (rc->regtype == regtype && rc->addr == addr) {
 			rc->value = *valuep;
-			return 1;	/* exists */
+			return (1);	/* exists */
 		}
 	}
 
-	return acpi_simulate_regcontent_add(regtype, addr, *valuep);
+	return (acpi_simulate_regcontent_add(regtype, addr, *valuep));
 }
 
 static u_int32_t
 acpi_simulate_prompt(char *msg, u_int32_t def_val)
 {
-	u_int32_t	val = def_val;
 	char		buf[16], *ep;
+	u_int32_t	val;
 
+	val = def_val;
 	printf("DEBUG");
 	if (msg != NULL) {
 		printf("%s", msg);
@@ -143,11 +144,9 @@
 		if (read(0, buf, sizeof buf) == 0) {
 			continue;
 		}
-
 		if (buf[0] == '\n') {
 			break;	/* use default value */
 		}
-		
 		if (buf[0] == '0' && buf[1] == 'x') {
 			val = strtoq(buf, &ep, 16);
 		} else {
@@ -155,25 +154,23 @@
 		}
 		break;
 	}
-	return val;
+	return (val);
 }
 
 static void
 acpi_simulation_regload(const char *dumpfile)
 {
-	struct ACPIRegionContent	rc;
-	FILE				*fp;
-	char				buf[256], *np, *ep;
+	char	buf[256], *np, *ep;
+	struct	ACPIRegionContent rc;
+	FILE	*fp;
 
 	if (!acpi_simulation_initialized) {
 		return;
 	}
-
 	if ((fp = fopen(dumpfile, "r")) == NULL) {
 		warn(dumpfile);
 		return;
 	}
-
 	while (fgets(buf, sizeof buf, fp) != NULL) {
 		np = buf;
 		/* reading region type */
@@ -181,7 +178,6 @@
 		if (np == ep) {
 			continue;
 		}
-		
 		np = ep;
 
 		/* reading address */
@@ -189,7 +185,6 @@
 		if (np == ep) {
 			continue;
 		}
-
 		np = ep;
 
 		/* reading value */
@@ -197,7 +192,6 @@
 		if (np == ep) {
 			continue;
 		}
-
 		acpi_simulate_regcontent_write(rc.regtype, rc.addr, &rc.value);
 	}
 
@@ -211,15 +205,20 @@
 acpi_simulate_region_io(int io, int regtype, u_int32_t flags, u_int32_t *valuep,
     u_int32_t baseaddr, u_int32_t bitoffset, u_int32_t bitlen, int prompt)
 {
-	int		value = *valuep, readval = 0;
-	u_int32_t	addr, byteoffset, bytelen;
-	u_int8_t	val = 0, tmp, masklow = 0xff, maskhigh = 0xff;
-	u_int8_t	offsetlow, offsethigh;
-	int		state = 0, i;
 	char		buf[64];
+	u_int8_t	val, tmp, masklow, maskhigh;
+	u_int8_t	offsetlow, offsethigh;
+	u_int32_t	addr, byteoffset, bytelen;
+	int		value, readval;
+	int		state, i;
 
+	value = *valuep;
+	val = readval = 0;
+	masklow = maskhigh = 0xff;
+	state = 0;
+
 	byteoffset = bitoffset / 8;
-	bytelen = bitlen / 8 + ((bitlen % 8)? 1 : 0);
+	bytelen = bitlen / 8 + ((bitlen % 8) ? 1 : 0);
 	addr = baseaddr + byteoffset;
 	offsetlow = bitoffset % 8;
 	if (bytelen > 1) {
@@ -229,8 +228,8 @@
 	}
 
 	if (offsetlow) {
-		masklow = (~((1 << bitlen) - 1) << offsetlow)|\
-		    	  ~(0xff << offsetlow);
+		masklow = (~((1 << bitlen) - 1) << offsetlow) | \
+		    ~(0xff << offsetlow);
 		printf("\t[offsetlow = 0x%x, masklow = 0x%x, ~masklow = 0x%x]\n",
 		    offsetlow, masklow, ~masklow & 0xff);
 	}
@@ -239,14 +238,12 @@
 		printf("\t[offsethigh = 0x%x, maskhigh = 0x%x, ~maskhigh = 0x%x]\n",
 		    offsethigh, maskhigh, ~maskhigh & 0xff);
 	}
-
 	for (i = bytelen; i > 0; i--, addr++) {
 		val = 0;
 		state = acpi_simulate_regcontent_read(regtype, addr, &val);
 		if (state == -1) {
 			goto finish;
 		}
-
 		printf("\t[%d:0x%02x@0x%x]", regtype, val, addr);
 
 		switch (io) {
@@ -271,12 +268,10 @@
 			if (i > 1) {
 				continue;
 			}
-
 			/* final adjustment before finishing region access */
 			if (offsetlow) {
 				readval = readval >> offsetlow;
 			}
-
 			sprintf(buf, "[read(%d, 0x%x)&mask:0x%x]",
 			    regtype, addr, readval);
 			if (prompt) {
@@ -296,7 +291,6 @@
 			*valuep = value;
 
 			break;
-
 		case ACPI_REGION_OUTPUT:
 			tmp = value & 0xff;
 			/* the lowest byte? */
@@ -327,23 +321,28 @@
 			if (state == -1) {
 				goto finish;
 			}
+			break;
 		}
 	}
 finish:
-	return state;
+	return (state);
 }
 
 static int
 acpi_simulate_region_io_buffer(int io, int regtype, u_int32_t flags,
     u_int8_t *buffer, u_int32_t baseaddr, u_int32_t bitoffset, u_int32_t bitlen)
 {
+	u_int8_t	val;
+	u_int8_t	offsetlow, offsethigh;
 	u_int32_t	addr, byteoffset, bytelen;
-	u_int8_t	val = 0;
-	u_int8_t	offsetlow, offsethigh = 0;
-	int		state = 0, i;
+	int		state, i;
+
+	val = 0;
+	offsetlow = offsethigh = 0;
+	state = 0;
 
 	byteoffset = bitoffset / 8;
-	bytelen = bitlen / 8 + ((bitlen % 8)? 1 : 0);
+	bytelen = bitlen / 8 + ((bitlen % 8) ? 1 : 0);
 	addr = baseaddr + byteoffset;
 	offsetlow = bitoffset % 8;
 	assert(offsetlow == 0);
@@ -354,7 +353,6 @@
 	assert(offsethigh == 0);
 
 	for (i = bytelen; i > 0; i--, addr++) {
-
 		switch (io) {
 		case ACPI_REGION_INPUT:
 			val = 0;
@@ -362,10 +360,8 @@
 			if (state == -1) {
 				goto finish;
 			}
-
 			buffer[bytelen - i] = val;
 			break;
-
 		case ACPI_REGION_OUTPUT:
 			val = buffer[bytelen - i];
 			state = acpi_simulate_regcontent_write(regtype,
@@ -373,69 +369,68 @@
 			if (state == -1) {
 				goto finish;
 			}
-
 			break;
 		}
 	}
 finish:
-	return state;
+	return (state);
 }
 
 static u_int32_t
 acpi_simulate_region_read(int regtype, u_int32_t flags, u_int32_t addr,
     u_int32_t bitoffset, u_int32_t bitlen)
 {
-	int		value;
-	int		state;
+	int	value;
+	int	state;
 
 	AML_PRINTF("\n[acpi_region_read(%d, %d, 0x%x, 0x%x, 0x%x)]\n",
 	    regtype, flags, addr, bitoffset, bitlen);
 	state = acpi_simulate_region_io(ACPI_REGION_INPUT, regtype, flags, &value,
 	    addr, bitoffset, bitlen, acpi_debug_prompt_reginput);
 	assert(state != -1);
-	return value;
+	return (value);
 }
 
 int
 acpi_simulate_region_read_into_buffer(int regtype, u_int32_t flags,
     u_int32_t addr, u_int32_t bitoffset, u_int32_t bitlen, u_int8_t *buffer)
 {
-	int		state;
+	int	state;
 
 	AML_PRINTF("\n[acpi_region_read_into_buffer(%d, %d, 0x%x, 0x%x, 0x%x)]\n",
 	    regtype, flags, addr, bitoffset, bitlen);
 	state = acpi_simulate_region_io_buffer(ACPI_REGION_INPUT, regtype, flags,
 	    buffer, addr, bitoffset, bitlen);
 	assert(state != -1);
-	return state;
+	return (state);
 }
 
 int
 acpi_simulate_region_write(int regtype, u_int32_t flags, u_int32_t value,
     u_int32_t addr, u_int32_t bitoffset, u_int32_t bitlen)
 {
-	int		state;
+	int	state;
 
 	AML_PRINTF("\n[acpi_region_write(%d, %d, 0x%x, 0x%x, 0x%x, 0x%x)]\n",
 	    regtype, flags, value, addr, bitoffset, bitlen);
 	state = acpi_simulate_region_io(ACPI_REGION_OUTPUT, regtype, flags,
 	    &value, addr, bitoffset, bitlen, acpi_debug_prompt_regoutput);
 	assert(state != -1);
-	return state;
+	return (state);
 }
 
 int
 acpi_simulate_region_write_from_buffer(int regtype, u_int32_t flags,
     u_int8_t *buffer, u_int32_t addr, u_int32_t bitoffset, u_int32_t bitlen)
 {
-	int		state;
+	int	state;
 
 	AML_PRINTF("\n[acpi_region_write_from_buffer(%d, %d, 0x%x, 0x%x, 0x%x)]\n",
 	    regtype, flags, addr, bitoffset, bitlen);
 	state = acpi_simulate_region_io_buffer(ACPI_REGION_OUTPUT, regtype,
 	    flags, buffer, addr, bitoffset, bitlen);
 	assert(state != -1);
-	return state;
+	return (state);
 }
 
 int
@@ -453,7 +448,7 @@
 	    dflags, daddr, dbitoffset, dbitlen);
 
 	len = (bitlen > dbitlen) ? dbitlen : bitlen;
-	len = len / 8 + ((len % 8)? 1 : 0);
+	len = len / 8 + ((len % 8) ? 1 : 0);
 
 	for (i = 0; i < len; i++) {
 		state = acpi_simulate_region_io(ACPI_REGION_INPUT, regtype,
@@ -464,39 +459,43 @@
 		assert(state != -1);
 	}
 
-	return 0;
+	return (0);
 }
 
 u_int32_t
 acpi_region_read(int regtype, u_int32_t flags, u_int32_t addr,
     u_int32_t bitoffset, u_int32_t bitlen)
 {
-	return acpi_simulate_region_read(regtype, flags, addr,
-	    bitoffset, bitlen);
+
+	return (acpi_simulate_region_read(regtype, flags, addr,
+	    bitoffset, bitlen));
 }
 
 int
 acpi_region_read_into_buffer(int regtype, u_int32_t flags, u_int32_t addr,
     u_int32_t bitoffset, u_int32_t bitlen, u_int8_t *buffer)
 {
-	return acpi_simulate_region_read_into_buffer(regtype, flags, addr,
-	    bitoffset, bitlen, buffer);
+
+	return (acpi_simulate_region_read_into_buffer(regtype, flags, addr,
+	    bitoffset, bitlen, buffer));
 }
 
 int
 acpi_region_write(int regtype, u_int32_t flags, u_int32_t value,
     u_int32_t addr, u_int32_t bitoffset, u_int32_t bitlen)
 {
-	return acpi_simulate_region_write(regtype, flags, value, addr,
-	    bitoffset, bitlen);
+
+	return (acpi_simulate_region_write(regtype, flags, value, addr,
+	    bitoffset, bitlen));
 }
 
 int
 acpi_region_write_from_buffer(int regtype, u_int32_t flags, u_int8_t *buffer,
     u_int32_t addr, u_int32_t bitoffset, u_int32_t bitlen)
 {
-	return acpi_simulate_region_write_from_buffer(regtype, flags, buffer,
-	    addr, bitoffset, bitlen);
+
+	return (acpi_simulate_region_write_from_buffer(regtype, flags, buffer,
+	    addr, bitoffset, bitlen));
 }
 
 int
@@ -505,25 +504,24 @@
     u_int32_t dflags, u_int32_t daddr,
     u_int32_t dbitoffset, u_int32_t dbitlen)
 {
-	return acpi_simulate_region_bcopy(regtype, flags, addr, bitoffset, bitlen,
-	    dflags, daddr, dbitoffset, dbitlen);
+
+	return (acpi_simulate_region_bcopy(regtype, flags, addr, bitoffset,
+	    bitlen, dflags, daddr, dbitoffset, dbitlen));
 }
 
 void
 acpi_simulation_regdump(const char *dumpfile)
 {
-	struct ACPIRegionContent	*rc;
-	FILE				*fp;
+	struct	ACPIRegionContent *rc;
+	FILE	*fp;
 
 	if (!acpi_simulation_initialized) {
 		return;
 	}
-
 	if ((fp = fopen(dumpfile, "w")) == NULL) {
 		warn(dumpfile);
 		return;
 	}
-
 	while (!TAILQ_EMPTY(&RegionContentList)) {
 		rc = TAILQ_FIRST(&RegionContentList);
 		fprintf(fp, "%d	0x%x	0x%x\n",
@@ -535,4 +533,3 @@
 	fclose(fp);
 	TAILQ_INIT(&RegionContentList);
 }
-
