From owner-acpi-jp@jp.freebsd.org  Tue Mar 21 01:36:35 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id BAA23389;
	Tue, 21 Mar 2000 01:36:35 +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 BAA23383
	for <acpi-jp@jp.freebsd.org>; Tue, 21 Mar 2000 01:36:34 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (isdnb27.imasy.or.jp [202.227.24.155])
	by tasogare.imasy.or.jp (8.9.3+3.2W/3.7W-tasogare/smtpfeed 1.01) with ESMTP id BAA13366
	for <acpi-jp@jp.freebsd.org>; Tue, 21 Mar 2000 01:36:29 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Message-Id: <200003201636.BAA13366@tasogare.imasy.or.jp>
To: acpi-jp@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Date: Tue, 21 Mar 2000 01:36:30 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 980905(IM100)
Lines: 513
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 289
Subject: [acpi-jp 289] Want Style 9 Police
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

$BK\2H%^!<%8$,%9%`!<%:$K$$$/$h$&$K(B style 9 $B2=$7$F$/$l$k?M$$$^$;$s$+(B?
$B%l%S%e!<$7$F$b$i$&:]$K:3:Y$JItJ,$G5DO@$NO+NO;H$$$?$/$J$$$N$G(B...

$B$H$j$"$($:5$$N$D$$$?7Z$$$H$3$m$+$i;O$a$^$7$?$,!"47$l$F$$$J$$$N$G(B
$BFq9R$7$=$&$G$9!#(B
# $B$/$j$d$^$5$s!"(Bhelp?

man 9 style $B$r0lDL$jFI$s$G!"4{B8$N%=!<%9$r<jD>$7$7$F%3%s%Q%$%k3NG'$7$F(B
$B$/$l$k$@$1$G4r$7$$$G$9!#(BACPI $B$N$3$H$OJ,$+$i$J$/$F$b(B C $B8@8l%W%m%0%i%`$,(B
$BFI$a$l$P(B OK $B$G$9!#(B

$B$H$j$"$($:L@F|(B commit $BM=Dj$N$d$D$rE:IU$7$F$*$-$^$9!#(B

Index: amlmem.c
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/amlmem.c,v
retrieving revision 1.6
diff -u -r1.6 amlmem.c
--- amlmem.c	2000/03/20 14:46:30	1.6
+++ amlmem.c	2000/03/20 16:11:19
@@ -55,7 +55,7 @@
 MEMMAN_INITIALSTORAGE_DESC(struct aml_environ, _aml_environ_storage);
 MEMMAN_INITIALSTORAGE_DESC(struct aml_local_stack, _aml_objectptr_storage);
 
-memman_blockman_t aml_blockman[] = {
+struct memman_blockman aml_blockman[] = {
 	MEMMAN_MEMBLOCK_DESC(sizeof(struct aml_namestr), _aml_namestr_storage),
 	MEMMAN_MEMBLOCK_DESC(sizeof(struct aml_num), _aml_num_storage),
 	MEMMAN_MEMBLOCK_DESC(sizeof(struct aml_string), _aml_string_storage),
@@ -76,10 +76,10 @@
 	MEMMAN_MEMBLOCK_DESC(sizeof(struct aml_local_stack), _aml_objectptr_storage),
 };
 
-memman_histogram_t aml_histogram[MEMMAN_HISTOGRAM_SIZE];
+struct memman_histogram aml_histogram[MEMMAN_HISTOGRAM_SIZE];
 
-static memman_t _aml_memman = MEMMAN_MEMMANAGER_DESC(aml_blockman, 18,
+static struct memman _aml_memman = MEMMAN_MEMMANAGER_DESC(aml_blockman, 18,
 						     aml_histogram, 1);
 
-memman_t *aml_memman = &_aml_memman;
+struct memman *aml_memman = &_aml_memman;
 
Index: amlmem.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/amlmem.h,v
retrieving revision 1.5
diff -u -r1.5 amlmem.h
--- amlmem.h	2000/03/20 14:46:30	1.5
+++ amlmem.h	2000/03/20 16:11:19
@@ -55,6 +55,6 @@
 	memid_aml_local_stack,
 };
 
-extern memman_t	*aml_memman;
+extern struct memman	*aml_memman;
 #endif
 
Index: debug.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/debug.h,v
retrieving revision 1.2
diff -u -r1.2 debug.h
--- debug.h	2000/01/03 10:16:59	1.2
+++ debug.h	2000/03/20 16:11:19
@@ -27,10 +27,10 @@
  */
 extern int acpi_debug;
 #define DPRINT(args...)	if (acpi_debug) printf(args)
-void showobject(union aml_object * obj);
-void showtree(struct aml_name * aname, int lev);
-int acpi_print_curname(struct aml_name *name);
-void acpi_print_namestring(u_int8_t *dp);
+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_dbgr(struct aml_environ *,struct aml_environ *);
 
 
Index: evalobj.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/evalobj.h,v
retrieving revision 1.3
diff -u -r1.3 evalobj.h
--- evalobj.h	2000/01/11 11:33:41	1.3
+++ evalobj.h	2000/03/20 16:11:19
@@ -27,9 +27,9 @@
  */
 
 union aml_object 
-*acpi_eval_name(struct aml_environ * env, struct aml_name * aname);
-int acpi_objtonum(struct aml_environ *env,union aml_object * obj);
-struct aml_name *acpi_execute_method(struct aml_environ *env);
-union aml_object *acpi_invoke_method_by_name(char *method,
-					    int argc, union aml_object *argv);
+*acpi_eval_name(struct aml_environ *, struct aml_name *);
+int acpi_objtonum(struct aml_environ *,union aml_object *);
+struct aml_name *acpi_execute_method(struct aml_environ *);
+union aml_object *acpi_invoke_method_by_name(char *,
+					    int, union aml_object *);
 
Index: memman.c
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/memman.c,v
retrieving revision 1.3
diff -u -r1.3 memman.c
--- memman.c	2000/01/04 20:39:54	1.3
+++ memman.c	2000/03/20 16:11:19
@@ -35,15 +35,15 @@
 #include <stdio.h>
 #include <string.h>
 
-memid_t	memid_unkown = 255;
+unsigned int	memid_unkown = 255;
 
 static int
-manage_block(memman_t *memman, memid_t id, void *block, unsigned static_mem, unsigned entries)
+manage_block(struct memman *memman, unsigned int id, void *block, unsigned static_mem, unsigned entries)
 {
 	unsigned int		i;
 	size_t			alloc_size;
 	void			*tmp, *realblock;
-	memman_blockman_t	*bmp;
+	struct memman_blockman	*bmp;
 	struct memman_block	*memblock;
 	struct memman_node	*memnodes;
 
@@ -88,9 +88,9 @@
 }
 
 static int
-blockman_init(memman_t *memman, memid_t id)
+blockman_init(struct memman *memman, unsigned int id)
 {
-	memman_blockman_t	*bmp;
+	struct memman_blockman	*bmp;
 
 	bmp = &memman->blockman[id];
 	bmp->initialized = 1;
@@ -101,11 +101,11 @@
 }
 
 void *
-memman_alloc(memman_t *memman, memid_t id)
+memman_alloc(struct memman *memman, unsigned int id)
 {
 	size_t			alloc_size;
 	void			*chunk, *block;
-	memman_blockman_t	*bmp;
+	struct memman_blockman	*bmp;
 	struct memman_node	*memnode;
 
 	if (memman->max_memid <= id) {
@@ -152,7 +152,7 @@
 }
 
 static void
-memman_flexsize_add_histogram(memman_t *memman, size_t size, int tolerance)
+memman_flexsize_add_histogram(struct memman *memman, size_t size, int tolerance)
 {
 	int	i;
 	int	gap;
@@ -186,18 +186,18 @@
 static int
 memman_comp_histogram_size(const void *a, const void *b)
 {
-	return ((memman_histogram_t *)a)->mem_size - ((memman_histogram_t *)b)->mem_size;
+	return ((struct memman_histogram *)a)->mem_size - ((struct memman_histogram *)b)->mem_size;
 }
 
 static void
-memman_sort_histogram_by_size(memman_t *memman)
+memman_sort_histogram_by_size(struct memman *memman)
 {
 	qsort(memman->flex_mem_histogram, memman->flex_mem_histogram_ptr,
-	      sizeof(memman_histogram_t), memman_comp_histogram_size);
+	      sizeof(struct memman_histogram), memman_comp_histogram_size);
 }
 
 void *
-memman_alloc_flexsize(memman_t *memman, size_t size)
+memman_alloc_flexsize(struct memman *memman, size_t size)
 {
 	void	*mem;
 	struct memman_flexmem_info *info;
@@ -213,7 +213,7 @@
 			if (!memman->flex_mem_initialized) {
 				LIST_INIT(&memman->flexmem_info_list);
 				bzero(memman->flex_mem_histogram,
-				    sizeof(memman_histogram_t));
+				    sizeof(struct memman_histogram));
 				memman->flex_mem_initialized = 1;
 			}
 			info->addr = mem;
@@ -243,11 +243,11 @@
 	return mem;
 }
 
-static memid_t
-memman_guess_memid(memman_t *memman, void *chunk)
+static unsigned int
+memman_guess_memid(struct memman *memman, void *chunk)
 {
-	memid_t			id;
-	memman_blockman_t	*bmp;
+	unsigned int		id;
+	struct memman_blockman	*bmp;
 	struct memman_node	*memnode;
 
 	for (id = 0; id < memman->max_memid; id++) {
@@ -268,12 +268,12 @@
 }
 
 void
-memman_free(memman_t *memman, memid_t memid, void *chunk)
+memman_free(struct memman *memman, unsigned int memid, void *chunk)
 {
-	memid_t			id = memid;
+	unsigned int		id = memid;
 	unsigned		found;
 	void			*block;
-	memman_blockman_t	*bmp;
+	struct memman_blockman	*bmp;
 	struct memman_block	*memblock;
 	struct memman_node	*memnode;
 
@@ -335,7 +335,7 @@
 }
 
 void
-memman_free_flexsize(memman_t *memman, void *chunk)
+memman_free_flexsize(struct memman *memman, void *chunk)
 {
 	struct memman_flexmem_info *info;
 
@@ -354,11 +354,11 @@
 }
 
 void
-memman_freeall(memman_t *memman)
+memman_freeall(struct memman *memman)
 {
 	int			id;
 	void			*chunk;
-	memman_blockman_t	*bmp;
+	struct memman_blockman	*bmp;
 	struct memman_node	*memnode;
 	struct memman_block	*memblock;
 	struct memman_flexmem_info *info;
@@ -390,7 +390,7 @@
 }
 
 static void
-memman_statistics_fixedsize(memman_t *memman)
+memman_statistics_fixedsize(struct memman *memman)
 {
 	printf("  fixed size memory blocks\n");
 	printf("    alloc():		%d times\n", memman->alloc_called);
@@ -403,7 +403,7 @@
 }
 
 static void
-memman_statistics_flexsize(memman_t *memman)
+memman_statistics_flexsize(struct memman *memman)
 {
 	int	i;
 
@@ -434,7 +434,7 @@
 }
 
 void
-memman_statistics(memman_t *memman)
+memman_statistics(struct memman *memman)
 {
 	printf("memman: reporting statistics\n");
 	memman_statistics_fixedsize(memman);
@@ -442,7 +442,7 @@
 }
 
 size_t
-memman_memid2size(memman_t *memman, memid_t id)
+memman_memid2size(struct memman *memman, unsigned int id)
 {
 	if (memman->max_memid <= id) {
 		printf("memman_alloc: invalid memory type id\n");
Index: memman.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/memman.h,v
retrieving revision 1.3
diff -u -r1.3 memman.h
--- memman.h	2000/01/04 20:39:54	1.3
+++ memman.h	2000/03/20 16:11:19
@@ -59,11 +59,10 @@
 LIST_HEAD(memman_node_list, memman_node);
 
 /* memory type id */
-typedef unsigned int	memid_t;
-extern memid_t	memid_unkown;
+extern unsigned int	memid_unkown;
 
 /* memory block manager */
-typedef struct {
+struct memman_blockman {
 	unsigned int	size;		/* size of chunk */
 	unsigned int	available;	/* total number of available chunks */
 	void		*initial_block;	/* initial memory storage */
@@ -72,14 +71,14 @@
 	struct memman_block_list	block_list;
 	struct memman_node_list		free_node_list;
 	struct memman_node_list		occupied_node_list;
-} memman_blockman_t;
+};
 
 /* memory size histogram */
 #define MEMMAN_HISTOGRAM_SIZE	20
-typedef struct {
+struct memman_histogram {
 	int	mem_size;
 	int	count;
-} memman_histogram_t;
+};
 
 /* flex size memory allocation info */
 struct memman_flexmem_info {
@@ -91,9 +90,9 @@
 LIST_HEAD(memman_flexmem_info_list, memman_flexmem_info);
 
 /* memory manager */
-typedef struct {
-	memman_blockman_t *blockman;
-	memid_t		max_memid;	/* max number of valid memid */
+struct memman {
+	struct memman_blockman	*blockman;
+	unsigned int	max_memid;	/* max number of valid memid */
 
 	/* fixed size memory blocks */
 	unsigned int	alloc_called;	/* memman_alloc() calling */
@@ -116,12 +115,12 @@
 	size_t		flex_peak_mem_usage;/* memory usage at a peak period */
 
 	/* stuff for more detailed statistical information */
-	memman_histogram_t *flex_mem_histogram;
+	struct memman_histogram	*flex_mem_histogram;
 	unsigned int	flex_mem_histogram_ptr;
 	int		flex_mem_histogram_initial_tolerance;
 	unsigned	flex_mem_initialized;
 	struct memman_flexmem_info_list	flexmem_info_list;
-} memman_t;
+};
 
 #define MEMMAN_BLOCKNODE_SIZE(entries) sizeof(struct memman_block) + \
 			    sizeof(struct memman_node) * entries
@@ -151,12 +150,12 @@
 	{ blockman, max_memid, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
 	  0, 0, 0, histogram, 0, tolerance, 0}
 
-void	*memman_alloc(memman_t *memman, memid_t id);
-void	*memman_alloc_flexsize(memman_t *memman, size_t size);
-void	memman_free(memman_t *memman, memid_t id, void *chunk);
-void	memman_free_flexsize(memman_t *memman, void *chunk);
-void	memman_freeall(memman_t *memman);
-void	memman_statistics(memman_t *memman);
-size_t	memman_memid2size(memman_t *memman, memid_t id);
+void	*memman_alloc(struct memman *, unsigned int);
+void	*memman_alloc_flexsize(struct memman *, size_t);
+void	memman_free(struct memman *, unsigned int, void *);
+void	memman_free_flexsize(struct memman *, void *);
+void	memman_freeall(struct memman *);
+void	memman_statistics(struct memman *);
+size_t	memman_memid2size(struct memman *, unsigned int);
 #endif
 
Index: name.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/name.h,v
retrieving revision 1.7
diff -u -r1.7 name.h
--- name.h	2000/03/20 14:46:30	1.7
+++ name.h	2000/03/20 16:13:45
@@ -62,23 +62,22 @@
 struct aml_envrion;
 
 struct aml_name *get_rootname();
-struct aml_name_group *new_aml_name_group(int Id);
-void delete_aml_name_group(struct aml_name_group *target);
+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 * parent, char *name);
-void delete_aml_name(struct aml_name *target);
-struct aml_name *search_aml_name(struct aml_name * parent, char *name);
-struct aml_name *search_aml_name_recursive(struct aml_name * parent, char *name);
-struct aml_name *acpi_search_name(struct aml_environ * env, u_int8_t * dp);
-struct aml_name *acpi_create_name(struct aml_environ * env, u_int8_t * dp);
+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 aml_local_stack_push(struct aml_local_stack *stack);
+void aml_local_stack_push(struct aml_local_stack *);
 struct aml_local_stack *aml_local_stack_pop();
-void aml_local_stack_delete(struct aml_local_stack *stack);
-struct aml_name *aml_local_stack_getLocalX(int index);
-struct aml_name *aml_local_stack_getArgX(struct aml_local_stack *stack,
-					 int index);
+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();
 #endif
Index: obj.c
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/obj.c,v
retrieving revision 1.5
diff -u -r1.5 obj.c
--- obj.c	2000/03/20 14:46:30	1.5
+++ obj.c	2000/03/20 16:11:19
@@ -81,7 +81,7 @@
 union aml_object *
 acpi_alloc_object(enum aml_objtype type, union aml_object * orig)
 {
-	memid_t		memid;
+	unsigned int	memid;
 	union aml_object *ret;
 	if (orig != NULL) {
 		type = orig->type;
Index: obj.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/obj.h,v
retrieving revision 1.6
diff -u -r1.6 obj.h
--- obj.h	2000/03/20 14:46:30	1.6
+++ obj.h	2000/03/20 16:18:44
@@ -169,10 +169,13 @@
 	struct aml_objref objref;
 };
 
-union aml_object * acpi_copy_object(struct aml_environ *env,union aml_object *orig);
-union aml_object * acpi_alloc_object(enum aml_objtype type, union aml_object * orig);
-void acpi_free_objectcontent(union aml_object * obj);
+union aml_object * acpi_copy_object(struct aml_environ *,union aml_object *);
+union aml_object * acpi_alloc_object(enum aml_objtype, union aml_object *);
+void acpi_free_objectcontent(union aml_object *);
 void
-acpi_free_object(union aml_object ** obj);
-void acpi_realloc_object(union aml_object * obj, int size);
+acpi_free_object(union aml_object **);
+void acpi_realloc_object(union aml_object *, int);
+void acpi_register_temporary_object(struct aml_environ *,union aml_object *);
+
 #endif
+
Index: parse.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/parse.h,v
retrieving revision 1.3
diff -u -r1.3 parse.h
--- parse.h	2000/03/20 14:46:30	1.3
+++ parse.h	2000/03/20 16:14:34
@@ -26,6 +26,6 @@
  *	$Id: parse.h,v 1.3 2000/03/20 14:46:30 iwasaki Exp $
  */
 
-void acpi_print_namestring(u_int8_t * dp);
-struct aml_name *acpi_parse_objectlist(struct aml_environ * env, int indent);
-struct aml_name *acpi_parse_termobj(struct aml_environ * env, int indent);
+void acpi_print_namestring(u_int8_t *);
+struct aml_name *acpi_parse_objectlist(struct aml_environ *, int);
+struct aml_name *acpi_parse_termobj(struct aml_environ *, int);
Index: region.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/region.h,v
retrieving revision 1.2
diff -u -r1.2 region.h
--- region.h	2000/01/03 11:28:06	1.2
+++ region.h	2000/03/20 16:11:19
@@ -33,12 +33,12 @@
 #ifndef _REGION_H_
 #define _REGION_H_
 
-u_int32_t	acpi_region_read(int regtype, u_int32_t acctype, int addr,
-				 int bitoffset, int bitlen);
-int		acpi_region_write(int regtype, u_int32_t flags, int value,
-    				  int addr, int bitoffset, int bitlen);
+u_int32_t	acpi_region_read(int, u_int32_t, int,
+				 int, int);
+int		acpi_region_write(int, u_int32_t, int,
+    				  int, int, int);
 
-void		acpi_simulation_regdump(const char * dumpfile);
+void		acpi_simulation_regdump(const char *);
 extern int     acpi_debug_prompt_regoutput;
 extern int     acpi_debug_prompt_reginput;
 
Index: store.h
===================================================================
RCS file: /home/cvs/ACPI/util/acpiconf/store.h,v
retrieving revision 1.1
diff -u -r1.1 store.h
--- store.h	1999/12/26 06:36:25	1.1
+++ store.h	2000/03/20 16:11:19
@@ -26,4 +26,4 @@
  *	$Id: store.h,v 1.1 1999/12/26 06:36:25 takawata Exp $
  */
 void 
-acpi_store_to_name(struct aml_environ *env,union aml_object *obj,struct aml_name *name);
+acpi_store_to_name(struct aml_environ *,union aml_object *,struct aml_name *);
