From owner-acpi-jp@jp.freebsd.org  Mon Jun  5 23:26:06 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA13506;
	Mon, 5 Jun 2000 23:26:06 +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 XAA13500
	for <acpi-jp@jp.freebsd.org>; Mon, 5 Jun 2000 23:26:05 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (isdn28.imasy.or.jp [202.227.24.220])
	by tasogare.imasy.or.jp (8.10.1+3.3W/3.7W-tasogare/smtpfeed 1.04) with ESMTP id e55EQ1P80909
	for <acpi-jp@jp.freebsd.org>; Mon, 5 Jun 2000 23:26:01 +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)
References: <20000604191645K.iwasaki@jp.FreeBSD.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000605232559D.iwasaki@jp.FreeBSD.org>
Date: Mon, 05 Jun 2000 23:25:59 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 497
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 376
Subject: [acpi-jp 376] style fix: aml_name.[ch]
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

> $B<!$O$3$l$i$KCe<j$7$^$9!#(B
> aml_name.c
> aml_name.h
> aml_obj.c
> aml_obj.h
> aml_parse.c
> aml_parse.h

$B$H$j$"$($:=PMh$?$N$G!"N.$7$^$9!#%3%a%s%H$h$m$7$/$*4j$$$7$^$9!#(B
aml_parse.c $B$O%G%+%$$N$G(Bgzip+uuencode $B$7$FN.$7$^$9!#(B

Index: aml_name.c
===================================================================
RCS file: /home/cvs/ACPI/sys/i386/acpi/aml/aml_name.c,v
retrieving revision 1.8
diff -u -r1.8 aml_name.c
--- aml_name.c	2000/06/03 14:32:57	1.8
+++ aml_name.c	2000/06/05 05:01:34
@@ -28,7 +28,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 
 #include <i386/acpi/aml/aml_amlmem.h>
 #include <i386/acpi/aml/aml_common.h>
@@ -39,49 +38,51 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "debug.h"
-#else
+#else /* _KERNEL */
 #include <sys/systm.h>
-#endif
+#endif /* !_KERNEL */
 
-static struct aml_name rootname = {"\\", NULL, NULL, NULL, NULL, NULL};
+static struct	aml_name rootname = {"\\", NULL, NULL, NULL, NULL, NULL};
 
-static struct aml_name_group root_group = {
+static struct	aml_name_group root_group = {
 	AML_NAME_GROUP_ROOT,
 	&rootname,
-/*	&rootname,*/
 	NULL
 };
 
-struct aml_name_group *name_group_list = &root_group;
-struct aml_local_stack *stack_top = NULL;
+struct	aml_name_group *name_group_list = &root_group;
+struct	aml_local_stack *stack_top = NULL;
 
 struct aml_name *
 get_rootname()
 {
-	return &rootname;
+
+	return (&rootname);
 }
 
 struct aml_name *
-search_aml_name(struct aml_name * parent, char *name)
+search_aml_name(struct aml_name *parent, char *name)
 {
-	struct aml_name *result;
+	struct	aml_name *result;
 
 	if (!parent)
 		parent = &rootname;
-	for (result = parent->child; result; result = result->brother) 
+	for (result = parent->child; result; result = result->brother)
 		if (!strncmp(result->name, name, 4))
 			break;
-	return result;
+	return (result);
 }
 
 struct aml_name *
 search_aml_name_recursive(struct aml_name *parent, char *name)
 {
-	char	*ptr = name;
+	char	*ptr;
 	int	len;
-	struct  aml_name *result;
-	
+	struct	aml_name *result;
+
+	ptr = name;
 	if (!parent)
 		parent = &rootname;
 
@@ -89,44 +90,45 @@
 		ptr++;
 		parent = &rootname;
 	}
-
 	for (len = 0; ptr[len] != '.' && ptr[len] != '\0'; len++)
 		;
 
 	for (result = parent->child; result; result = result->brother) {
 		if (!strncmp(result->name, ptr, len)) {
 			if (ptr[len] == '\0' || ptr[len + 1] == '\0') {
-				return result;
+				return (result);
 			}
 			ptr += len;
 			if (ptr[0] != '.') {
-				return NULL;
+				return (NULL);
 			}
 			ptr++;
-			return search_aml_name_recursive(result, ptr);
+			return (search_aml_name_recursive(result, ptr));
 		}
 	}
 
-	return NULL;
+	return (NULL);
 }
 
 struct aml_name_group *
-new_aml_name_group(int Id)
+new_aml_name_group(int id)
 {
-	struct aml_name_group *result =
-	    memman_alloc(aml_memman, memid_aml_name_group);
-	result->id = Id;
-/*	result->head = result->tail = NULL; */ 
+	struct	aml_name_group *result;
+
+	result = memman_alloc(aml_memman, memid_aml_name_group);
+	result->id = id;
 	result->head = NULL;
 	result->next = name_group_list;
 	name_group_list = result;
-	return result;
+	return (result);
 }
 
 void
 delete_aml_name_group(struct aml_name_group *target)
 {
-	struct aml_name_group *previous = name_group_list;
+	struct	aml_name_group *previous;
+
+	previous = name_group_list;
 	if (previous == target)
 		name_group_list = target->next;
 	else {
@@ -142,12 +144,12 @@
 }
 
 struct aml_name *
-new_aml_name(struct aml_name * parent, char *name)
+new_aml_name(struct aml_name *parent, char *name)
 {
-	struct aml_name *newname;
+	struct	aml_name *newname;
 
 	if ((newname = search_aml_name(parent, name)) != NULL)
-		return newname;
+		return (newname);
 
 	newname = memman_alloc(aml_memman, memid_aml_name);
 	strncpy(newname->name, name, 4);
@@ -155,18 +157,15 @@
 	newname->child = NULL;
 	newname->property = NULL;
 	if (parent->child)
-		newname->brother=parent->child;
+		newname->brother = parent->child;
 	else
-		newname->brother=NULL;
+		newname->brother = NULL;
 	parent->child = newname;
 
 	newname->chain = name_group_list->head;
 	name_group_list->head = newname;
-	/*
-	if (!name_group_list->tail)
-		name_group_list->tail = newname;
-	*/
-	return newname;
+
+	return (newname);
 }
 
 /*
@@ -176,8 +175,10 @@
 void
 delete_aml_name(struct aml_name *target)
 {
-        struct aml_name *next;
-	for (;target; target = next) {
+	struct	aml_name *next;
+	struct	aml_name *ptr;
+
+	for (; target; target = next) {
 		next = target->chain;
 		if (target->child) {
 			target->chain = NULL;
@@ -188,8 +189,6 @@
 				if (target->parent->child == target) {
 					target->parent->child = target->brother;
 				} else {
-					struct aml_name	*ptr;
-
 					ptr = target->parent->child;
 					while (ptr && ptr->brother != target)
 						ptr = ptr->brother;
@@ -208,32 +207,36 @@
 
 #define AML_SEARCH_NAME 0
 #define AML_CREATE_NAME 1
-static struct aml_name *acpi_nameman(struct aml_environ *, u_int8_t *, int);
+static struct aml_name	*acpi_nameman(struct aml_environ *, u_int8_t *, int);
 
 struct aml_name *
-acpi_search_name(struct aml_environ * env, u_int8_t * dp)
+acpi_search_name(struct aml_environ *env, u_int8_t *dp)
 {
-	return acpi_nameman(env, dp, AML_SEARCH_NAME);
+
+	return (acpi_nameman(env, dp, AML_SEARCH_NAME));
 }
 
 struct aml_name *
-acpi_create_name(struct aml_environ * env, u_int8_t * dp)
+acpi_create_name(struct aml_environ *env, u_int8_t *dp)
 {
-	return acpi_nameman(env, dp, AML_CREATE_NAME);
-	
+
+	return (acpi_nameman(env, dp, AML_CREATE_NAME));
 }
 
 static struct aml_name *
-acpi_nameman(struct aml_environ * env, u_int8_t * dp, int flag)
+acpi_nameman(struct aml_environ *env, u_int8_t *dp, int flag)
 {
-	struct aml_name *newname, *curname;
-	struct aml_name *(*searchfunc) (struct aml_name *, char *);
-#define CREATECHECK() do {					\
-	if (newname == NULL) {					\
-		AML_PRINTF("ERROR CANNOT FIND NAME\n");		\
-		env->stat = aml_stat_panic;			\
-		return (NULL);					\
-	}							\
+	int	segcount;
+	int	i;
+	struct	aml_name *newname, *curname;
+	struct	aml_name *(*searchfunc) (struct aml_name *, char *);
+
+#define CREATECHECK() do {						\
+	if (newname == NULL) {						\
+		AML_PRINTF("ERROR CANNOT FIND NAME\n");			\
+		env->stat = aml_stat_panic;				\
+		return (NULL);						\
+	}								\
 } while(0)
 
 	searchfunc = (flag == AML_CREATE_NAME) ? new_aml_name : search_aml_name;
@@ -256,8 +259,7 @@
 		newname = (*searchfunc) (newname, dp + 5);
 		CREATECHECK();
 	} 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) {
 			newname = (*searchfunc) (newname, dp);
 			CREATECHECK();
@@ -267,83 +269,91 @@
 		CREATECHECK();
 	} else {
 		curname = newname;
-		for(;;) {
+		for (;;) {
 			newname = search_aml_name(curname, dp);
 			if (newname != NULL)
 				break;
-			if(curname == &rootname)
+			if (curname == &rootname)
 				break;
 			curname = curname->parent;
 		}
 	}
-	return newname;
+	return (newname);
 }
+
 #undef CREATECHECK
 
 struct aml_local_stack *
 aml_local_stack_create()
 {
-	struct aml_local_stack *result =
-	    memman_alloc(aml_memman, memid_aml_local_stack);
+	struct aml_local_stack *result;
+
+	result = memman_alloc(aml_memman, memid_aml_local_stack);
 	memset(result, 0, sizeof(struct aml_local_stack));
-	return result;
+	return (result);
 }
-
 
-void aml_local_stack_push(struct aml_local_stack *stack)
+void 
+aml_local_stack_push(struct aml_local_stack *stack)
 {
+
 	stack->next = stack_top;
 	stack_top = stack;
-	return;
 }
 
-struct aml_local_stack*
+struct aml_local_stack *
 aml_local_stack_pop()
 {
-	struct aml_local_stack *result = stack_top;
+	struct aml_local_stack *result;
+
+	result = stack_top;
 	stack_top = result->next;
 	result->next = NULL;
-	return result;
+	return (result);
 }
 
 void
 aml_local_stack_delete(struct aml_local_stack *stack)
 {
-	int i;
-	for (i = 0; i < 8; i ++)
+	int	i;
+
+	for (i = 0; i < 8; i++)
 		acpi_free_object(&stack->localvalue[i].property);
-	for (i = 0; i < 7; i ++)
+	for (i = 0; i < 7; i++)
 		acpi_free_object(&stack->argumentvalue[i].property);
 	delete_aml_name(stack->temporary);
 	memman_free(aml_memman, memid_aml_local_stack, stack);
-	return;
 }
 
 struct aml_name *
 aml_local_stack_getLocalX(int index)
 {
+
 	if (stack_top == NULL)
-		return NULL;
-	return &stack_top->localvalue[index];
+		return (NULL);
+	return (&stack_top->localvalue[index]);
 }
 
 struct aml_name *
 aml_local_stack_getArgX(struct aml_local_stack *stack, int index)
 {
+
 	if (!stack)
 		stack = stack_top;
 	if (stack == NULL)
-		return NULL;
-	return &stack->argumentvalue[index];
+		return (NULL);
+	return (&stack->argumentvalue[index]);
 }
 
 struct aml_name *
 aml_create_local_object()
 {
-	struct aml_name *result = memman_alloc(aml_memman, memid_aml_name);
+	struct aml_name *result;
+
+	result = memman_alloc(aml_memman, memid_aml_name);
 	result->child = result->brother = result->parent = NULL;
 	result->property = NULL;
 	result->chain = stack_top->temporary;
 	stack_top->temporary = result;
-	return result;
+	return (result);
 }
Index: aml_name.h
===================================================================
RCS file: /home/cvs/ACPI/sys/i386/acpi/aml/aml_name.h,v
retrieving revision 1.10
diff -u -r1.10 aml_name.h
--- aml_name.h	2000/06/03 14:32:57	1.10
+++ aml_name.h	2000/06/04 10:48:43
@@ -27,58 +27,59 @@
  *	$Id: aml_name.h,v 1.10 2000/06/03 14:32:57 iwasaki Exp $
  */
 
-#ifndef _NAME_H_
-#define _NAME_H_
+#ifndef _AML_NAME_H_
+#define _AML_NAME_H_
 
 #include <i386/acpi/aml/aml_obj.h>
 
 struct aml_name {
-	char            name[4];
-	union aml_object *property;
-	struct aml_name *parent;
-	struct aml_name *brother;
-	struct aml_name *child;
-	struct aml_name *chain;
+	char	name[4];
+	union	aml_object *property;
+	struct	aml_name *parent;
+	struct	aml_name *brother;
+	struct	aml_name *child;
+	struct	aml_name *chain;
 };
 
-#define AML_NAME_GROUP_ROOT       0
-#define AML_NAME_GROUP_OS_DEFINED 1
-#define AML_NAME_GROUP_IN_METHOD  2
-
-struct aml_name_group {
-	int	id; /* DSDT address or DBHANDLE */
-	struct aml_name *head;
-/*	struct aml_name *tail; XXX not be used? */
-	struct aml_name_group *next;
+#define AML_NAME_GROUP_ROOT		0
+#define AML_NAME_GROUP_OS_DEFINED	1
+#define AML_NAME_GROUP_IN_METHOD	2
+
+struct	aml_name_group {
+	int	id;			/* DSDT address or DBHANDLE */
+	struct	aml_name *head;
+	struct	aml_name_group *next;
 };
 
-struct aml_local_stack {
-	struct aml_name localvalue[8];
-	struct aml_name argumentvalue[7];
-	struct aml_name *temporary;
-	struct aml_local_stack *next;
+struct	aml_local_stack {
+	struct	aml_name localvalue[8];
+	struct	aml_name argumentvalue[7];
+	struct	aml_name *temporary;
+	struct	aml_local_stack *next;
 };
 
 /* forward declarement */
 struct aml_envrion;
 
-struct aml_name *get_rootname(void);
-struct aml_name_group *new_aml_name_group(int);
-void delete_aml_name_group(struct aml_name_group *);
-extern struct aml_name_group *name_group_list;
-
-struct aml_name *new_aml_name(struct aml_name *, char *);
-void delete_aml_name(struct aml_name *);
-struct aml_name *search_aml_name(struct aml_name *, char *);
-struct aml_name *search_aml_name_recursive(struct aml_name *, char *);
-struct aml_name *acpi_search_name(struct aml_environ *, u_int8_t *);
-struct aml_name *acpi_create_name(struct aml_environ *, u_int8_t *);
-
-struct aml_local_stack *aml_local_stack_create(void);
-void aml_local_stack_push(struct aml_local_stack *);
-struct aml_local_stack *aml_local_stack_pop(void);
-void aml_local_stack_delete(struct aml_local_stack *);
-struct aml_name *aml_local_stack_getLocalX(int);
-struct aml_name *aml_local_stack_getArgX(struct aml_local_stack *, int);
-struct aml_name *aml_create_local_object(void);
-#endif
+struct aml_name		*get_rootname(void);
+struct aml_name_group	*new_aml_name_group(int);
+void			 delete_aml_name_group(struct aml_name_group *);
+
+struct aml_name		*new_aml_name(struct aml_name *, char *);
+void			 delete_aml_name(struct aml_name *);
+struct aml_name		*search_aml_name(struct aml_name *, char *);
+struct aml_name		*search_aml_name_recursive(struct aml_name *, char *);
+struct aml_name		*acpi_search_name(struct aml_environ *, u_int8_t *);
+struct aml_name		*acpi_create_name(struct aml_environ *, u_int8_t *);
+
+struct aml_local_stack	*aml_local_stack_create(void);
+void			 aml_local_stack_push(struct aml_local_stack *);
+struct aml_local_stack	*aml_local_stack_pop(void);
+void			 aml_local_stack_delete(struct aml_local_stack *);
+struct aml_name		*aml_local_stack_getLocalX(int);
+struct aml_name		*aml_local_stack_getArgX(struct aml_local_stack *, int);
+struct aml_name		*aml_create_local_object(void);
+
+extern struct	aml_name_group *name_group_list;
+
+#endif /* !_AML_NAME_H_ */
