Overhaul of the NATIVE* types. renamed to ACPI_NATIVE*, eliminated

use of MAX32 and MIN32 types


date	2002.12.16.23.55.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:23:20 +00:00
parent d67522b1ef
commit 6bcd2a5546

View File

@ -1,6 +1,7 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: dbhistry - debugger HISTORY command * Module Name: dbhistry - debugger HISTORY command
* $Revision: 1.27 $
* *
*****************************************************************************/ *****************************************************************************/
@ -8,8 +9,8 @@
* *
* 1. Copyright Notice * 1. Copyright Notice
* *
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* reserved. * All rights reserved.
* *
* 2. License * 2. License
* *
@ -37,9 +38,9 @@
* The above copyright and patent license is granted only if the following * The above copyright and patent license is granted only if the following
* conditions are met: * conditions are met:
* *
* 3. Conditions * 3. Conditions
* *
* 3.1. Redistribution of Source with Rights to Further Distribute Source. * 3.1. Redistribution of Source with Rights to Further Distribute Source.
* Redistribution of source code of any substantial portion of the Covered * Redistribution of source code of any substantial portion of the Covered
* Code or modification with rights to further distribute source must include * Code or modification with rights to further distribute source must include
* the above Copyright Notice, the above License, this list of Conditions, * the above Copyright Notice, the above License, this list of Conditions,
@ -47,11 +48,11 @@
* Licensee must cause all Covered Code to which Licensee contributes to * Licensee must cause all Covered Code to which Licensee contributes to
* contain a file documenting the changes Licensee made to create that Covered * contain a file documenting the changes Licensee made to create that Covered
* Code and the date of any change. Licensee must include in that file the * Code and the date of any change. Licensee must include in that file the
* documentation of any changes made by any predecessor Licensee. Licensee * documentation of any changes made by any predecessor Licensee. Licensee
* must include a prominent statement that the modification is derived, * must include a prominent statement that the modification is derived,
* directly or indirectly, from Original Intel Code. * directly or indirectly, from Original Intel Code.
* *
* 3.2. Redistribution of Source with no Rights to Further Distribute Source. * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
* Redistribution of source code of any substantial portion of the Covered * Redistribution of source code of any substantial portion of the Covered
* Code or modification without rights to further distribute source must * Code or modification without rights to further distribute source must
* include the following Disclaimer and Export Compliance provision in the * include the following Disclaimer and Export Compliance provision in the
@ -85,7 +86,7 @@
* INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
* UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
* IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
* PARTICULAR PURPOSE. * PARTICULAR PURPOSE.
* *
* 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
* OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
@ -114,23 +115,18 @@
*****************************************************************************/ *****************************************************************************/
#include <acpi.h> #include "acpi.h"
#include <parser.h> #include "acdebug.h"
#include <dispatch.h>
#include <amlcode.h>
#include <namesp.h>
#include <parser.h>
#include <events.h>
#include <interp.h>
#include <debugger.h>
#include <tables.h>
#ifdef ACPI_DEBUG #ifdef ACPI_DEBUGGER
#define _COMPONENT DEBUGGER #define _COMPONENT ACPI_CA_DEBUGGER
MODULE_NAME ("dbhistry"); ACPI_MODULE_NAME ("dbhistry")
#define HI_NO_HISTORY 0
#define HI_RECORD_HISTORY 1
#define HISTORY_SIZE 20
typedef struct HistoryInfo typedef struct HistoryInfo
@ -141,66 +137,65 @@ typedef struct HistoryInfo
} HISTORY_INFO; } HISTORY_INFO;
#define HI_NO_HISTORY 0 static HISTORY_INFO AcpiGbl_HistoryBuffer[HISTORY_SIZE];
#define HI_RECORD_HISTORY 1 static UINT16 AcpiGbl_LoHistory = 0;
static UINT16 AcpiGbl_NumHistory = 0;
static UINT16 AcpiGbl_NextHistoryIndex = 0;
static UINT32 AcpiGbl_NextCmdNum = 1;
#define HISTORY_SIZE 20
HISTORY_INFO HistoryBuffer[HISTORY_SIZE];
UINT16 LoHistory = 0;
UINT16 NumHistory = 0;
UINT16 NextHistoryIndex = 0;
UINT32 NextCmdNum = 1;
/****************************************************************************** /*******************************************************************************
*
* FUNCTION: DbAddToHistory
* *
* PARAMETERS: None * FUNCTION: AcpiDbAddToHistory
*
* PARAMETERS: CommandLine - Command to add
* *
* RETURN: None * RETURN: None
* *
* DESCRIPTION: Add a command line to the history buffer. * DESCRIPTION: Add a command line to the history buffer.
* *
*****************************************************************************/ ******************************************************************************/
void void
DbAddToHistory ( AcpiDbAddToHistory (
char *CommandLine) char *CommandLine)
{ {
/* Put command into the next available slot */
STRCPY (HistoryBuffer[NextHistoryIndex].Command, CommandLine); ACPI_STRCPY (AcpiGbl_HistoryBuffer[AcpiGbl_NextHistoryIndex].Command, CommandLine);
HistoryBuffer[NextHistoryIndex].CmdNum = NextCmdNum;
if ((NumHistory == HISTORY_SIZE) && AcpiGbl_HistoryBuffer[AcpiGbl_NextHistoryIndex].CmdNum = AcpiGbl_NextCmdNum;
(NextHistoryIndex == LoHistory))
/* Adjust indexes */
if ((AcpiGbl_NumHistory == HISTORY_SIZE) &&
(AcpiGbl_NextHistoryIndex == AcpiGbl_LoHistory))
{ {
LoHistory++; AcpiGbl_LoHistory++;
if (LoHistory >= HISTORY_SIZE) if (AcpiGbl_LoHistory >= HISTORY_SIZE)
{ {
LoHistory = 0; AcpiGbl_LoHistory = 0;
} }
} }
NextHistoryIndex++; AcpiGbl_NextHistoryIndex++;
if (NextHistoryIndex >= HISTORY_SIZE) if (AcpiGbl_NextHistoryIndex >= HISTORY_SIZE)
{ {
NextHistoryIndex = 0; AcpiGbl_NextHistoryIndex = 0;
} }
AcpiGbl_NextCmdNum++;
NextCmdNum++; if (AcpiGbl_NumHistory < HISTORY_SIZE)
if (NumHistory < HISTORY_SIZE)
{ {
NumHistory++; AcpiGbl_NumHistory++;
} }
} }
/****************************************************************************** /*******************************************************************************
* *
* FUNCTION: DbDisplayHistory * FUNCTION: AcpiDbDisplayHistory
* *
* PARAMETERS: None * PARAMETERS: None
* *
@ -208,19 +203,23 @@ DbAddToHistory (
* *
* DESCRIPTION: Display the contents of the history buffer * DESCRIPTION: Display the contents of the history buffer
* *
*****************************************************************************/ ******************************************************************************/
void void
DbDisplayHistory (void) AcpiDbDisplayHistory (void)
{ {
NATIVE_UINT i; ACPI_NATIVE_UINT i;
UINT16 HistoryIndex; UINT16 HistoryIndex;
HistoryIndex = LoHistory; HistoryIndex = AcpiGbl_LoHistory;
for (i = 0; i < NumHistory; i++)
/* Dump entire history buffer */
for (i = 0; i < AcpiGbl_NumHistory; i++)
{ {
OsdPrintf ("%ld %s\n", HistoryBuffer[HistoryIndex].CmdNum, HistoryBuffer[HistoryIndex].Command); AcpiOsPrintf ("%ld %s\n", AcpiGbl_HistoryBuffer[HistoryIndex].CmdNum,
AcpiGbl_HistoryBuffer[HistoryIndex].Command);
HistoryIndex++; HistoryIndex++;
if (HistoryIndex >= HISTORY_SIZE) if (HistoryIndex >= HISTORY_SIZE)
@ -231,9 +230,9 @@ DbDisplayHistory (void)
} }
/****************************************************************************** /*******************************************************************************
* *
* FUNCTION: DbGetFromHistory * FUNCTION: AcpiDbGetFromHistory
* *
* PARAMETERS: CommandNumArg - String containing the number of the * PARAMETERS: CommandNumArg - String containing the number of the
* command to be retrieved * command to be retrieved
@ -242,33 +241,37 @@ DbDisplayHistory (void)
* *
* DESCRIPTION: Get a command from the history buffer * DESCRIPTION: Get a command from the history buffer
* *
*****************************************************************************/ ******************************************************************************/
char * char *
DbGetFromHistory ( AcpiDbGetFromHistory (
char *CommandNumArg) char *CommandNumArg)
{ {
NATIVE_UINT i; ACPI_NATIVE_UINT i;
UINT16 HistoryIndex; UINT16 HistoryIndex;
UINT32 CmdNum; UINT32 CmdNum;
if (CommandNumArg == NULL) if (CommandNumArg == NULL)
{ {
CmdNum = NextCmdNum - 1; CmdNum = AcpiGbl_NextCmdNum - 1;
} }
else else
{ {
CmdNum = STRTOUL (CommandNumArg, NULL, 0); CmdNum = ACPI_STRTOUL (CommandNumArg, NULL, 0);
} }
HistoryIndex = LoHistory; /* Search history buffer */
for (i = 0; i < NumHistory; i++)
HistoryIndex = AcpiGbl_LoHistory;
for (i = 0; i < AcpiGbl_NumHistory; i++)
{ {
if (HistoryBuffer[HistoryIndex].CmdNum == CmdNum) if (AcpiGbl_HistoryBuffer[HistoryIndex].CmdNum == CmdNum)
{ {
return (HistoryBuffer[HistoryIndex].Command); /* Found the commnad, return it */
return (AcpiGbl_HistoryBuffer[HistoryIndex].Command);
} }
@ -279,10 +282,10 @@ DbGetFromHistory (
} }
} }
OsdPrintf ("Invalid history number: %d\n", HistoryIndex); AcpiOsPrintf ("Invalid history number: %d\n", HistoryIndex);
return NULL; return (NULL);
} }
#endif
#endif /* ACPI_DEBUGGER */