Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/acpica/dist Merge local changes with acpica...



details:   https://anonhg.NetBSD.org/src/rev/a8f404812afd
branches:  trunk
changeset: 960948:a8f404812afd
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 03 17:45:02 2021 +0000

description:
Merge local changes with acpica-20210331

diffstat:

 sys/external/bsd/acpica/dist/common/dmtables.c                       |   4 +-
 sys/external/bsd/acpica/dist/common/dmtbdump.c                       |   4 +-
 sys/external/bsd/acpica/dist/common/dmtbinfo.c                       |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslanalyze.c                   |   6 +-
 sys/external/bsd/acpica/dist/compiler/aslcompile.c                   |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslcompiler.h                  |   8 +-
 sys/external/bsd/acpica/dist/compiler/aslcompiler.l                  |   9 +-
 sys/external/bsd/acpica/dist/compiler/aslerror.c                     |  12 +-
 sys/external/bsd/acpica/dist/compiler/aslfileio.c                    |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslfiles.c                     |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslload.c                      |   4 +-
 sys/external/bsd/acpica/dist/compiler/asllookup.c                    |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslopcodes.c                   |   6 +-
 sys/external/bsd/acpica/dist/compiler/aslopt.c                       |   4 +-
 sys/external/bsd/acpica/dist/compiler/asloptions.c                   |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslpredef.c                    |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslprepkg.c                    |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslsupport.l                   |   4 +-
 sys/external/bsd/acpica/dist/compiler/asltree.c                      |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslutils.c                     |   4 +-
 sys/external/bsd/acpica/dist/compiler/aslwalks.c                     |   6 +-
 sys/external/bsd/acpica/dist/compiler/aslxref.c                      |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtcompile.c                    |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y             |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtfield.c                      |   6 +-
 sys/external/bsd/acpica/dist/compiler/dtparser.y                     |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtsubtable.c                   |   4 +-
 sys/external/bsd/acpica/dist/compiler/dttable.c                      |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtutils.c                      |   9 +-
 sys/external/bsd/acpica/dist/compiler/prparser.y                     |   4 +-
 sys/external/bsd/acpica/dist/compiler/prutils.c                      |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbcmds.c                       |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbdisply.c                     |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbexec.c                       |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbinput.c                      |   8 +-
 sys/external/bsd/acpica/dist/debugger/dbmethod.c                     |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbnames.c                      |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbtest.c                       |   4 +-
 sys/external/bsd/acpica/dist/debugger/dbutils.c                      |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmbuffer.c                 |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmcstyle.c                 |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmresrc.c                  |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmresrcl.c                 |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c                |  94 +++++++++-
 sys/external/bsd/acpica/dist/disassembler/dmwalk.c                   |  12 +-
 sys/external/bsd/acpica/dist/dispatcher/dscontrol.c                  |   6 +-
 sys/external/bsd/acpica/dist/dispatcher/dsopcode.c                   |   4 +-
 sys/external/bsd/acpica/dist/dispatcher/dspkginit.c                  |   4 +-
 sys/external/bsd/acpica/dist/dispatcher/dsutils.c                    |   4 +-
 sys/external/bsd/acpica/dist/events/evregion.c                       |  97 +++++----
 sys/external/bsd/acpica/dist/events/evrgnini.c                       |   4 +-
 sys/external/bsd/acpica/dist/events/evxface.c                        |   4 +-
 sys/external/bsd/acpica/dist/executer/exconfig.c                     |   4 +-
 sys/external/bsd/acpica/dist/executer/exdebug.c                      |   4 +-
 sys/external/bsd/acpica/dist/executer/exdump.c                       |   4 +-
 sys/external/bsd/acpica/dist/hardware/hwesleep.c                     |   4 +-
 sys/external/bsd/acpica/dist/hardware/hwregs.c                       |   4 +-
 sys/external/bsd/acpica/dist/hardware/hwsleep.c                      |   4 +-
 sys/external/bsd/acpica/dist/hardware/hwxfsleep.c                    |   4 +-
 sys/external/bsd/acpica/dist/include/acapps.h                        |   6 +-
 sys/external/bsd/acpica/dist/include/acdebug.h                       |   4 +-
 sys/external/bsd/acpica/dist/include/acdisasm.h                      |  54 ++++-
 sys/external/bsd/acpica/dist/include/acexcep.h                       |  14 +-
 sys/external/bsd/acpica/dist/include/acglobal.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/acinterp.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/aclocal.h                       |   4 +-
 sys/external/bsd/acpica/dist/include/acmacros.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/acnamesp.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/acoutput.h                      |   6 +-
 sys/external/bsd/acpica/dist/include/acpiosxf.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/acpixf.h                        |   6 +-
 sys/external/bsd/acpica/dist/include/acresrc.h                       |   8 +-
 sys/external/bsd/acpica/dist/include/actables.h                      |   4 +-
 sys/external/bsd/acpica/dist/include/actbl1.h                        |  67 ++++++-
 sys/external/bsd/acpica/dist/include/actypes.h                       |   9 +-
 sys/external/bsd/acpica/dist/include/acutils.h                       |   5 +-
 sys/external/bsd/acpica/dist/include/amlresrc.h                      |  29 ++-
 sys/external/bsd/acpica/dist/include/platform/acgcc.h                |  19 +-
 sys/external/bsd/acpica/dist/include/platform/acnetbsd.h             |   6 +-
 sys/external/bsd/acpica/dist/namespace/nsaccess.c                    |   7 +-
 sys/external/bsd/acpica/dist/namespace/nsdump.c                      |   4 +-
 sys/external/bsd/acpica/dist/namespace/nseval.c                      |   4 +-
 sys/external/bsd/acpica/dist/namespace/nsinit.c                      |   4 +-
 sys/external/bsd/acpica/dist/namespace/nsrepair2.c                   |  22 +-
 sys/external/bsd/acpica/dist/namespace/nsxfeval.c                    |   4 +-
 sys/external/bsd/acpica/dist/namespace/nsxfname.c                    |   4 +-
 sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c |   4 +-
 sys/external/bsd/acpica/dist/parser/psopcode.c                       |   4 +-
 sys/external/bsd/acpica/dist/parser/psopinfo.c                       |   4 +-
 sys/external/bsd/acpica/dist/resources/rsdump.c                      |  14 +-
 sys/external/bsd/acpica/dist/resources/rsdumpinfo.c                  |  19 +-
 sys/external/bsd/acpica/dist/resources/rsutils.c                     |   4 +-
 sys/external/bsd/acpica/dist/resources/rsxface.c                     |   4 +-
 sys/external/bsd/acpica/dist/tables/tbdata.c                         |   4 +-
 sys/external/bsd/acpica/dist/tables/tbfadt.c                         |   4 +-
 sys/external/bsd/acpica/dist/tables/tbinstal.c                       |   4 +-
 sys/external/bsd/acpica/dist/tables/tbutils.c                        |   4 +-
 sys/external/bsd/acpica/dist/tables/tbxface.c                        |   4 +-
 sys/external/bsd/acpica/dist/tables/tbxfload.c                       |   4 +-
 sys/external/bsd/acpica/dist/tables/tbxfroot.c                       |   4 +-
 sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c                |   4 +-
 sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c           |   4 +-
 sys/external/bsd/acpica/dist/utilities/utcache.c                     |   4 +-
 sys/external/bsd/acpica/dist/utilities/utdebug.c                     |   4 +-
 sys/external/bsd/acpica/dist/utilities/utdecode.c                    |   4 +-
 sys/external/bsd/acpica/dist/utilities/utdelete.c                    |   6 +-
 sys/external/bsd/acpica/dist/utilities/uteval.c                      |   4 +-
 sys/external/bsd/acpica/dist/utilities/utglobal.c                    |   4 +-
 sys/external/bsd/acpica/dist/utilities/utmisc.c                      |   4 +-
 sys/external/bsd/acpica/dist/utilities/utmutex.c                     |   4 +-
 sys/external/bsd/acpica/dist/utilities/utnonansi.c                   |   4 +-
 sys/external/bsd/acpica/dist/utilities/utobject.c                    |   4 +-
 sys/external/bsd/acpica/dist/utilities/utosi.c                       |   4 +-
 sys/external/bsd/acpica/dist/utilities/utprint.c                     |   4 +-
 sys/external/bsd/acpica/dist/utilities/uttrack.c                     |   4 +-
 sys/external/bsd/acpica/dist/utilities/utuuid.c                      |   4 +-
 116 files changed, 601 insertions(+), 319 deletions(-)

diffs (truncated from 3479 to 300 lines):

diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/common/dmtables.c
--- a/sys/external/bsd/acpica/dist/common/dmtables.c    Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtables.c    Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c    Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c    Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c    Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c    Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslanalyze.c
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c        Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c        Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
@@ -362,7 +362,7 @@
                 "Method returns [%s], %s operator requires [%s]",
                 AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
 
-            AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
+            AslError (ASL_WARNING, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
         }
     }
 
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c        Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c        Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslcompiler.h
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.h       Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.h       Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
@@ -1431,6 +1431,10 @@
     ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
+RsDoCsi2SerialBusDescriptor (
+    ASL_RESOURCE_INFO       *Info);
+
+ASL_RESOURCE_NODE *
 RsDoPinFunctionDescriptor (
     ASL_RESOURCE_INFO       *Info);
 
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslcompiler.l
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l       Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l       Sat Apr 03 17:45:02 2021 +0000
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
@@ -326,6 +326,7 @@
 "ResourceTemplate"          { count (1); return (PARSEOP_RESOURCETEMPLATE); }
 "RawDataBuffer"             { count (1); return (PARSEOP_DATABUFFER); }
 
+"Csi2Bus"                   { count (1); return (PARSEOP_CSI2_SERIALBUS); }
 "DMA"                       { count (1); return (PARSEOP_DMA); }
 "DWordIO"                   { count (1); return (PARSEOP_DWORDIO); }
 "DWordMemory"               { count (1); return (PARSEOP_DWORDMEMORY); }
@@ -704,9 +705,9 @@
 "__PATH__"                  { count (0); return (PARSEOP___PATH__); }
 "__METHOD__"                { count (0); return (PARSEOP___METHOD__); }
 "__EXPECT__"{ErrorCode}     { char *s;
-                                int index = 0;
+                                unsigned int index = 0;
                                 count (0);
-                                while (!isdigit (AslCompilertext[index]))
+                                while (!isdigit ((int) AslCompilertext[index]))
                                 {
                                     index++;
                                 }
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslerror.c
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c  Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c  Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
@@ -1017,7 +1017,7 @@
 AslCheckExpectedExceptions (
     void)
 {
-    UINT8                   i;
+    UINT32                  i;
     ASL_EXPECTED_MSG_NODE   *Current = AslGbl_ExpectedErrorCodeList;
     ASL_LOCATION_NODE       *LocationNode;
 
@@ -1080,7 +1080,7 @@
 
     if (MessageId > 6999)
     {
-        printf ("\"%s\" is not a valid warning/remark/erro ID\n",
+        printf ("\"%s\" is not a valid warning/remark/error ID\n",
             MessageIdString);
         return (AE_BAD_PARAMETER);
     }
@@ -1228,7 +1228,7 @@
 
     if (MessageId > 6999)
     {
-        printf ("\"%s\" is not a valid warning/remark/erro ID\n",
+        printf ("\"%s\" is not a valid warning/remark/error ID\n",
             MessageIdString);
         return (AE_BAD_PARAMETER);
     }
@@ -1348,7 +1348,7 @@
         {
             return (TRUE);
         }
-        /* Fall through */
+        ACPI_FALLTHROUGH;
 
     case ASL_WARNING:
     case ASL_REMARK:
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslfileio.c
--- a/sys/external/bsd/acpica/dist/compiler/aslfileio.c Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslfileio.c Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslfiles.c
--- a/sys/external/bsd/acpica/dist/compiler/aslfiles.c  Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslfiles.c  Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
diff -r f7701c87f7c5 -r a8f404812afd sys/external/bsd/acpica/dist/compiler/aslload.c
--- a/sys/external/bsd/acpica/dist/compiler/aslload.c   Sat Apr 03 17:43:31 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslload.c   Sat Apr 03 17:45:02 2021 +0000
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2020, Intel Corp.
+ * Copyright (C) 2000 - 2021, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * NO WARRANTY



Home | Main Index | Thread Index | Old Index