PERFORCE change 34452 for review

Marcel Moolenaar marcel at FreeBSD.org
Sun Jul 13 16:34:21 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=34452

Change 34452 by marcel at marcel_nfs on 2003/07/13 16:33:20

	IFC @34451
	
	NOTE: The merge removes the local modifications we had to
	the acpi contributed code. The merge conflict is expected
	to be caused by a fix to the problem for which we had the
	local changes anyway. This hasn't been verified yet, but
	Robert Moore <robert.moore at intel.com> did say he had a fix
	for it. We have to test it anyway...

Affected files ...

.. //depot/projects/ia64/contrib/opie/popen.c#3 integrate
.. //depot/projects/ia64/games/fortune/datfiles/startrek#4 integrate
.. //depot/projects/ia64/lib/libc/sys/ioctl.2#5 integrate
.. //depot/projects/ia64/lib/libc_r/Makefile#6 integrate
.. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#26 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#3 integrate
.. //depot/projects/ia64/share/man/man5/config.5#2 integrate
.. //depot/projects/ia64/share/mk/bsd.cpu.mk#16 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#4 integrate
.. //depot/projects/ia64/sys/boot/pc98/boot2/asm.h#3 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#11 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/achware.h#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acinterp.h#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#11 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acpi.h#4 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#13 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#11 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#11 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dmobject.c#1 branch
.. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#4 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#4 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsinit.c#2 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#2 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evsci.c#6 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evxfevnt.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/hwacpi.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#6 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#12 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/hwtimer.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsparse.c#2 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nswalk.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfname.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/pswalk.c#6 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsio.c#6 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsmemory.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/rsxface.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#11 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#5 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/tbxface.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utdebug.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#10 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utinit.c#8 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#9 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#7 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#8 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#9 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#8 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#8 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi.c#33 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#11 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#6 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#16 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/ia64/sys/dev/kbd/atkbd.c#8 integrate
.. //depot/projects/ia64/sys/net/if_ethersubr.c#31 integrate
.. //depot/projects/ia64/sys/pc98/pc98/syscons.c#18 integrate
.. //depot/projects/ia64/sys/vm/vm_init.c#9 integrate
.. //depot/projects/ia64/usr.sbin/apm/apm.c#6 integrate
.. //depot/projects/ia64/usr.sbin/ctm/ctm_smail/ctm_smail.c#2 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/options.c#3 integrate

Differences ...

==== //depot/projects/ia64/contrib/opie/popen.c#3 (text+ko) ====

@@ -23,6 +23,7 @@
 	Modified at NRL for OPIE 2.0.
 	Originally from BSD.
 
+$FreeBSD: src/contrib/opie/popen.c,v 1.2 2003/07/13 05:59:50 kris Exp $
 */
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -84,6 +85,9 @@
 
 #include "opie.h"
 
+#define MAXUSRARGS	100
+#define MAXGLOBARGS	1000
+
 char **ftpglob __P((register char *));
 char **copyblk __P((char **));
 VOIDRET blkfree __P((char **));
@@ -103,7 +107,7 @@
   char *cp;
   FILE *iop;
   int argc, gargc, pdes[2];
-  char **pop, *argv[100], *gargv[1000], *vv[2];
+  char **pop, *argv[MAXUSRARGS], *gargv[MAXGLOBARGS], *vv[2];
 
   if ((*type != 'r' && *type != 'w') || type[1])
     return (NULL);
@@ -112,13 +116,15 @@
     return (NULL);
 
   /* break up string into pieces */
-  for (argc = 0, cp = program;; cp = NULL)
+  for (argc = 0, cp = program; argc < MAXUSRARGS-1; cp = NULL) {
     if (!(argv[argc++] = strtok(cp, " \t\n")))
       break;
+  }
+  argv[argc - 1] = NULL;
 
   /* glob each piece */
   gargv[0] = argv[0];
-  for (gargc = argc = 1; argv[argc]; argc++) {
+  for (gargc = argc = 1; argv[argc] && gargc < (MAXGLOBARGS-1); argc++) {
     if (!(pop = (char **) ftpglob(argv[argc]))) {
       /* globbing failed */
       vv[0] = argv[argc];
@@ -126,7 +132,7 @@
       pop = (char **) copyblk(vv);
     }
     argv[argc] = (char *) pop;	/* save to free later */
-    while (*pop && gargc < 1000)
+    while (*pop && gargc < MAXGLOBARGS-1)
       gargv[gargc++] = *pop++;
   }
   gargv[gargc] = NULL;

==== //depot/projects/ia64/games/fortune/datfiles/startrek#4 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.3 2003/01/04 17:08:23 schweikh Exp $
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.4 2003/07/13 03:49:43 kris Exp $
 A father doesn't destroy his children.
 		-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
 		   stardate 3468.1.
@@ -494,7 +494,7 @@
 to know each other.
 		-- Kirk, "Elaan of Troyius", stardate 4372.5
 %
-"The release of emotion is what keeps us health.  Emotionally healthy."
+"The release of emotion is what keeps us healthy.  Emotionally healthy."
 
 "That may be, Doctor.  However, I have noted that the healthy release
 of emotion is frequently unhealthy for those closest to you."
@@ -735,7 +735,7 @@
 		-- Kor, the Klingon Commander, "Errand of Mercy",
 		   stardate 3201.7
 %
-You!  What PLANET is this!
+You!  What PLANET is this?!
 		-- McCoy, "The City on the Edge of Forever", stardate 3134.0
 %
 You'll learn something about men and women -- the way they're supposed

==== //depot/projects/ia64/lib/libc/sys/ioctl.2#5 (text+ko) ====

@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
-.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.21 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.22 2003/07/13 21:02:48 ceri Exp $
 .\"
 .Dd December 11, 1993
 .Dt IOCTL 2
@@ -85,7 +85,7 @@
 Macros and defines used in specifying an ioctl
 .Fa request
 are located in the file
-.Ao Pa sys/ioctl.h Ac .
+.Ao Pa sys/ioccom.h Ac .
 .Sh RETURN VALUES
 If an error has occurred, a value of -1 is returned and
 .Va errno

==== //depot/projects/ia64/lib/libc_r/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc_r/Makefile,v 1.35 2003/07/02 13:27:54 ru Exp $
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.36 2003/07/13 05:35:30 deischen Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -9,7 +9,7 @@
 # system call stubs.
 LIB=c_r
 SHLIB_MAJOR= 5
-CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE 
+CFLAGS+=-DPTHREAD_KERNEL 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \
 	-I${.CURDIR}/../../include
 

==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#26 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Author:	Jordan Hubbard
 # Date:		Mon Jul 10 01:18:20 2000
-# Version:	$FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.43 2003/07/12 15:35:06 trhodes Exp $
+# Version:	$FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.44 2003/07/13 07:20:24 murray Exp $
 #
 # MAINTAINER:	re
 #
@@ -67,17 +67,17 @@
 ## Start of set for CDROM #1
 # This is the set required by sysinstall.
 CDROM_SET_1=""
+CDROM_SET_1="${CDROM_SET_1} devel/pcre"
 if [ "X${PKG_ARCH}" = "Xalpha" ]; then
 CDROM_SET_1="${CDROM_SET_1} emulators/osf1_base"
 elif [ "X${PKG_ARCH}" = "Xi386" ]; then
 CDROM_SET_1="${CDROM_SET_1} emulators/linux_base"
 fi
-CDROM_SET_1="${CDROM_SET_1} devel/pcre"
 CDROM_SET_1="${CDROM_SET_1} lang/perl5"
+CDROM_SET_1="${CDROM_SET_1} mail/exim"
+CDROM_SET_1="${CDROM_SET_1} mail/postfix"
 CDROM_SET_1="${CDROM_SET_1} net/pcnfsd"
 CDROM_SET_1="${CDROM_SET_1} net/rsync"
-CDROM_SET_1="${CDROM_SET_1} mail/exim"
-CDROM_SET_1="${CDROM_SET_1} mail/postfix"
 CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi"
 CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi"
 CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic"

==== //depot/projects/ia64/share/man/man4/ath.4#3 (text+ko) ====

@@ -29,9 +29,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/ath.4,v 1.3 2003/06/28 17:59:37 sam Exp $
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.4 2003/07/13 17:03:39 sam Exp $
 .\"/
-.Dd June 26, 2003
+.Dd July 13, 2003
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -112,9 +112,9 @@
 D-Link DWL-AB650	AR5211	Cardbus
 D-Link DWL-AG520	AR5212	PCI
 D-Link DWL-AG650	AR5212	Cardbus
-Linksys WMP55AG	AR5212	Cardbus
+Linksys WMP55AG	AR5212	PCI
 Linksys WPC51AB	AR5211	Cardbus
-Linksys WPC55AG	AR5212	PCI
+Linksys WPC55AG	AR5212	Cardbus
 Netgear WAB501	AR5211	Cardbus
 Netgear WAG511	AR5212	Cardbus
 .El

==== //depot/projects/ia64/share/man/man5/config.5#2 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/config.5,v 1.2 2003/07/08 01:39:02 jkoshy Exp $
+.\" $FreeBSD: src/share/man/man5/config.5,v 1.3 2003/07/13 09:11:10 jkoshy Exp $
 .\"
 .Dd July 3, 2003
 .Dt CONFIG 5
@@ -221,7 +221,7 @@
 A value of 0 indicates that the kernel should configure
 its data structures according to the size of available
 physical memory.
-If autoconfiguration is requested, the kernel will set
+If auto configuration is requested, the kernel will set
 this tunable to a value between 32 and 384.
 .Pp
 As explained in

==== //depot/projects/ia64/share/mk/bsd.cpu.mk#16 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.28 2003/05/22 16:56:46 anholt Exp $
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.29 2003/07/13 10:34:09 mux Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
@@ -50,9 +50,7 @@
 .  elif ${CPUTYPE} == "k5"
 _CPUCFLAGS = -march=pentium
 .  elif ${CPUTYPE} == "p4"
-# gcc 3.2 is known to produce broken code with -march=pentium4, so it is
-# disabled for now.  This is fixed in gcc 3.3.
-_CPUCFLAGS = -march=pentium3
+_CPUCFLAGS = -march=pentium4
 .  elif ${CPUTYPE} == "p3"
 _CPUCFLAGS = -march=pentium3
 .  elif ${CPUTYPE} == "p2"

==== //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $
  */
 
 #include <stand.h>
@@ -31,6 +31,7 @@
 #include <bootstrap.h>
 
 #include "acfreebsd.h"
+#include "acconfig.h"
 #define ACPI_SYSTEM_XFACE
 #include "actypes.h"
 #include "actbl.h"

==== //depot/projects/ia64/sys/boot/pc98/boot2/asm.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.4 2002/05/14 12:34:03 nyan Exp $
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $
  */
 
 #define S_ARG0	 4(%esp)
@@ -64,19 +64,19 @@
 #define OUTL	outl	(%dx)
 
 #else	/* wheeze */
+
 #define ALIGN
 #define	LCL(x)	x
 
 #define LB(x,n) n
 #ifdef	__STDC__
 #define EXT(x) x
-#define LEXT(x) x ## :
-
+#define LEXT(x) .type EXT(x), at function; EXT(x):
 #define LBb(x,n) n ## b
 #define LBf(x,n) n ## f
 #else	/* __STDC__ */
 #define EXT(x) _/**/x
-#define LEXT(x) _/**/x/**/:
+#define LEXT(x) .type EXT(x), at function; EXT(x)/**/:
 #define LBb(x,n) n/**/b
 #define LBf(x,n) n/**/f
 #endif	/* __STDC__ */

==== //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#5 (text+ko) ====

@@ -1,3 +1,268 @@
+----------------------------------------
+19 June 2003.  Summary of changes for version 20030619:
+
+1) ACPI CA Core Subsystem:
+
+Fix To/FromBCD, eliminating the need for an arch-specific
+#define.
+
+Do not acquire a semaphore in the S5 shutdown path.
+
+Fix ex_digits_needed for 0. (Takayoshi Kochi)
+
+Fix sleep/stall code reversal. (Andi Kleen)
+
+Revert a change having to do with control method calling
+semantics.
+
+2) Linux:
+
+acpiphp update (Takayoshi Kochi)
+
+Export acpi_disabled for sonypi (Stelian Pop)
+
+Mention acpismp=force in config help
+
+Re-add acpitable.c and acpismp=force. This improves backwards
+compatibility and also cleans up the code to a significant
+degree.
+
+Add ASUS Value-add driver (Karol Kozimor and Julien Lerouge)
+
+
+
+----------------------------------------
+22 May 2003.  Summary of changes for version 20030522:
+
+1) ACPI CA Core Subsystem:
+
+Found and fixed a reported problem where an AE_NOT_FOUND error
+occurred occasionally during _BST evaluation.  This turned out to
+be an Owner ID allocation issue where a called method did not get
+a new ID assigned to it.  Eventually, (after 64k calls), the
+Owner ID UINT16 would wraparound so that the ID would be the same
+as the caller's and the called method would delete the caller's
+namespace.
+
+Implemented extended error reporting for control methods that are
+aborted due to a run-time exception.  Output includes the exact
+AML instruction that caused the method abort, a dump of the
+method locals and arguments at the time of the abort, and a trace
+of all nested control method calls.
+
+Modified the interpreter to allow the creation of buffers of zero
+length from the AML code. Implemented new code to ensure that no
+attempt is made to actually allocate a memory buffer (of length
+zero) - instead, a simple buffer object with a NULL buffer
+pointer and length zero is created.  A warning is no longer
+issued when the AML attempts to create a zero-length buffer.
+
+Implemented a workaround for the "leading asterisk issue" in
+_HIDs, _UIDs, and _CIDs in the AML interpreter.  One leading
+asterisk is automatically removed if present in any HID, UID, or
+CID strings.  The iASL compiler will still flag this asterisk as
+an error, however.
+
+Implemented full support for _CID methods that return a package
+of multiple CIDs (Compatible IDs).  The AcpiGetObjectInfo()
+interface now additionally returns a device _CID list if present.
+This required a change to the external interface in order to pass
+an ACPI_BUFFER object as a parameter since the _CID list is of
+variable length.
+
+Fixed a problem with the new AE_SAME_HANDLER exception where
+handler initialization code did not know about this exception.
+
+Code and Data Size: Current and previous core subsystem library
+sizes are shown below.  These are the code and data sizes for the
+acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and
+these values do not include any ACPI driver or OSPM code.  The
+debug version of the code includes the debug output trace
+mechanism and has a much larger code and data size.  Note that
+these values will vary depending on the efficiency of the
+compiler and the compiler options used during generation.
+
+  Previous Release (20030509):
+    Non-Debug Version:  73.4K Code,   9.7K Data,   83.1K Total
+    Debug Version:     156.1K Code,  63.9K Data,  220.0K Total
+  Current Release:
+    Non-Debug Version:  73.7K Code,   9.7K Data,   83.4K Total
+    Debug Version:     156.9K Code,  64.2K Data,  221.1K Total
+
+
+2) Linux:
+
+Fixed a bug in which we would reinitialize the ACPI interrupt
+after it was already working, thus disabling all ACPI and the
+IRQs for any other device sharing the interrupt. (Thanks to Stian
+Jordet)
+
+Toshiba driver update (John Belmonte)
+
+Return only 0 or 1 for our interrupt handler status (Andrew
+Morton)
+
+
+3) iASL Compiler:
+
+Fixed a reported problem where multiple (nested) ElseIf()
+statements were not handled correctly by the compiler, resulting
+in incorrect warnings and incorrect AML code.  This was a problem
+in both the ASL parser and the code generator.
+
+
+4) Documentation:
+
+Added changes to existing interfaces, new exception codes, and
+new text concerning reference count object management versus
+garbage collection.
+
+----------------------------------------
+09 May 2003.  Summary of changes for version 20030509.
+
+
+1) ACPI CA Core Subsystem:
+
+Changed the subsystem initialization sequence to hold off
+installation of address space handlers until the hardware has
+been initialized and the system has entered ACPI mode.  This is
+because the installation of space handlers can cause _REG methods
+to be run.  Previously, the _REG methods could potentially be run
+before ACPI mode was enabled.
+
+Fixed some memory leak issues related to address space handler
+and notify handler installation.  There were some problems with
+the reference count mechanism caused by the fact that the handler
+objects are shared across several namespace objects.
+
+Fixed a reported problem where reference counts within the
+namespace were not properly updated when named objects created by
+method execution were deleted.
+
+Fixed a reported problem where multiple SSDTs caused a deletion
+issue during subsystem termination.  Restructured the table data
+structures to simplify the linked lists and the related code.
+
+Fixed a problem where the table ID associated with secondary
+tables (SSDTs) was not being propagated into the namespace
+objects created by those tables.  This would only present a
+problem for tables that are unloaded at run-time, however.
+
+Updated AcpiOsReadable and AcpiOsWritable to use the ACPI_SIZE
+type as the length parameter (instead of UINT32).
+
+Solved a long-standing problem where an ALREADY_EXISTS error
+appears on various systems.  This problem could happen when there
+are multiple PCI_Config operation regions under a single PCI root
+bus.  This doesn't happen very frequently, but there are some
+systems that do this in the ASL.
+
+Fixed a reported problem where the internal DeleteNode function
+was incorrectly handling the case where a namespace node was the
+first in the parent's child list, and had additional peers (not
+the only child, but first in the list of children.)
+
+Code and Data Size: Current core subsystem library sizes are
+shown below.  These are the code and data sizes for the
+acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and
+these values do not include any ACPI driver or OSPM code.  The
+debug version of the code includes the debug output trace
+mechanism and has a much larger code and data size.  Note that
+these values will vary depending on the efficiency of the
+compiler and the compiler options used during generation.
+
+  Previous Release
+    Non-Debug Version:  73.7K Code,   9.5K Data,   83.2K Total
+    Debug Version:     156.1K Code,  63.6K Data,  219.7K Total
+  Current Release:
+    Non-Debug Version:  73.4K Code,   9.7K Data,   83.1K Total
+    Debug Version:     156.1K Code,  63.9K Data,  220.0K Total
+
+
+2) Linux:
+
+Allow ":" in OS override string (Ducrot Bruno)
+
+Kobject fix (Greg KH)
+
+
+3 iASL Compiler/Disassembler:
+
+Fixed a problem in the generation of the C source code files (AML
+is emitted in C source statements for BIOS inclusion) where the
+Ascii dump that appears within a C comment at the end of each
+line could cause a compile time error if the AML sequence happens
+to have an open comment or close comment sequence embedded.
+
+
+----------------------------------------
+24 April 2003.  Summary of changes for version 20030424.
+
+
+1) ACPI CA Core Subsystem:
+
+Support for big-endian systems has been implemented.  Most of the
+support has been invisibly added behind big-endian versions of
+the ACPI_MOVE_* macros.
+
+Fixed a problem in AcpiHwDisableGpeBlock() and
+AcpiHwClearGpeBlock() where an incorrect offset was passed to the
+low level hardware write routine.  The offset parameter was
+actually eliminated from the low level read/write routines
+because they had become obsolete.
+
+Fixed a problem where a handler object was deleted twice during
+the removal of a fixed event handler.
+
+
+2) Linux:
+
+A fix for SMP systems with link devices was contributed by
+Compaq's Dan Zink.
+
+(2.5) Return whether we handled the interrupt in our IRQ handler.
+(Linux ISRs no longer return void, so we can propagate the
+handler return value from the ACPI CA core back to the OS.)
+
+
+3) Documentation:
+
+The ACPI CA Programmer Reference has been updated to reflect new
+interfaces and changes to existing interfaces.
+
+----------------------------------------
+28 March 2003.  Summary of changes for version 20030328.
+
+1) ACPI CA Core Subsystem:
+
+The GPE Block Device support has been completed.  New interfaces
+are AcpiInstallGpeBlock and AcpiRemoveGpeBlock.  The Event
+interfaces (enable, disable, clear, getstatus) have been split
+into separate interfaces for Fixed Events and General Purpose
+Events (GPEs) in order to support GPE Block Devices properly.
+
+Fixed a problem where the error message "Failed to acquire
+semaphore" would appear during operations on the embedded
+controller (EC).
+
+Code and Data Size: Current core subsystem library sizes are
+shown below.  These are the code and data sizes for the
+acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and
+these values do not include any ACPI driver or OSPM code.  The
+debug version of the code includes the debug output trace
+mechanism and has a much larger code and data size.  Note that
+these values will vary depending on the efficiency of the
+compiler and the compiler options used during generation.
+
+  Previous Release
+    Non-Debug Version:  72.3K Code,   9.5K Data,   81.8K Total
+    Debug Version:     154.0K Code,  63.4K Data,  217.4K Total
+  Current Release:
+    Non-Debug Version:  73.7K Code,   9.5K Data,   83.2K Total
+    Debug Version:     156.1K Code,  63.6K Data,  219.7K Total
+
+
+----------------------------------------
 28 February 2003.  Summary of changes for version 20030228.
 
 
@@ -82,6 +347,7 @@
 Added support for the _PDC reserved name.
 
 
+----------------------------------------
 22 January 2003.  Summary of changes for version 20030122.
 
 

==== //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#11 (text+ko) ====

@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 129 $
+ *       $Revision: 139 $
  *
  *****************************************************************************/
 
@@ -120,7 +120,7 @@
 
 /******************************************************************************
  *
- * Compile-time options
+ * Configuration options
  *
  *****************************************************************************/
 
@@ -135,6 +135,24 @@
  *
  */
 
+/* Version string */
+
+#define ACPI_CA_VERSION                 0x20030619
+
+/* Maximum objects in the various object caches */
+
+#define ACPI_MAX_STATE_CACHE_DEPTH      64          /* State objects for stacks */
+#define ACPI_MAX_PARSE_CACHE_DEPTH      96          /* Parse tree objects */
+#define ACPI_MAX_EXTPARSE_CACHE_DEPTH   64          /* Parse tree objects */
+#define ACPI_MAX_OBJECT_CACHE_DEPTH     64          /* Interpreter operand objects */
+#define ACPI_MAX_WALK_CACHE_DEPTH       4           /* Objects for parse tree walks */
+
+/*
+ * Should the subystem abort the loading of an ACPI table if the
+ * table checksum is incorrect?
+ */
+#define ACPI_CHECKSUM_ABORT             FALSE
+
 
 /******************************************************************************
  *
@@ -142,23 +160,10 @@
  *
  *****************************************************************************/
 
-
-/* Version string */
-
-#define ACPI_CA_VERSION                 0x20030228
-
 /* Version of ACPI supported */
 
 #define ACPI_CA_SUPPORT_LEVEL           2
 
-/* Maximum objects in the various object caches */
-
-#define ACPI_MAX_STATE_CACHE_DEPTH      64          /* State objects for stacks */
-#define ACPI_MAX_PARSE_CACHE_DEPTH      96          /* Parse tree objects */
-#define ACPI_MAX_EXTPARSE_CACHE_DEPTH   64          /* Parse tree objects */
-#define ACPI_MAX_OBJECT_CACHE_DEPTH     64          /* Interpreter operand objects */
-#define ACPI_MAX_WALK_CACHE_DEPTH       4           /* Objects for parse tree walks */
-
 /* String size constants */
 
 #define ACPI_MAX_STRING_LENGTH          512
@@ -179,20 +184,6 @@
 
 /******************************************************************************
  *
- * Configuration of subsystem behavior
- *
- *****************************************************************************/
-
-
-/*
- * Should the subystem abort the loading of an ACPI table if the
- * table checksum is incorrect?
- */
-#define ACPI_CHECKSUM_ABORT             FALSE
-
-
-/******************************************************************************
- *
  * ACPI Specification constants (Do not change unless the specification changes)
  *
  *****************************************************************************/
@@ -215,6 +206,11 @@
 
 #define ACPI_MAX_STRING_CONVERSION      200
 
+/* Length of _HID, _UID, and _CID values */
+
+#define ACPI_DEVICE_ID_LENGTH           0x09
+#define ACPI_MAX_CID_LENGTH             48
+
 /*
  * Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG
  */
@@ -269,7 +265,6 @@
  *
  *****************************************************************************/
 
-
 #define ACPI_DEBUGGER_MAX_ARGS          8  /* Must be max method args + 1 */
 
 #define ACPI_DEBUGGER_COMMAND_PROMPT    '-'

==== //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#8 (text+ko) ====

@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdebug.h - ACPI/AML debugger
- *       $Revision: 70 $
+ *       $Revision: 72 $
  *
  *****************************************************************************/
 
@@ -305,10 +305,6 @@
     char                    *OutputType);
 
 void
-AcpiDbDecodeNode (
-    ACPI_NAMESPACE_NODE     *Node);
-
-void
 AcpiDbDisplayResultObject (
     ACPI_OPERAND_OBJECT     *ObjDesc,
     ACPI_WALK_STATE         *WalkState);
@@ -318,11 +314,6 @@
     char                    *DisplayCountArg);
 
 void
-AcpiDbDisplayInternalObject (
-    ACPI_OPERAND_OBJECT     *ObjDesc,
-    ACPI_WALK_STATE         *WalkState);
-
-void
 AcpiDbDisplayArguments (
     void);
 
@@ -339,6 +330,10 @@
     void);
 
 void
+AcpiDbDisplayObjectType (
+    char                    *ObjectArg);
+
+void
 AcpiDbDisplayArgumentObject (
     ACPI_OPERAND_OBJECT     *ObjDesc,
     ACPI_WALK_STATE         *WalkState);
@@ -351,10 +346,6 @@
 AcpiDbGetPointer (
     void                    *Target);
 
-void
-AcpiDbDecodeInternalObject (
-    ACPI_OPERAND_OBJECT     *ObjDesc);
-
 
 /*
  * dbexec - debugger control method execution

==== //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#5 (text+ko) ====

@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdisasm.h - AML disassembler
- *       $Revision: 8 $
+ *       $Revision: 9 $
  *
  *****************************************************************************/
 
@@ -277,6 +277,34 @@
 
 
 /*
+ * dmobject
+ */
+
+void
+AcpiDmDecodeNode (
+    ACPI_NAMESPACE_NODE     *Node);
+
+void
+AcpiDmDisplayInternalObject (
+    ACPI_OPERAND_OBJECT     *ObjDesc,
+    ACPI_WALK_STATE         *WalkState);
+
+void
+AcpiDmDisplayArguments (
+    ACPI_WALK_STATE         *WalkState);
+
+void
+AcpiDmDisplayLocals (
+    ACPI_WALK_STATE         *WalkState);
+
+void
+AcpiDmDumpMethodInfo (
+    ACPI_STATUS             Status,
+    ACPI_WALK_STATE         *WalkState,
+    ACPI_PARSE_OBJECT       *Op);
+
+
+/*
  * dmbuffer
  */
 

==== //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#8 (text+ko) ====

@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acevents.h - Event subcomponent prototypes and defines
- *       $Revision: 83 $
+ *       $Revision: 91 $
  *
  *****************************************************************************/
 
@@ -182,21 +182,44 @@
  * Evgpe - GPE handling and dispatch
  */
 
+ACPI_STATUS
+AcpiEvWalkGpeList (
+    ACPI_GPE_CALLBACK       GpeWalkCallback);
+
+BOOLEAN
+AcpiEvValidGpeEvent (
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo);
+
 ACPI_GPE_EVENT_INFO *
 AcpiEvGetGpeEventInfo (
+    ACPI_HANDLE             GpeDevice,
     UINT32                  GpeNumber);
 
 ACPI_STATUS
 AcpiEvGpeInitialize (
     void);
 
+ACPI_STATUS
+AcpiEvCreateGpeBlock (
+    ACPI_NAMESPACE_NODE     *GpeDevice,
+    ACPI_GENERIC_ADDRESS    *GpeBlockAddress,
+    UINT32                  RegisterCount,
+    UINT8                   GpeBlockBaseNumber,
+    UINT32                  InterruptLevel,
+    ACPI_GPE_BLOCK_INFO     **ReturnGpeBlock);
+
+ACPI_STATUS
+AcpiEvDeleteGpeBlock (
+    ACPI_GPE_BLOCK_INFO     *GpeBlock);
+
 UINT32
 AcpiEvGpeDispatch (
-    ACPI_GPE_EVENT_INFO     *GpeEventInfo);
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo,
+    UINT32                  GpeNumber);
 
 UINT32
 AcpiEvGpeDetect (
-    void);
+    ACPI_GPE_XRUPT_INFO     *GpeXruptList);
 
 /*
  * Evregion - Address Space handling
@@ -215,7 +238,7 @@
     void                    *Value);
 
 ACPI_STATUS
-AcpiEvAddrHandlerHelper (
+AcpiEvInstallHandler (
     ACPI_HANDLE             ObjHandle,
     UINT32                  Level,
     void                    *Context,
@@ -289,6 +312,10 @@
  * Evsci - SCI (System Control Interrupt) handling/dispatch
  */
 
+UINT32 ACPI_SYSTEM_XFACE
+AcpiEvGpeXruptHandler (
+    void                    *Context);
+
 UINT32
 AcpiEvInstallSciHandler (
     void);

==== //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#7 (text+ko) ====

@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acexcep.h - Exception codes returned by the ACPI subsystem

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list