CVS commit: src/usr.sbin/acpitools/aml

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Jan 28 10:09:54 UTC 2024

Modified Files:
src/usr.sbin/acpitools/aml: aml_common.h

Log Message:
s/errer/error/ in log message.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/aml

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Jan 28 10:09:54 UTC 2024

Modified Files:
src/usr.sbin/acpitools/aml: aml_common.h

Log Message:
s/errer/error/ in log message.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_common.h
diff -u src/usr.sbin/acpitools/aml/aml_common.h:1.2 src/usr.sbin/acpitools/aml/aml_common.h:1.3
--- src/usr.sbin/acpitools/aml/aml_common.h:1.2	Thu Jun 30 20:09:42 2011
+++ src/usr.sbin/acpitools/aml/aml_common.h	Sun Jan 28 10:09:54 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_common.h,v 1.2 2011/06/30 20:09:42 wiz Exp $	*/
+/*	$NetBSD: aml_common.h,v 1.3 2024/01/28 10:09:54 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2000 Mitsuru IWASAKI 
@@ -37,7 +37,7 @@
  */
 #ifdef _KERNEL
 #define AML_SYSABORT() do {		\
-	printf("aml: fatal errer at %s:%d\n", __FILE__, __LINE__);	\
+	printf("aml: fatal error at %s:%d\n", __FILE__, __LINE__);	\
 	panic("panic in AML interpreter!");\
 } while(0)
 #define AML_SYSASSERT(x) do {		\

CVS commit: src/usr.sbin/acpitools/aml

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Dec 10 11:09:52 UTC 2021

Modified Files:
src/usr.sbin/acpitools/aml: aml_evalobj.c

Log Message:
s/OCCURED/OCCURRED/ in a debug message.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_evalobj.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_evalobj.c
diff -u src/usr.sbin/acpitools/aml/aml_evalobj.c:1.2 src/usr.sbin/acpitools/aml/aml_evalobj.c:1.3
--- src/usr.sbin/acpitools/aml/aml_evalobj.c:1.2	Sun Jan 14 05:33:18 2007
+++ src/usr.sbin/acpitools/aml/aml_evalobj.c	Fri Dec 10 11:09:52 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_evalobj.c,v 1.2 2007/01/14 05:33:18 dogcow Exp $	*/
+/*	$NetBSD: aml_evalobj.c,v 1.3 2021/12/10 11:09:52 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999 Takanori Watanabe
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_evalobj.c,v 1.4 2000/11/09 06:24:45 iwasaki Exp $
  */
 #include 
-__RCSID("$NetBSD: aml_evalobj.c,v 1.2 2007/01/14 05:33:18 dogcow Exp $");
+__RCSID("$NetBSD: aml_evalobj.c,v 1.3 2021/12/10 11:09:52 msaitoh Exp $");
 
 #include 
 
@@ -260,7 +260,7 @@ reevaluate:
 		tmp = aml_execute_method(copy);
 		obj = aml_eval_name(env, tmp);
 		if (copy->stat == aml_stat_panic) {
-			AML_DEBUGPRINT("PANIC OCCURED IN METHOD");
+			AML_DEBUGPRINT("PANIC OCCURRED IN METHOD");
 			env->stat = aml_stat_panic;
 			ret = NULL;
 			aml_local_stack_delete(aml_local_stack_pop());

CVS commit: src/usr.sbin/acpitools/aml

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Dec 10 11:09:52 UTC 2021

Modified Files:
src/usr.sbin/acpitools/aml: aml_evalobj.c

Log Message:
s/OCCURED/OCCURRED/ in a debug message.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_evalobj.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/aml

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 22:22:17 UTC 2016

Modified Files:
src/usr.sbin/acpitools/aml: aml_memman.h

Log Message:
Drop pointless packed attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_memman.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_memman.h
diff -u src/usr.sbin/acpitools/aml/aml_memman.h:1.2 src/usr.sbin/acpitools/aml/aml_memman.h:1.3
--- src/usr.sbin/acpitools/aml/aml_memman.h:1.2	Sun Jan 18 09:46:59 2009
+++ src/usr.sbin/acpitools/aml/aml_memman.h	Tue Oct  4 22:22:16 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_memman.h,v 1.2 2009/01/18 09:46:59 lukem Exp $	*/
+/*	$NetBSD: aml_memman.h,v 1.3 2016/10/04 22:22:16 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 Mitsuru IWASAKI 
@@ -48,7 +48,7 @@ struct	memman_block {
 	unsigned int	available;	/* number of available chunks */
 	unsigned int	allocated_mem;	/* block + misc (in bytes) */
 
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_block_list, memman_block);
 
@@ -57,7 +57,7 @@ struct	memman_node {
 	LIST_ENTRY(memman_node)	links;
 	void	*node;
 	struct	memman_block *memblock;
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_node_list, memman_node);
 
@@ -88,7 +88,7 @@ struct	memman_flexmem_info {
 	LIST_ENTRY(memman_flexmem_info) links;
 	void	*addr;
 	size_t	mem_size;
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_flexmem_info_list, memman_flexmem_info);
 

CVS commit: src/usr.sbin/acpitools/aml

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 22:22:17 UTC 2016

Modified Files:
src/usr.sbin/acpitools/aml: aml_memman.h

Log Message:
Drop pointless packed attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_memman.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/aml

[David Young]

Module Name:src
Committed By:   dyoung
Date:   Mon May 30 01:15:30 UTC 2011

Modified Files:
src/usr.sbin/acpitools/aml: aml_common.c aml_parse.c aml_region.c

Log Message:
It's not necessary to #include both machine/bus.h and sys/bus.h,
because sys/bus.h will do: sys/bus.h #includes machine/bus.h.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/acpitools/aml/aml_parse.c \
src/usr.sbin/acpitools/aml/aml_region.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_common.c
diff -u src/usr.sbin/acpitools/aml/aml_common.c:1.2 src/usr.sbin/acpitools/aml/aml_common.c:1.3
--- src/usr.sbin/acpitools/aml/aml_common.c:1.2	Sun Jan 18 09:46:59 2009
+++ src/usr.sbin/acpitools/aml/aml_common.c	Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_common.c,v 1.2 2009/01/18 09:46:59 lukem Exp $	*/
+/*	$NetBSD: aml_common.c,v 1.3 2011/05/30 01:15:30 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1999 Takanori Watanabe
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_common.c,v 1.6 2000/11/09 06:24:45 iwasaki Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_common.c,v 1.2 2009/01/18 09:46:59 lukem Exp $);
+__RCSID($NetBSD: aml_common.c,v 1.3 2011/05/30 01:15:30 dyoung Exp $);
 
 #include sys/param.h
 
@@ -47,7 +47,6 @@
 #include sys/sysctl.h
 #include sys/systm.h
 #include sys/bus.h
-#include machine/bus.h
 #include dev/acpi/acpireg.h
 #include dev/acpi/acpivar.h
 #ifndef ACPI_NO_OSDFUNC_INLINE

Index: src/usr.sbin/acpitools/aml/aml_parse.c
diff -u src/usr.sbin/acpitools/aml/aml_parse.c:1.1 src/usr.sbin/acpitools/aml/aml_parse.c:1.2
--- src/usr.sbin/acpitools/aml/aml_parse.c:1.1	Sun Jan 14 04:36:13 2007
+++ src/usr.sbin/acpitools/aml/aml_parse.c	Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_parse.c,v 1.1 2007/01/14 04:36:13 christos Exp $	*/
+/*	$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1999 Doug Rabson
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_parse.c,v 1.1 2007/01/14 04:36:13 christos Exp $);
+__RCSID($NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $);
 
 #include sys/param.h
 
@@ -61,7 +61,6 @@
 #else /* _KERNEL */
 #include sys/systm.h
 #include sys/bus.h
-#include machine/bus.h
 #include dev/acpi/acpireg.h
 #include dev/acpi/acpivar.h
 #ifndef ACPI_NO_OSDFUNC_INLINE
Index: src/usr.sbin/acpitools/aml/aml_region.c
diff -u src/usr.sbin/acpitools/aml/aml_region.c:1.1 src/usr.sbin/acpitools/aml/aml_region.c:1.2
--- src/usr.sbin/acpitools/aml/aml_region.c:1.1	Sun Jan 14 04:36:13 2007
+++ src/usr.sbin/acpitools/aml/aml_region.c	Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_region.c,v 1.1 2007/01/14 04:36:13 christos Exp $	*/
+/*	$NetBSD: aml_region.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000 Mitsuru IWASAKI iwas...@freebsd.org
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_region.c,v 1.5 2000/11/09 06:24:45 iwasaki Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_region.c,v 1.1 2007/01/14 04:36:13 christos Exp $);
+__RCSID($NetBSD: aml_region.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $);
 
 /*
  * Region I/O subroutine
@@ -41,7 +41,6 @@
 #include sys/systm.h
 #include sys/bus.h
 
-#include machine/bus.h
 #include machine/resource.h
 #include sys/rman.h
 

CVS commit: src/usr.sbin/acpitools/aml

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Thu Oct  8 13:16:13 UTC 2009

Modified Files:
src/usr.sbin/acpitools/aml: aml_name.c

Log Message:
fix acpidump segfault


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/acpitools/aml/aml_name.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_name.c
diff -u src/usr.sbin/acpitools/aml/aml_name.c:1.3 src/usr.sbin/acpitools/aml/aml_name.c:1.4
--- src/usr.sbin/acpitools/aml/aml_name.c:1.3	Tue Jan 15 19:08:00 2008
+++ src/usr.sbin/acpitools/aml/aml_name.c	Thu Oct  8 13:16:13 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_name.c,v 1.3 2008/01/15 19:08:00 jmcneill Exp $	*/
+/*	$NetBSD: aml_name.c,v 1.4 2009/10/08 13:16:13 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1999 Takanori Watanabe
@@ -31,7 +31,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_name.c,v 1.3 2000/11/09 06:24:45 iwasaki Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_name.c,v 1.3 2008/01/15 19:08:00 jmcneill Exp $);
+__RCSID($NetBSD: aml_name.c,v 1.4 2009/10/08 13:16:13 cegger Exp $);
 
 #include sys/param.h
 
@@ -283,11 +283,12 @@
 	newname-parent = parent;
 	newname-child = NULL;
 	newname-property = NULL;
-	if (parent-child)
+	if (parent  parent-child)
 		newname-brother = parent-child;
 	else
 		newname-brother = NULL;
-	parent-child = newname;
+	if (parent)
+		parent-child = newname;
 
 	newname-chain = name_group_list-head;
 	name_group_list-head = newname;