mirror of https://github.com/acidanthera/audk.git
Change functional static variable to Global variable. No STATIC modifier is recommended though it is defined in Base.h.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6313 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
8630d2ddf1
commit
19b15d6310
|
@ -1,7 +1,7 @@
|
||||||
/**@file
|
/**@file
|
||||||
IPF specific debug support functions
|
IPF specific debug support functions
|
||||||
|
|
||||||
Copyright (c) 2006, Intel Corporation
|
Copyright (c) 2006 - 2008, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials
|
All rights reserved. This program and the accompanying materials
|
||||||
are licensed and made available under the terms and conditions of the BSD License
|
are licensed and made available under the terms and conditions of the BSD License
|
||||||
which accompanies this distribution. The full text of the license may be found at
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
|
@ -17,6 +17,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
//
|
//
|
||||||
#include "plDebugSupport.h"
|
#include "plDebugSupport.h"
|
||||||
|
|
||||||
|
BOOLEAN mInHandler = FALSE;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
UINT64 low;
|
UINT64 low;
|
||||||
UINT64 high;
|
UINT64 high;
|
||||||
|
@ -156,26 +158,24 @@ Returns:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
{
|
{
|
||||||
STATIC BOOLEAN InHandler = FALSE;
|
|
||||||
|
|
||||||
DEBUG_CODE_BEGIN ();
|
DEBUG_CODE_BEGIN ();
|
||||||
if (InHandler) {
|
if (mInHandler) {
|
||||||
DEBUG ((EFI_D_INFO, "ERROR: Re-entered debugger!\n"
|
DEBUG ((EFI_D_INFO, "ERROR: Re-entered debugger!\n"
|
||||||
" ExceptionType == %X\n"
|
" ExceptionType == %X\n"
|
||||||
" Context == %X\n"
|
" Context == %X\n"
|
||||||
" Context.SystemContextIpf->CrIip == %X\n"
|
" Context.SystemContextIpf->CrIip == %X\n"
|
||||||
" Context.SystemContextIpf->CrIpsr == %X\n"
|
" Context.SystemContextIpf->CrIpsr == %X\n"
|
||||||
" InHandler == %X\n",
|
" mInHandler == %X\n",
|
||||||
ExceptionType,
|
ExceptionType,
|
||||||
Context,
|
Context,
|
||||||
Context.SystemContextIpf->CrIip,
|
Context.SystemContextIpf->CrIip,
|
||||||
Context.SystemContextIpf->CrIpsr,
|
Context.SystemContextIpf->CrIpsr,
|
||||||
InHandler));
|
mInHandler));
|
||||||
}
|
}
|
||||||
DEBUG_CODE_END ();
|
DEBUG_CODE_END ();
|
||||||
|
|
||||||
ASSERT (!InHandler);
|
ASSERT (!mInHandler);
|
||||||
InHandler = TRUE;
|
mInHandler = TRUE;
|
||||||
if (IvtEntryTable[ExceptionType].RegisteredCallback != NULL) {
|
if (IvtEntryTable[ExceptionType].RegisteredCallback != NULL) {
|
||||||
if (ExceptionType != EXCEPT_IPF_EXTERNAL_INTERRUPT) {
|
if (ExceptionType != EXCEPT_IPF_EXTERNAL_INTERRUPT) {
|
||||||
IvtEntryTable[ExceptionType].RegisteredCallback (ExceptionType, Context.SystemContextIpf);
|
IvtEntryTable[ExceptionType].RegisteredCallback (ExceptionType, Context.SystemContextIpf);
|
||||||
|
@ -186,7 +186,7 @@ Returns:
|
||||||
ASSERT (0);
|
ASSERT (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
InHandler = FALSE;
|
mInHandler = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/** @file
|
/** @file
|
||||||
|
|
||||||
Copyright (c) 2004 - 2007, Intel Corporation
|
Copyright (c) 2004 - 2008, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials
|
All rights reserved. This program and the accompanying materials
|
||||||
are licensed and made available under the terms and conditions of the BSD License
|
are licensed and made available under the terms and conditions of the BSD License
|
||||||
which accompanies this distribution. The full text of the license may be found at
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
|
@ -39,7 +39,7 @@ typedef union {
|
||||||
UINT8 *BytePtr;
|
UINT8 *BytePtr;
|
||||||
} UNION_PTR;
|
} UNION_PTR;
|
||||||
|
|
||||||
|
UINTN mPropeller;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
PxeBc callback routine for status updates and aborts.
|
PxeBc callback routine for status updates and aborts.
|
||||||
|
@ -68,13 +68,11 @@ bc_callback (
|
||||||
IN EFI_PXE_BASE_CODE_PACKET * PacketPtr OPTIONAL
|
IN EFI_PXE_BASE_CODE_PACKET * PacketPtr OPTIONAL
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
STATIC UINTN Propeller;
|
|
||||||
|
|
||||||
EFI_INPUT_KEY Key;
|
EFI_INPUT_KEY Key;
|
||||||
UINTN Row;
|
UINTN Row;
|
||||||
UINTN Col;
|
UINTN Col;
|
||||||
|
|
||||||
Propeller = 0;
|
mPropeller = 0;
|
||||||
//
|
//
|
||||||
// Resolve Warning 4 unreferenced parameter problem
|
// Resolve Warning 4 unreferenced parameter problem
|
||||||
//
|
//
|
||||||
|
@ -139,10 +137,10 @@ bc_callback (
|
||||||
Row = gST->ConOut->Mode->CursorRow;
|
Row = gST->ConOut->Mode->CursorRow;
|
||||||
Col = gST->ConOut->Mode->CursorColumn;
|
Col = gST->ConOut->Mode->CursorColumn;
|
||||||
|
|
||||||
AsciiPrint ("%c", "/-\\|"[Propeller]);
|
AsciiPrint ("%c", "/-\\|"[mPropeller]);
|
||||||
gST->ConOut->SetCursorPosition (gST->ConOut, Col, Row);
|
gST->ConOut->SetCursorPosition (gST->ConOut, Col, Row);
|
||||||
|
|
||||||
Propeller = (Propeller + 1) & 3;
|
mPropeller = (mPropeller + 1) & 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;
|
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/** @file
|
/** @file
|
||||||
Utility functions for User Interface functions.
|
Utility functions for User Interface functions.
|
||||||
|
|
||||||
Copyright (c) 2004 - 2007, Intel Corporation
|
Copyright (c) 2004 - 2008, Intel Corporation
|
||||||
All rights reserved. This program and the accompanying materials
|
All rights reserved. This program and the accompanying materials
|
||||||
are licensed and made available under the terms and conditions of the BSD License
|
are licensed and made available under the terms and conditions of the BSD License
|
||||||
which accompanies this distribution. The full text of the license may be found at
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
|
@ -116,6 +116,8 @@ SCREEN_OPERATION_T0_CONTROL_FLAG gScreenOperationToControlFlag[] = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
BOOLEAN mInputError;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Set Buffer to Value for Size bytes.
|
Set Buffer to Value for Size bytes.
|
||||||
|
@ -892,7 +894,6 @@ UpdateStatusBar (
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINTN Index;
|
UINTN Index;
|
||||||
STATIC BOOLEAN InputError;
|
|
||||||
CHAR16 *NvUpdateMessage;
|
CHAR16 *NvUpdateMessage;
|
||||||
CHAR16 *InputErrorMessage;
|
CHAR16 *InputErrorMessage;
|
||||||
|
|
||||||
|
@ -908,14 +909,14 @@ UpdateStatusBar (
|
||||||
gScreenDimensions.BottomRow - 1,
|
gScreenDimensions.BottomRow - 1,
|
||||||
InputErrorMessage
|
InputErrorMessage
|
||||||
);
|
);
|
||||||
InputError = TRUE;
|
mInputError = TRUE;
|
||||||
} else {
|
} else {
|
||||||
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);
|
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);
|
||||||
for (Index = 0; Index < (GetStringWidth (InputErrorMessage) - 2) / 2; Index++) {
|
for (Index = 0; Index < (GetStringWidth (InputErrorMessage) - 2) / 2; Index++) {
|
||||||
PrintAt (gScreenDimensions.LeftColumn + gPromptBlockWidth + Index, gScreenDimensions.BottomRow - 1, L" ");
|
PrintAt (gScreenDimensions.LeftColumn + gPromptBlockWidth + Index, gScreenDimensions.BottomRow - 1, L" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
InputError = FALSE;
|
mInputError = FALSE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -947,7 +948,7 @@ UpdateStatusBar (
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case REFRESH_STATUS_BAR:
|
case REFRESH_STATUS_BAR:
|
||||||
if (InputError) {
|
if (mInputError) {
|
||||||
UpdateStatusBar (INPUT_ERROR, Flags, TRUE);
|
UpdateStatusBar (INPUT_ERROR, Flags, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue