WebSVN – Kolibri OS – Path Comparison – / – /drivers/devman/acpica/tools/acpisrc/ Rev 2215 and /drivers/devman/acpica/tools/acpisrc/ Rev 2216

Regard whitespace Rev 2215 → Rev 2216

 /drivers/devman/acpica/tools/acpisrc/Makefile
 ,17 → 1,113
+#
+# acpisrc - ACPICA source code conversion utility
+#
+# NOTE: This makefile is intended to be used in the Linux environment,
+# with the Linux directory structure. It will not work directly
+# on the native ACPICA source tree.
+#
+#
+# Configuration
+# Notes:
+#   gcc should be version 4 or greater, otherwise some of the options
+#       used will not be recognized.
+#   Global optimization flags (such as -O2, -Os) are not used, since
+#       they cause issues on some compilers.
+#   The _GNU_SOURCE symbol is required for many hosts.
+#
 PROG=   acpisrc
-SRCS=   ascase.c asconvrt.c asfile.c asmain.c asremove.c astable.c \
-        asutils.c osunixdir.c ../../common/getopt.c
-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
+HOST =          _LINUX
+NOMAN =         YES
+COMPILE =       $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $?
+ACPICA_COMPONENTS =
+ACPICA_SRC =    ../..
+ACPICA_COMMON = $(ACPICA_SRC)/common
+ACPICA_CORE =   $(ACPICA_SRC)$(ACPICA_COMPONENTS)
+ACPICA_TOOLS =  $(ACPICA_SRC)/tools
+ACPICA_OSL =    $(ACPICA_SRC)/os_specific/service_layers
+INSTALLDIR =    /usr/bin
+INSTALLPROG =   cp --remove-destination $(PROG) $(INSTALLDIR)
-aslmain : $(patsubst %.c,%.o, $(SRCS))
-        $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+CFLAGS+= \
+    -D$(HOST) \
+    -D_GNU_SOURCE \
+    -DACPI_SRC_APP \
+    -I$(ACPICA_SRC)/include \
+    -I.
-CLEANFILES= $(PROG)
+CWARNINGFLAGS = \
+    -ansi \
+    -Wall \
+    -Wbad-function-cast \
+    -Wdeclaration-after-statement \
+    -Werror \
+    -Wformat=2 \
+    -Wmissing-declarations \
+    -Wmissing-prototypes \
+    -Wstrict-aliasing=0 \
+    -Wstrict-prototypes \
+    -Wswitch-default \
+    -Wpointer-arith \
+    -Wundef
+OBJS = \
+    ascase.o \
+    asconvrt.o \
+    asfile.o \
+    asmain.o \
+    asremove.o \
+    astable.o \
+    asutils.o \
+    osunixdir.o \
+    getopt.o
+#
+# Root rule
+#
+$(PROG) : $(OBJS)
+        $(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+#
+# acpisrc source
+#
+ascase.o :          $(ACPICA_TOOLS)/acpisrc/ascase.c
+        $(COMPILE)
+asconvrt.o :        $(ACPICA_TOOLS)/acpisrc/asconvrt.c
+        $(COMPILE)
+asfile.o :          $(ACPICA_TOOLS)/acpisrc/asfile.c
+        $(COMPILE)
+asmain.o :          $(ACPICA_TOOLS)/acpisrc/asmain.c
+        $(COMPILE)
+asremove.o :        $(ACPICA_TOOLS)/acpisrc/asremove.c
+        $(COMPILE)
+astable.o :         $(ACPICA_TOOLS)/acpisrc/astable.c
+        $(COMPILE)
+asutils.o :         $(ACPICA_TOOLS)/acpisrc/asutils.c
+        $(COMPILE)
+#
+# ACPICA core source - common
+#
+getopt.o :          $(ACPICA_COMMON)/getopt.c
+        $(COMPILE)
+#
+# Unix OS services layer (OSL)
+#
+osunixdir.o :       $(ACPICA_OSL)/osunixdir.c
+        $(COMPILE)
 clean :
-        rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
+        rm -f $(PROG) $(PROG) $(OBJS)
+install :
+        $(INSTALLPROG)

 /drivers/devman/acpica/tools/acpisrc/acpisrc.h
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License
 ,6 → 121,9
 #define LINUX_HEADER_SIGNATURE              " * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS"
 #define LINES_IN_ASL_HEADER                 29 /* Header as output from disassembler */
+#include "acpi.h"
+#include "accommon.h"
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 ,16 → 135,14
 #endif
 #include <errno.h>
-#include "acpi.h"
-#include "accommon.h"
-/* Fixups for non-Win32 compilation */
-#ifndef WIN32
+/* O_BINARY is not always defined */
 #ifndef O_BINARY
 #define O_BINARY    0x0
 #endif
+/* Fixups for non-Win32 compilation */
+#ifndef WIN32
 #define mkdir(x) mkdir(x, 0770)
 char * strlwr(char* str);
 #endif
 ,6 → 279,7
 extern ACPI_CONVERSION_TABLE       CleanupConversionTable;
 extern ACPI_CONVERSION_TABLE       StatsConversionTable;
 extern ACPI_CONVERSION_TABLE       CustomConversionTable;
+extern ACPI_CONVERSION_TABLE       LicenseConversionTable;
 /* Prototypes */

 /drivers/devman/acpica/tools/acpisrc/ascase.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License

 /drivers/devman/acpica/tools/acpisrc/asconvrt.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License

 /drivers/devman/acpica/tools/acpisrc/asfile.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License
 ,7 → 132,7
     char                    *Filename,
     char                    *Buffer);
-static inline int
+static ACPI_INLINE int
 AsMaxInt (int a, int b)
 {
     return (a > b ? a : b);
 ,7 → 409,8
     Gbl_StructDefs = strstr (FileBuffer, "/* acpisrc:StructDefs");
     Gbl_Files++;
-    VERBOSE_PRINT (("Processing %u bytes\n", strlen (FileBuffer)));
+    VERBOSE_PRINT (("Processing %u bytes\n",
+        (unsigned int) strlen (FileBuffer)));
     if (ConversionTable->LowerCaseTable)
     {

 /drivers/devman/acpica/tools/acpisrc/asmain.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License
 ,6 → 340,7
     printf ("\n");
     printf ("Usage: acpisrc [-c|l|u] [-dsvy] <SourceDir> <DestinationDir>\n\n");
     printf ("Where: -c          Generate cleaned version of the source\n");
+    printf ("       -h          Insert dual-license header into all modules\n");
     printf ("       -l          Generate Linux version of the source\n");
     printf ("       -u          Generate Custom source translation\n");
     printf ("\n");
 ,9 → 373,7
     UINT32                  FileType;
-    printf ("ACPI Source Code Conversion Utility");
-    printf (" version %8.8X", ((UINT32) ACPI_CA_VERSION));
-    printf (" [%s]\n\n",  __DATE__);
+    printf (ACPI_COMMON_SIGNON ("ACPI Source Code Conversion Utility"));
     if (argc < 2)
     {
 ,7 → 383,7
     /* Command line options */
-    while ((j = AcpiGetopt (argc, argv, "cdlqsuvy")) != EOF) switch(j)
+    while ((j = AcpiGetopt (argc, argv, "cdhlqsuvy")) != EOF) switch(j)
     {
     case 'l':
         /* Linux code generation */
 ,6 → 401,13
         ConversionTable = &CleanupConversionTable;
         break;
+    case 'h':
+        /* Inject Dual-license header */
+        printf ("Inserting Dual-license header to all modules\n");
+        ConversionTable = &LicenseConversionTable;
+        break;
     case 's':
         /* Statistics only */

 /drivers/devman/acpica/tools/acpisrc/asremove.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License

 /drivers/devman/acpica/tools/acpisrc/astable.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License
 ,9 → 161,9
  *
  ******************************************************************************/
-char                        LinuxHeader[] =
+char                        DualLicenseHeader[] =
 "/*\n"
-" * Copyright (C) 2000 - 2010, Intel Corp.\n"
+" * Copyright (C) 2000 - 2011, Intel Corp.\n"
 " * All rights reserved.\n"
 " *\n"
 " * Redistribution and use in source and binary forms, with or without\n"
 ,7 → 241,11
     {"INT16",                    "s16",                      REPLACE_WHOLE_WORD},
     {"INT8",                     "s8",                       REPLACE_WHOLE_WORD},
-    {NULL,                       NULL,                       0},
+    /* Include file paths */
+    {"\"acpi.h\"",              "<acpi/acpi.h>",    REPLACE_WHOLE_WORD},
+    {NULL,                      NULL,               0}
 };
 ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
 ,6 → 287,7
     {"ACPI_EXECUTE_TYPE",                   SRC_TYPE_SIMPLE},
     {"ACPI_EXECUTE_WALK",                   SRC_TYPE_STRUCT},
     {"ACPI_EXTERNAL_LIST",                  SRC_TYPE_STRUCT},
+    {"ACPI_EXTERNAL_FILE",                  SRC_TYPE_STRUCT},
     {"ACPI_FADT_INFO",                      SRC_TYPE_STRUCT},
     {"ACPI_FADT_PM_INFO",                   SRC_TYPE_STRUCT},
     {"ACPI_FIELD_INFO",                     SRC_TYPE_STRUCT},
 ,6 → 302,7
     {"ACPI_GPE_DEVICE_INFO",                SRC_TYPE_STRUCT},
     {"ACPI_GPE_EVENT_INFO",                 SRC_TYPE_STRUCT},
     {"ACPI_GPE_HANDLER",                    SRC_TYPE_SIMPLE},
+    {"ACPI_GPE_HANDLER_INFO",               SRC_TYPE_STRUCT},
     {"ACPI_GPE_INDEX_INFO",                 SRC_TYPE_STRUCT},
     {"ACPI_GPE_REGISTER_INFO",              SRC_TYPE_STRUCT},
     {"ACPI_GPE_WALK_INFO",                  SRC_TYPE_STRUCT},
 ,6 → 383,7
     {"ACPI_PARSE_STATE",                    SRC_TYPE_STRUCT},
     {"ACPI_PARSE_UPWARDS",                  SRC_TYPE_SIMPLE},
     {"ACPI_PARSE_VALUE",                    SRC_TYPE_UNION},
+    {"ACPI_PCI_DEVICE",                     SRC_TYPE_STRUCT},
     {"ACPI_PCI_ID",                         SRC_TYPE_STRUCT},
     {"ACPI_PCI_ROUTING_TABLE",              SRC_TYPE_STRUCT},
     {"ACPI_PHYSICAL_ADDRESS",               SRC_TYPE_SIMPLE},
 ,6 → 607,8
     {"ACPI_MADT_PROCESSOR_APIC",            SRC_TYPE_STRUCT},
     {"ACPI_MCFG_ALLOCATION",                SRC_TYPE_STRUCT},
     {"ACPI_MSCT_PROXIMITY",                 SRC_TYPE_STRUCT},
+    {"ACPI_RSDP_COMMON",                    SRC_TYPE_STRUCT},
+    {"ACPI_RSDP_EXTENSION",                 SRC_TYPE_STRUCT},
     {"ACPI_SRAT_CPU_AFFINITY",              SRC_TYPE_STRUCT},
     {"ACPI_SRAT_HEADER",                    SRC_TYPE_STRUCT},
     {"ACPI_SRAT_MEM_AFFINITY",              SRC_TYPE_STRUCT},
 ,33 → 615,11
     {"ACPI_SRAT_X2APIC_CPU_AFFINITY",       SRC_TYPE_STRUCT},
     {"ACPI_WDAT_ENTRY",                     SRC_TYPE_STRUCT},
+    /* Data Table compiler */
-    /* Legacy names, should be removed  */
+    {"DT_FIELD",                            SRC_TYPE_STRUCT},
+    {"DT_SUBTABLE",                         SRC_TYPE_STRUCT},
-    {"EC_BOOT_RESOURCES",                   SRC_TYPE_STRUCT},
-    {"HPET_TABLE",                          SRC_TYPE_STRUCT},
-    {"MADT_ADDRESS_OVERRIDE",               SRC_TYPE_STRUCT},
-    {"MADT_INTERRUPT_OVERRIDE",             SRC_TYPE_STRUCT},
-    {"MADT_INTERRUPT_SOURCE",               SRC_TYPE_STRUCT},
-    {"MADT_IO_APIC",                        SRC_TYPE_STRUCT},
-    {"MADT_IO_SAPIC",                       SRC_TYPE_STRUCT},
-    {"MADT_LOCAL_APIC_NMI",                 SRC_TYPE_STRUCT},
-    {"MADT_LOCAL_SAPIC",                    SRC_TYPE_STRUCT},
-    {"MADT_NMI_SOURCE",                     SRC_TYPE_STRUCT},
-    {"MADT_PROCESSOR_APIC",                 SRC_TYPE_STRUCT},
-    {"MEMORY_AFFINITY",                     SRC_TYPE_STRUCT},
-    {"MULTIPLE_APIC_TABLE",                 SRC_TYPE_STRUCT},
-    {"SMART_BATTERY_TABLE",                 SRC_TYPE_STRUCT},
-    {"STATIC_RESOURCE_ALLOC",               SRC_TYPE_STRUCT},
-    {"SYSTEM_RESOURCE_AFFINITY",            SRC_TYPE_STRUCT},
-    {"SYSTEM_LOCALITY_INFO",                SRC_TYPE_STRUCT},
-    {"FACS_DESCRIPTOR",                     SRC_TYPE_STRUCT},
-    {"FADT_DESCRIPTOR_REV1",                SRC_TYPE_STRUCT},
-    {"FADT_DESCRIPTOR",                     SRC_TYPE_STRUCT},
-    {"FADT_DESCRIPTOR_REV2_MINUS",          SRC_TYPE_STRUCT},
-    {"RSDP_DESCRIPTOR",                     SRC_TYPE_STRUCT},
-    {"RSDT_DESCRIPTOR",                     SRC_TYPE_STRUCT},
-    {"XSDT_DESCRIPTOR",                     SRC_TYPE_STRUCT},
     {NULL, 0}
 };
 ,7 → 664,7
 ACPI_CONVERSION_TABLE       LinuxConversionTable = {
-    LinuxHeader,
+    DualLicenseHeader,
     FLG_NO_CARRIAGE_RETURNS | FLG_LOWERCASE_DIRNAMES,
     AcpiIdentifiers,
 ,7 → 702,6
  *
  ******************************************************************************/
 ACPI_CONVERSION_TABLE       CleanupConversionTable = {
     NULL,
 ,6 → 759,40
 /******************************************************************************
  *
+ * Dual License injection translation table
+ *
+ ******************************************************************************/
+ACPI_CONVERSION_TABLE       LicenseConversionTable = {
+    DualLicenseHeader,
+    FLG_DEFAULT_FLAGS,
+    NULL,
+    /* C source files */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES |
+     CVT_COUNT_SHORTMULTILINE_COMMENTS),
+    /* C header files */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES |
+     CVT_COUNT_SHORTMULTILINE_COMMENTS),
+};
+/******************************************************************************
+ *
  * Customizable translation tables
  *
  ******************************************************************************/
 ,14 → 800,14
 ACPI_STRING_TABLE           CustomReplacements[] = {
-    {"ACPI_INTEGER_MAX", "ACPI_UINT64_MAX",   REPLACE_WHOLE_WORD},
+    {"(c) 1999 - 2010",      "(c) 1999 - 2011",         REPLACE_WHOLE_WORD}, /* Main ACPICA source */
+    {"(c) 2006 - 2010",      "(c) 2006 - 2011",         REPLACE_WHOLE_WORD}, /* Test suites */
 #if 0
     {"(ACPI_INTEGER)", "(UINT64)",   REPLACE_WHOLE_WORD},
     {"ACPI_INTEGER        ", "UINT64              ",   REPLACE_WHOLE_WORD},
     {"ACPI_INTEGER", "UINT64",   REPLACE_WHOLE_WORD},
-    {"(c) 1999 - 2009",      "(c) 1999 - 2010",         REPLACE_WHOLE_WORD}, /* Main ACPICA source */
-    {"(c) 2006 - 2009",      "(c) 2006 - 2010",         REPLACE_WHOLE_WORD}, /* Test suites */
+    {"ACPI_INTEGER_MAX", "ACPI_UINT64_MAX",   REPLACE_WHOLE_WORD},
     {"#include \"acpi.h\"",   "#include \"acpi.h\"\n#include \"accommon.h\"",  REPLACE_SUBSTRINGS},
     {"AcpiTbSumTable", "AcpiTbSumTable",  REPLACE_WHOLE_WORD},
     {"ACPI_SIG_BOOT", "ACPI_SIG_BOOT",   REPLACE_WHOLE_WORD},

 /drivers/devman/acpica/tools/acpisrc/asutils.c
 ,7 → 9,7
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2215 → Rev 2216