From owner-acpi-jp@jp.freebsd.org  Sun Jun  4 19:04:52 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id TAA24792;
	Sun, 4 Jun 2000 19:04:52 +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 TAA24787
	for <acpi-jp@jp.freebsd.org>; Sun, 4 Jun 2000 19:04:51 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (isdnb33.imasy.or.jp [202.227.24.161])
	by tasogare.imasy.or.jp (8.10.1+3.3W/3.7W-tasogare/smtpfeed 1.04) with ESMTP id e54A4nP39110
	for <acpi-jp@jp.freebsd.org>; Sun, 4 Jun 2000 19:04:49 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
To: acpi-jp@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=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20000604190448Z.iwasaki@jp.FreeBSD.org>
Date: Sun, 04 Jun 2000 19:04:48 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 350
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 371
Subject: [acpi-jp 371] style fix: aml_common.[ch]
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

Index: aml_common.c
===================================================================
RCS file: /home/cvs/ACPI/sys/i386/acpi/aml/aml_common.c,v
retrieving revision 1.1
diff -u -r1.1 aml_common.c
--- aml_common.c	2000/06/03 14:39:14	1.1
+++ aml_common.c	2000/06/04 09:19:22
@@ -27,7 +27,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 
 #ifndef _KERNEL
 #include <assert.h>
@@ -36,11 +35,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#else
+#else /* _KERNEL */
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#endif
+#endif /* !_KERNEL */
 
 #include <i386/acpi/aml/aml_common.h>
 #include <i386/acpi/aml/aml_env.h>
@@ -55,11 +54,14 @@
 int	aml_debug = 0;
 #ifdef _KERNEL
 SYSCTL_INT(_debug, OID_AUTO, aml_debug, CTLFLAG_RW, &aml_debug, 1, "");
-#endif
+#endif /* _KERNEL */
 
+static void	 acpi_print_nameseg(u_int8_t *dp);
+
 static void
-acpi_print_nameseg(u_int8_t * dp)
+acpi_print_nameseg(u_int8_t *dp)
 {
+
 	if (dp[3] != '_') {
 		AML_PRINTF("%c%c%c%c", dp[0], dp[1], dp[2], dp[3]);
 	} else if (dp[2] != '_') {
@@ -72,8 +74,11 @@
 }
 
 void
-acpi_print_namestring(u_int8_t * dp)
+acpi_print_namestring(u_int8_t *dp)
 {
+	int	segcount;
+	int	i;
+
 	if (dp[0] == '\\') {
 		AML_PRINTF("%c", dp[0]);
 		dp++;
@@ -91,8 +96,7 @@
 		AML_PRINTF("%c", '.');
 		acpi_print_nameseg(dp + 5);
 	} else if (dp[0] == 0x2f) {	/* MultiNamePrefix */
-		int	segcount = dp[1];
-		int	i;
+		segcount = dp[1];
 		for (i = 0, dp += 2; i < segcount; i++, dp += 4) {
 			if (i > 0) {
 				AML_PRINTF("%c", '.');
@@ -106,12 +110,13 @@
 int
 acpi_print_curname(struct aml_name *name)
 {
-	struct aml_name *root=get_rootname();
+	struct	aml_name *root;
 
+	root = get_rootname();
 	if (name == root) {
 		AML_PRINTF("\\");
 		return (0);
-	} else { 
+	} else {
 		acpi_print_curname(name->parent);
 	}
 	acpi_print_nameseg(name->name);
@@ -131,9 +136,10 @@
 void
 showobject(union aml_object * obj)
 {
-	int	debug = aml_debug;
+	int	debug;
 	int	i;
 
+	debug = aml_debug;
 	aml_debug = 1;
 	if (obj == NULL) {
 		printf("NO object\n");
@@ -145,7 +151,7 @@
 		return;
 	case aml_t_processor:
 		printf("Processor:No %d,Port 0x%x length %d\n",
-		       obj->proc.id, obj->proc.addr, obj->proc.len);
+		    obj->proc.id, obj->proc.addr, obj->proc.len);
 		return;
 	case aml_t_mutex:
 		printf("Mutex:Level %d\n", obj->mutex.level);
@@ -156,11 +162,13 @@
 		return;
 	case aml_t_opregion:
 		printf("OprationRegion:Busspace%d, Offset 0x%x Length %d\n",
-		    obj->opregion.space, obj->opregion.offset, obj->opregion.length);
+		    obj->opregion.space, obj->opregion.offset,
+		    obj->opregion.length);
 		return;
 	case aml_t_field:
 		printf("Fieldelement:flag 0x%x offset %d len %d {",
-		    obj->field.flags, obj->field.bitoffset, obj->field.bitlen);
+		    obj->field.flags, obj->field.bitoffset,
+		    obj->field.bitlen);
 		switch (obj->field.f.ftype) {
 		case f_t_field:
 			acpi_print_namestring(obj->field.f.fld.regname);
@@ -184,21 +192,22 @@
 		    obj->meth.from, obj->meth.to);
 		break;
 	case aml_t_buffer:
-		printf("Buffer: size:%d Data %p\n", obj->buffer.size, obj->buffer.data);
+		printf("Buffer: size:%d Data %p\n", obj->buffer.size,
+		    obj->buffer.data);
 		break;
 	case aml_t_device:
 		printf("Device\n");
 		break;
 	case aml_t_bufferfield:
 		printf("Bufferfield:offset %d len %d Origin %p\n",
-		   obj->bfld.bitoffset, obj->bfld.bitlen, obj->bfld.origin);
+		    obj->bfld.bitoffset, obj->bfld.bitlen, obj->bfld.origin);
 		break;
 	case aml_t_string:
 		printf("String:%s\n", obj->str.string);
 		break;
 	case aml_t_package:
 		printf("Package:elements %d \n", obj->package.elements);
-		for (i = 0; i< obj->package.elements; i++) {
+		for (i = 0; i < obj->package.elements; i++) {
 			if (obj->package.objects[i] == NULL) {
 				break;
 			}
@@ -208,7 +217,6 @@
 			printf("        ");
 			showobject(obj->package.objects[i]);
 		}
-		
 		break;
 	case aml_t_therm:
 		printf("Thermalzone\n");
@@ -241,9 +249,9 @@
 void
 showtree(struct aml_name * aname, int lev)
 {
-	int		i;
-	struct aml_name	*ptr;
-	char		name[5];
+	int	i;
+	struct	aml_name *ptr;
+	char	name[5];
 
 	for (i = 0; i < lev; i++) {
 		printf("  ");
@@ -267,19 +275,27 @@
 #define AML_BUFFER_INPUT	0
 #define AML_BUFFER_OUTPUT	1
 
+static int	 acpi_bufferfield_io(int io, u_int32_t *valuep,
+				     u_int8_t *origin, u_int32_t bitoffset,
+				     u_int32_t bitlen);
+
 static int
 acpi_bufferfield_io(int io, u_int32_t *valuep, u_int8_t *origin,
     u_int32_t bitoffset, u_int32_t bitlen)
 {
-	int		value = *valuep, readval = 0;
-	u_int32_t	byteoffset, bytelen;
-	u_int8_t	val = 0, tmp, masklow = 0xff, maskhigh = 0xff;
+	u_int8_t	val, tmp, masklow, maskhigh;
 	u_int8_t	offsetlow, offsethigh;
 	u_int8_t	*addr;
+	int		value = *valuep, readval;
 	int		i;
+	u_int32_t	byteoffset, bytelen;
 
+	masklow = maskhigh = 0xff;
+	val = readval = 0;
+	value = *valuep;
+
 	byteoffset = bitoffset / 8;
-	bytelen = bitlen / 8 + ((bitlen % 8)? 1 : 0);
+	bytelen = bitlen / 8 + ((bitlen % 8) ? 1 : 0);
 	addr = origin + byteoffset;
 	offsetlow = bitoffset % 8;
 	if (bytelen > 1) {
@@ -289,8 +305,7 @@
 	}
 
 	if (offsetlow) {
-		masklow = (~((1 << bitlen) - 1) << offsetlow)|\
-		    	  ~(0xff << offsetlow);
+		masklow = (~((1 << bitlen) - 1) << offsetlow) | ~(0xff << offsetlow);
 		AML_PRINTF("\t[offsetlow = 0x%x, masklow = 0x%x, ~masklow = 0x%x]\n",
 		    offsetlow, masklow, ~masklow & 0xff);
 	}
@@ -299,7 +314,6 @@
 		AML_PRINTF("\t[offsethigh = 0x%x, maskhigh = 0x%x, ~maskhigh = 0x%x]\n",
 		    offsethigh, maskhigh, ~maskhigh & 0xff);
 	}
-
 	for (i = bytelen; i > 0; i--, addr++) {
 		val = *addr;
 
@@ -327,12 +341,10 @@
 			if (i > 1) {
 				continue;
 			}
-
 			/* final adjustment before finishing region access */
 			if (offsetlow) {
 				readval = readval >> offsetlow;
 			}
-
 			AML_PRINTF("[read(bufferfield, 0x%p)&mask:0x%x]\n",
 			    addr, readval);
 			*valuep = readval;
@@ -354,7 +366,8 @@
 				value = value >> 8;
 			}
 
-			AML_PRINTF("->[bufferfield:0x%02x@0x%p]\n", tmp, addr);
+			AML_PRINTF("->[bufferfield:0x%02x@0x%p]\n",
+			    tmp, addr);
 			*addr = tmp;
 		}
 	}
@@ -363,21 +376,24 @@
 }
 
 u_int32_t
-acpi_bufferfield_read(u_int8_t *origin, u_int32_t bitoffset, u_int32_t bitlen)
+acpi_bufferfield_read(u_int8_t *origin, u_int32_t bitoffset,
+    u_int32_t bitlen)
 {
-	int		value = 0;
+	int	value;
 
-	acpi_bufferfield_io(AML_BUFFER_INPUT, &value, origin, bitoffset, bitlen);
+	value = 0;
+	acpi_bufferfield_io(AML_BUFFER_INPUT, &value, origin,
+	    bitoffset, bitlen);
 	return (value);
 }
 
 int
-acpi_bufferfield_write(u_int32_t value, u_int8_t *origin, u_int32_t bitoffset, u_int32_t bitlen)
+acpi_bufferfield_write(u_int32_t value, u_int8_t *origin,
+    u_int32_t bitoffset, u_int32_t bitlen)
 {
 	int	status;
 
 	status = acpi_bufferfield_io(AML_BUFFER_OUTPUT, &value,
-				     origin, bitoffset, bitlen);
+	    origin, bitoffset, bitlen);
 	return (status);
 }
-
Index: aml_common.h
===================================================================
RCS file: /home/cvs/ACPI/sys/i386/acpi/aml/aml_common.h,v
retrieving revision 1.1
diff -u -r1.1 aml_common.h
--- aml_common.h	2000/06/03 14:39:14	1.1
+++ aml_common.h	2000/06/04 09:20:53
@@ -26,53 +26,45 @@
  *	$Id: aml_common.h,v 1.1 2000/06/03 14:39:14 iwasaki Exp $
  */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _AML_COMMON_H_
+#define _AML_COMMON_H_
 
 #ifdef _KERNEL
-
 #define AML_SYSABORT() do {						\
 	printf("aml: fatal errer at %s:%d\n", __FILE__, __LINE__);	\
 	panic("panic in AML interpreter!");				\
 } while(0)
-
 #define AML_SYSASSERT(x) do {						\
 	if (!(x)) {							\
 		AML_SYSABORT();						\
 	}								\
 } while(0)
-
 #define AML_SYSERRX(eval, fmt, args...) do {				\
 	printf(fmt, args);						\
 } while(0)
-
 #define AML_DEBUGGER(x, y)	/* no debugger in kernel */
-
-#else  /* _KERNEL */
- 
+#else /* !_KERNEL */
 #define AML_SYSASSERT(x)	assert(x)
 #define AML_SYSABORT()  	abort()
 #define AML_SYSERRX(eval, fmt, args...)	errx(eval, fmt, args)
 #define AML_DEBUGGER(x, y)	acpi_dbgr(x, y)
- 
-#endif  /* _KERNEL */
+#endif /* _KERNEL */
 
-union aml_object;
-struct aml_name;
+union	aml_object;
+struct	aml_name;
 
 extern int	aml_debug;
 
 #define AML_PRINTF(args...)	do { if (aml_debug) printf(args); } while(0)
-
-void		showobject(union aml_object *);
-void		showtree(struct aml_name *, int);
-int		acpi_print_curname(struct aml_name *);
-void		acpi_print_namestring(u_int8_t *);
-void		acpi_print_indent(int);
-
-u_int32_t	acpi_bufferfield_read(u_int8_t *, u_int32_t, u_int32_t);
-int		acpi_bufferfield_write(u_int32_t, u_int8_t *,
-				       u_int32_t, u_int32_t);
 
-#endif
+void		 showobject(union aml_object *);
+void		 showtree(struct aml_name *, int);
+int		 acpi_print_curname(struct aml_name *);
+void		 acpi_print_namestring(u_int8_t *);
+void		 acpi_print_indent(int);
+
+u_int32_t	 acpi_bufferfield_read(u_int8_t *, u_int32_t, u_int32_t);
+int		 acpi_bufferfield_write(u_int32_t, u_int8_t *,
+					u_int32_t, u_int32_t);
 
+#endif /* !_AML_COMMON_H_ */
