From: qwang12 Date: Wed, 14 Feb 2007 06:35:30 +0000 (+0000) Subject: Added Print, ErrorPrint, AsciiPrint, AsciiErrorPrint() to the UEFI Library. X-Git-Tag: edk2-stable201903~23485 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=22d9199fe5bc0cc9b868b3e33c90a215ce8da3fd;hp=c0db4cdc640920a99133fc4b6c111e9bd9f9630b Added Print, ErrorPrint, AsciiPrint, AsciiErrorPrint() to the UEFI Library. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2392 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.c b/EdkModulePkg/Application/HelloWorld/HelloWorld.c index cd6113fb77..0e8e752747 100644 --- a/EdkModulePkg/Application/HelloWorld/HelloWorld.c +++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.c @@ -1,7 +1,7 @@ /** @file - This driver supports platform security service - - Copyright (c) 2006, Intel Corporation + This simple application just print a "UEFI Hello World!" to the UEFI Console. + + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -12,22 +12,6 @@ **/ -STATIC -VOID -Print ( - IN CONST CHAR16 *Format, - ... - ) -{ - CHAR16 PrintBuffer[0x100]; - VA_LIST Marker; - - VA_START (Marker, Format); - UnicodeVSPrint (PrintBuffer, sizeof (PrintBuffer), Format, Marker); - gST->ConOut->OutputString (gST->ConOut, PrintBuffer); - return; -} - EFI_STATUS EFIAPI UefiMain ( @@ -36,6 +20,9 @@ UefiMain ( ) { + CHAR16 Ptr16; + Print ((CHAR16 *)L"UEFI Hello World!\n"); + return EFI_SUCCESS; } diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa index 85e2db15d4..5f9192bdfe 100644 --- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa +++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa @@ -7,12 +7,12 @@ 1.0 Sample UEFI Application Reference Module This is a shell application that will display Hello World. - Copyright (c) 2006, Intel Corporation. - All rights reserved. This program and the accompanying materials - 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 - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + Copyright (c) 2006 - 2007, Intel Corporation. + All rights reserved. This program and the accompanying materials + 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 + http://opensource.org/licenses/bsd-license.php + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 @@ -29,10 +29,13 @@ DebugLib - UefiBootServicesTableLib + UefiLib + + + UefiApplicationEntryPoint - UefiDriverEntryPoint + UefiBootServicesTableLib @@ -48,4 +51,4 @@ UefiMain - + \ No newline at end of file diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd index ee60f3c12c..f3356420fd 100644 --- a/EdkModulePkg/EdkModulePkg.fpd +++ b/EdkModulePkg/EdkModulePkg.fpd @@ -124,6 +124,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -341,6 +349,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -441,6 +457,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -620,6 +644,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -702,6 +734,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -797,6 +837,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1132,6 +1180,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1300,6 +1356,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1404,6 +1468,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1741,6 +1813,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1859,6 +1939,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -1960,6 +2048,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2305,6 +2401,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2388,6 +2492,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2568,6 +2680,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2668,6 +2788,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2768,6 +2896,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -2851,6 +2987,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3033,6 +3177,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3133,6 +3285,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3232,6 +3392,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3331,6 +3499,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3414,6 +3590,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3586,6 +3770,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3712,6 +3904,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3812,6 +4012,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3912,6 +4120,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4023,6 +4239,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4123,6 +4347,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4223,6 +4455,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4323,6 +4563,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4423,6 +4671,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4525,6 +4781,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4626,6 +4890,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4727,6 +4999,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4829,6 +5109,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -4930,6 +5218,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5031,6 +5327,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5133,6 +5437,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5234,6 +5546,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5335,6 +5655,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5506,6 +5834,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5678,6 +6014,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5850,6 +6194,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -5951,6 +6303,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6168,6 +6528,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6268,6 +6636,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6447,6 +6823,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6529,6 +6913,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6624,6 +7016,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -6959,6 +7359,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7127,7 +7535,15 @@ 4 0x80000000 - + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + + NULL RT_DRIVER @@ -7231,6 +7647,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7568,6 +7992,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7686,6 +8118,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7787,6 +8227,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7889,6 +8337,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -7972,6 +8428,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8135,6 +8599,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8317,6 +8789,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8417,6 +8897,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8516,6 +9004,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8615,6 +9111,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8698,6 +9202,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8870,6 +9382,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -8996,6 +9516,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9096,6 +9624,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9196,6 +9732,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9307,6 +9851,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9407,6 +9959,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9509,6 +10069,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9610,6 +10178,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9711,6 +10287,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9813,6 +10397,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -9914,6 +10506,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10015,6 +10615,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10117,6 +10725,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10218,6 +10834,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10319,6 +10943,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10420,6 +11052,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10637,6 +11277,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10737,6 +11385,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10916,6 +11572,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -10998,6 +11662,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -11093,6 +11765,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -11428,6 +12108,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -11598,6 +12286,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -11853,6 +12549,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -11971,6 +12675,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12072,6 +12784,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12174,6 +12894,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12257,6 +12985,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12420,6 +13156,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12602,6 +13346,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12702,6 +13454,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12801,6 +13561,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12900,6 +13668,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -12983,6 +13759,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13155,6 +13939,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13281,6 +14073,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13381,6 +14181,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13481,6 +14289,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13592,6 +14408,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13692,6 +14516,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13794,6 +14626,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13895,6 +14735,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -13996,6 +14844,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14098,6 +14954,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14199,6 +15063,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14300,6 +15172,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14402,6 +15282,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14503,6 +15391,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14604,6 +15500,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14705,6 +15609,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -14922,6 +15834,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15022,6 +15942,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15201,6 +16129,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15283,6 +16219,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15378,6 +16322,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15705,6 +16657,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -15960,6 +16920,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16078,6 +17046,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16179,6 +17155,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16281,6 +17265,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16364,6 +17356,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16527,6 +17527,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16709,6 +17717,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16808,6 +17824,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -16907,6 +17931,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17079,6 +18111,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17205,6 +18245,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17305,6 +18353,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17405,6 +18461,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17516,6 +18580,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17616,6 +18688,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17718,6 +18798,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17819,6 +18907,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -17920,6 +19016,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18022,6 +19126,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18123,6 +19235,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18224,6 +19344,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18326,6 +19454,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18427,6 +19563,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -18528,6 +19672,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -19150,6 +20302,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -19252,6 +20412,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -19354,6 +20522,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -19456,6 +20632,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -19570,6 +20754,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + @@ -19657,6 +20849,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa index cfa7a7592b..56de8a41fd 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa @@ -1,20 +1,18 @@ - + Metronome DXE_DRIVER 154CAB4A-52B5-46CD-99C3-4368ABBACFFD 1.0 NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS - - This metronome module simulates metronome by Sleep WinAPI. - + This metronome module simulates metronome by Sleep WinAPI. Copyright (c) 2006, Intel Corporation - All rights reserved. This program and the accompanying materials - 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 - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + All rights reserved. This program and the accompanying materials + 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 + http://opensource.org/licenses/bsd-license.php + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 @@ -30,18 +28,12 @@ DebugLib - - UefiLib - UefiDriverEntryPoint WinNtLib - - MemoryAllocationLib - UefiBootServicesTableLib diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd index 02583a35cf..82e6280901 100644 --- a/EdkNt32Pkg/Nt32.fpd +++ b/EdkNt32Pkg/Nt32.fpd @@ -1388,6 +1388,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1407,6 +1415,8 @@ + + @@ -1489,6 +1499,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1571,6 +1589,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1656,6 +1682,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1673,7 +1707,10 @@ - + + + + @@ -1740,6 +1777,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1825,6 +1870,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1909,6 +1962,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -1993,6 +2054,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2094,6 +2163,14 @@ 1 0 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2177,6 +2254,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2345,6 +2430,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2520,6 +2613,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2586,6 +2687,14 @@ 1 0x06 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2704,6 +2813,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2808,6 +2925,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2884,6 +3009,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -2966,6 +3099,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3067,6 +3208,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL @@ -3250,6 +3399,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3349,6 +3506,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3449,6 +3614,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3551,6 +3724,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3634,6 +3815,14 @@ 4 10000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3816,6 +4005,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3915,6 +4112,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -3998,6 +4203,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4081,6 +4294,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4264,6 +4485,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4396,6 +4625,14 @@ 1 TRUE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4568,6 +4805,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4748,6 +4993,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4848,6 +5101,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -4959,6 +5220,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5059,6 +5328,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5159,6 +5436,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_MAIN @@ -5261,6 +5546,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5362,6 +5655,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5463,6 +5764,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5565,6 +5874,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5666,6 +5983,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5767,6 +6092,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5869,6 +6202,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -5970,6 +6311,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6071,6 +6420,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6171,6 +6528,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6270,6 +6635,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6369,6 +6742,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6453,6 +6834,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6634,6 +7023,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6725,6 +7122,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6816,6 +7221,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6908,6 +7321,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -6999,6 +7420,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -7083,6 +7512,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -7154,7 +7591,7 @@ gEfiMdePkgTokenSpaceGuid UINT8 1 - 0x1f + 0x1F PcdDebugClearMemoryValue @@ -7172,6 +7609,14 @@ 4 0x80000000 + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 10 + FV_RECOVERY @@ -7253,6 +7698,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + FV_RECOVERY @@ -7344,6 +7797,14 @@ 1 FALSE + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + NULL diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h index ef10f136b4..9eaf48cace 100644 --- a/MdePkg/Include/Library/UefiLib.h +++ b/MdePkg/Include/Library/UefiLib.h @@ -616,4 +616,96 @@ EfiGetNameGuidFromFwVolDevicePathNode ( IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvDevicePathNode ); +/** + Prints a formatted Unicode string to the console output device specified by + ConOut defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted Unicode string to the console output device + specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode + characters that printed to ConOut. If the length of the formatted Unicode + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to ConOut. + + @param Format Null-terminated Unicode format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +Print ( + IN CONST CHAR16 *Format, + ... + ); + +/** + Prints a formatted Unicode string to the console output device specified by + StdErr defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted Unicode string to the console output device + specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode + characters that printed to StdErr. If the length of the formatted Unicode + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to StdErr. + + @param Format Null-terminated Unicode format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +ErrorPrint ( + IN CONST CHAR16 *Format, + ... + ); + +/** + Prints a formatted ASCII string to the console output device specified by + ConOut defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted ASCII string to the console output device + specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII + characters that printed to ConOut. If the length of the formatted ASCII + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to ConOut. + + @param Format Null-terminated ASCII format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +AsciiPrint ( + IN CONST CHAR8 *Format, + ... + ); + +/** + Prints a formatted ASCII string to the console output device specified by + StdErr defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted ASCII string to the console output device + specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII + characters that printed to StdErr. If the length of the formatted ASCII + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to StdErr. + + @param Format Null-terminated ASCII format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +AsciiErrorPrint ( + IN CONST CHAR8 *Format, + ... + ); + #endif diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/MdePkg/Library/UefiLib/UefiLib.msa index e2599e596f..19b5703a3f 100644 --- a/MdePkg/Library/UefiLib/UefiLib.msa +++ b/MdePkg/Library/UefiLib/UefiLib.msa @@ -43,11 +43,18 @@ MemoryAllocationLib + + PcdLib + + + PrintLib + UefiLib.c Console.c UefiNotTiano.c + UefiLibPrint.c @@ -67,4 +74,11 @@ EFI_SPECIFICATION_VERSION 0x00020000 EDK_RELEASE_VERSION 0x00020000 + + + PcdUefiLibMaxPrintBufferSize + gEfiMdePkgTokenSpaceGuid + This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console. + + \ No newline at end of file diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c new file mode 100644 index 0000000000..493034e85f --- /dev/null +++ b/MdePkg/Library/UefiLib/UefiLibPrint.c @@ -0,0 +1,259 @@ +/** @file + Mde UEFI library API implemention. + Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE + + Copyright (c) 2007, Intel Corporation
+ All rights reserved. This program and the accompanying materials + 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 + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +/** + Internal function which prints a formatted Unicode string to the console output device + specified by Console + + This function prints a formatted Unicode string to the console output device + specified by Console and returns the number of Unicode characters that printed + to it. If the length of the formatted Unicode string is greater than PcdUefiLibMaxPrintBufferSize, + then only the first PcdUefiLibMaxPrintBufferSize characters are sent to Console. + + @param Format Null-terminated Unicode format string. + @param Console The output console. + @param Marker VA_LIST marker for the variable argument list. + + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ + +STATIC +UINTN +InternalPrint ( + IN CONST CHAR16 *Format, + IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *Console, + IN VA_LIST Marker + ) +{ + UINTN Return; + CHAR16 *Buffer; + UINTN BufferSize; + + ASSERT (Format != NULL); + ASSERT (((UINTN) Format & 0x01) == 0); + + BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16); + + Buffer = (CHAR16 *) AllocatePool(BufferSize); + ASSERT (Buffer != NULL); + + Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker); + + if (Console != NULL) { + // + // To be extra safe make sure ConOut has been initialized + // + Console->OutputString (Console, Buffer); + } + + FreePool (Buffer); + + return Return; +} + +/** + Prints a formatted Unicode string to the console output device specified by + ConOut defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted Unicode string to the console output device + specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode + characters that printed to ConOut. If the length of the formatted Unicode + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to ConOut. + + @param Format Null-terminated Unicode format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +Print ( + IN CONST CHAR16 *Format, + ... + ) +{ + VA_LIST Marker; + UINTN Return; + + VA_START (Marker, Format); + + Return = InternalPrint (Format, gST->ConOut, Marker); + + VA_END (Marker); + + return Return; +} + +/** + Prints a formatted Unicode string to the console output device specified by + StdErr defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted Unicode string to the console output device + specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode + characters that printed to StdErr. If the length of the formatted Unicode + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to StdErr. + + @param Format Null-terminated Unicode format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ + +UINTN +EFIAPI +ErrorPrint ( + IN CONST CHAR16 *Format, + ... + ) +{ + VA_LIST Marker; + UINTN Return; + + VA_START (Marker, Format); + + Return = InternalPrint( Format, gST->StdErr, Marker); + + VA_END (Marker); + + return Return; +} + + +/** + Internal function which prints a formatted ASCII string to the console output device + specified by Console + + This function prints a formatted ASCII string to the console output device + specified by Console and returns the number of ASCII characters that printed + to it. If the length of the formatted ASCII string is greater than PcdUefiLibMaxPrintBufferSize, + then only the first PcdUefiLibMaxPrintBufferSize characters are sent to Console. + + @param Format Null-terminated ASCII format string. + @param Console The output console. + @param Marker VA_LIST marker for the variable argument list. + + If Format is NULL, then ASSERT(). + +**/ + +STATIC +UINTN +AsciiInternalPrint ( + IN CONST CHAR8 *Format, + IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *Console, + IN VA_LIST Marker + ) +{ + UINTN Return; + CHAR16 *Buffer; + UINTN BufferSize; + + ASSERT (Format != NULL); + + BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16); + + Buffer = (CHAR16 *) AllocatePool(BufferSize); + ASSERT (Buffer != NULL); + + Return = UnicodeVSPrintAsciiFormat (Buffer, BufferSize, Format, Marker); + + if (Console != NULL) { + // + // To be extra safe make sure ConOut has been initialized + // + Console->OutputString (Console, Buffer); + } + + FreePool (Buffer); + + return Return; +} + +/** + Prints a formatted ASCII string to the console output device specified by + ConOut defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted ASCII string to the console output device + specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII + characters that printed to ConOut. If the length of the formatted ASCII + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to ConOut. + + @param Format Null-terminated ASCII format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +AsciiPrint ( + IN CONST CHAR8 *Format, + ... + ) +{ + VA_LIST Marker; + UINTN Return; + + VA_START (Marker, Format); + + Return = AsciiInternalPrint( Format, gST->ConOut, Marker); + + VA_END (Marker); + + return Return; +} + +/** + Prints a formatted ASCII string to the console output device specified by + StdErr defined in the EFI_SYSTEM_TABLE. + + This function prints a formatted ASCII string to the console output device + specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII + characters that printed to StdErr. If the length of the formatted ASCII + string is greater than PcdUefiLibMaxPrintBufferSize, then only the first + PcdUefiLibMaxPrintBufferSize characters are sent to StdErr. + + @param Format Null-terminated ASCII format string. + @param ... VARARG list consumed to process Format. + If Format is NULL, then ASSERT(). + If Format is not aligned on a 16-bit boundary, then ASSERT(). + +**/ +UINTN +EFIAPI +AsciiErrorPrint ( + IN CONST CHAR8 *Format, + ... + ) +{ + VA_LIST Marker; + UINTN Return; + + VA_START (Marker, Format); + + Return = AsciiInternalPrint( Format, gST->StdErr, Marker); + + VA_END (Marker); + + return Return; +} + diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd index 0d39529245..4a40a95526 100644 --- a/MdePkg/MdePkg.fpd +++ b/MdePkg/MdePkg.fpd @@ -478,6 +478,16 @@ + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + + NULL LIBRARY @@ -1020,6 +1030,16 @@ + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + + NULL LIBRARY @@ -1598,6 +1618,16 @@ + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + + NULL LIBRARY @@ -2124,6 +2154,16 @@ + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + + NULL LIBRARY diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index a70622b1b4..331ae70603 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -1,4 +1,4 @@ - + MdePkg @@ -2366,5 +2366,14 @@ FALSE If this value is set TRUE, autogen will replace Driver Diagnostics Protocol instance with NULL. + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + FIXED_AT_BUILD + 320 + This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console. + \ No newline at end of file