mirror of
https://github.com/acpica/acpica/
synced 2025-01-14 21:39:19 +03:00
Prefixed all macros with "ACPI_" to prevent collisions with local OS
header files. date 2002.02.12.22.41.00; author rmoore1; state Exp;
This commit is contained in:
aystarik
parent
c03ad3a408
commit
9f78dd91c9
@ -1,7 +1,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: aeexec - Support routines for AcpiExec utility
|
||||
* $Revision: 1.54 $
|
||||
* $Revision: 1.55 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -127,7 +127,7 @@
|
||||
|
||||
|
||||
#define _COMPONENT ACPI_TOOLS
|
||||
MODULE_NAME ("aeexec")
|
||||
ACPI_MODULE_NAME ("aeexec")
|
||||
|
||||
|
||||
ACPI_PARSE_OBJECT *AcpiGbl_ParsedNamespaceRoot;
|
||||
@ -286,7 +286,7 @@ AeLocalGetRootPointer (
|
||||
ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress)
|
||||
{
|
||||
|
||||
*RsdpPhysicalAddress = ACPI_TO_INTEGER (&LocalRSDP);
|
||||
*RsdpPhysicalAddress = ACPI_PTR_TO_PHYSADDR (&LocalRSDP);
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
@ -323,7 +323,7 @@ AeRegionHandler (
|
||||
UINT32 ByteWidth;
|
||||
|
||||
|
||||
PROC_NAME ("AeRegionHandler");
|
||||
ACPI_FUNCTION_NAME ("AeRegionHandler");
|
||||
|
||||
|
||||
/*
|
||||
@ -582,7 +582,7 @@ AeInstallHandlers (void)
|
||||
UINT32 i;
|
||||
|
||||
|
||||
PROC_NAME ("AeInstallHandlers");
|
||||
ACPI_FUNCTION_NAME ("AeInstallHandlers");
|
||||
|
||||
|
||||
Status = AcpiInstallNotifyHandler (ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: aemain - Main routine for the AcpiExec utility
|
||||
* $Revision: 1.50 $
|
||||
* $Revision: 1.58 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -121,7 +121,6 @@
|
||||
#include "acpi.h"
|
||||
#include "amlcode.h"
|
||||
#include "acparser.h"
|
||||
#include "actables.h"
|
||||
#include "acnamesp.h"
|
||||
#include "acinterp.h"
|
||||
#include "acdebug.h"
|
||||
@ -130,7 +129,7 @@
|
||||
|
||||
|
||||
#define _COMPONENT PARSER
|
||||
MODULE_NAME ("aemain")
|
||||
ACPI_MODULE_NAME ("aemain")
|
||||
|
||||
/*
|
||||
* TBD: Debug only, remove!
|
||||
@ -207,14 +206,6 @@ AeDoDivideCheck (void)
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* We need a local FADT so that the hardware subcomponent will function,
|
||||
* even though the underlying OSD HW access functions don't do
|
||||
* anything.
|
||||
*/
|
||||
|
||||
FADT_DESCRIPTOR LocalFADT;
|
||||
ACPI_COMMON_FACS LocalFACS;
|
||||
|
||||
#ifdef _IA16
|
||||
ACPI_STATUS
|
||||
@ -224,16 +215,6 @@ AcpiGetIrqRoutingTable (
|
||||
{
|
||||
return AE_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiGetFirmwareTable (
|
||||
ACPI_STRING Signature,
|
||||
UINT32 Instance,
|
||||
UINT32 Flags,
|
||||
ACPI_TABLE_HEADER **TablePointer)
|
||||
{
|
||||
return (AE_NOT_IMPLEMENTED);
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************
|
||||
@ -290,7 +271,7 @@ main (
|
||||
|
||||
/* Init globals */
|
||||
|
||||
AcpiDbgLevel = NORMAL_DEFAULT | ACPI_LV_TABLES;
|
||||
AcpiDbgLevel = NORMAL_DEFAULT;
|
||||
AcpiDbgLayer = 0xFFFFFFFF;
|
||||
|
||||
|
||||
@ -308,7 +289,7 @@ main (
|
||||
|
||||
/* Get the command line options */
|
||||
|
||||
while ((j = getopt (argc, argv, "?dgijl:o:sv")) != EOF) switch(j)
|
||||
while ((j = getopt (argc, argv, "?dgil:o:sv")) != EOF) switch(j)
|
||||
{
|
||||
case 'd':
|
||||
AcpiGbl_DbOpt_disasm = TRUE;
|
||||
@ -324,10 +305,6 @@ main (
|
||||
AcpiGbl_DbOpt_ini_methods = FALSE;
|
||||
break;
|
||||
|
||||
case 'j':
|
||||
AcpiGbl_DbOpt_parse_jit = TRUE;
|
||||
break;
|
||||
|
||||
case 'l':
|
||||
AcpiDbgLevel = strtoul (optarg, NULL, 0);
|
||||
AcpiGbl_DbConsoleDebugLevel = AcpiDbgLevel;
|
||||
@ -376,25 +353,17 @@ main (
|
||||
goto enterloop;
|
||||
}
|
||||
|
||||
/* Build a fake FADT so we can test the hardware/event init */
|
||||
|
||||
ACPI_STORE_ADDRESS (LocalFADT.XGpe0Blk.Address, 0x70);
|
||||
ACPI_STORE_ADDRESS (LocalFADT.XPm1aEvtBlk.Address, 0x80);
|
||||
ACPI_STORE_ADDRESS (LocalFADT.XPm1aCntBlk.Address, 0x90);
|
||||
ACPI_STORE_ADDRESS (LocalFADT.XPmTmrBlk.Address, 0xA0);
|
||||
AeBuildLocalTables ();
|
||||
Status = AeInstallTables ();
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
printf ("**** Could not load ACPI tables, %s\n", AcpiFormatException (Status));
|
||||
goto enterloop;
|
||||
}
|
||||
|
||||
LocalFADT.Gpe0BlkLen = 8;
|
||||
LocalFADT.Gpe1BlkLen = 12;
|
||||
LocalFADT.Gpe1Base = 64;
|
||||
LocalFADT.Pm1EvtLen = 4;
|
||||
LocalFADT.Pm1CntLen = 4;
|
||||
LocalFADT.PmTmLen = 8;
|
||||
|
||||
AcpiGbl_FADT = &LocalFADT;
|
||||
AcpiGbl_FACS = &LocalFACS;
|
||||
|
||||
|
||||
/* TBD:
|
||||
/*
|
||||
* TBD:
|
||||
* Need a way to call this after the "LOAD" command
|
||||
*/
|
||||
Status = AeInstallHandlers ();
|
||||
@ -414,6 +383,7 @@ main (
|
||||
ReturnBuf.Pointer = Buffer;
|
||||
AcpiGetName (AcpiGbl_RootNode, ACPI_FULL_PATHNAME, &ReturnBuf);
|
||||
AcpiEnableEvent (ACPI_EVENT_GLOBAL, ACPI_EVENT_FIXED, 0);
|
||||
AcpiEnableEvent (0, ACPI_EVENT_GPE, 0);
|
||||
}
|
||||
|
||||
#ifdef _IA16
|
||||
@ -464,7 +434,7 @@ enterloop:
|
||||
|
||||
/* Enter the debugger command loop */
|
||||
|
||||
AcpiDbUserCommands (DB_COMMAND_PROMPT, NULL);
|
||||
AcpiDbUserCommands (ACPI_DEBUGGER_COMMAND_PROMPT, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: asmain - Main module for the acpi source processor utility
|
||||
* $Revision: 1.35 $
|
||||
* $Revision: 1.38 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -187,7 +187,7 @@ ACPI_STRING_TABLE StandardDataTypes[] = {
|
||||
|
||||
char LinuxHeader[] =
|
||||
"/*\n"
|
||||
" * Copyright (C) 2000, 2001 R. Byron Moore\n"
|
||||
" * Copyright (C) 2000 - 2002, R. Byron Moore\n"
|
||||
" *\n"
|
||||
" * This program is free software; you can redistribute it and/or modify\n"
|
||||
" * it under the terms of the GNU General Public License as published by\n"
|
||||
@ -344,18 +344,18 @@ ACPI_IDENTIFIER_TABLE LinuxLowerCase[] = {
|
||||
"ACPI_WALK_INFO",
|
||||
"ACPI_WALK_LIST",
|
||||
"ACPI_WALK_STATE",
|
||||
"DB_METHOD_INFO",
|
||||
"ACPI_DB_METHOD_INFO",
|
||||
"FACS_DESCRIPTOR_REV071",
|
||||
"FACS_DESCRIPTOR_REV1",
|
||||
"FACS_DESCRIPTOR_REV2",
|
||||
"FADT_DESCRIPTOR_REV071",
|
||||
"FADT_DESCRIPTOR_REV1",
|
||||
"FADT_DESCRIPTOR_REV2",
|
||||
"FIND_CONTEXT",
|
||||
"NS_SEARCH_DATA",
|
||||
"OPERATING_MODE",
|
||||
"ACPI_FIND_CONTEXT",
|
||||
"ACPI_NS_SEARCH_DATA",
|
||||
"ACPI_INTERPRETER_MODE",
|
||||
"ACPI_PCI_ROUTING_TABLE",
|
||||
"PREDEFINED_NAMES",
|
||||
"ACPI_PREDEFINED_NAMES",
|
||||
"UINT64_OVERLAY",
|
||||
"UINT64_STRUCT",
|
||||
"XSDT_DESCRIPTOR",
|
||||
@ -465,7 +465,10 @@ ACPI_CONVERSION_TABLE StatsConversionTable = {
|
||||
ACPI_STRING_TABLE CustomReplacements[] = {
|
||||
|
||||
|
||||
"1999 - 2002, Intel Corp", "1999 - 2002, Intel Corp", REPLACE_WHOLE_WORD,
|
||||
"1999 - 2002, Intel Corp", "1999 - 2002, Intel Corp", REPLACE_WHOLE_WORD,
|
||||
"1999, Intel Corp", "1999 - 2002, Intel Corp", REPLACE_WHOLE_WORD,
|
||||
" All rights\n * reserved.", "\n * All rights reserved.", REPLACE_WHOLE_WORD,
|
||||
"Copyright (C) 2000, 2001", "Copyright (C) 2000 - 2002", REPLACE_WHOLE_WORD,
|
||||
NULL, NULL, 0
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user