sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move registration of Font into driver entry point.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7948 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xli24
2009-03-25 07:25:52 +00:00
parent 3ffa0f1f8a
commit 28487361ff
2 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
View File

@@ -1,7 +1,7 @@
/** @file /** @file
This is the main routine for initializing the Graphics Console support routines. This is the main routine for initializing the Graphics Console support routines.
Copyright (c) 2006 - 2008 Intel Corporation. <BR> Copyright (c) 2006 - 2009 Intel Corporation. <BR>
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
@@ -47,13 +47,13 @@ GRAPHICS_CONSOLE_DEV mGraphicsConsoleDevTemplate = {
{ 100,31, 0, 0, 0, 0 }, // Mode 2 { 100,31, 0, 0, 0, 0 }, // Mode 2
{ 0, 0, 0, 0, 0, 0 } // Mode 3 { 0, 0, 0, 0, 0, 0 } // Mode 3
}, },
(EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) NULL, (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) NULL
(EFI_HII_HANDLE ) 0
}; };
EFI_HII_DATABASE_PROTOCOL *mHiiDatabase; EFI_HII_DATABASE_PROTOCOL *mHiiDatabase;
EFI_HII_FONT_PROTOCOL *mHiiFont; EFI_HII_FONT_PROTOCOL *mHiiFont;
BOOLEAN mFirstAccessFlag = TRUE; EFI_HII_HANDLE mHiiHandle;
EFI_EVENT mHiiRegistration;
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}};
@@ -234,7 +234,6 @@ GraphicsConsoleControllerDriverStart (
{ {
EFI_STATUS Status; EFI_STATUS Status;
GRAPHICS_CONSOLE_DEV *Private; GRAPHICS_CONSOLE_DEV *Private;
UINT32 NarrowFontSize;
UINT32 HorizontalResolution; UINT32 HorizontalResolution;
UINT32 VerticalResolution; UINT32 VerticalResolution;
UINT32 ColorDepth; UINT32 ColorDepth;
@@ -243,11 +242,6 @@ GraphicsConsoleControllerDriverStart (
UINTN Columns; UINTN Columns;
UINTN Rows; UINTN Rows;
UINT32 ModeNumber; UINT32 ModeNumber;
EFI_HII_SIMPLE_FONT_PACKAGE_HDR *SimplifiedFont;
UINT32 PackageLength;
EFI_HII_PACKAGE_LIST_HEADER *PackageList;
UINT8 *Package;
UINT8 *Location;
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode; EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode;
ModeNumber = 0; ModeNumber = 0;
@@ -288,52 +282,6 @@ GraphicsConsoleControllerDriverStart (
goto Error; goto Error;
} }
NarrowFontSize = mNarrowFontSize;
if (mFirstAccessFlag) {
//
// Add 4 bytes to the header for entire length for HiiLibPreparePackageList use only.
// Looks ugly. Might be updated when font tool is ready.
//
// +--------------------------------+ <-- Package
// | |
// | PackageLength(4 bytes) |
// | |
// |--------------------------------| <-- SimplifiedFont
// | |
// |EFI_HII_SIMPLE_FONT_PACKAGE_HDR |
// | |
// |--------------------------------| <-- Location
// | |
// | gUsStdNarrowGlyphData |
// | |
// +--------------------------------+
PackageLength = sizeof (EFI_HII_SIMPLE_FONT_PACKAGE_HDR) + NarrowFontSize + 4;
Package = AllocateZeroPool (PackageLength);
if (Package == NULL) {
return EFI_OUT_OF_RESOURCES;
}
WriteUnaligned32((UINT32 *) Package,PackageLength);
SimplifiedFont = (EFI_HII_SIMPLE_FONT_PACKAGE_HDR *) (Package + 4);
SimplifiedFont->Header.Length = (UINT32) (PackageLength - 4);
SimplifiedFont->Header.Type = EFI_HII_PACKAGE_SIMPLE_FONTS;
SimplifiedFont->NumberOfNarrowGlyphs = (UINT16) (NarrowFontSize / sizeof (EFI_NARROW_GLYPH));
Location = (UINT8 *) (&SimplifiedFont->NumberOfWideGlyphs + 1);
CopyMem (Location, gUsStdNarrowGlyphData, NarrowFontSize);
//
// Add this simplified font package to a package list then install it.
//
PackageList = HiiLibPreparePackageList (1, &mFontPackageListGuid, Package);
Status = mHiiDatabase->NewPackageList (mHiiDatabase, PackageList, NULL, &(Private->HiiHandle));
ASSERT_EFI_ERROR (Status);
FreePool (PackageList);
FreePool (Package);
mFirstAccessFlag = FALSE;
}
// //
// If the current mode information can not be retrieved, then attempt to set the default mode // If the current mode information can not be retrieved, then attempt to set the default mode
// of 800x600, 32 bit color, 60 Hz refresh. // of 800x600, 32 bit color, 60 Hz refresh.
@@ -633,14 +581,6 @@ GraphicsConsoleControllerDriverStop (
); );
} }
//
// Remove the font pack
//
if (Private->HiiHandle != NULL) {
HiiLibRemovePackages (Private->HiiHandle);
mFirstAccessFlag = TRUE;
}
if (Private->LineBuffer != NULL) { if (Private->LineBuffer != NULL) {
FreePool (Private->LineBuffer); FreePool (Private->LineBuffer);
} }
@@ -1907,6 +1847,71 @@ EraseCursor (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
VOID
EFIAPI
RegisterFontPackage (
IN EFI_EVENT Event,
IN VOID *Context
)
{
EFI_STATUS Status;
EFI_HII_SIMPLE_FONT_PACKAGE_HDR *SimplifiedFont;
UINT32 PackageLength;
EFI_HII_PACKAGE_LIST_HEADER *PackageList;
UINT8 *Package;
UINT8 *Location;
EFI_HII_DATABASE_PROTOCOL *HiiDatabase;
//
// Locate HII Database Protocol
//
Status = gBS->LocateProtocol (
&gEfiHiiDatabaseProtocolGuid,
NULL,
(VOID **) &HiiDatabase
);
ASSERT_EFI_ERROR (Status);
//
// Add 4 bytes to the header for entire length for HiiLibPreparePackageList use only.
//
// +--------------------------------+ <-- Package
// | |
// | PackageLength(4 bytes) |
// | |
// |--------------------------------| <-- SimplifiedFont
// | |
// |EFI_HII_SIMPLE_FONT_PACKAGE_HDR |
// | |
// |--------------------------------| <-- Location
// | |
// | gUsStdNarrowGlyphData |
// | |
// +--------------------------------+
PackageLength = sizeof (EFI_HII_SIMPLE_FONT_PACKAGE_HDR) + mNarrowFontSize + 4;
Package = AllocateZeroPool (PackageLength);
ASSERT (Package != NULL);
WriteUnaligned32((UINT32 *) Package,PackageLength);
SimplifiedFont = (EFI_HII_SIMPLE_FONT_PACKAGE_HDR *) (Package + 4);
SimplifiedFont->Header.Length = (UINT32) (PackageLength - 4);
SimplifiedFont->Header.Type = EFI_HII_PACKAGE_SIMPLE_FONTS;
SimplifiedFont->NumberOfNarrowGlyphs = (UINT16) (mNarrowFontSize / sizeof (EFI_NARROW_GLYPH));
Location = (UINT8 *) (&SimplifiedFont->NumberOfWideGlyphs + 1);
CopyMem (Location, gUsStdNarrowGlyphData, mNarrowFontSize);
//
// Add this simplified font package to a package list then install it.
//
PackageList = HiiLibPreparePackageList (1, &mFontPackageListGuid, Package);
Status = HiiDatabase->NewPackageList (HiiDatabase, PackageList, NULL, &mHiiHandle);
ASSERT_EFI_ERROR (Status);
FreePool (PackageList);
FreePool (Package);
}
/** /**
The user Entry Point for module GraphicsConsole. The user code starts with this function. The user Entry Point for module GraphicsConsole. The user code starts with this function.
@@ -1926,6 +1931,17 @@ InitializeGraphicsConsole (
{ {
EFI_STATUS Status; EFI_STATUS Status;
//
// Register notify function on HII Database Protocol to add font package.
//
EfiCreateProtocolNotifyEvent (
&gEfiHiiDatabaseProtocolGuid,
TPL_CALLBACK,
RegisterFontPackage,
NULL,
&mHiiRegistration
);
// //
// Install driver model protocol(s). // Install driver model protocol(s).
// //

3
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
View File

@@ -1,7 +1,7 @@
/** @file /** @file
Header file for GraphicsConsole driver. Header file for GraphicsConsole driver.
Copyright (c) 2006 - 2008, Intel Corporation. <BR> Copyright (c) 2006 - 2009, Intel Corporation. <BR>
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
@@ -79,7 +79,6 @@ typedef struct {
EFI_SIMPLE_TEXT_OUTPUT_MODE SimpleTextOutputMode; EFI_SIMPLE_TEXT_OUTPUT_MODE SimpleTextOutputMode;
GRAPHICS_CONSOLE_MODE_DATA ModeData[GRAPHICS_MAX_MODE]; GRAPHICS_CONSOLE_MODE_DATA ModeData[GRAPHICS_MAX_MODE];
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *LineBuffer; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *LineBuffer;
EFI_HII_HANDLE HiiHandle;
} GRAPHICS_CONSOLE_DEV; } GRAPHICS_CONSOLE_DEV;
#define GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS(a) \ #define GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS(a) \