vendor/acpica/20140325

2 files changed, 12 insertions, 7 deletions

diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index 42cefa46e88e1..d3b72de798b2f 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -42,6 +42,7 @@
  */
 
 #include "acpisrc.h"
+#include "acapps.h"
 
 /* Local prototypes */
 
@@ -714,8 +715,6 @@ AsGetFile (
     FILE                    *File;
     UINT32                  Size;
     char                    *Buffer;
-    int                     Seek1;
-    int                     Seek2;
     size_t                  Actual;
 
 
@@ -730,11 +729,8 @@ AsGetFile (
 
     /* Need file size to allocate a buffer */
 
-    Seek1 = fseek (File, 0L, SEEK_END);
-    Size = ftell (File);
-    Seek2 = fseek (File, 0L, SEEK_SET);
-
-    if (Seek1 || Seek2 || (Size == -1))
+    Size = CmGetFileSize (File);
+    if (Size == ACPI_UINT32_MAX)
     {
         printf ("Could not get file size for %s\n", Filename);
         goto ErrorExit;
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 7c3d663695c95..0073128b631a6 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -637,6 +637,10 @@ ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
     {"PR_MACRO_ARG",                        SRC_TYPE_STRUCT},
     {"PR_OPERATOR_INFO",                    SRC_TYPE_STRUCT},
 
+    /* AcpiDump utility */
+
+    {"AP_DUMP_ACTION",                      SRC_TYPE_STRUCT},
+
     /* AcpiHelp utility */
 
     {"AH_AML_OPCODE",                       SRC_TYPE_STRUCT},
@@ -648,6 +652,11 @@ ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
 
     {"AX_TABLE_INFO",                       SRC_TYPE_STRUCT},
 
+    /* OS service layers */
+
+    {"EXTERNAL_FIND_INFO",                  SRC_TYPE_STRUCT},
+    {"OSL_TABLE_INFO",                      SRC_TYPE_STRUCT},
+
     {NULL, 0}
 };