Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6296 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
//
|
||||
// Template for Text In Splitter
|
||||
//
|
||||
STATIC TEXT_IN_SPLITTER_PRIVATE_DATA mConIn = {
|
||||
TEXT_IN_SPLITTER_PRIVATE_DATA mConIn = {
|
||||
TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE,
|
||||
(EFI_HANDLE) NULL,
|
||||
{
|
||||
@@ -139,7 +139,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_GRAPHICS_OUTPUT_PROTOCOL mGraphicsOutputProtoc
|
||||
//
|
||||
// Template for Text Out Splitter
|
||||
//
|
||||
STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
|
||||
TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
|
||||
TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,
|
||||
(EFI_HANDLE) NULL,
|
||||
{
|
||||
@@ -206,7 +206,7 @@ STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
|
||||
//
|
||||
// Template for Standard Error Text Out Splitter
|
||||
//
|
||||
STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
|
||||
TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
|
||||
TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,
|
||||
(EFI_HANDLE) NULL,
|
||||
{
|
||||
|
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include "ConSplitter.h"
|
||||
|
||||
|
||||
STATIC CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
|
||||
CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
|
||||
|
||||
|
||||
/**
|
||||
|
@@ -94,7 +94,7 @@ CheckModeSupported (
|
||||
//
|
||||
// Graphics Console Devcie Private Data template
|
||||
//
|
||||
STATIC GRAPHICS_CONSOLE_DEV mGraphicsConsoleDevTemplate = {
|
||||
GRAPHICS_CONSOLE_DEV mGraphicsConsoleDevTemplate = {
|
||||
GRAPHICS_CONSOLE_DEV_SIGNATURE,
|
||||
(EFI_GRAPHICS_OUTPUT_PROTOCOL *) NULL,
|
||||
(EFI_UGA_DRAW_PROTOCOL *) NULL,
|
||||
@@ -132,11 +132,11 @@ EFI_HII_DATABASE_PROTOCOL *mHiiDatabase;
|
||||
EFI_HII_FONT_PROTOCOL *mHiiFont;
|
||||
BOOLEAN mFirstAccessFlag = TRUE;
|
||||
|
||||
STATIC EFI_GUID mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};
|
||||
EFI_GUID mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};
|
||||
|
||||
STATIC CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
|
||||
CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
|
||||
|
||||
STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
|
||||
EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
|
||||
//
|
||||
// B G R
|
||||
//
|
||||
@@ -158,13 +158,13 @@ STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
|
||||
{0xff, 0xff, 0xff, 0x00} // WHITE
|
||||
};
|
||||
|
||||
STATIC EFI_NARROW_GLYPH mCursorGlyph = {
|
||||
EFI_NARROW_GLYPH mCursorGlyph = {
|
||||
0x0000,
|
||||
0x00,
|
||||
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF }
|
||||
};
|
||||
|
||||
STATIC CHAR16 SpaceStr[] = { NARROW_CHAR, ' ', 0 };
|
||||
CHAR16 SpaceStr[] = { NARROW_CHAR, ' ', 0 };
|
||||
|
||||
EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = {
|
||||
GraphicsConsoleControllerDriverSupported,
|
||||
|
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
// ASCII. The ASCII mapping we just made up.
|
||||
//
|
||||
//
|
||||
STATIC UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {
|
||||
UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {
|
||||
{ BOXDRAW_HORIZONTAL, 0xc4, L'-' },
|
||||
{ BOXDRAW_VERTICAL, 0xb3, L'|' },
|
||||
{ BOXDRAW_DOWN_RIGHT, 0xda, L'/' },
|
||||
@@ -78,10 +78,10 @@ STATIC UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {
|
||||
{ 0x0000, 0x00, L'\0' }
|
||||
};
|
||||
|
||||
STATIC CHAR16 mSetModeString[] = { ESC, '[', '=', '3', 'h', 0 };
|
||||
STATIC CHAR16 mSetAttributeString[] = { ESC, '[', '0', 'm', ESC, '[', '4', '0', 'm', ESC, '[', '4', '0', 'm', 0 };
|
||||
STATIC CHAR16 mClearScreenString[] = { ESC, '[', '2', 'J', 0 };
|
||||
STATIC CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 };
|
||||
CHAR16 mSetModeString[] = { ESC, '[', '=', '3', 'h', 0 };
|
||||
CHAR16 mSetAttributeString[] = { ESC, '[', '0', 'm', ESC, '[', '4', '0', 'm', ESC, '[', '4', '0', 'm', 0 };
|
||||
CHAR16 mClearScreenString[] = { ESC, '[', '2', 'J', 0 };
|
||||
CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 };
|
||||
|
||||
//
|
||||
// Body of the ConOut functions
|
||||
|
Reference in New Issue
Block a user