1 Index: EfiCompress/Compress.h
2 ===================================================================
3 --- EfiCompress/Compress.h (revision 64)
4 +++ EfiCompress/Compress.h (working copy)
10 \ No newline at end of file
12 Index: EfiCompress/CompressMain.c
13 ===================================================================
14 --- EfiCompress/CompressMain.c (revision 64)
15 +++ EfiCompress/CompressMain.c (working copy)
21 + (SHELL_VAR_CHECK_FLAG_TYPE)0
25 Index: EfiCompress/compress.inf
26 ===================================================================
27 --- EfiCompress/compress.inf (revision 64)
28 +++ EfiCompress/compress.inf (working copy)
30 COMPONENT_TYPE = APPLICATION
33 -..\ShCommonStrings.uni
34 +../ShCommonStrings.uni
44 - $(EDK_SOURCE)\Foundation
45 - $(EDK_SOURCE)\Foundation\Include
46 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
47 - $(EDK_SOURCE)\Foundation\Efi
48 - $(EDK_SOURCE)\Foundation\Efi\Include
49 - $(EDK_SOURCE)\Foundation\FrameWork
50 - $(EDK_SOURCE)\Foundation\FrameWork\Include
51 - $(EDK_SOURCE)\Foundation\Core\Dxe
55 + $(EDK_SOURCE)/Foundation
56 + $(EDK_SOURCE)/Foundation/Include
57 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
58 + $(EDK_SOURCE)/Foundation/Efi
59 + $(EDK_SOURCE)/Foundation/Efi/Include
60 + $(EDK_SOURCE)/Foundation/FrameWork
61 + $(EDK_SOURCE)/Foundation/FrameWork/Include
62 + $(EDK_SOURCE)/Foundation/Core/Dxe
68 # we will specify some additional DEFINEs on the compile command line.
71 + IMAGE_ENTRY_POINT=InitializeCompress
73 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
74 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
75 - IMAGE_ENTRY_POINT=InitializeCompress
76 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
77 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
78 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
82 \ No newline at end of file
83 +[nmake.ARM, nmake.AARCH64]
84 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
85 Index: EfiCompress/compress.c
86 ===================================================================
87 --- EfiCompress/compress.c (revision 64)
88 +++ EfiCompress/compress.c (working copy)
90 STATIC UINT32 mCompSize, mOrigSize;
92 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
93 - mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
94 + mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
95 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
97 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
99 ===================================================================
100 --- load/load.c (revision 64)
101 +++ load/load.c (working copy)
107 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
112 ===================================================================
113 --- load/load.h (revision 64)
114 +++ load/load.h (working copy)
121 ===================================================================
122 --- load/load.inf (revision 64)
123 +++ load/load.inf (working copy)
125 COMPONENT_TYPE = APPLICATION
128 - ..\ShCommonStrings.uni
129 + ../ShCommonStrings.uni
137 - $(EDK_SOURCE)\Foundation
138 - $(EDK_SOURCE)\Foundation\Include
139 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
140 - $(EDK_SOURCE)\Foundation\Efi
141 - $(EDK_SOURCE)\Foundation\Efi\Include
142 - $(EDK_SOURCE)\Foundation\FrameWork
143 - $(EDK_SOURCE)\Foundation\FrameWork\Include
144 - $(EDK_SOURCE)\Foundation\Core\Dxe
148 + $(EDK_SOURCE)/Foundation
149 + $(EDK_SOURCE)/Foundation/Include
150 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
151 + $(EDK_SOURCE)/Foundation/Efi
152 + $(EDK_SOURCE)/Foundation/Efi/Include
153 + $(EDK_SOURCE)/Foundation/FrameWork
154 + $(EDK_SOURCE)/Foundation/FrameWork/Include
155 + $(EDK_SOURCE)/Foundation/Core/Dxe
163 IMAGE_ENTRY_POINT=InitializeLoad
165 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
166 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
167 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
168 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
170 +[nmake.ARM, nmake.AARCH64]
171 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
172 Index: drvdiag/drvdiag.c
173 ===================================================================
174 --- drvdiag/drvdiag.c (revision 64)
175 +++ drvdiag/drvdiag.c (working copy)
180 -EFI_HII_HANDLE HiiHandle;
181 +STATIC EFI_HII_HANDLE HiiHandle;
182 EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID;
183 SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = {
190 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
194 Index: drvdiag/drvdiag.h
195 ===================================================================
196 --- drvdiag/drvdiag.h (revision 64)
197 +++ drvdiag/drvdiag.h (working copy)
203 Index: drvdiag/drvdiag.inf
204 ===================================================================
205 --- drvdiag/drvdiag.inf (revision 64)
206 +++ drvdiag/drvdiag.inf (working copy)
211 - ..\ShCommonStrings.uni
212 + ../ShCommonStrings.uni
222 - $(EDK_SOURCE)\Foundation
223 - $(EDK_SOURCE)\Foundation\Include
224 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
225 - $(EDK_SOURCE)\Foundation\Efi
226 - $(EDK_SOURCE)\Foundation\Efi\Include
227 - $(EDK_SOURCE)\Foundation\FrameWork
228 - $(EDK_SOURCE)\Foundation\FrameWork\Include
229 - $(EDK_SOURCE)\Foundation\Core\Dxe
233 + $(EDK_SOURCE)/Foundation
234 + $(EDK_SOURCE)/Foundation/Include
235 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
236 + $(EDK_SOURCE)/Foundation/Efi
237 + $(EDK_SOURCE)/Foundation/Efi/Include
238 + $(EDK_SOURCE)/Foundation/FrameWork
239 + $(EDK_SOURCE)/Foundation/FrameWork/Include
240 + $(EDK_SOURCE)/Foundation/Core/Dxe
248 IMAGE_ENTRY_POINT=DrvdiagMain
250 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
251 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
252 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
253 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
255 +[nmake.ARM, nmake.AARCH64]
256 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
258 ===================================================================
259 --- cls/cls.c (revision 64)
260 +++ cls/cls.c (working copy)
263 #include STRING_DEFINES_FILE
265 -EFI_HII_HANDLE HiiHandle;
266 +STATIC EFI_HII_HANDLE HiiHandle;
267 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
268 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
275 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
280 ===================================================================
281 --- cls/cls.h (revision 64)
282 +++ cls/cls.h (working copy)
289 ===================================================================
290 --- cls/cls.inf (revision 64)
291 +++ cls/cls.inf (working copy)
296 - ..\ShCommonStrings.uni
297 + ../ShCommonStrings.uni
306 - $(EDK_SOURCE)\Foundation
307 - $(EDK_SOURCE)\Foundation\Include
308 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
309 - $(EDK_SOURCE)\Foundation\Efi
310 - $(EDK_SOURCE)\Foundation\Efi\Include
311 - $(EDK_SOURCE)\Foundation\FrameWork
312 - $(EDK_SOURCE)\Foundation\FrameWork\Include
313 - $(EDK_SOURCE)\Foundation\Core\Dxe
317 + $(EDK_SOURCE)/Foundation
318 + $(EDK_SOURCE)/Foundation/Include
319 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
320 + $(EDK_SOURCE)/Foundation/Efi
321 + $(EDK_SOURCE)/Foundation/Efi/Include
322 + $(EDK_SOURCE)/Foundation/FrameWork
323 + $(EDK_SOURCE)/Foundation/FrameWork/Include
324 + $(EDK_SOURCE)/Foundation/Core/Dxe
332 IMAGE_ENTRY_POINT=InitializeCls
334 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
335 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
336 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
337 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
339 +[nmake.ARM, nmake.AARCH64]
340 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
342 Index: newshell/nshell.inf
343 ===================================================================
344 --- newshell/nshell.inf (revision 64)
345 +++ newshell/nshell.inf (working copy)
350 - ..\ShCommonStrings.uni
351 + ../ShCommonStrings.uni
360 - $(EDK_SOURCE)\Foundation
361 - $(EDK_SOURCE)\Foundation\Include
362 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
363 - $(EDK_SOURCE)\Foundation\Efi
364 - $(EDK_SOURCE)\Foundation\Efi\Include
365 - $(EDK_SOURCE)\Foundation\FrameWork
366 - $(EDK_SOURCE)\Foundation\FrameWork\Include
367 - $(EDK_SOURCE)\Foundation\Core\Dxe
371 + $(EDK_SOURCE)/Foundation
372 + $(EDK_SOURCE)/Foundation/Include
373 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
374 + $(EDK_SOURCE)/Foundation/Efi
375 + $(EDK_SOURCE)/Foundation/Efi/Include
376 + $(EDK_SOURCE)/Foundation/FrameWork
377 + $(EDK_SOURCE)/Foundation/FrameWork/Include
378 + $(EDK_SOURCE)/Foundation/Core/Dxe
384 # we will specify some additional DEFINEs on the compile command line.
387 + IMAGE_ENTRY_POINT=InitializeShell
389 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
390 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
391 - IMAGE_ENTRY_POINT=InitializeShell
392 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
393 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
394 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL=2
395 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
399 \ No newline at end of file
400 +[nmake.ARM, nmake.AARCH64]
401 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
402 Index: newshell/FakeHii.c
403 ===================================================================
404 --- newshell/FakeHii.c (revision 64)
405 +++ newshell/FakeHii.c (working copy)
407 Status = BS->HandleProtocol (
409 &gEfiHiiProtocolGuid,
413 Status = BS->UninstallProtocolInterface (
416 if (Language == NULL) {
417 return EFI_OUT_OF_RESOURCES;
419 - strcpya (Language, (UINT8 *) PackageHdr + HeaderSize - LanguageSize);
420 + strcpya (Language, (CHAR8*) ((UINT8 *) PackageHdr + HeaderSize - LanguageSize));
421 for (Link = PackageList->StringPkgHdr.Flink; Link != &PackageList->StringPkgHdr; Link = Link->Flink) {
422 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
423 if (CompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
425 StringPackage = NULL;
426 for (Link = DatabaseRecord->StringPkgHdr.Flink; Link != &DatabaseRecord->StringPkgHdr; Link = Link->Flink) {
427 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
428 - if (CompareLanguage (StringPackage->StringPkgHdr->Language, (UINT8 *) Language)) {
429 + if (CompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) Language)) {
433 Index: newshell/init.c
434 ===================================================================
435 --- newshell/init.c (revision 64)
436 +++ newshell/init.c (working copy)
440 extern UINT8 STRING_ARRAY_NAME[];
441 -extern BOOLEAN gHiiInitialized = FALSE;
442 +BOOLEAN gHiiInitialized = FALSE;
445 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
447 Status = BS->HandleProtocol (
449 &gEfiLoadedImageProtocolGuid,
453 if (!EFI_ERROR (Status)) {
454 Status = BS->HandleProtocol (
456 &gEfiDevicePathProtocolGuid,
460 if (!EFI_ERROR (Status)) {
461 *DevPath = DuplicateDevicePath (dp);
464 Status = LibLocateProtocol (
465 &gEfiConsoleControlProtocolGuid,
467 + (VOID**)&ConsoleControl
469 if (!EFI_ERROR (Status)) {
470 Status = ConsoleControl->GetMode (ConsoleControl, &mOldCurrentMode, NULL, NULL);
472 Status = _ShellLoadEnvDriver (ImageHandle);
474 if (EFI_ERROR (Status)) {
475 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
476 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
477 if (EFI_ERROR (Status)) {
478 PrintToken (STRING_TOKEN (STR_NSHELL_ENV_DRIVER), HiiNewshellHandle);
481 *IsRootInstance = TRUE;
484 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
485 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
486 ASSERT (!EFI_ERROR (Status));
487 SI = SE->NewShell (ImageHandle);
491 ConsoleControlStatus = LibLocateProtocol (
492 &gEfiConsoleControlProtocolGuid,
494 + (VOID**)&ConsoleControl
496 if (!EFI_ERROR (ConsoleControlStatus)) {
497 ConsoleControlStatus = ConsoleControl->GetMode (ConsoleControl, &CurrentMode, NULL, NULL);
500 SE2->IncrementShellNestingLevel ();
502 - while (Status != -1) {
503 + while (Status != (EFI_STATUS) -1) {
504 Status = NShellPrompt (ImageHandle);
505 EFI_NT_EMULATOR_CODE (
508 Status = BS->HandleProtocol (
510 &ShellInterfaceProtocol,
514 ASSERT (!EFI_ERROR (Status));
516 Index: newshell/FakeHii.h
517 ===================================================================
518 --- newshell/FakeHii.h (revision 64)
519 +++ newshell/FakeHii.h (working copy)
525 Index: newshell/nshell.h
526 ===================================================================
527 --- newshell/nshell.h (revision 64)
528 +++ newshell/nshell.h (working copy)
530 #define EFI_NO_MONOSHELL_CODE(code) code
534 \ No newline at end of file
538 ===================================================================
539 --- type/type.c (revision 64)
540 +++ type/type.c (working copy)
545 -EFI_HII_HANDLE HiiHandle;
546 +STATIC EFI_HII_HANDLE HiiHandle;
547 EFI_GUID EfiTypeGuid = EFI_TYPE_GUID;
548 SHELL_VAR_CHECK_ITEM TypeCheckList[] = {
555 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
560 ===================================================================
561 --- type/type.h (revision 64)
562 +++ type/type.h (working copy)
569 ===================================================================
570 --- type/type.inf (revision 64)
571 +++ type/type.inf (working copy)
576 - ..\ShCommonStrings.uni
577 + ../ShCommonStrings.uni
586 - $(EDK_SOURCE)\Foundation
587 - $(EDK_SOURCE)\Foundation\Include
588 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
589 - $(EDK_SOURCE)\Foundation\Efi
590 - $(EDK_SOURCE)\Foundation\Efi\Include
591 - $(EDK_SOURCE)\Foundation\FrameWork
592 - $(EDK_SOURCE)\Foundation\FrameWork\Include
593 - $(EDK_SOURCE)\Foundation\Core\Dxe
597 + $(EDK_SOURCE)/Foundation
598 + $(EDK_SOURCE)/Foundation/Include
599 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
600 + $(EDK_SOURCE)/Foundation/Efi
601 + $(EDK_SOURCE)/Foundation/Efi/Include
602 + $(EDK_SOURCE)/Foundation/FrameWork
603 + $(EDK_SOURCE)/Foundation/FrameWork/Include
604 + $(EDK_SOURCE)/Foundation/Core/Dxe
612 IMAGE_ENTRY_POINT=InitializeType
614 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
615 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
616 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
617 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
619 +[nmake.ARM, nmake.AARCH64]
620 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
621 Index: dmem/MemCommonPart.c
622 ===================================================================
623 --- dmem/MemCommonPart.c (revision 64)
624 +++ dmem/MemCommonPart.c (working copy)
630 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
638 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
639 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
640 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
645 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
647 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
648 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
649 if (EFI_ERROR (Status)) {
650 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
656 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
657 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
659 Buffer = (UINT8 *) (UINTN) Address;
664 AddressStr = SizeStr = NULL;
665 - Address = (UINT64) SystemTable;
666 + Address = (UINT64)(UINTN) SystemTable;
668 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
669 if (VarCheckOk != RetCode) {
672 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
674 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
675 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
676 if (EFI_ERROR (Status)) {
677 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
683 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
684 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
686 Buffer = (UINT8 *) (UINTN) Address;
688 Index: dmem/MemCommonPart.h
689 ===================================================================
690 --- dmem/MemCommonPart.h (revision 64)
691 +++ dmem/MemCommonPart.h (working copy)
693 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
697 \ No newline at end of file
699 Index: dmem/efidump.c
700 ===================================================================
701 --- dmem/efidump.c (revision 64)
702 +++ dmem/efidump.c (working copy)
707 -#include "Efipart.h"
708 +#include "EfiPart.h"
709 #include "EfiShellLib.h"
711 #include STRING_DEFINES_FILE
712 @@ -320,13 +320,11 @@
716 - VOID *SalSystemTable;
722 - SalSystemTable = NULL;
726 @@ -352,11 +350,13 @@
727 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
730 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
731 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
732 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
733 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
736 - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
737 + VOID *SalSystemTable;
739 + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
740 if (!EFI_ERROR(Status)) {
741 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable);
743 @@ -364,22 +364,22 @@
745 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
746 if (!EFI_ERROR (Status)) {
747 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
748 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable);
751 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
752 if (!EFI_ERROR (Status)) {
753 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
754 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table);
757 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
758 if (!EFI_ERROR (Status)) {
759 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
760 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable);
763 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
764 if (!EFI_ERROR (Status)) {
765 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
766 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable);
771 ===================================================================
772 --- dmem/debug.h (revision 64)
773 +++ dmem/debug.h (working copy)
775 extern EFI_HII_HANDLE HiiDmemHandle;
780 ===================================================================
781 --- dmem/dmem.inf (revision 64)
782 +++ dmem/dmem.inf (working copy)
784 COMPONENT_TYPE = APPLICATION
787 - ..\ShCommonStrings.uni
788 + ../ShCommonStrings.uni
798 - $(EDK_SOURCE)\Foundation
799 - $(EDK_SOURCE)\Foundation\Include
800 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
801 - $(EDK_SOURCE)\Foundation\Efi
802 - $(EDK_SOURCE)\Foundation\Efi\Include
803 - $(EDK_SOURCE)\Foundation\FrameWork
804 - $(EDK_SOURCE)\Foundation\FrameWork\Include
805 - $(EDK_SOURCE)\Foundation\Core\Dxe
809 + $(EDK_SOURCE)/Foundation
810 + $(EDK_SOURCE)/Foundation/Include
811 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
812 + $(EDK_SOURCE)/Foundation/Efi
813 + $(EDK_SOURCE)/Foundation/Efi/Include
814 + $(EDK_SOURCE)/Foundation/FrameWork
815 + $(EDK_SOURCE)/Foundation/FrameWork/Include
816 + $(EDK_SOURCE)/Foundation/Core/Dxe
822 # we will specify some additional DEFINEs on the compile command line.
825 + IMAGE_ENTRY_POINT=DumpMem
827 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
828 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
829 - IMAGE_ENTRY_POINT=DumpMem
830 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
831 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
832 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
834 +[nmake.ARM, nmake.AARCH64]
835 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
836 Index: devices/devices.c
837 ===================================================================
838 --- devices/devices.c (revision 64)
839 +++ devices/devices.c (working copy)
844 -EFI_HII_HANDLE HiiHandle;
845 +STATIC EFI_HII_HANDLE HiiHandle;
846 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
847 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
854 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
858 Index: devices/devices.h
859 ===================================================================
860 --- devices/devices.h (revision 64)
861 +++ devices/devices.h (working copy)
863 0x6fabed98, 0x2a7, 0x46a4, 0x84, 0xd1, 0x76, 0xcd, 0x5c, 0x49, 0x78, 0x74 \
867 Index: devices/devices.inf
868 ===================================================================
869 --- devices/devices.inf (revision 64)
870 +++ devices/devices.inf (working copy)
875 - ..\ShCommonStrings.uni
876 + ../ShCommonStrings.uni
884 - $(EDK_SOURCE)\Foundation
885 - $(EDK_SOURCE)\Foundation\Include
886 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
887 - $(EDK_SOURCE)\Foundation\Efi
888 - $(EDK_SOURCE)\Foundation\Efi\Include
889 - $(EDK_SOURCE)\Foundation\FrameWork
890 - $(EDK_SOURCE)\Foundation\FrameWork\Include
891 - $(EDK_SOURCE)\Foundation\Core\Dxe
895 + $(EDK_SOURCE)/Foundation
896 + $(EDK_SOURCE)/Foundation/Include
897 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
898 + $(EDK_SOURCE)/Foundation/Efi
899 + $(EDK_SOURCE)/Foundation/Efi/Include
900 + $(EDK_SOURCE)/Foundation/FrameWork
901 + $(EDK_SOURCE)/Foundation/FrameWork/Include
902 + $(EDK_SOURCE)/Foundation/Core/Dxe
910 IMAGE_ENTRY_POINT=DevicesMain
912 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
913 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
914 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
915 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
917 +[nmake.ARM, nmake.AARCH64]
918 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
920 ===================================================================
921 --- mv/mv.c (revision 64)
922 +++ mv/mv.c (working copy)
927 -EFI_HII_HANDLE HiiHandle;
928 +STATIC EFI_HII_HANDLE HiiHandle;
929 EFI_GUID EfiMvGuid = EFI_MV_GUID;
930 SHELL_VAR_CHECK_ITEM MvCheckList[] = {
937 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
942 ===================================================================
943 --- mv/mv.h (revision 64)
944 +++ mv/mv.h (working copy)
947 #define EFI_FILE_STRING_SIZE 260
950 \ No newline at end of file
953 ===================================================================
954 --- mv/mv.inf (revision 64)
955 +++ mv/mv.inf (working copy)
960 - ..\ShCommonStrings.uni
961 + ../ShCommonStrings.uni
970 - $(EDK_SOURCE)\Foundation
971 - $(EDK_SOURCE)\Foundation\Include
972 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
973 - $(EDK_SOURCE)\Foundation\Efi
974 - $(EDK_SOURCE)\Foundation\Efi\Include
975 - $(EDK_SOURCE)\Foundation\FrameWork
976 - $(EDK_SOURCE)\Foundation\FrameWork\Include
977 - $(EDK_SOURCE)\Foundation\Core\Dxe
981 + $(EDK_SOURCE)/Foundation
982 + $(EDK_SOURCE)/Foundation/Include
983 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
984 + $(EDK_SOURCE)/Foundation/Efi
985 + $(EDK_SOURCE)/Foundation/Efi/Include
986 + $(EDK_SOURCE)/Foundation/FrameWork
987 + $(EDK_SOURCE)/Foundation/FrameWork/Include
988 + $(EDK_SOURCE)/Foundation/Core/Dxe
996 IMAGE_ENTRY_POINT=InitializeMv
998 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
999 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1000 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1001 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1003 +[nmake.ARM, nmake.AARCH64]
1004 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1005 Index: unload/unload.c
1006 ===================================================================
1007 --- unload/unload.c (revision 64)
1008 +++ unload/unload.c (working copy)
1014 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1019 *DriverName = LibDevicePathToStr (Image->FilePath);
1022 - LibGetDriverName(DriverBindingHandle, Language, DriverName);
1023 + LibGetDriverName(DriverBindingHandle, (CHAR8*)Language, DriverName);
1030 BestDeviceName = NULL;
1031 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
1032 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
1035 PrintToken (STRING_TOKEN (STR_UNLOAD_CONTROLLER_NAME), HiiUnloadHandle);
1036 @@ -242,14 +242,14 @@
1038 Status = _UnloadGetDriverName (
1039 DriverBindingHandleBuffer[Index],
1045 if (DriverName == NULL) {
1046 Status = _UnloadGetDriverName (
1047 DriverBindingHandleBuffer[Index],
1055 Status = _UnloadGetDriverName (
1064 Status = _UnloadGetDriverName (
1073 if (Prot->Handles[Index] == Handle) {
1074 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
1075 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
1076 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
1077 if (!EFI_ERROR (Status)) {
1079 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
1084 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
1085 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
1086 if (!EFI_ERROR (Status)) {
1087 PrintToken (STRING_TOKEN (STR_UNLOAD_TWO_VARS_HG_NEW), HiiUnloadHandle, ProtocolBuffer[Index1], Interface);
1089 Index: unload/unload.h
1090 ===================================================================
1091 --- unload/unload.h (revision 64)
1092 +++ unload/unload.h (working copy)
1098 Index: unload/unload.inf
1099 ===================================================================
1100 --- unload/unload.inf (revision 64)
1101 +++ unload/unload.inf (working copy)
1103 COMPONENT_TYPE = APPLICATION
1106 - ..\ShCommonStrings.uni
1107 + ../ShCommonStrings.uni
1115 - $(EDK_SOURCE)\Foundation
1116 - $(EDK_SOURCE)\Foundation\Include
1117 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1118 - $(EDK_SOURCE)\Foundation\Efi
1119 - $(EDK_SOURCE)\Foundation\Efi\Include
1120 - $(EDK_SOURCE)\Foundation\FrameWork
1121 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1122 - $(EDK_SOURCE)\Foundation\Core\Dxe
1126 + $(EDK_SOURCE)/Foundation
1127 + $(EDK_SOURCE)/Foundation/Include
1128 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1129 + $(EDK_SOURCE)/Foundation/Efi
1130 + $(EDK_SOURCE)/Foundation/Efi/Include
1131 + $(EDK_SOURCE)/Foundation/FrameWork
1132 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1133 + $(EDK_SOURCE)/Foundation/Core/Dxe
1141 IMAGE_ENTRY_POINT=InitializeUnload
1143 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1144 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1145 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1146 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1148 +[nmake.ARM, nmake.AARCH64]
1149 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1150 Index: mode/mode.inf
1151 ===================================================================
1152 --- mode/mode.inf (revision 64)
1153 +++ mode/mode.inf (working copy)
1158 - ..\ShCommonStrings.uni
1159 + ../ShCommonStrings.uni
1168 - $(EDK_SOURCE)\Foundation
1169 - $(EDK_SOURCE)\Foundation\Include
1170 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1171 - $(EDK_SOURCE)\Foundation\Efi
1172 - $(EDK_SOURCE)\Foundation\Efi\Include
1173 - $(EDK_SOURCE)\Foundation\FrameWork
1174 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1175 - $(EDK_SOURCE)\Foundation\Core\Dxe
1179 + $(EDK_SOURCE)/Foundation
1180 + $(EDK_SOURCE)/Foundation/Include
1181 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1182 + $(EDK_SOURCE)/Foundation/Efi
1183 + $(EDK_SOURCE)/Foundation/Efi/Include
1184 + $(EDK_SOURCE)/Foundation/FrameWork
1185 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1186 + $(EDK_SOURCE)/Foundation/Core/Dxe
1194 IMAGE_ENTRY_POINT=InitializeMode
1196 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1197 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1198 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1199 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1201 +[nmake.ARM, nmake.AARCH64]
1202 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1204 ===================================================================
1205 --- mode/mode.c (revision 64)
1206 +++ mode/mode.c (working copy)
1212 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1217 ===================================================================
1218 --- mode/mode.h (revision 64)
1219 +++ mode/mode.h (working copy)
1225 Index: attrib/attrib.inf
1226 ===================================================================
1227 --- attrib/attrib.inf (revision 64)
1228 +++ attrib/attrib.inf (working copy)
1233 - ..\ShCommonStrings.uni
1234 + ../ShCommonStrings.uni
1243 - $(EDK_SOURCE)\Foundation
1244 - $(EDK_SOURCE)\Foundation\Include
1245 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1246 - $(EDK_SOURCE)\Foundation\Efi
1247 - $(EDK_SOURCE)\Foundation\Efi\Include
1248 - $(EDK_SOURCE)\Foundation\FrameWork
1249 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1250 - $(EDK_SOURCE)\Foundation\Core\Dxe
1254 + $(EDK_SOURCE)/Foundation
1255 + $(EDK_SOURCE)/Foundation/Include
1256 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1257 + $(EDK_SOURCE)/Foundation/Efi
1258 + $(EDK_SOURCE)/Foundation/Efi/Include
1259 + $(EDK_SOURCE)/Foundation/FrameWork
1260 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1261 + $(EDK_SOURCE)/Foundation/Core/Dxe
1269 IMAGE_ENTRY_POINT=InitializeAttrib
1271 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1272 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1273 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1274 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1276 +[nmake.ARM, nmake.AARCH64]
1277 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1278 Index: attrib/attrib.c
1279 ===================================================================
1280 --- attrib/attrib.c (revision 64)
1281 +++ attrib/attrib.c (working copy)
1286 -EFI_HII_HANDLE HiiHandle;
1287 +STATIC EFI_HII_HANDLE HiiHandle;
1288 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
1289 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
1296 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1303 if (Add || Remove) {
1304 - Info->Attribute = Info->Attribute & (~Remove) | Add;
1305 + Info->Attribute = (Info->Attribute & (~Remove)) | Add;
1306 Status = Arg->Handle->SetInfo (
1309 Index: attrib/attrib.h
1310 ===================================================================
1311 --- attrib/attrib.h (revision 64)
1312 +++ attrib/attrib.h (working copy)
1314 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \
1318 \ No newline at end of file
1322 ===================================================================
1323 --- err/err.inf (revision 64)
1324 +++ err/err.inf (working copy)
1326 COMPONENT_TYPE = APPLICATION
1329 -..\ShCommonStrings.uni
1330 +../ShCommonStrings.uni
1340 - $(EDK_SOURCE)\Foundation
1341 - $(EDK_SOURCE)\Foundation\Include
1342 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1343 - $(EDK_SOURCE)\Foundation\Efi
1344 - $(EDK_SOURCE)\Foundation\Efi\Include
1345 - $(EDK_SOURCE)\Foundation\FrameWork
1346 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1347 - $(EDK_SOURCE)\Foundation\Core\Dxe
1351 + $(EDK_SOURCE)/Foundation
1352 + $(EDK_SOURCE)/Foundation/Include
1353 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1354 + $(EDK_SOURCE)/Foundation/Efi
1355 + $(EDK_SOURCE)/Foundation/Efi/Include
1356 + $(EDK_SOURCE)/Foundation/FrameWork
1357 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1358 + $(EDK_SOURCE)/Foundation/Core/Dxe
1364 # we will specify some additional DEFINEs on the compile command line.
1367 + IMAGE_ENTRY_POINT=InitializeError
1369 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1370 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
1371 - IMAGE_ENTRY_POINT=InitializeError
1372 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1373 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1374 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1377 +[nmake.ARM, nmake.AARCH64]
1378 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1380 \ No newline at end of file
1381 Index: err/DebugMask.h
1382 ===================================================================
1383 --- err/DebugMask.h (revision 64)
1384 +++ err/DebugMask.h (working copy)
1386 extern EFI_GUID gEfiDebugMaskProtocolGuid;
1391 ===================================================================
1392 --- err/err.c (revision 64)
1393 +++ err/err.c (working copy)
1398 -EFI_HII_HANDLE HiiHandle;
1399 +STATIC EFI_HII_HANDLE HiiHandle;
1400 EFI_GUID EfiErrGuid = EFI_ERR_GUID;
1401 SHELL_VAR_CHECK_ITEM ErrCheckList[] = {
1408 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1413 EFI_DEBUG_MASK_PROTOCOL *dmp;
1416 - Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp);
1417 + Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1418 if (!EFI_ERROR (Status)) {
1419 Status = dmp->GetDebugMask (dmp, &Mask);
1420 if (!EFI_ERROR (Status)) {
1421 @@ -170,13 +170,11 @@
1430 Status = EFI_SUCCESS;
1433 if (NULL != Handle) {
1434 DrvHandle = (UINTN) StrToUIntegerBase (Handle, 16, &Status) - 1;
1439 - Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp);
1440 + Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1441 if (EFI_ERROR (Status)) {
1442 PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1);
1447 for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) {
1448 - Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp);
1449 + Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1450 Status = dmp->SetDebugMask (dmp, Msk);
1454 ===================================================================
1455 --- err/err.h (revision 64)
1456 +++ err/err.h (working copy)
1458 0xdaab229b, 0x7883, 0x4f5f, 0xac, 0x6e, 0x15, 0x20, 0xc7, 0xe7, 0x8f, 0xd4 \
1462 \ No newline at end of file
1464 Index: EfiDecompress/Decompress.inf
1465 ===================================================================
1466 --- EfiDecompress/Decompress.inf (revision 64)
1467 +++ EfiDecompress/Decompress.inf (working copy)
1469 COMPONENT_TYPE = APPLICATION
1472 -..\ShCommonStrings.uni
1473 +../ShCommonStrings.uni
1474 DecompressStrings.uni
1483 - $(EDK_SOURCE)\Foundation
1484 - $(EDK_SOURCE)\Foundation\Include
1485 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1486 - $(EDK_SOURCE)\Foundation\Efi
1487 - $(EDK_SOURCE)\Foundation\Efi\Include
1488 - $(EDK_SOURCE)\Foundation\FrameWork
1489 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1490 - $(EDK_SOURCE)\Foundation\Core\Dxe
1494 + $(EDK_SOURCE)/Foundation
1495 + $(EDK_SOURCE)/Foundation/Include
1496 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1497 + $(EDK_SOURCE)/Foundation/Efi
1498 + $(EDK_SOURCE)/Foundation/Efi/Include
1499 + $(EDK_SOURCE)/Foundation/FrameWork
1500 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1501 + $(EDK_SOURCE)/Foundation/Core/Dxe
1507 # we will specify some additional DEFINEs on the compile command line.
1510 + IMAGE_ENTRY_POINT=InitializeDecompress
1512 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1513 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
1514 - IMAGE_ENTRY_POINT=InitializeDecompress
1515 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1516 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1517 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1521 +[nmake.ARM, nmake.AARCH64]
1522 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1524 \ No newline at end of file
1525 Index: EfiDecompress/Decompress.c
1526 ===================================================================
1527 --- EfiDecompress/Decompress.c (revision 64)
1528 +++ EfiDecompress/Decompress.c (working copy)
1532 #include "EfiShellLib.h"
1533 -#include "decompress.h"
1534 +#include "Decompress.h"
1536 extern UINT8 STRING_ARRAY_NAME[];
1540 #include STRING_DEFINES_FILE
1542 -#include EFI_PROTOCOL_DEFINITION (decompress)
1543 +#include EFI_PROTOCOL_DEFINITION (Decompress)
1545 EFI_HII_HANDLE HiiDecompressHandle;
1546 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
1552 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1560 - Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
1561 + Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
1562 if (EFI_ERROR (Status)) {
1563 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
1564 Status = EFI_UNSUPPORTED;
1565 Index: EfiDecompress/Decompress.h
1566 ===================================================================
1567 --- EfiDecompress/Decompress.h (revision 64)
1568 +++ EfiDecompress/Decompress.h (working copy)
1570 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
1574 \ No newline at end of file
1576 Index: hexedit/libStatusBar.c
1577 ===================================================================
1578 --- hexedit/libStatusBar.c (revision 64)
1579 +++ hexedit/libStatusBar.c (working copy)
1581 // back up the screen attributes
1583 Orig = HMainEditor.ColorAttributes;
1585 New.Colors.Foreground = Orig.Colors.Background;
1586 New.Colors.Background = Orig.Colors.Foreground;
1588 Index: hexedit/libtitlebar.h
1589 ===================================================================
1590 --- hexedit/libtitlebar.h (revision 64)
1591 +++ hexedit/libtitlebar.h (working copy)
1597 Index: hexedit/heditor.h
1598 ===================================================================
1599 --- hexedit/heditor.h (revision 64)
1600 +++ hexedit/heditor.h (working copy)
1602 #include "libinputbar.h"
1603 #include "libmenubar.h"
1605 -#include "libmisc.h"
1606 +#include "libMisc.h"
1608 #include "libclipboard.h"
1611 extern BOOLEAN HEditorFirst;
1612 extern BOOLEAN HEditorExit;
1614 -extern EFI_HII_HANDLE HiiHandle;
1615 +extern EFI_HII_HANDLE gHexEditHiiHandle;
1616 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1617 extern EFI_HII_PROTOCOL *Hii;
1620 #endif // _HEDITOR_H
1622 Index: hexedit/libBufferImage.c
1623 ===================================================================
1624 --- hexedit/libBufferImage.c (revision 64)
1625 +++ hexedit/libBufferImage.c (working copy)
1642 if (HMainEditor.MouseSupported) {
1644 if (HBufferImageMouseNeedRefresh) {
1646 // backup the old screen attributes
1648 Orig = HMainEditor.ColorAttributes;
1650 New.Colors.Foreground = Orig.Colors.Background;
1651 New.Colors.Background = Orig.Colors.Foreground;
1653 @@ -801,10 +805,10 @@
1660 Orig = HMainEditor.ColorAttributes;
1662 New.Colors.Foreground = Orig.Colors.Background;
1663 New.Colors.Background = Orig.Colors.Foreground;
1668 FStartRow = StartRow;
1671 StartRow = TEXT_START_ROW + StartRow - HBufferImage.LowVisibleRow;
1672 EndRow = TEXT_START_ROW + EndRow - HBufferImage.LowVisibleRow;
1673 @@ -980,6 +983,10 @@
1675 Status = HMemImageRead (MemOffset, MemSize, Recover);
1679 + Status = EFI_UNSUPPORTED;
1683 if (EFI_ERROR (Status)) {
1684 @@ -1030,6 +1037,10 @@
1686 Status = HMemImageSave (MemOffset, MemSize);
1690 + Status = EFI_UNSUPPORTED;
1694 if (EFI_ERROR (Status)) {
1695 @@ -1967,14 +1978,11 @@
1699 - HEFI_EDITOR_LINE *Line;
1705 - Line = HBufferImage.CurrentLine;
1707 FRow = HBufferImage.BufferPosition.Row;
1708 FCol = HBufferImage.BufferPosition.Column;
1710 @@ -1996,7 +2004,7 @@
1714 - Line = HMoveLine (Retreat);
1715 + HMoveLine (Retreat);
1719 @@ -2025,13 +2033,10 @@
1723 - HEFI_EDITOR_LINE *Line;
1728 - Line = HBufferImage.CurrentLine;
1731 // curosr will at the high bit
1733 @@ -2157,7 +2162,6 @@
1735 HEFI_EDITOR_LINE *Line;
1736 EFI_LIST_ENTRY *Link;
1741 @@ -2167,11 +2171,6 @@
1746 - // get the line that start position is at
1748 - StartRow = Pos / 0x10;
1750 Size = HBufferImageGetTotalSize ();
1753 @@ -2300,7 +2299,6 @@
1754 HEFI_EDITOR_LINE *Line;
1756 EFI_LIST_ENTRY *Link;
1761 @@ -2308,11 +2306,6 @@
1766 - // get the line that start position is at
1768 - StartRow = Pos / 0x10;
1770 Size = HBufferImageGetTotalSize ();
1773 Index: hexedit/libstatusbar.h
1774 ===================================================================
1775 --- hexedit/libstatusbar.h (revision 64)
1776 +++ hexedit/libstatusbar.h (working copy)
1782 Index: hexedit/heditortype.h
1783 ===================================================================
1784 --- hexedit/heditortype.h (revision 64)
1785 +++ hexedit/heditortype.h (working copy)
1787 #define EDITOR_NAME L"EFI Hex Editor\0"
1788 #define EDITOR_VERSION L"0.99\0"
1790 -#define EFI_EDITOR_LINE_LIST 'eell'
1791 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
1793 #define FILE_ATTRIBUTES EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE
1794 #define FILE_READ_WRITE EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE
1796 } HEFI_EDITOR_MENU_ITEM;
1799 - UINT32 Foreground : 4;
1800 - UINT32 Background : 4;
1801 + UINT8 Foreground : 4;
1802 + UINT8 Background : 4;
1803 } HEFI_EDITOR_COLOR_ATTRIBUTES;
1807 } HEFI_EDITOR_GLOBAL_EDITOR;
1811 Index: hexedit/libMemImage.c
1812 ===================================================================
1813 --- hexedit/libMemImage.c (revision 64)
1814 +++ hexedit/libMemImage.c (working copy)
1816 Status = BS->LocateProtocol (
1817 &gEfiPciRootBridgeIoProtocolGuid,
1820 + (VOID**)&HMemImage.IoFncs
1822 if (Status == EFI_NOT_FOUND) {
1826 HEFI_EDITOR_LINE *Line;
1828 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
1830 - BufferTypeBackup = HBufferImage.BufferType;
1831 HBufferImage.BufferType = MEM_BUFFER;
1833 Buffer = AllocatePool (Size);
1838 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
1841 // not modified, so directly return
1847 - BufferTypeBackup = HBufferImage.BufferType;
1848 HBufferImage.BufferType = MEM_BUFFER;
1850 Buffer = AllocatePool (Size);
1851 Index: hexedit/libbufferimage.h
1852 ===================================================================
1853 --- hexedit/libbufferimage.h (revision 64)
1854 +++ hexedit/libbufferimage.h (working copy)
1860 Index: hexedit/libInputBar.c
1861 ===================================================================
1862 --- hexedit/libInputBar.c (revision 64)
1863 +++ hexedit/libInputBar.c (working copy)
1872 // variable initialization
1874 // back up the old screen attributes
1876 Orig = HMainEditor.ColorAttributes;
1878 New.Colors.Foreground = Orig.Colors.Background;
1879 New.Colors.Background = Orig.Colors.Foreground;
1881 @@ -201,15 +200,9 @@
1882 HEditorClearLine (INPUT_BAR_LOCATION);
1884 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
1885 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
1886 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
1889 - // that's the maximum input length that can be displayed on screen
1891 - PromptLen = StrLen (HMainInputBar.Prompt);
1892 - Limit = HMainEditor.ScreenSize.Column - PromptLen;
1895 // this is a selection prompt, cursor will stay in edit area
1896 // actually this is for search , search/replace
1898 Index: hexedit/libmemimage.h
1899 ===================================================================
1900 --- hexedit/libmemimage.h (revision 64)
1901 +++ hexedit/libmemimage.h (working copy)
1907 Index: hexedit/libEditor.c
1908 ===================================================================
1909 --- hexedit/libEditor.c (revision 64)
1910 +++ hexedit/libEditor.c (working copy)
1915 -#include "Heditor.h"
1916 +#include "heditor.h"
1918 HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
1921 Status = BS->HandleProtocol (
1923 &gEfiSimplePointerProtocolGuid,
1924 - &HMainEditor.MouseInterface
1925 + (VOID**)&HMainEditor.MouseInterface
1927 if (EFI_ERROR (Status)) {
1930 Status = BS->HandleProtocol (
1931 HandleBuffer[Index],
1932 &gEfiSimplePointerProtocolGuid,
1933 - &HMainEditor.MouseInterface
1934 + (VOID**)&HMainEditor.MouseInterface
1936 if (!EFI_ERROR (Status)) {
1938 @@ -182,37 +182,37 @@
1940 Status = HMainTitleBarInit ();
1941 if (EFI_ERROR (Status)) {
1942 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
1943 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
1944 return EFI_LOAD_ERROR;
1947 Status = HMainMenuBarInit ();
1948 if (EFI_ERROR (Status)) {
1949 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
1950 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
1951 return EFI_LOAD_ERROR;
1954 Status = HMainStatusBarInit ();
1955 if (EFI_ERROR (Status)) {
1956 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
1957 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
1958 return EFI_LOAD_ERROR;
1961 Status = HMainInputBarInit ();
1962 if (EFI_ERROR (Status)) {
1963 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
1964 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
1965 return EFI_LOAD_ERROR;
1968 Status = HBufferImageInit ();
1969 if (EFI_ERROR (Status)) {
1970 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
1971 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
1972 return EFI_LOAD_ERROR;
1975 Status = HClipBoardInit ();
1976 if (EFI_ERROR (Status)) {
1977 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
1978 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
1979 return EFI_LOAD_ERROR;
1982 @@ -259,32 +259,32 @@
1984 Status = HMainTitleBarCleanup ();
1985 if (EFI_ERROR (Status)) {
1986 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
1987 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
1990 Status = HMainMenuBarCleanup ();
1991 if (EFI_ERROR (Status)) {
1992 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
1993 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
1996 Status = HMainStatusBarCleanup ();
1997 if (EFI_ERROR (Status)) {
1998 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
1999 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
2002 Status = HMainInputBarCleanup ();
2003 if (EFI_ERROR (Status)) {
2004 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
2005 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
2008 Status = HBufferImageCleanup ();
2009 if (EFI_ERROR (Status)) {
2010 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
2011 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
2014 Status = HClipBoardCleanup ();
2015 if (EFI_ERROR (Status)) {
2016 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
2017 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
2023 OldSize = HBufferImage.MemImage->Size;
2030 if (LengthChange == FALSE) {
2031 Index: hexedit/libfileimage.h
2032 ===================================================================
2033 --- hexedit/libfileimage.h (revision 64)
2034 +++ hexedit/libfileimage.h (working copy)
2040 Index: hexedit/libinputbar.h
2041 ===================================================================
2042 --- hexedit/libinputbar.h (revision 64)
2043 +++ hexedit/libinputbar.h (working copy)
2049 Index: hexedit/libMenuBar.c
2050 ===================================================================
2051 --- hexedit/libMenuBar.c (revision 64)
2052 +++ hexedit/libMenuBar.c (working copy)
2055 CHAR16 *FunctionKeyString;
2057 - EFI_STATUS Status;
2060 // variable initialization
2062 FunctionKeyString = AllocatePool (BufferSize);
2064 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2065 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2066 + Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2068 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
2069 + LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
2072 Width = max ((StrLen (NameString) + 6), 18);
2076 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2077 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2078 + Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2080 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2081 + LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2084 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
2085 @@ -1138,7 +1137,6 @@
2086 // the file won't be saved
2093 @@ -1567,7 +1565,6 @@
2097 - HEFI_EDITOR_LINE *Line;
2098 EFI_LIST_ENTRY *Link;
2101 @@ -1592,8 +1589,6 @@
2105 - Line = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);
2107 Count = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;
2108 Buffer = AllocatePool (Count);
2109 if (Buffer == NULL) {
2110 Index: hexedit/libeditor.h
2111 ===================================================================
2112 --- hexedit/libeditor.h (revision 64)
2113 +++ hexedit/libeditor.h (working copy)
2119 Index: hexedit/hexedit.inf
2120 ===================================================================
2121 --- hexedit/hexedit.inf (revision 64)
2122 +++ hexedit/hexedit.inf (working copy)
2124 COMPONENT_TYPE = APPLICATION
2127 - ..\ShCommonStrings.uni
2128 + ../ShCommonStrings.uni
2138 - $(EDK_SOURCE)\Foundation
2139 - $(EDK_SOURCE)\Foundation\Include
2140 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2141 - $(EDK_SOURCE)\Foundation\Efi
2142 - $(EDK_SOURCE)\Foundation\Efi\Include
2143 - $(EDK_SOURCE)\Foundation\FrameWork
2144 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2145 - $(EDK_SOURCE)\Foundation\Core\Dxe
2149 + $(EDK_SOURCE)/Foundation
2150 + $(EDK_SOURCE)/Foundation/Include
2151 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2152 + $(EDK_SOURCE)/Foundation/Efi
2153 + $(EDK_SOURCE)/Foundation/Efi/Include
2154 + $(EDK_SOURCE)/Foundation/FrameWork
2155 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2156 + $(EDK_SOURCE)/Foundation/Core/Dxe
2162 # we will specify some additional DEFINEs on the compile command line.
2165 + IMAGE_ENTRY_POINT=InitializeEFIHexEditor
2167 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2168 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2169 - IMAGE_ENTRY_POINT=InitializeEFIHexEditor
2170 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2171 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2172 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2175 +[nmake.ARM, nmake.AARCH64]
2176 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2178 \ No newline at end of file
2179 Index: hexedit/libdiskimage.c
2180 ===================================================================
2181 --- hexedit/libdiskimage.c (revision 64)
2182 +++ hexedit/libdiskimage.c (working copy)
2183 @@ -228,11 +228,7 @@
2186 HEFI_EDITOR_LINE *Line;
2187 - UINT64 ByteOffset;
2189 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
2191 - BufferTypeBackup = HBufferImage.BufferType;
2192 HBufferImage.BufferType = DISK_BUFFER;
2194 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
2196 Status = LibDevicePathToInterface (
2197 &gEfiBlockIoProtocolGuid,
2202 if (EFI_ERROR (Status)) {
2203 HMainStatusBarSetStatusString (L"Read Disk Failed");
2205 return EFI_OUT_OF_RESOURCES;
2208 - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
2213 @@ -405,10 +399,6 @@
2217 - UINT64 ByteOffset;
2219 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
2222 // if not modified, directly return
2228 - BufferTypeBackup = HBufferImage.BufferType;
2229 HBufferImage.BufferType = DISK_BUFFER;
2231 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
2233 Status = LibDevicePathToInterface (
2234 &gEfiBlockIoProtocolGuid,
2239 if (EFI_ERROR (Status)) {
2245 - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
2248 // write the buffer to disk
2250 Index: hexedit/main.c
2251 ===================================================================
2252 --- hexedit/main.c (revision 64)
2253 +++ hexedit/main.c (working copy)
2258 -EFI_HII_HANDLE HiiHandle;
2259 +EFI_HII_HANDLE gHexEditHiiHandle;
2260 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2261 EFI_HII_PROTOCOL *Hii;
2268 + (SHELL_VAR_CHECK_FLAG_TYPE)0
2276 - PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle);
2277 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle);
2278 - PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle);
2279 - PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle);
2280 + PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle);
2281 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle);
2282 + PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle);
2283 + PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle);
2288 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
2290 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2291 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
2292 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
2293 if (EFI_ERROR (Status)) {
2296 @@ -158,12 +158,12 @@
2297 // Register our string package with HII and return the handle to it.
2298 // If previously registered we will simply receive the handle
2300 - EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2301 + EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2303 if (!EFI_PROPER_VERSION (1, 10)) {
2305 STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT),
2307 + gHexEditHiiHandle,
2311 @@ -187,17 +187,17 @@
2313 case VarCheckConflict:
2315 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful);
2316 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful);
2319 case VarCheckDuplicate:
2321 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful);
2322 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2325 case VarCheckUnknown:
2327 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful);
2328 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2332 @@ -220,10 +220,10 @@
2333 ChkPck.FlagCount > 2 ||
2334 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
2336 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2337 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2338 Status = EFI_INVALID_PARAMETER;
2340 - PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle);
2341 + PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle);
2342 Status = EFI_SUCCESS;
2345 @@ -233,13 +233,13 @@
2346 Item = LibCheckVarGetFlag (&ChkPck, L"-d");
2348 if (3 < ChkPck.ValueCount) {
2349 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2350 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2351 Status = EFI_INVALID_PARAMETER;
2355 if (3 > ChkPck.ValueCount) {
2356 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2357 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2358 Status = EFI_INVALID_PARAMETER;
2363 Result = HXtoi (Item->VarStr, &Offset);
2364 if (EFI_ERROR (Result)) {
2365 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2366 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2367 Status = EFI_INVALID_PARAMETER;
2370 @@ -257,13 +257,13 @@
2372 Result = HXtoi (Item->VarStr, &Size);
2373 if (EFI_ERROR (Result)) {
2374 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2375 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2376 Status = EFI_INVALID_PARAMETER;
2380 if (Offset < 0 || Size <= 0) {
2381 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2382 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2383 Status = EFI_INVALID_PARAMETER;
2386 @@ -274,13 +274,13 @@
2387 Item = LibCheckVarGetFlag (&ChkPck, L"-m");
2389 if (2 < ChkPck.ValueCount) {
2390 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2391 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2392 Status = EFI_INVALID_PARAMETER;
2396 if (2 > ChkPck.ValueCount) {
2397 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2398 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2399 Status = EFI_INVALID_PARAMETER;
2403 Item = ChkPck.VarList;
2404 Result = HXtoi (Item->VarStr, &Offset);
2405 if (EFI_ERROR (Result)) {
2406 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2407 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2408 Status = EFI_INVALID_PARAMETER;
2411 @@ -296,20 +296,20 @@
2413 Result = HXtoi (Item->VarStr, &Size);
2414 if (EFI_ERROR (Result)) {
2415 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2416 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2417 Status = EFI_INVALID_PARAMETER;
2421 if (Offset < 0 || Size <= 0) {
2422 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2423 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2424 Status = EFI_INVALID_PARAMETER;
2428 LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1;
2429 if (LastOffset > 0xffffffff) {
2430 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2431 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2435 @@ -319,13 +319,13 @@
2436 Item = LibCheckVarGetFlag (&ChkPck, L"-f");
2438 if (1 < ChkPck.ValueCount) {
2439 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2440 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2441 Status = EFI_INVALID_PARAMETER;
2445 if (1 > ChkPck.ValueCount) {
2446 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2447 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2448 Status = EFI_INVALID_PARAMETER;
2452 Item = ChkPck.VarList;
2453 Name = Item->VarStr;
2454 if (!HIsValidFileName (Name)) {
2455 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2456 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2457 Status = EFI_INVALID_PARAMETER;
2460 @@ -345,20 +345,20 @@
2464 - PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), HiiHandle, L"hexedit");
2465 + PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), gHexEditHiiHandle, L"hexedit");
2466 Status = EFI_INVALID_PARAMETER;
2469 } else if (1 == ChkPck.ValueCount) {
2470 Name = ChkPck.VarList->VarStr;
2472 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2473 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2474 Status = EFI_INVALID_PARAMETER;
2478 if (!HIsValidFileName (Name)) {
2479 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2480 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2481 Status = EFI_INVALID_PARAMETER;
2487 if (SI->RedirArgc != 0) {
2488 - PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle);
2489 + PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle);
2490 Status = EFI_INVALID_PARAMETER;
2494 if (EFI_ERROR (Status)) {
2495 Out->ClearScreen (Out);
2496 Out->EnableCursor (Out, TRUE);
2497 - PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle);
2498 + PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle);
2508 + Status = EFI_UNSUPPORTED;
2512 if (!EFI_ERROR (Status)) {
2513 @@ -453,19 +455,19 @@
2515 if (Status == EFI_SUCCESS) {
2516 } else if (Status == EFI_OUT_OF_RESOURCES) {
2517 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit");
2518 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit");
2520 if (Buffer != NULL) {
2521 if (StrCmp (Buffer, L"") != 0) {
2523 // print out the status string
2525 - PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer);
2526 + PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer);
2528 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2529 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2532 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2533 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2537 Index: hexedit/libmenubar.h
2538 ===================================================================
2539 --- hexedit/libmenubar.h (revision 64)
2540 +++ hexedit/libmenubar.h (working copy)
2542 #ifndef _LIB_MENU_BAR_H_
2543 #define _LIB_MENU_BAR_H_
2545 -#include "Heditortype.h"
2546 +#include "heditortype.h"
2555 Index: hexedit/libMisc.h
2556 ===================================================================
2557 --- hexedit/libMisc.h (revision 64)
2558 +++ hexedit/libMisc.h (working copy)
2560 #ifndef _LIB_MISC_H_
2561 #define _LIB_MISC_H_
2563 -#include "Heditortype.h"
2564 +#include "heditortype.h"
2573 Index: hexedit/libdiskimage.h
2574 ===================================================================
2575 --- hexedit/libdiskimage.h (revision 64)
2576 +++ hexedit/libdiskimage.h (working copy)
2582 Index: hexedit/libclipboard.h
2583 ===================================================================
2584 --- hexedit/libclipboard.h (revision 64)
2585 +++ hexedit/libclipboard.h (working copy)
2591 Index: hexedit/libTitleBar.c
2592 ===================================================================
2593 --- hexedit/libTitleBar.c (revision 64)
2594 +++ hexedit/libTitleBar.c (working copy)
2596 // backup the old screen attributes
2598 Orig = HMainEditor.ColorAttributes;
2600 New.Colors.Foreground = Orig.Colors.Background;
2601 New.Colors.Background = Orig.Colors.Foreground;
2604 // the space for file name is 35 characters
2606 if (StrLen (FileNameTmp) <= 35) {
2607 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp);
2608 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp);
2610 for (Index = StrLen (FileNameTmp); Index < 35; Index++) {
2615 for (Index = 0; Index < 32; Index++) {
2616 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]);
2617 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]);
2621 @@ -234,14 +235,14 @@
2622 if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) {
2624 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR),
2626 + gHexEditHiiHandle,
2627 HMainEditor.BufferImage->DiskImage->Name
2630 for (Index = 0; Index < 6; Index++) {
2632 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C),
2634 + gHexEditHiiHandle,
2635 HMainEditor.BufferImage->DiskImage->Name[Index]
2641 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2643 + gHexEditHiiHandle,
2644 HMainEditor.BufferImage->DiskImage->Offset,
2645 HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1
2650 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2652 + gHexEditHiiHandle,
2653 HMainEditor.BufferImage->MemImage->Offset,
2654 HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1
2656 @@ -280,22 +281,27 @@
2666 switch (HMainEditor.BufferImage->BufferType) {
2668 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle);
2669 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle);
2673 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle);
2674 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle);
2678 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle);
2679 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle);
2686 // print modified field
2688 ===================================================================
2689 --- Ping/Ping.h (revision 64)
2690 +++ Ping/Ping.h (working copy)
2696 Index: Ping/Ping.inf
2697 ===================================================================
2698 --- Ping/Ping.inf (revision 64)
2699 +++ Ping/Ping.inf (working copy)
2701 COMPONENT_TYPE = APPLICATION
2704 - ..\ShCommonStrings.uni
2705 + ../ShCommonStrings.uni
2713 - $(EDK_SOURCE)\Foundation\Efi
2714 - $(EDK_SOURCE)\Foundation
2715 - $(EDK_SOURCE)\Foundation\Efi\Include
2716 - $(EDK_SOURCE)\Foundation\Include
2717 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2718 - $(EDK_SOURCE)\Foundation\FrameWork
2719 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2720 - $(EDK_SOURCE)\Foundation\Core\Dxe
2721 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2725 + $(EDK_SOURCE)/Foundation/Efi
2726 + $(EDK_SOURCE)/Foundation
2727 + $(EDK_SOURCE)/Foundation/Efi/Include
2728 + $(EDK_SOURCE)/Foundation/Include
2729 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2730 + $(EDK_SOURCE)/Foundation/FrameWork
2731 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2732 + $(EDK_SOURCE)/Foundation/Core/Dxe
2733 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2750 - C_PROJ_FLAGS = $(C_PROJ_FLAGS)
2751 IMAGE_ENTRY_POINT=Ping
2752 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2754 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2755 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2756 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2757 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2759 +[nmake.ARM, nmake.AARCH64]
2760 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2762 ===================================================================
2763 --- Ping/Ping.c (revision 64)
2764 +++ Ping/Ping.c (working copy)
2768 #include "EfiShellLib.h"
2769 -#include "CpuFuncs.h"
2770 +//#include "CpuFuncs.h"
2771 #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu)
2772 #include EFI_PROTOCOL_DEFINITION (Ip4)
2774 #include STRING_DEFINES_FILE
2775 extern UINT8 STRING_ARRAY_NAME[];
2777 -EFI_HII_HANDLE HiiHandle;
2778 +STATIC EFI_HII_HANDLE HiiHandle;
2780 EFI_GUID EfiPingGuid = EFI_PING_GUID;
2781 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
2787 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2795 +EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
2800 @@ -135,7 +137,22 @@
2804 - return EfiReadTsc ();
2805 + static UINT64 CurrentTick = 0;
2806 + UINT64 TimerPeriod;
2807 + EFI_STATUS Status;
2809 + ASSERT (gCpu != NULL);
2811 + Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);
2812 + if (EFI_ERROR (Status)) {
2814 + // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the
2815 + // TimerPeriod by ourselves.
2817 + CurrentTick += 1000000;
2820 + return CurrentTick;
2826 // Locate the Cpu Arch Protocol.
2828 - Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
2829 + Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu);
2830 if (EFI_ERROR (Status)) {
2834 ===================================================================
2835 --- time/time.c (revision 64)
2836 +++ time/time.c (working copy)
2842 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2850 - IN OUT INTN *Offset,
2851 - IN OUT INTN *number,
2852 + IN OUT UINTN *Offset,
2853 + IN OUT UINTN *number,
2854 IN BOOLEAN GetSecond
2861 - IN OUT INTN *Offset,
2862 - IN OUT INTN *Number,
2863 + IN OUT UINTN *Offset,
2864 + IN OUT UINTN *Number,
2865 IN BOOLEAN GetSecond
2869 ===================================================================
2870 --- time/time.h (revision 64)
2871 +++ time/time.h (working copy)
2877 Index: time/time.inf
2878 ===================================================================
2879 --- time/time.inf (revision 64)
2880 +++ time/time.inf (working copy)
2885 - ..\ShCommonStrings.uni
2886 + ../ShCommonStrings.uni
2895 - $(EDK_SOURCE)\Foundation
2896 - $(EDK_SOURCE)\Foundation\Include
2897 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2898 - $(EDK_SOURCE)\Foundation\Efi
2899 - $(EDK_SOURCE)\Foundation\Efi\Include
2900 - $(EDK_SOURCE)\Foundation\FrameWork
2901 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2902 - $(EDK_SOURCE)\Foundation\Core\Dxe
2906 + $(EDK_SOURCE)/Foundation
2907 + $(EDK_SOURCE)/Foundation/Include
2908 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2909 + $(EDK_SOURCE)/Foundation/Efi
2910 + $(EDK_SOURCE)/Foundation/Efi/Include
2911 + $(EDK_SOURCE)/Foundation/FrameWork
2912 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2913 + $(EDK_SOURCE)/Foundation/Core/Dxe
2921 IMAGE_ENTRY_POINT=InitializeTime
2923 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2924 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2925 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2926 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2928 +[nmake.ARM, nmake.AARCH64]
2929 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2930 Index: mount/mount.c
2931 ===================================================================
2932 --- mount/mount.c (revision 64)
2933 +++ mount/mount.c (working copy)
2938 -EFI_HII_HANDLE HiiHandle;
2939 +STATIC EFI_HII_HANDLE HiiHandle;
2940 EFI_GUID EfiMountGuid = EFI_MOUNT_GUID;
2941 SHELL_VAR_CHECK_ITEM MountCheckList[] = {
2948 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2952 Index: mount/mount.h
2953 ===================================================================
2954 --- mount/mount.h (revision 64)
2955 +++ mount/mount.h (working copy)
2961 Index: mount/mount.inf
2962 ===================================================================
2963 --- mount/mount.inf (revision 64)
2964 +++ mount/mount.inf (working copy)
2969 - ..\ShCommonStrings.uni
2970 + ../ShCommonStrings.uni
2979 - $(EDK_SOURCE)\Foundation
2980 - $(EDK_SOURCE)\Foundation\Include
2981 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2982 - $(EDK_SOURCE)\Foundation\Efi
2983 - $(EDK_SOURCE)\Foundation\Efi\Include
2984 - $(EDK_SOURCE)\Foundation\FrameWork
2985 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2986 - $(EDK_SOURCE)\Foundation\Core\Dxe
2990 + $(EDK_SOURCE)/Foundation
2991 + $(EDK_SOURCE)/Foundation/Include
2992 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2993 + $(EDK_SOURCE)/Foundation/Efi
2994 + $(EDK_SOURCE)/Foundation/Efi/Include
2995 + $(EDK_SOURCE)/Foundation/FrameWork
2996 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2997 + $(EDK_SOURCE)/Foundation/Core/Dxe
3005 IMAGE_ENTRY_POINT=MountMain
3007 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3008 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3009 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3010 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3012 +[nmake.ARM, nmake.AARCH64]
3013 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3014 Index: mkdir/mkdir.inf
3015 ===================================================================
3016 --- mkdir/mkdir.inf (revision 64)
3017 +++ mkdir/mkdir.inf (working copy)
3022 - ..\ShCommonStrings.uni
3023 + ../ShCommonStrings.uni
3031 - $(EDK_SOURCE)\Foundation
3032 - $(EDK_SOURCE)\Foundation\Include
3033 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3034 - $(EDK_SOURCE)\Foundation\Efi
3035 - $(EDK_SOURCE)\Foundation\Efi\Include
3036 - $(EDK_SOURCE)\Foundation\FrameWork
3037 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3038 - $(EDK_SOURCE)\Foundation\Core\Dxe
3042 + $(EDK_SOURCE)/Foundation
3043 + $(EDK_SOURCE)/Foundation/Include
3044 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3045 + $(EDK_SOURCE)/Foundation/Efi
3046 + $(EDK_SOURCE)/Foundation/Efi/Include
3047 + $(EDK_SOURCE)/Foundation/FrameWork
3048 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3049 + $(EDK_SOURCE)/Foundation/Core/Dxe
3057 IMAGE_ENTRY_POINT=InitializeMkDir
3059 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3060 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3061 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3062 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3064 +[nmake.ARM, nmake.AARCH64]
3065 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3066 Index: mkdir/mkdir.c
3067 ===================================================================
3068 --- mkdir/mkdir.c (revision 64)
3069 +++ mkdir/mkdir.c (working copy)
3074 -EFI_HII_HANDLE HiiHandle;
3075 +STATIC EFI_HII_HANDLE HiiHandle;
3076 EFI_GUID EfiMkdirGuid = EFI_MKDIR_GUID;
3077 SHELL_VAR_CHECK_ITEM MkdirCheckList[] = {
3084 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3088 Index: mkdir/mkdir.h
3089 ===================================================================
3090 --- mkdir/mkdir.h (revision 64)
3091 +++ mkdir/mkdir.h (working copy)
3093 0x75ecb57f, 0x4264, 0x49d2, 0x98, 0xe6, 0x39, 0x1a, 0x32, 0x17, 0x9d, 0xf2 \
3097 \ No newline at end of file
3101 ===================================================================
3102 --- pci/pci.h (revision 64)
3103 +++ pci/pci.h (working copy)
3105 0x388da6c3, 0x3447, 0x4b1f, 0xa0, 0xba, 0xa9, 0xe8, 0xa2, 0x87, 0xf1, 0x76 \
3118 Index: pci/pci_class.c
3119 ===================================================================
3120 --- pci/pci_class.c (revision 64)
3121 +++ pci/pci_class.c (working copy)
3126 -EFI_HII_HANDLE HiiHandle;
3127 +STATIC EFI_HII_HANDLE HiiHandle;
3129 PCI_CLASS_ENTRY gClassStringList[];
3132 ===================================================================
3133 --- pci/pci.inf (revision 64)
3134 +++ pci/pci.inf (working copy)
3139 - ..\ShCommonStrings.uni
3140 + ../ShCommonStrings.uni
3150 - $(EDK_SOURCE)\Foundation
3151 - $(EDK_SOURCE)\Foundation\Include
3152 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3153 - $(EDK_SOURCE)\Foundation\Efi
3154 - $(EDK_SOURCE)\Foundation\Efi\Include
3155 - $(EDK_SOURCE)\Foundation\FrameWork
3156 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3157 - $(EDK_SOURCE)\Foundation\Core\Dxe
3161 + $(EDK_SOURCE)/Foundation
3162 + $(EDK_SOURCE)/Foundation/Include
3163 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3164 + $(EDK_SOURCE)/Foundation/Efi
3165 + $(EDK_SOURCE)/Foundation/Efi/Include
3166 + $(EDK_SOURCE)/Foundation/FrameWork
3167 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3168 + $(EDK_SOURCE)/Foundation/Core/Dxe
3176 IMAGE_ENTRY_POINT=PciDump
3178 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3179 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3180 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3181 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3183 +[nmake.ARM, nmake.AARCH64]
3184 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3185 Index: pci/pci_class.h
3186 ===================================================================
3187 --- pci/pci_class.h (revision 64)
3188 +++ pci/pci_class.h (working copy)
3190 #ifndef _PCI_CLASS_H_
3191 #define _PCI_CLASS_H_
3193 -#include "TIANO.h" // for UINT32 etc.
3194 +#include "Tiano.h" // for UINT32 etc.
3195 #define PCI_CLASS_STRING_LIMIT 54
3197 // Printable strings for Pci class code
3201 #endif // _PCI_CLASS_H_
3204 ===================================================================
3205 --- pci/pci.c (revision 64)
3206 +++ pci/pci.c (working copy)
3212 + (PCIE_CAPREG_FIELD_WIDTH)0,
3219 PCI_CONFIG_SPACE *mConfigSpace;
3220 -EFI_HII_HANDLE HiiHandle;
3221 +STATIC EFI_HII_HANDLE HiiHandle;
3222 EFI_GUID EfiPciGuid = EFI_PCI_GUID;
3223 SHELL_VAR_CHECK_ITEM PciCheckList[] = {
3230 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3234 @@ -1034,7 +1034,7 @@
3235 Status = BS->HandleProtocol (
3237 &gEfiPciRootBridgeIoProtocolGuid,
3242 if (EFI_ERROR (Status)) {
3243 @@ -1043,7 +1043,7 @@
3245 // Call Configuration() to get address space descriptors
3247 - Status = (*IoDev)->Configuration (*IoDev, Descriptors);
3248 + Status = (*IoDev)->Configuration (*IoDev, (VOID**)Descriptors);
3249 if (Status == EFI_UNSUPPORTED) {
3250 *Descriptors = NULL;
3252 @@ -1237,7 +1237,7 @@
3253 PrintToken (STRING_TOKEN (STR_PCI2_SINGLE_FUNCTION), HiiHandle);
3256 - HeaderType = (UINT8) (Common->HeaderType & 0x7f);
3257 + HeaderType = (PCI_HEADER_TYPE) (Common->HeaderType & 0x7f);
3258 switch (HeaderType) {
3260 PrintToken (STRING_TOKEN (STR_PCI2_PCI_DEVICE), HiiHandle);
3261 @@ -1300,6 +1300,9 @@
3263 CapPtr = ConfigSpace->NonCommon.CardBus.CapabilitiesPtr;
3267 + Status = EFI_UNSUPPORTED;
3270 // If Status bit4 is 1, dump or explain capability structure
3271 @@ -1956,7 +1959,7 @@
3272 INDEX_OF (&(CardBus->IoBase0)),
3273 Io32Bit ? L" 32 bit" : L" 16 bit",
3274 CardBus->IoBase0 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
3275 - CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
3276 + (CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3279 Io32Bit = (BOOLEAN) (CardBus->IoBase1 & PCI_BIT_0);
3280 @@ -1966,7 +1969,7 @@
3281 INDEX_OF (&(CardBus->IoBase1)),
3282 Io32Bit ? L" 32 bit" : L" 16 bit",
3283 CardBus->IoBase1 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
3284 - CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
3285 + (CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3289 Index: memmap/memmap.h
3290 ===================================================================
3291 --- memmap/memmap.h (revision 64)
3292 +++ memmap/memmap.h (working copy)
3298 Index: memmap/memmap.inf
3299 ===================================================================
3300 --- memmap/memmap.inf (revision 64)
3301 +++ memmap/memmap.inf (working copy)
3306 - ..\ShCommonStrings.uni
3307 + ../ShCommonStrings.uni
3317 - $(EDK_SOURCE)\Foundation
3318 - $(EDK_SOURCE)\Foundation\Include
3319 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3320 - $(EDK_SOURCE)\Foundation\Efi
3321 - $(EDK_SOURCE)\Foundation\Efi\Include
3322 - $(EDK_SOURCE)\Foundation\FrameWork
3323 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3324 - $(EDK_SOURCE)\Foundation\Core\Dxe
3328 + $(EDK_SOURCE)/Foundation
3329 + $(EDK_SOURCE)/Foundation/Include
3330 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3331 + $(EDK_SOURCE)/Foundation/Efi
3332 + $(EDK_SOURCE)/Foundation/Efi/Include
3333 + $(EDK_SOURCE)/Foundation/FrameWork
3334 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3335 + $(EDK_SOURCE)/Foundation/Core/Dxe
3343 IMAGE_ENTRY_POINT=InitializeMemmap
3345 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3346 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3347 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3348 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3350 +[nmake.ARM, nmake.AARCH64]
3351 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3352 Index: memmap/memmap.c
3353 ===================================================================
3354 --- memmap/memmap.c (revision 64)
3355 +++ memmap/memmap.c (working copy)
3360 -EFI_HII_HANDLE HiiHandle;
3361 +STATIC EFI_HII_HANDLE HiiHandle;
3362 EFI_GUID EfiMemmapGuid = EFI_MEMMAP_GUID;
3363 SHELL_VAR_CHECK_ITEM MemmapCheckList[] = {
3370 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3377 Bytes = LShiftU64 (Desc->NumberOfPages, 12);
3378 - Ptr = MemoryTypeStr (Desc->Type);
3379 + Ptr = MemoryTypeStr ((EFI_MEMORY_TYPE)Desc->Type);
3381 STRING_TOKEN (STR_MEMMAP_FIVE_ARGS),
3384 ===================================================================
3385 --- dblk/dblk.h (revision 64)
3386 +++ dblk/dblk.h (working copy)
3388 extern EFI_HII_HANDLE HiiDblkHandle;
3392 Index: dblk/dblk.inf
3393 ===================================================================
3394 --- dblk/dblk.inf (revision 64)
3395 +++ dblk/dblk.inf (working copy)
3400 - ..\ShCommonStrings.uni
3401 + ../ShCommonStrings.uni
3409 - $(EDK_SOURCE)\Foundation
3410 - $(EDK_SOURCE)\Foundation\Include
3411 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3412 - $(EDK_SOURCE)\Foundation\Efi
3413 - $(EDK_SOURCE)\Foundation\Efi\Include
3414 - $(EDK_SOURCE)\Foundation\FrameWork
3415 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3416 - $(EDK_SOURCE)\Foundation\Core\Dxe
3420 + $(EDK_SOURCE)/Foundation
3421 + $(EDK_SOURCE)/Foundation/Include
3422 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3423 + $(EDK_SOURCE)/Foundation/Efi
3424 + $(EDK_SOURCE)/Foundation/Efi/Include
3425 + $(EDK_SOURCE)/Foundation/FrameWork
3426 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3427 + $(EDK_SOURCE)/Foundation/Core/Dxe
3433 # we will specify some additional DEFINEs on the compile command line.
3436 + IMAGE_ENTRY_POINT=DumpBlockDev
3438 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3439 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3440 - IMAGE_ENTRY_POINT=DumpBlockDev
3441 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3442 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3443 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3445 +[nmake.ARM, nmake.AARCH64]
3446 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3450 \ No newline at end of file
3451 Index: dblk/efidump.c
3452 ===================================================================
3453 --- dblk/efidump.c (revision 64)
3454 +++ dblk/efidump.c (working copy)
3459 -#include "Efipart.h"
3460 +#include "EfiPart.h"
3461 #include "EfiShellLib.h"
3463 #include STRING_DEFINES_FILE
3464 @@ -320,13 +320,11 @@
3468 - VOID *SalSystemTable;
3474 - SalSystemTable = NULL;
3478 @@ -352,10 +350,12 @@
3479 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
3482 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
3483 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
3484 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3485 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3488 + VOID *SalSystemTable;
3490 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3491 if (!EFI_ERROR(Status)) {
3492 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable);
3493 @@ -364,22 +364,22 @@
3495 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3496 if (!EFI_ERROR (Status)) {
3497 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
3498 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable);
3501 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3502 if (!EFI_ERROR (Status)) {
3503 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
3504 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table);
3507 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3508 if (!EFI_ERROR (Status)) {
3509 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
3510 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable);
3513 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3514 if (!EFI_ERROR (Status)) {
3515 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
3516 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable);
3521 ===================================================================
3522 --- dblk/dblk.c (revision 64)
3523 +++ dblk/dblk.c (working copy)
3529 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3534 ===================================================================
3535 --- date/date.h (revision 64)
3536 +++ date/date.h (working copy)
3542 Index: date/date.inf
3543 ===================================================================
3544 --- date/date.inf (revision 64)
3545 +++ date/date.inf (working copy)
3550 - ..\ShCommonStrings.uni
3551 + ../ShCommonStrings.uni
3560 - $(EDK_SOURCE)\Foundation
3561 - $(EDK_SOURCE)\Foundation\Include
3562 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3563 - $(EDK_SOURCE)\Foundation\Efi
3564 - $(EDK_SOURCE)\Foundation\Efi\Include
3565 - $(EDK_SOURCE)\Foundation\FrameWork
3566 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3567 - $(EDK_SOURCE)\Foundation\Core\Dxe
3571 + $(EDK_SOURCE)/Foundation
3572 + $(EDK_SOURCE)/Foundation/Include
3573 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3574 + $(EDK_SOURCE)/Foundation/Efi
3575 + $(EDK_SOURCE)/Foundation/Efi/Include
3576 + $(EDK_SOURCE)/Foundation/FrameWork
3577 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3578 + $(EDK_SOURCE)/Foundation/Core/Dxe
3586 IMAGE_ENTRY_POINT=InitializeDate
3588 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3589 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3590 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3591 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3593 +[nmake.ARM, nmake.AARCH64]
3594 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3597 ===================================================================
3598 --- date/date.c (revision 64)
3599 +++ date/date.c (working copy)
3604 - IN OUT INTN *Position,
3605 - IN OUT INTN *Number,
3606 + IN OUT UINTN *Position,
3607 + IN OUT UINTN *Number,
3616 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3624 - IN OUT INTN *Position,
3625 - IN OUT INTN *Number,
3626 + IN OUT UINTN *Position,
3627 + IN OUT UINTN *Number,
3632 ===================================================================
3633 --- rm/rm.c (revision 64)
3634 +++ rm/rm.c (working copy)
3640 + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
3645 ===================================================================
3646 --- rm/rm.h (revision 64)
3647 +++ rm/rm.h (working copy)
3654 ===================================================================
3655 --- rm/rm.inf (revision 64)
3656 +++ rm/rm.inf (working copy)
3661 - ..\ShCommonStrings.uni
3662 + ../ShCommonStrings.uni
3670 - $(EDK_SOURCE)\Foundation
3671 - $(EDK_SOURCE)\Foundation\Include
3672 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3673 - $(EDK_SOURCE)\Foundation\Efi
3674 - $(EDK_SOURCE)\Foundation\Efi\Include
3675 - $(EDK_SOURCE)\Foundation\FrameWork
3676 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3677 - $(EDK_SOURCE)\Foundation\Core\Dxe
3681 + $(EDK_SOURCE)/Foundation
3682 + $(EDK_SOURCE)/Foundation/Include
3683 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3684 + $(EDK_SOURCE)/Foundation/Efi
3685 + $(EDK_SOURCE)/Foundation/Efi/Include
3686 + $(EDK_SOURCE)/Foundation/FrameWork
3687 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3688 + $(EDK_SOURCE)/Foundation/Core/Dxe
3696 IMAGE_ENTRY_POINT=InitializeRM
3698 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3699 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3700 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3701 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3703 +[nmake.ARM, nmake.AARCH64]
3704 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3705 Index: mem/MemCommonPart.c
3706 ===================================================================
3707 --- mem/MemCommonPart.c (revision 64)
3708 +++ mem/MemCommonPart.c (working copy)
3714 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3722 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
3723 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
3724 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
3729 PrintToken (STRING_TOKEN (STR_MEM_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3731 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3732 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3733 if (EFI_ERROR (Status)) {
3734 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3740 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3741 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3743 Buffer = (UINT8 *) (UINTN) Address;
3749 - Address = (UINT64) SystemTable;
3750 + Address = (UINT64)(UINTN) SystemTable;
3752 RetCode = LibCheckVariables (SI, MemCheckList, &ChkPck, &Useful);
3753 if (VarCheckOk != RetCode) {
3756 PrintToken (STRING_TOKEN (STR_MEM_NEW_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3758 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3759 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3760 if (EFI_ERROR (Status)) {
3761 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3767 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3768 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3770 Buffer = (UINT8 *) (UINTN) Address;
3772 Index: mem/MemCommonPart.h
3773 ===================================================================
3774 --- mem/MemCommonPart.h (revision 64)
3775 +++ mem/MemCommonPart.h (working copy)
3777 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
3781 \ No newline at end of file
3784 ===================================================================
3785 --- mem/mem.inf (revision 64)
3786 +++ mem/mem.inf (working copy)
3788 COMPONENT_TYPE = APPLICATION
3791 - ..\ShCommonStrings.uni
3792 + ../ShCommonStrings.uni
3802 - $(EDK_SOURCE)\Foundation
3803 - $(EDK_SOURCE)\Foundation\Include
3804 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3805 - $(EDK_SOURCE)\Foundation\Efi
3806 - $(EDK_SOURCE)\Foundation\Efi\Include
3807 - $(EDK_SOURCE)\Foundation\FrameWork
3808 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3809 - $(EDK_SOURCE)\Foundation\Core\Dxe
3813 + $(EDK_SOURCE)/Foundation
3814 + $(EDK_SOURCE)/Foundation/Include
3815 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3816 + $(EDK_SOURCE)/Foundation/Efi
3817 + $(EDK_SOURCE)/Foundation/Efi/Include
3818 + $(EDK_SOURCE)/Foundation/FrameWork
3819 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3820 + $(EDK_SOURCE)/Foundation/Core/Dxe
3826 # we will specify some additional DEFINEs on the compile command line.
3829 + IMAGE_ENTRY_POINT=DumpMm
3831 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3832 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3833 - IMAGE_ENTRY_POINT=DumpMm
3834 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3835 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3836 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3838 +[nmake.ARM, nmake.AARCH64]
3839 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3840 Index: mem/efidump.c
3841 ===================================================================
3842 --- mem/efidump.c (revision 64)
3843 +++ mem/efidump.c (working copy)
3848 -#include "Efipart.h"
3849 +#include "EfiPart.h"
3850 #include "EfiShellLib.h"
3852 #include STRING_DEFINES_FILE
3853 @@ -320,13 +320,11 @@
3857 - VOID *SalSystemTable;
3863 - SalSystemTable = NULL;
3867 @@ -352,11 +350,13 @@
3868 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiMemHandle, LibDevicePathToStr (DevicePath));
3871 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->RuntimeServices);
3872 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->BootServices);
3873 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3874 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3877 - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3878 + VOID *SalSystemTable;
3880 + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3881 if (!EFI_ERROR(Status)) {
3882 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiMemHandle, (UINT64)SalSystemTable);
3884 @@ -364,22 +364,22 @@
3886 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3887 if (!EFI_ERROR (Status)) {
3888 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64) AcpiTable);
3889 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64)(UINTN) AcpiTable);
3892 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3893 if (!EFI_ERROR (Status)) {
3894 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64) Acpi20Table);
3895 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64)(UINTN) Acpi20Table);
3898 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3899 if (!EFI_ERROR (Status)) {
3900 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64) MpsTable);
3901 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64)(UINTN) MpsTable);
3904 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3905 if (!EFI_ERROR (Status)) {
3906 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64) SMBIOSTable);
3907 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64)(UINTN) SMBIOSTable);
3912 ===================================================================
3913 --- mem/debug.h (revision 64)
3914 +++ mem/debug.h (working copy)
3916 extern EFI_HII_HANDLE HiiMemHandle;
3921 ===================================================================
3922 --- ls/ls.c (revision 64)
3923 +++ ls/ls.c (working copy)
3929 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3936 EFI_LIST_ENTRY DirList;
3937 - EFI_LIST_ENTRY *Link;
3938 SHELL_FILE_ARG *Arg;
3939 BOOLEAN WildcardsEncountered;
3944 InitializeListHead (&DirList);
3948 Status = EFI_SUCCESS;
3954 - EFI_STATUS Status;
3959 BOOLEAN LeadingBlanks;
3961 LeadingBlanks = TRUE;
3962 - Status = EFI_SUCCESS;
3964 for (PtrOne = PtrTwo = Path; PtrOne < Path + StrLen (Path); PtrOne++) {
3965 if ((*PtrOne) == ' ' && LeadingBlanks) {
3966 @@ -917,14 +912,14 @@
3968 if ((IsMatch && mIgnoreAttribute) ||
3969 (IsMatch && !mAttributes && !(Info->Attribute & EFI_FILE_HIDDEN) && !(Info->Attribute & EFI_FILE_SYSTEM)) ||
3974 (mAttribA ? (Info->Attribute & EFI_FILE_ARCHIVE ? TRUE : FALSE) : TRUE) &&
3975 (mAttribH ? (Info->Attribute & EFI_FILE_HIDDEN ? TRUE : FALSE) : TRUE) &&
3976 (mAttribR ? (Info->Attribute & EFI_FILE_READ_ONLY ? TRUE : FALSE) : TRUE) &&
3977 (mAttribS ? (Info->Attribute & EFI_FILE_SYSTEM ? TRUE : FALSE) : TRUE) &&
3978 - (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE)
3979 + (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE))
3984 ===================================================================
3985 --- ls/ls.h (revision 64)
3986 +++ ls/ls.h (working copy)
3992 \ No newline at end of file
3996 ===================================================================
3997 --- ls/ls.inf (revision 64)
3998 +++ ls/ls.inf (working copy)
4003 - ..\ShCommonStrings.uni
4004 + ../ShCommonStrings.uni
4013 - $(EDK_SOURCE)\Foundation
4014 - $(EDK_SOURCE)\Foundation\Include
4015 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4016 - $(EDK_SOURCE)\Foundation\Efi
4017 - $(EDK_SOURCE)\Foundation\Efi\Include
4018 - $(EDK_SOURCE)\Foundation\FrameWork
4019 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4020 - $(EDK_SOURCE)\Foundation\Core\Dxe
4024 + $(EDK_SOURCE)/Foundation
4025 + $(EDK_SOURCE)/Foundation/Include
4026 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4027 + $(EDK_SOURCE)/Foundation/Efi
4028 + $(EDK_SOURCE)/Foundation/Efi/Include
4029 + $(EDK_SOURCE)/Foundation/FrameWork
4030 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4031 + $(EDK_SOURCE)/Foundation/Core/Dxe
4039 IMAGE_ENTRY_POINT=InitializeLS
4041 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4042 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4043 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4044 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4046 +[nmake.ARM, nmake.AARCH64]
4047 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
4048 Index: stall/stall.c
4049 ===================================================================
4050 --- stall/stall.c (revision 64)
4051 +++ stall/stall.c (working copy)
4057 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4061 Index: stall/stall.h
4062 ===================================================================
4063 --- stall/stall.h (revision 64)
4064 +++ stall/stall.h (working copy)
4070 Index: stall/stall.inf
4071 ===================================================================
4072 --- stall/stall.inf (revision 64)
4073 +++ stall/stall.inf (working copy)
4078 - ..\ShCommonStrings.uni
4079 + ../ShCommonStrings.uni
4088 - $(EDK_SOURCE)\Foundation
4089 - $(EDK_SOURCE)\Foundation\Include
4090 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4091 - $(EDK_SOURCE)\Foundation\Efi
4092 - $(EDK_SOURCE)\Foundation\Efi\Include
4093 - $(EDK_SOURCE)\Foundation\FrameWork
4094 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4095 - $(EDK_SOURCE)\Foundation\Core\Dxe
4099 + $(EDK_SOURCE)/Foundation
4100 + $(EDK_SOURCE)/Foundation/Include
4101 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4102 + $(EDK_SOURCE)/Foundation/Efi
4103 + $(EDK_SOURCE)/Foundation/Efi/Include
4104 + $(EDK_SOURCE)/Foundation/FrameWork
4105 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4106 + $(EDK_SOURCE)/Foundation/Core/Dxe
4114 IMAGE_ENTRY_POINT=InitializeStall
4116 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4117 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4118 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4119 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4121 +[nmake.ARM, nmake.AARCH64]
4122 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
4123 Index: DeviceTree/devicetree.c
4124 ===================================================================
4125 --- DeviceTree/devicetree.c (revision 64)
4126 +++ DeviceTree/devicetree.c (working copy)
4131 -EFI_HII_HANDLE HiiHandle;
4132 +STATIC EFI_HII_HANDLE HiiHandle;
4133 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
4134 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
4141 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4145 Index: DeviceTree/devicetree.h
4146 ===================================================================
4147 --- DeviceTree/devicetree.h (revision 64)
4148 +++ DeviceTree/devicetree.h (working copy)
4150 0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
4154 Index: DeviceTree/devicetree.inf
4155 ===================================================================
4156 --- DeviceTree/devicetree.inf (revision 64)
4157 +++ DeviceTree/devicetree.inf (working copy)
4162 - ..\ShCommonStrings.uni
4163 + ../ShCommonStrings.uni
4164 DevicetreeStrings.uni
4172 - $(EDK_SOURCE)\Foundation
4173 - $(EDK_SOURCE)\Foundation\Include
4174 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4175 - $(EDK_SOURCE)\Foundation\Efi
4176 - $(EDK_SOURCE)\Foundation\Efi\Include
4177 - $(EDK_SOURCE)\Foundation\FrameWork
4178 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4179 - $(EDK_SOURCE)\Foundation\Core\Dxe
4183 + $(EDK_SOURCE)/Foundation
4184 + $(EDK_SOURCE)/Foundation/Include
4185 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4186 + $(EDK_SOURCE)/Foundation/Efi
4187 + $(EDK_SOURCE)/Foundation/Efi/Include
4188 + $(EDK_SOURCE)/Foundation/FrameWork
4189 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4190 + $(EDK_SOURCE)/Foundation/Core/Dxe
4198 IMAGE_ENTRY_POINT=DevicetreeMain
4200 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4201 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4202 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4203 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4205 +[nmake.ARM, nmake.AARCH64]
4206 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
4207 Index: TelnetMgmt/TelnetMgmt.c
4208 ===================================================================
4209 --- TelnetMgmt/TelnetMgmt.c (revision 64)
4210 +++ TelnetMgmt/TelnetMgmt.c (working copy)
4213 #include STRING_DEFINES_FILE
4215 -EFI_HII_HANDLE HiiHandle;
4216 +STATIC EFI_HII_HANDLE HiiHandle;
4217 EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID;
4218 EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID;
4219 SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
4225 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4229 Index: TelnetMgmt/TelnetMgmt.h
4230 ===================================================================
4231 --- TelnetMgmt/TelnetMgmt.h (revision 64)
4232 +++ TelnetMgmt/TelnetMgmt.h (working copy)
4234 0x55d41b9a, 0x954d, 0x4fbb, 0x8d, 0x6d, 0x24, 0x75, 0xf5, 0x30, 0x9d, 0x37 \
4238 \ No newline at end of file
4240 Index: TelnetMgmt/TelnetServer.h
4241 ===================================================================
4242 --- TelnetMgmt/TelnetServer.h (revision 64)
4243 +++ TelnetMgmt/TelnetServer.h (working copy)
4245 extern EFI_GUID gEfiTelnetServerGuid;
4249 Index: TelnetMgmt/TelnetMgmt.inf
4250 ===================================================================
4251 --- TelnetMgmt/TelnetMgmt.inf (revision 64)
4252 +++ TelnetMgmt/TelnetMgmt.inf (working copy)
4254 COMPONENT_TYPE = APPLICATION
4257 - ..\ShCommonStrings.uni
4258 + ../ShCommonStrings.uni
4259 TelnetMgmtStrings.uni
4266 - $(EDK_SOURCE)\Foundation
4267 - $(EDK_SOURCE)\Foundation\Include
4268 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4269 - $(EDK_SOURCE)\Foundation\Efi
4270 - $(EDK_SOURCE)\Foundation\Efi\Include
4271 - $(EDK_SOURCE)\Foundation\FrameWork
4272 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4273 - $(EDK_SOURCE)\Foundation\Core\Dxe
4277 + $(EDK_SOURCE)/Foundation
4278 + $(EDK_SOURCE)/Foundation/Include
4279 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4280 + $(EDK_SOURCE)/Foundation/Efi
4281 + $(EDK_SOURCE)/Foundation/Efi/Include
4282 + $(EDK_SOURCE)/Foundation/FrameWork
4283 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4284 + $(EDK_SOURCE)/Foundation/Core/Dxe
4292 IMAGE_ENTRY_POINT=InitializeTelnetMgmt
4294 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4295 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4296 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4297 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4299 +[nmake.ARM, nmake.AARCH64]
4300 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
4301 Index: shellenv/if.c
4302 ===================================================================
4303 --- shellenv/if.c (revision 64)
4304 +++ shellenv/if.c (working copy)
4313 @@ -122,10 +121,8 @@
4315 if ((StriCmp (SI->Argv[1], L"/i") == 0)) {
4323 NotPos = ExistI ? 2 : 1;
4324 Index: shellenv/init.c
4325 ===================================================================
4326 --- shellenv/init.c (revision 64)
4327 +++ shellenv/init.c (working copy)
4329 Status = BS->HandleProtocol (
4332 - &(mOldSEnv->Interface)
4333 + (VOID**)&(mOldSEnv->Interface)
4335 ASSERT (!EFI_ERROR (Status));
4336 Status = BS->ReinstallProtocolInterface (
4337 Index: shellenv/echo.c
4338 ===================================================================
4339 --- shellenv/echo.c (revision 64)
4340 +++ shellenv/echo.c (working copy)
4346 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4350 Index: shellenv/shelle.h
4351 ===================================================================
4352 --- shellenv/shelle.h (revision 64)
4353 +++ shellenv/shelle.h (working copy)
4354 @@ -2074,3 +2074,4 @@
4357 #endif // _SHELLE_H_
4359 Index: shellenv/batch.c
4360 ===================================================================
4361 --- shellenv/batch.c (revision 64)
4362 +++ shellenv/batch.c (working copy)
4363 @@ -2388,7 +2388,6 @@
4367 - BOOLEAN EndOfFile;
4370 CHAR16 *CommandLine;
4371 @@ -2396,7 +2395,6 @@
4372 EFI_BATCH_STATEMENT *Stmt;
4373 ENV_SHELL_INTERFACE NewShell;
4374 UINTN GotoTargetStatus;
4375 - UINTN SkippedIfCount;
4376 BOOLEAN EchoStateValid;
4378 EFI_STATUS ExecuteResult;
4379 @@ -2409,7 +2407,6 @@
4382 Status = EFI_SUCCESS;
4383 - EndOfFile = FALSE;
4385 EchoStateValid = FALSE;
4387 @@ -2468,14 +2465,6 @@
4388 EFI_BATCH_SCRIPT_SIGNATURE
4392 - // Iterate through the file, reading a line at a time and executing each
4393 - // line as a shell command. Nested shell scripts will come through
4394 - // this code path recursively.
4396 - EndOfFile = FALSE;
4397 - SkippedIfCount = 0;
4401 // Read a command line from the file
4402 @@ -2681,7 +2670,7 @@
4403 LastError = ExecuteResult;
4406 - if (ExecuteResult == -1) {
4407 + if (ExecuteResult == (EFI_STATUS) -1) {
4408 SE2->DecrementShellNestingLevel ();
4409 if (SE2->IsRootShell ()) {
4411 @@ -2774,7 +2763,7 @@
4412 Status = _ResumePreviousMode ();
4415 - if (LastError == -1) {
4416 + if (LastError == (UINTN) -1) {
4420 Index: shellenv/dprot.c
4421 ===================================================================
4422 --- shellenv/dprot.c (revision 64)
4423 +++ shellenv/dprot.c (working copy)
4427 #include "shellenvguid.h"
4431 STATIC CHAR16 *SEnvDP_IlleagalStr[] = { L"Illegal" };
4434 I2O_DEVICE_PATH *I2ODevicePath;
4435 MAC_ADDR_DEVICE_PATH *MacAddrDevicePath;
4436 IPv4_DEVICE_PATH *IPv4DevicePath;
4437 - IPv6_DEVICE_PATH *IPv6DevicePath;
4438 INFINIBAND_DEVICE_PATH *InfinibandDevicePath;
4439 UART_DEVICE_PATH *UartDevicePath;
4440 VENDOR_DEVICE_PATH *VendorDevicePath;
4445 - IPv6DevicePath = (IPv6_DEVICE_PATH *) DevicePath;
4446 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_NOT_AVAIL), HiiEnvHandle);
4449 @@ -1054,6 +1052,8 @@
4450 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4451 } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) {
4452 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4453 + } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_AARCH64) {
4454 + Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4456 Magic = NtHdr->OptionalHeader.Magic;
4458 @@ -1294,6 +1294,8 @@
4459 case EfiIsaAcpiResourceInterrupt:
4460 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_INT), HiiEnvHandle);
4462 + case EfiIsaAcpiResourceEndOfList:
4466 if (IsaIo->ResourceList->ResourceItem[Index].StartRange == IsaIo->ResourceList->ResourceItem[Index].EndRange) {
4467 Index: shellenv/Connect.c
4468 ===================================================================
4469 --- shellenv/Connect.c (revision 64)
4470 +++ shellenv/Connect.c (working copy)
4476 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4485 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4494 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4499 Status = BS->HandleProtocol (
4501 &gEfiDevicePathProtocolGuid,
4505 if (EFI_ERROR (Status)) {
4506 DriverBindingHandleCount = 1;
4508 Status = BS->HandleProtocol (
4510 &gEfiDevicePathProtocolGuid,
4514 if (EFI_ERROR (Status)) {
4517 Status = BS->HandleProtocol (
4519 &gEfiDriverBindingProtocolGuid,
4523 if (EFI_ERROR (Status)) {
4526 Status = BS->HandleProtocol (
4527 AllHandleBuffer[Index],
4528 &gEfiDriverBindingProtocolGuid,
4532 if (EFI_ERROR (Status)) {
4533 DeviceHandleBuffer[DeviceHandleCount++] = AllHandleBuffer[Index];
4534 @@ -1052,7 +1052,7 @@
4535 Status = BS->HandleProtocol (
4539 + (VOID**)&Interface
4543 @@ -1079,7 +1079,7 @@
4544 Status = BS->HandleProtocol (
4545 AllHandleBuffer[Index],
4546 &gEfiDevicePathProtocolGuid,
4548 + (VOID**)&Interface
4550 if (!EFI_ERROR (Status)) {
4551 ConsoleIndex = Index;
4552 @@ -1095,7 +1095,7 @@
4553 BS->HandleProtocol (
4557 + (VOID**)ConsoleInterface
4561 Index: shellenv/shellenvguid.h
4562 ===================================================================
4563 --- shellenv/shellenvguid.h (revision 64)
4564 +++ shellenv/shellenvguid.h (working copy)
4566 extern EFI_HII_HANDLE HiiEnvHandle;
4570 Index: shellenv/protid.c
4571 ===================================================================
4572 --- shellenv/protid.c (revision 64)
4573 +++ shellenv/protid.c (working copy)
4579 + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
4583 @@ -1183,7 +1183,7 @@
4584 *DriverName = LibDevicePathToStr (Image->FilePath);
4587 - LibGetDriverName (DriverBindingHandle, Language, DriverName);
4588 + LibGetDriverName (DriverBindingHandle, (CHAR8*)Language, DriverName);
4592 @@ -1539,7 +1539,7 @@
4595 BestDeviceName = NULL;
4596 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
4597 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
4600 PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_CONTROLLER_NAME), HiiEnvHandle);
4601 @@ -1598,14 +1598,14 @@
4603 Status = GetDriverName (
4604 DriverBindingHandleBuffer[Index],
4610 if (DriverName == NULL) {
4611 Status = GetDriverName (
4612 DriverBindingHandleBuffer[Index],
4618 @@ -1792,7 +1792,7 @@
4620 Status = GetDriverName (
4627 @@ -1806,7 +1806,7 @@
4629 Status = GetDriverName (
4636 @@ -1979,7 +1979,7 @@
4638 if (Prot->Handles[Index] == Handle) {
4639 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
4640 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
4641 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
4642 if (!EFI_ERROR (Status)) {
4644 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
4645 @@ -2027,7 +2027,7 @@
4649 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
4650 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
4651 if (!EFI_ERROR (Status)) {
4653 STRING_TOKEN (STR_SHELLENV_PROTID_TWO_VARS_HG_NEW),
4654 @@ -2660,8 +2660,6 @@
4658 - EFI_STATUS Status;
4660 DEVICEPATH_INFO *DevicePathInfo;
4663 @@ -2688,7 +2686,7 @@
4665 // Establish current device path info list
4667 - Status = LibLocateHandle (
4672 Index: shellenv/parsecmd.h
4673 ===================================================================
4674 --- shellenv/parsecmd.h (revision 64)
4675 +++ shellenv/parsecmd.h (working copy)
4677 IN OUT SHELL_PARSED_ARGS *args
4681 \ No newline at end of file
4684 Index: shellenv/ConsoleProxy.c
4685 ===================================================================
4686 --- shellenv/ConsoleProxy.c (revision 64)
4687 +++ shellenv/ConsoleProxy.c (working copy)
4688 @@ -1483,7 +1483,7 @@
4690 if (!EFI_ERROR (TimerStatus)) {
4691 mConInProxy.InputState = INPUT_STATE_DEFAULT;
4693 + Status = BS->SetTimer (
4694 mConInProxy.TwoSecondTimeOut,
4697 @@ -1496,9 +1496,11 @@
4700 mConInProxy.InputState = INPUT_STATE_ESC;
4702 + Status = EFI_UNSUPPORTED;
4705 - return EFI_SUCCESS;
4710 Index: shellenv/conio.c
4711 ===================================================================
4712 --- shellenv/conio.c (revision 64)
4713 +++ shellenv/conio.c (working copy)
4716 // If we need to update the output do so now
4718 - if (Update != -1) {
4719 + if (Update != (UINTN) -1) {
4720 if ((ConOut->Mode->CursorColumn != (INT32) Column) || (ConOut->Mode->CursorRow != (INT32) Row)) {
4721 PrintAt (Column, Row, L"%s%.*s", Str + Update, Delete, L"");
4723 Index: shellenv/map.c
4724 ===================================================================
4725 --- shellenv/map.c (revision 64)
4726 +++ shellenv/map.c (working copy)
4732 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4741 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4745 @@ -2038,13 +2038,13 @@
4749 - Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, &BlockIo);
4750 + Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID**)&BlockIo);
4752 // This is just for NT32, because fsntx has no block io protocol installed
4753 // but fsntx has installed simple file system protocol
4755 if (EFI_ERROR (Status)) {
4756 - Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, &BlockIo);
4757 + Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&BlockIo);
4760 if (EFI_ERROR (Status)) {
4761 @@ -2630,7 +2630,6 @@
4767 EFI_LIST_ENTRY *Link;
4768 EFI_LIST_ENTRY *Head;
4769 @@ -2729,11 +2728,6 @@
4774 - // New code, try to make mapping list sequence unchanged if current device
4775 - // paths and original device paths are the same
4780 // Load handle table and handle protocol info so that we can get
4781 @@ -3410,4 +3404,4 @@
4782 FreePool (HistoryNode->DevicePath);
4783 FreePool (HistoryNode);
4786 \ No newline at end of file
4788 Index: shellenv/pause.c
4789 ===================================================================
4790 --- shellenv/pause.c (revision 64)
4791 +++ shellenv/pause.c (working copy)
4797 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4801 Index: shellenv/exec.c
4802 ===================================================================
4803 --- shellenv/exec.c (revision 64)
4804 +++ shellenv/exec.c (working copy)
4810 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4819 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4823 @@ -1270,7 +1270,6 @@
4824 SHELLENV_INTERNAL_COMMAND InternalCommand;
4825 EFI_HANDLE NewImage;
4826 EFI_FILE_HANDLE Script;
4828 BOOLEAN ConsoleContextSaved;
4829 EFI_HANDLE SavedConsoleInHandle;
4830 EFI_HANDLE SavedConsoleOutHandle;
4831 @@ -1292,7 +1291,6 @@
4833 Status = EFI_SUCCESS;
4836 ConsoleContextSaved = FALSE;
4839 @@ -1557,7 +1555,7 @@
4842 EFI_SHELL_APP_INIT (ParentImageHandle, ParentSystemTable);
4843 - if (-2 == Status) {
4844 + if ((EFI_STATUS) -2 == Status) {
4846 // if status = -2 we assume that a nested shell has just exited.
4848 @@ -1613,7 +1611,9 @@
4851 if (EFI_ERROR (Status) && Output) {
4852 - if ((Status == -1) || (Status == -2) || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4853 + if ((Status == (EFI_STATUS) -1)
4854 + || (Status == (EFI_STATUS) -2)
4855 + || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4856 || (Status == EFI_REDIRECTION_SAME)) {
4858 PrintToken (STRING_TOKEN (STR_SHELLENV_EXEC_EXIT_STATUS_CODE), HiiEnvHandle, Status);
4859 @@ -1674,7 +1674,7 @@
4860 PrintToken (STRING_TOKEN (STR_SHELLENV_REDIR_NOT_ALLOWED), HiiEnvHandle);
4863 - if (Status != -1) {
4864 + if (Status != (EFI_STATUS) -1) {
4866 // Don't Print on a "Disconnect All" exit. The ConOut device may not exist
4868 @@ -1872,7 +1872,7 @@
4872 - // Processing foo: or foo:\
4873 + // Processing foo:\ or foo:
4875 if (PathPos != -1 && Ptr1 == NULL) {
4877 @@ -2638,7 +2638,6 @@
4880 CHAR16 *SubstituteStr;
4881 - CHAR16 *OldSubstituteStr;
4885 @@ -2735,7 +2734,6 @@
4886 // Try to find a shell enviroment variable
4889 - OldSubstituteStr = SubstituteStr;
4890 SubstituteStr = Str + 1;
4891 while (*SubstituteStr != '%' && *SubstituteStr != 0 && (!IsWhiteSpace (*SubstituteStr) || ParseState->Quote)) {
4892 if (*SubstituteStr == '"') {
4893 Index: shellenv/for.c
4894 ===================================================================
4895 --- shellenv/for.c (revision 64)
4896 +++ shellenv/for.c (working copy)
4899 #include "shellenvguid.h"
4905 IN CHAR16 *wszValueStr,
4908 EFI_SUCCESS The function finished sucessfully
4913 EFI_BATCH_STATEMENT *Stmt;
4914 EFI_LIST_ENTRY FileList;
4924 IN EFI_HANDLE hImageHandle,
4925 Index: shellenv/help.c
4926 ===================================================================
4927 --- shellenv/help.c (revision 64)
4928 +++ shellenv/help.c (working copy)
4934 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4938 Index: shellenv/var.c
4939 ===================================================================
4940 --- shellenv/var.c (revision 64)
4941 +++ shellenv/var.c (working copy)
4947 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4952 EFI_LIST_ENTRY *ListHead;
4959 @@ -175,15 +174,12 @@
4960 // See if it's a shellenv variable
4964 if (CompareGuid (&Id, &SEnvEnvId) == 0) {
4965 ListHead = &SEnvEnv;
4969 if (CompareGuid (&Id, &SEnvAliasId) == 0) {
4970 ListHead = &SEnvAlias;
4975 Index: reset/reset.c
4976 ===================================================================
4977 --- reset/reset.c (revision 64)
4978 +++ reset/reset.c (working copy)
4984 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4988 Index: reset/reset.h
4989 ===================================================================
4990 --- reset/reset.h (revision 64)
4991 +++ reset/reset.h (working copy)
4997 Index: reset/reset.inf
4998 ===================================================================
4999 --- reset/reset.inf (revision 64)
5000 +++ reset/reset.inf (working copy)
5005 - ..\ShCommonStrings.uni
5006 + ../ShCommonStrings.uni
5015 - $(EDK_SOURCE)\Foundation
5016 - $(EDK_SOURCE)\Foundation\Include
5017 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5018 - $(EDK_SOURCE)\Foundation\Efi
5019 - $(EDK_SOURCE)\Foundation\Efi\Include
5020 - $(EDK_SOURCE)\Foundation\FrameWork
5021 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5022 - $(EDK_SOURCE)\Foundation\Core\Dxe
5026 + $(EDK_SOURCE)/Foundation
5027 + $(EDK_SOURCE)/Foundation/Include
5028 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5029 + $(EDK_SOURCE)/Foundation/Efi
5030 + $(EDK_SOURCE)/Foundation/Efi/Include
5031 + $(EDK_SOURCE)/Foundation/FrameWork
5032 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5033 + $(EDK_SOURCE)/Foundation/Core/Dxe
5041 IMAGE_ENTRY_POINT=InitializeReset
5043 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5044 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5045 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5046 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5048 +[nmake.ARM, nmake.AARCH64]
5049 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
5050 Index: touch/touch.c
5051 ===================================================================
5052 --- touch/touch.c (revision 64)
5053 +++ touch/touch.c (working copy)
5058 -EFI_HII_HANDLE HiiHandle;
5059 +STATIC EFI_HII_HANDLE HiiHandle;
5060 EFI_GUID EfiTouchGuid = EFI_TOUCH_GUID;
5061 SHELL_VAR_CHECK_ITEM TouchCheckList[] = {
5063 Index: touch/touch.h
5064 ===================================================================
5065 --- touch/touch.h (revision 64)
5066 +++ touch/touch.h (working copy)
5068 0xa16a4695, 0x5815, 0x4d4f, 0xb8, 0xe, 0x6a, 0xf, 0x88, 0xac, 0xdb, 0x6c \
5072 \ No newline at end of file
5074 Index: touch/touch.inf
5075 ===================================================================
5076 --- touch/touch.inf (revision 64)
5077 +++ touch/touch.inf (working copy)
5079 COMPONENT_TYPE = APPLICATION
5082 - ..\ShCommonStrings.uni
5083 + ../ShCommonStrings.uni
5091 - $(EDK_SOURCE)\Foundation
5092 - $(EDK_SOURCE)\Foundation\Include
5093 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5094 - $(EDK_SOURCE)\Foundation\Efi
5095 - $(EDK_SOURCE)\Foundation\Efi\Include
5096 - $(EDK_SOURCE)\Foundation\FrameWork
5097 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5098 - $(EDK_SOURCE)\Foundation\Core\Dxe
5102 + $(EDK_SOURCE)/Foundation
5103 + $(EDK_SOURCE)/Foundation/Include
5104 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5105 + $(EDK_SOURCE)/Foundation/Efi
5106 + $(EDK_SOURCE)/Foundation/Efi/Include
5107 + $(EDK_SOURCE)/Foundation/FrameWork
5108 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5109 + $(EDK_SOURCE)/Foundation/Core/Dxe
5117 IMAGE_ENTRY_POINT=InitializeTouch
5119 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5120 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5121 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5122 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5124 +[nmake.ARM, nmake.AARCH64]
5125 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
5127 ===================================================================
5128 --- Shell.inf (revision 64)
5129 +++ Shell.inf (working copy)
5130 @@ -25,179 +25,189 @@
5131 COMPONENT_TYPE = APPLICATION
5134 - Library\ShellDebug.c
5144 - Library\ShellEnvInt.c
5147 - Library\ConsistMapping.c
5151 - Library\VarCheck.c
5152 - Library\HiiSupport.c
5153 + Library/ShellDebug.c
5163 + Library/ShellEnvInt.c
5166 + Library/ConsistMapping.c
5170 + Library/VarCheck.c
5171 + Library/HiiSupport.c
5173 - newshell\NshellStrings.uni
5176 - newshell\fakehii.c
5177 + newshell/NshellStrings.uni
5180 + newshell/fakehii.c
5183 - shellenv\ShellenvHelpStrings.uni
5184 - shellenv\ShellenvStrings.uni
5185 - shellenv\ScriptCmdStrings.uni
5186 - shellenv\ConnectStrings.uni
5187 - shellenv\EchoStrings.uni
5188 - shellenv\HelpStrings.uni
5189 - shellenv\MapStrings.uni
5190 - shellenv\CdStrings.uni
5191 - shellenv\DhStrings.uni
5192 + shellenv/ShellenvHelpStrings.uni
5193 + shellenv/ShellenvStrings.uni
5194 + shellenv/ScriptCmdStrings.uni
5195 + shellenv/ConnectStrings.uni
5196 + shellenv/EchoStrings.uni
5197 + shellenv/HelpStrings.uni
5198 + shellenv/MapStrings.uni
5199 + shellenv/CdStrings.uni
5200 + shellenv/DhStrings.uni
5202 - shellenv\cmddisp.c
5203 - shellenv\connect.c
5210 - shellenv\consoleproxy.c
5224 - shellenv\shellenvguid.h
5225 - shellenv\parsecmd.c
5227 + shellenv/cmddisp.c
5228 + shellenv/connect.c
5235 + shellenv/consoleproxy.c
5249 + shellenv/shellenvguid.h
5250 + shellenv/parsecmd.c
5253 - unload\UnloadStrings.uni
5255 + unload/UnloadStrings.uni
5258 - attrib\AttribStrings.uni
5261 + attrib/AttribStrings.uni
5265 - cls\clsstrings.uni
5267 + cls/clsstrings.uni
5277 - date\DateStrings.uni
5280 + date/DateStrings.uni
5284 - load\LoadStrings.uni
5287 + load/LoadStrings.uni
5298 - mkdir\MkdirStrings.uni
5301 + mkdir/MkdirStrings.uni
5312 - reset\ResetStrings.uni
5315 + reset/ResetStrings.uni
5326 - type\TypeStrings.uni
5329 - time\TimeStrings.uni
5332 + type/TypeStrings.uni
5335 + time/TimeStrings.uni
5339 - touch\TouchStrings.uni
5342 + touch/TouchStrings.uni
5346 - vol\VolStrings.uni
5349 + vol/VolStrings.uni
5353 - ver\VerStrings.uni
5356 + ver/VerStrings.uni
5360 - drivers\driversStrings.uni
5363 + drivers/driversStrings.uni
5367 - drvcfg\DrvcfgStrings.uni
5370 + drvcfg/DrvcfgStrings.uni
5374 - drvdiag\DrvdiagStrings.uni
5377 + drvdiag/DrvdiagStrings.uni
5385 - Library\ia32\math.c
5386 - Library\ia32\initplat.c
5388 + Library/IA32/math.c
5389 + Library/IA32/initplat.c
5394 - Library\ipf\math.c
5395 - Library\ipf\initplat.c
5396 - Library\ipf\palproc.s
5397 - Library\ipf\salpal.c
5399 + Library/IPF/math.c
5400 + Library/IPF/initplat.c
5401 + Library/IPF/palproc.s
5402 + Library/IPF/salpal.c
5406 - Library\EBC\math.c
5407 - Library\EBC\initplat.c
5409 + Library/Ebc/math.c
5410 + Library/Ebc/initplat.c
5414 - Library\ipf\math.c
5415 - Library\ia32\initplat.c
5417 + Library/IPF/math.c
5418 + Library/IA32/initplat.c
5422 + Library/IPF/math.c
5423 + Library/IA32/initplat.c
5427 + Library/IPF/math.c
5428 + Library/IA32/initplat.c
5435 - $(EDK_SOURCE)\Foundation
5436 - $(EDK_SOURCE)\Foundation\Include
5437 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5438 - $(EDK_SOURCE)\Foundation\Efi
5439 - $(EDK_SOURCE)\Foundation\Efi\Include
5440 - $(EDK_SOURCE)\Foundation\FrameWork
5441 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5442 - $(EDK_SOURCE)\Foundation\Core\Dxe
5446 + $(EDK_SOURCE)/Foundation
5447 + $(EDK_SOURCE)/Foundation/Include
5448 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5449 + $(EDK_SOURCE)/Foundation/Efi
5450 + $(EDK_SOURCE)/Foundation/Efi/Include
5451 + $(EDK_SOURCE)/Foundation/FrameWork
5452 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5453 + $(EDK_SOURCE)/Foundation/Core/Dxe
5457 @@ -216,17 +226,18 @@
5458 # we will specify some additional DEFINEs on the compile command line.
5461 + IMAGE_ENTRY_POINT=InitializeShell
5463 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5464 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
5465 - IMAGE_ENTRY_POINT=InitializeShell
5466 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
5467 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5468 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5469 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
5471 +[nmake.ARM, nmake.AARCH64]
5472 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL
5475 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL
5476 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5477 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5482 \ No newline at end of file
5483 Index: IfConfig/IfConfig.inf
5484 ===================================================================
5485 --- IfConfig/IfConfig.inf (revision 64)
5486 +++ IfConfig/IfConfig.inf (working copy)
5488 COMPONENT_TYPE = APPLICATION
5491 - ..\ShCommonStrings.uni
5492 + ../ShCommonStrings.uni
5502 - $(EDK_SOURCE)\Foundation\Efi
5503 - $(EDK_SOURCE)\Foundation
5504 - $(EDK_SOURCE)\Foundation\Efi\Include
5505 - $(EDK_SOURCE)\Foundation\Include
5506 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5507 - $(EDK_SOURCE)\Foundation\FrameWork
5508 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5509 - $(EDK_SOURCE)\Foundation\Core\Dxe
5510 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
5514 + $(EDK_SOURCE)/Foundation/Efi
5515 + $(EDK_SOURCE)/Foundation
5516 + $(EDK_SOURCE)/Foundation/Efi/Include
5517 + $(EDK_SOURCE)/Foundation/Include
5518 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5519 + $(EDK_SOURCE)/Foundation/FrameWork
5520 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5521 + $(EDK_SOURCE)/Foundation/Core/Dxe
5522 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
5533 - C_PROJ_FLAGS = $(C_PROJ_FLAGS)
5534 IMAGE_ENTRY_POINT=IfConfig
5535 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5537 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5538 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5539 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5540 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5542 +[nmake.ARM, nmake.AARCH64]
5543 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
5544 Index: IfConfig/ShellNetHelper.h
5545 ===================================================================
5546 --- IfConfig/ShellNetHelper.h (revision 64)
5547 +++ IfConfig/ShellNetHelper.h (working copy)
5549 IN EFI_HANDLE ChildHandle
5553 Index: IfConfig/IfConfig.c
5554 ===================================================================
5555 --- IfConfig/IfConfig.c (revision 64)
5556 +++ IfConfig/IfConfig.c (working copy)
5559 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
5561 -EFI_HII_HANDLE HiiHandle;
5562 +STATIC EFI_HII_HANDLE HiiHandle;
5564 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
5571 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
5576 Status = BS->LocateProtocol (
5577 &gEfiHiiConfigRoutingProtocolGuid,
5579 - &mHiiConfigRouting
5580 + (VOID**)&mHiiConfigRouting
5582 if (EFI_ERROR (Status)) {
5583 return EFI_NOT_FOUND;
5584 Index: IfConfig/IfConfig.h
5585 ===================================================================
5586 --- IfConfig/IfConfig.h (revision 64)
5587 +++ IfConfig/IfConfig.h (working copy)
5593 Index: edit/libStatusBar.c
5594 ===================================================================
5595 --- edit/libStatusBar.c (revision 64)
5596 +++ edit/libStatusBar.c (working copy)
5597 @@ -157,11 +157,15 @@
5598 // back up the screen attributes
5600 Orig = MainEditor.ColorAttributes;
5602 New.Colors.Foreground = Orig.Colors.Background;
5603 New.Colors.Background = Orig.Colors.Foreground;
5605 Out->EnableCursor (Out, FALSE);
5606 - Out->SetAttribute (Out, New.Data);
5607 + Out->SetAttribute (
5609 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5614 @@ -191,7 +195,10 @@
5616 // restore the old screen attributes
5618 - Out->SetAttribute (Out, Orig.Data);
5619 + Out->SetAttribute (
5621 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5625 // restore position in edit area
5626 Index: edit/libFileBuffer.c
5627 ===================================================================
5628 --- edit/libFileBuffer.c (revision 64)
5629 +++ edit/libFileBuffer.c (working copy)
5631 // backup the old screen attributes
5633 Orig = MainEditor.ColorAttributes;
5634 - New.Colors.Foreground = Orig.Colors.Background;
5635 - New.Colors.Background = Orig.Colors.Foreground;
5637 + New.Colors.Foreground = Orig.Colors.Foreground;
5638 + New.Colors.Background = Orig.Colors.Background;
5641 // clear the old mouse position
5642 @@ -235,10 +236,14 @@
5648 // set the new mouse position
5650 - Out->SetAttribute (Out, New.Data);
5651 + Out->SetAttribute (
5653 + EFI_TEXT_ATTR (New.Colors.Background, New.Colors.Foreground)
5657 // clear the old mouse position
5658 @@ -278,7 +283,10 @@
5660 // end of HasCharacter
5662 - Out->SetAttribute (Out, Orig.Data);
5663 + Out->SetAttribute (
5665 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5669 // end of MouseNeedRefresh
5673 UnicodeBuffer = NULL;
5675 + Type = DEFAULT_TYPE;
5678 // in this function, when you return error ( except EFI_OUT_OF_RESOURCES )
5679 @@ -2624,15 +2632,9 @@
5683 - EFI_EDITOR_LINE *Line;
5688 - // go to the first column of the line
5690 - Line = FileBuffer.CurrentLine;
5692 FRow = FileBuffer.FilePosition.Row;
5695 Index: edit/libtitlebar.h
5696 ===================================================================
5697 --- edit/libtitlebar.h (revision 64)
5698 +++ edit/libtitlebar.h (working copy)
5704 Index: edit/libstatusbar.h
5705 ===================================================================
5706 --- edit/libstatusbar.h (revision 64)
5707 +++ edit/libstatusbar.h (working copy)
5713 Index: edit/libfilebuffer.h
5714 ===================================================================
5715 --- edit/libfilebuffer.h (revision 64)
5716 +++ edit/libfilebuffer.h (working copy)
5722 Index: edit/libInputBar.c
5723 ===================================================================
5724 --- edit/libInputBar.c (revision 64)
5725 +++ edit/libInputBar.c (working copy)
5734 // variable initialization
5735 @@ -162,10 +160,14 @@
5736 // back up the old screen attributes
5738 Orig = MainEditor.ColorAttributes;
5740 New.Colors.Foreground = Orig.Colors.Background;
5741 New.Colors.Background = Orig.Colors.Foreground;
5743 - Out->SetAttribute (Out, New.Data);
5744 + Out->SetAttribute (
5746 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5751 @@ -173,22 +175,19 @@
5752 EditorClearLine (INPUT_BAR_LOCATION);
5754 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
5755 - PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt);
5756 + PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt);
5759 - // that's the maximum input length that can be displayed on screen
5761 - PromptLen = StrLen (MainInputBar.Prompt);
5762 - Limit = MainEditor.ScreenSize.Column - PromptLen;
5765 // this is a selection prompt, cursor will stay in edit area
5766 // actually this is for search , search/replace
5768 if (StrStr (MainInputBar.Prompt, L"Yes/No")) {
5770 FileBufferRestorePosition ();
5771 - Out->SetAttribute (Out, Orig.Data);
5772 + Out->SetAttribute (
5774 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5779 @@ -265,7 +264,10 @@
5781 // restore screen attributes
5783 - Out->SetAttribute (Out, Orig.Data);
5784 + Out->SetAttribute (
5786 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5789 StatusBarNeedRefresh = TRUE;
5791 Index: edit/libEditor.c
5792 ===================================================================
5793 --- edit/libEditor.c (revision 64)
5794 +++ edit/libEditor.c (working copy)
5796 Status = BS->HandleProtocol (
5798 &gEfiSimplePointerProtocolGuid,
5799 - &MainEditor.MouseInterface
5800 + (VOID**)&MainEditor.MouseInterface
5802 if (EFI_ERROR (Status)) {
5805 Status = BS->HandleProtocol (
5806 HandleBuffer[Index],
5807 &gEfiSimplePointerProtocolGuid,
5808 - &MainEditor.MouseInterface
5809 + (VOID**)&MainEditor.MouseInterface
5811 if (!EFI_ERROR (Status)) {
5813 @@ -169,31 +169,31 @@
5815 Status = MainTitleBarInit ();
5816 if (EFI_ERROR (Status)) {
5817 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle);
5818 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle);
5819 return EFI_LOAD_ERROR;
5822 Status = MainMenuBarInit ();
5823 if (EFI_ERROR (Status)) {
5824 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle);
5825 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle);
5826 return EFI_LOAD_ERROR;
5829 Status = MainStatusBarInit ();
5830 if (EFI_ERROR (Status)) {
5831 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle);
5832 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle);
5833 return EFI_LOAD_ERROR;
5836 Status = MainInputBarInit ();
5837 if (EFI_ERROR (Status)) {
5838 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle);
5839 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle);
5840 return EFI_LOAD_ERROR;
5843 Status = FileBufferInit ();
5844 if (EFI_ERROR (Status)) {
5845 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle);
5846 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle);
5847 return EFI_LOAD_ERROR;
5850 @@ -234,27 +234,27 @@
5852 Status = MainTitleBarCleanup ();
5853 if (EFI_ERROR (Status)) {
5854 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle);
5855 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle);
5858 Status = MainMenuBarCleanup ();
5859 if (EFI_ERROR (Status)) {
5860 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle);
5861 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle);
5864 Status = MainStatusBarCleanup ();
5865 if (EFI_ERROR (Status)) {
5866 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle);
5867 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle);
5870 Status = MainInputBarCleanup ();
5871 if (EFI_ERROR (Status)) {
5872 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle);
5873 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle);
5876 Status = FileBufferCleanup ();
5877 if (EFI_ERROR (Status)) {
5878 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle);
5879 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle);
5883 Index: edit/edit.inf
5884 ===================================================================
5885 --- edit/edit.inf (revision 64)
5886 +++ edit/edit.inf (working copy)
5888 COMPONENT_TYPE = APPLICATION
5891 - ..\ShCommonStrings.uni
5892 + ../ShCommonStrings.uni
5902 - $(EDK_SOURCE)\Foundation
5903 - $(EDK_SOURCE)\Foundation\Include
5904 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5905 - $(EDK_SOURCE)\Foundation\Efi
5906 - $(EDK_SOURCE)\Foundation\Efi\Include
5907 - $(EDK_SOURCE)\Foundation\FrameWork
5908 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5909 - $(EDK_SOURCE)\Foundation\Core\Dxe
5913 + $(EDK_SOURCE)/Foundation
5914 + $(EDK_SOURCE)/Foundation/Include
5915 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5916 + $(EDK_SOURCE)/Foundation/Efi
5917 + $(EDK_SOURCE)/Foundation/Efi/Include
5918 + $(EDK_SOURCE)/Foundation/FrameWork
5919 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5920 + $(EDK_SOURCE)/Foundation/Core/Dxe
5926 # we will specify some additional DEFINEs on the compile command line.
5929 + IMAGE_ENTRY_POINT=InitializeEFIEditor
5931 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5932 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
5933 - IMAGE_ENTRY_POINT=InitializeEFIEditor
5934 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5935 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5936 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5940 \ No newline at end of file
5941 +[nmake.ARM, nmake.AARCH64]
5942 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
5943 Index: edit/libMenuBar.c
5944 ===================================================================
5945 --- edit/libMenuBar.c (revision 64)
5946 +++ edit/libMenuBar.c (working copy)
5949 CHAR16 *FunctionKeyString;
5951 - EFI_STATUS Status;
5954 // variable initialization
5956 FunctionKeyString = AllocatePool (BufferSize);
5958 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5959 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
5960 + Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
5962 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
5963 + LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize);
5966 Width = max ((StrLen (NameString) + 6), 20);
5970 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5971 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
5972 + Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
5974 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
5975 + LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
5977 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
5979 Index: edit/libinputbar.h
5980 ===================================================================
5981 --- edit/libinputbar.h (revision 64)
5982 +++ edit/libinputbar.h (working copy)
5988 Index: edit/libeditor.h
5989 ===================================================================
5990 --- edit/libeditor.h (revision 64)
5991 +++ edit/libeditor.h (working copy)
5998 ===================================================================
5999 --- edit/main.c (revision 64)
6000 +++ edit/main.c (working copy)
6005 -EFI_HII_HANDLE HiiHandle;
6006 +EFI_HII_HANDLE gEditHiiHandle;
6007 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
6008 EFI_HII_PROTOCOL *Hii;
6015 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6019 @@ -121,13 +121,13 @@
6021 // There should only be one HII protocol
6023 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
6024 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
6025 if (EFI_ERROR (Status) || NULL == Hii) {
6030 - Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
6031 + Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
6033 if (EFI_ERROR (Status)) {
6036 if (VarCheckOk != RetCode) {
6038 case VarCheckUnknown:
6039 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful);
6040 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful);
6044 @@ -161,10 +161,10 @@
6045 ChkPck.FlagCount > 2 ||
6046 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
6048 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
6049 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
6050 Status = EFI_INVALID_PARAMETER;
6052 - PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle);
6053 + PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle);
6054 Status = EFI_SUCCESS;
6057 @@ -172,21 +172,21 @@
6060 if (ChkPck.ValueCount > 1) {
6061 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
6062 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
6063 Status = EFI_INVALID_PARAMETER;
6067 if (ChkPck.ValueCount == 1) {
6068 if (!IsValidFileName (ChkPck.VarList->VarStr)) {
6069 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle);
6070 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle);
6071 Status = EFI_INVALID_PARAMETER;
6076 if (SI->RedirArgc != 0) {
6077 - PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle);
6078 + PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle);
6079 Status = EFI_INVALID_PARAMETER;
6083 if (EFI_ERROR (Status)) {
6084 Out->ClearScreen (Out);
6085 Out->EnableCursor (Out, TRUE);
6086 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle);
6087 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle);
6091 @@ -240,19 +240,19 @@
6093 if (Status == EFI_SUCCESS) {
6094 } else if (Status == EFI_OUT_OF_RESOURCES) {
6095 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit");
6096 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit");
6098 if (Buffer != NULL) {
6099 if (StrCmp (Buffer, L"") != 0) {
6101 // print out the status string
6103 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer);
6104 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer);
6106 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
6107 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
6110 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
6111 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
6115 Index: edit/libmenubar.h
6116 ===================================================================
6117 --- edit/libmenubar.h (revision 64)
6118 +++ edit/libmenubar.h (working copy)
6124 Index: edit/libMisc.h
6125 ===================================================================
6126 --- edit/libMisc.h (revision 64)
6127 +++ edit/libMisc.h (working copy)
6133 Index: edit/editor.h
6134 ===================================================================
6135 --- edit/editor.h (revision 64)
6136 +++ edit/editor.h (working copy)
6138 #include "libstatusbar.h"
6139 #include "libinputbar.h"
6140 #include "libmenubar.h"
6141 -#include "libmisc.h"
6142 +#include "libMisc.h"
6144 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
6147 extern BOOLEAN EditorFirst;
6148 extern BOOLEAN EditorExit;
6150 -extern EFI_HII_HANDLE HiiHandle;
6151 +extern EFI_HII_HANDLE gEditHiiHandle;
6152 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
6153 extern EFI_HII_PROTOCOL *Hii;
6156 #endif // _EFI_EDITOR_H_
6158 Index: edit/libTitleBar.c
6159 ===================================================================
6160 --- edit/libTitleBar.c (revision 64)
6161 +++ edit/libTitleBar.c (working copy)
6162 @@ -120,10 +120,15 @@
6163 // backup the old screen attributes
6165 Orig = MainEditor.ColorAttributes;
6168 New.Colors.Foreground = Orig.Colors.Background;
6169 New.Colors.Background = Orig.Colors.Foreground;
6171 - Out->SetAttribute (Out, New.Data);
6172 + Out->SetAttribute (
6174 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
6178 // clear the old title bar
6179 @@ -142,7 +147,10 @@
6182 if (MainEditor.FileBuffer->FileName == NULL) {
6183 - Out->SetAttribute (Out, Orig.Data);
6184 + Out->SetAttribute (
6186 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
6188 FileBufferRestorePosition ();
6191 @@ -204,7 +212,10 @@
6193 // restore the old attribute
6195 - Out->SetAttribute (Out, Orig.Data);
6196 + Out->SetAttribute (
6198 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
6202 // restore edit area cursor position
6203 Index: edit/editortype.h
6204 ===================================================================
6205 --- edit/editortype.h (revision 64)
6206 +++ edit/editortype.h (working copy)
6208 #define EDITOR_NAME L"EFI Editor\0"
6209 #define EDITOR_VERSION L"0.99\0"
6211 -#define EFI_EDITOR_LINE_LIST 'eell'
6212 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
6214 #define INSERT_MODE_STR L"INS"
6215 #define OVERWR_MODE_STR L"OVR"
6217 } EFI_EDITOR_MENU_ITEM;
6220 - UINT32 Foreground : 4;
6221 - UINT32 Background : 4;
6222 + UINT8 Foreground : 4;
6223 + UINT8 Background : 4;
6224 } EFI_EDITOR_COLOR_ATTRIBUTES;
6228 } EFI_EDITOR_GLOBAL_EDITOR;
6232 Index: SmbiosView/EventLogInfo.c
6233 ===================================================================
6234 --- SmbiosView/EventLogInfo.c (revision 64)
6235 +++ SmbiosView/EventLogInfo.c (working copy)
6237 #include "PrintInfo.h"
6238 #include "QueryTable.h"
6239 #include "EventLogInfo.h"
6240 -#include "smbios.h"
6241 +#include "Smbios.h"
6242 #include STRING_DEFINES_FILE
6245 Index: SmbiosView/Smbios.h
6246 ===================================================================
6247 --- SmbiosView/Smbios.h (revision 64)
6248 +++ SmbiosView/Smbios.h (working copy)
6254 Index: SmbiosView/EventLogInfo.h
6255 ===================================================================
6256 --- SmbiosView/EventLogInfo.h (revision 64)
6257 +++ SmbiosView/EventLogInfo.h (working copy)
6263 Index: SmbiosView/PrintInfo.c
6264 ===================================================================
6265 --- SmbiosView/PrintInfo.c (revision 64)
6266 +++ SmbiosView/PrintInfo.c (working copy)
6268 #include "LibSmbiosView.h"
6269 #include "QueryTable.h"
6270 #include "EventLogInfo.h"
6271 -#include "smbios.h"
6272 +#include "Smbios.h"
6273 #include STRING_DEFINES_FILE
6276 Index: SmbiosView/PrintInfo.h
6277 ===================================================================
6278 --- SmbiosView/PrintInfo.h (revision 64)
6279 +++ SmbiosView/PrintInfo.h (working copy)
6285 Index: SmbiosView/QueryTable.c
6286 ===================================================================
6287 --- SmbiosView/QueryTable.c (revision 64)
6288 +++ SmbiosView/QueryTable.c (working copy)
6290 #include "EfiShellLib.h"
6291 #include "QueryTable.h"
6292 #include "PrintInfo.h"
6293 -#include "smbios.h"
6294 +#include "Smbios.h"
6296 #include STRING_DEFINES_FILE
6298 Index: SmbiosView/LibSmbiosView.c
6299 ===================================================================
6300 --- SmbiosView/LibSmbiosView.c (revision 64)
6301 +++ SmbiosView/LibSmbiosView.c (working copy)
6305 #include "EfiShellLib.h"
6306 -#include "LIbSmbios.h"
6307 +#include "LibSmbios.h"
6308 #include "LibSmbiosView.h"
6309 #include "smbiosview.h"
6310 -#include "smbios.h"
6311 +#include "Smbios.h"
6312 #include STRING_DEFINES_FILE
6314 STATIC UINT8 mInit = 0;
6317 // Get SMBIOS table from System Configure table
6319 - Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
6320 + Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
6322 if (mSmbiosTable == NULL) {
6323 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
6324 @@ -110,13 +110,13 @@
6327 LibSmbiosGetStructHead (
6328 - SMBIOS_STRUCTURE_POINTER *pHead
6329 + SMBIOS_STRUCTURE_POINTER **pHead
6333 // return SMBIOS structure table address
6335 - pHead = mSmbiosStruct;
6336 + *pHead = mSmbiosStruct;
6340 Index: SmbiosView/Smbiosview.inf
6341 ===================================================================
6342 --- SmbiosView/Smbiosview.inf (revision 64)
6343 +++ SmbiosView/Smbiosview.inf (working copy)
6345 COMPONENT_TYPE = APPLICATION
6348 - ..\ShCommonStrings.uni
6349 + ../ShCommonStrings.uni
6350 SmBiosViewStrings.uni
6359 - $(EDK_SOURCE)\Foundation
6360 - $(EDK_SOURCE)\Foundation\Include
6361 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6362 - $(EDK_SOURCE)\Foundation\Efi
6363 - $(EDK_SOURCE)\Foundation\Efi\Include
6364 - $(EDK_SOURCE)\Foundation\FrameWork
6365 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6366 - $(EDK_SOURCE)\Foundation\Core\Dxe
6368 - $(EFI_SOURCE)\Application\Shell\Inc
6369 - $(EFI_SOURCE)\Application\Shell\Library
6372 + $(EDK_SOURCE)/Foundation
6373 + $(EDK_SOURCE)/Foundation/Include
6374 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6375 + $(EDK_SOURCE)/Foundation/Efi
6376 + $(EDK_SOURCE)/Foundation/Efi/Include
6377 + $(EDK_SOURCE)/Foundation/FrameWork
6378 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6379 + $(EDK_SOURCE)/Foundation/Core/Dxe
6381 + $(EFI_SOURCE)/Applicatio./Shels/Inc
6382 + $(EFI_SOURCE)/Applicatio./Shels/Library
6389 IMAGE_ENTRY_POINT=InitializeSmbiosViewApplication
6391 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6392 L_PROJ_FLAGS=/align:4096
6393 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6394 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6395 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6397 +[nmake.ARM, nmake.AARCH64]
6398 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6399 Index: SmbiosView/QueryTable.h
6400 ===================================================================
6401 --- SmbiosView/QueryTable.h (revision 64)
6402 +++ SmbiosView/QueryTable.h (working copy)
6408 Index: SmbiosView/LibSmbiosView.h
6409 ===================================================================
6410 --- SmbiosView/LibSmbiosView.h (revision 64)
6411 +++ SmbiosView/LibSmbiosView.h (working copy)
6415 LibSmbiosGetStructHead (
6416 - SMBIOS_STRUCTURE_POINTER *pHead
6417 + SMBIOS_STRUCTURE_POINTER **pHead
6426 Index: SmbiosView/smbiosview.c
6427 ===================================================================
6428 --- SmbiosView/smbiosview.c (revision 64)
6429 +++ SmbiosView/smbiosview.c (working copy)
6431 #include "smbiosview.h"
6432 #include "PrintInfo.h"
6433 #include "QueryTable.h"
6434 -#include "smbios.h"
6435 +#include "Smbios.h"
6437 extern UINT8 STRING_ARRAY_NAME[];
6444 + (SHELL_VAR_CHECK_FLAG_TYPE)0
6448 Index: SmbiosView/LibSmbios.h
6449 ===================================================================
6450 --- SmbiosView/LibSmbios.h (revision 64)
6451 +++ SmbiosView/LibSmbios.h (working copy)
6457 Index: SmbiosView/smbiosview.h
6458 ===================================================================
6459 --- SmbiosView/smbiosview.h (revision 64)
6460 +++ SmbiosView/smbiosview.h (working copy)
6462 extern UINT8 gShowType;
6466 Index: guid/guid.inf
6467 ===================================================================
6468 --- guid/guid.inf (revision 64)
6469 +++ guid/guid.inf (working copy)
6471 FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405
6472 COMPONENT_TYPE = APPLICATION
6474 - ..\ShCommonStrings.uni
6475 + ../ShCommonStrings.uni
6483 - $(EDK_SOURCE)\Foundation
6484 - $(EDK_SOURCE)\Foundation\Include
6485 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6486 - $(EDK_SOURCE)\Foundation\Efi
6487 - $(EDK_SOURCE)\Foundation\Efi\Include
6488 - $(EDK_SOURCE)\Foundation\FrameWork
6489 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6490 - $(EDK_SOURCE)\Foundation\Core\Dxe
6494 + $(EDK_SOURCE)/Foundation
6495 + $(EDK_SOURCE)/Foundation/Include
6496 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6497 + $(EDK_SOURCE)/Foundation/Efi
6498 + $(EDK_SOURCE)/Foundation/Efi/Include
6499 + $(EDK_SOURCE)/Foundation/FrameWork
6500 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6501 + $(EDK_SOURCE)/Foundation/Core/Dxe
6512 IMAGE_ENTRY_POINT=GuidMain
6513 - C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6515 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6516 + C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6517 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6518 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6520 +[nmake.ARM, nmake.AARCH64]
6521 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6523 \ No newline at end of file
6525 ===================================================================
6526 --- guid/guid.c (revision 64)
6527 +++ guid/guid.c (working copy)
6532 -EFI_HII_HANDLE HiiHandle;
6533 +STATIC EFI_HII_HANDLE HiiHandle;
6534 EFI_GUID EfiGuidGuid = EFI_GUID_GUID;
6535 SHELL_VAR_CHECK_ITEM GuidCheckList[] = {
6542 + (SHELL_VAR_CHECK_FLAG_TYPE)0
6547 ===================================================================
6548 --- guid/guid.h (revision 64)
6549 +++ guid/guid.h (working copy)
6551 0x425bff44, 0x1cae, 0x4c27, 0x98, 0x2c, 0x25, 0xc8, 0x74, 0x59, 0xdf, 0xd6 \
6555 \ No newline at end of file
6557 Index: LoadPciRom/LoadPciRom.h
6558 ===================================================================
6559 --- LoadPciRom/LoadPciRom.h (revision 64)
6560 +++ LoadPciRom/LoadPciRom.h (working copy)
6566 Index: LoadPciRom/LoadPciRom.inf
6567 ===================================================================
6568 --- LoadPciRom/LoadPciRom.inf (revision 64)
6569 +++ LoadPciRom/LoadPciRom.inf (working copy)
6573 LoadPciRomStrings.uni
6574 - ..\ShCommonStrings.uni
6575 + ../ShCommonStrings.uni
6583 - $(EDK_SOURCE)\Foundation
6584 - $(EDK_SOURCE)\Foundation\Include
6585 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6586 - $(EDK_SOURCE)\Foundation\Efi
6587 - $(EDK_SOURCE)\Foundation\Efi\Include
6588 - $(EDK_SOURCE)\Foundation\FrameWork
6589 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6590 - $(EDK_SOURCE)\Foundation\Core\Dxe
6594 + $(EDK_SOURCE)/Foundation
6595 + $(EDK_SOURCE)/Foundation/Include
6596 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6597 + $(EDK_SOURCE)/Foundation/Efi
6598 + $(EDK_SOURCE)/Foundation/Efi/Include
6599 + $(EDK_SOURCE)/Foundation/FrameWork
6600 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6601 + $(EDK_SOURCE)/Foundation/Core/Dxe
6609 IMAGE_ENTRY_POINT=InitializeLoadPciRom
6611 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6612 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6613 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6614 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6616 +[nmake.ARM, nmake.AARCH64]
6617 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6618 Index: LoadPciRom/LoadPciRom.c
6619 ===================================================================
6620 --- LoadPciRom/LoadPciRom.c (revision 64)
6621 +++ LoadPciRom/LoadPciRom.c (working copy)
6624 #include "EfiShellLib.h"
6625 #include "LoadPciRom.h"
6629 extern UINT8 STRING_ARRAY_NAME[];
6634 EFI_HANDLE gMyImageHandle;
6635 -EFI_HII_HANDLE HiiHandle;
6636 +STATIC EFI_HII_HANDLE HiiHandle;
6637 EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID;
6638 SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
6645 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6652 if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {
6653 - Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress);
6654 + Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);
6655 if (EFI_ERROR (Status)) {
6656 PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle);
6659 ===================================================================
6660 --- ver/ver.h (revision 64)
6661 +++ ver/ver.h (working copy)
6663 IN EFI_SYSTEM_TABLE *SystemTable
6668 ===================================================================
6669 --- ver/Ver.inf (revision 64)
6670 +++ ver/Ver.inf (working copy)
6675 - ..\ShCommonStrings.uni
6676 + ../ShCommonStrings.uni
6681 -[sources.ia32,sources.x64]
6683 +[sources.ia32,sources.x64,sources.ARM,sources.AARCH64]
6698 - $(EDK_SOURCE)\Foundation
6699 - $(EDK_SOURCE)\Foundation\Include
6700 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6701 - $(EDK_SOURCE)\Foundation\Efi
6702 - $(EDK_SOURCE)\Foundation\Efi\Include
6703 - $(EDK_SOURCE)\Foundation\FrameWork
6704 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6705 - $(EDK_SOURCE)\Foundation\Core\Dxe
6709 + $(EDK_SOURCE)/Foundation
6710 + $(EDK_SOURCE)/Foundation/Include
6711 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6712 + $(EDK_SOURCE)/Foundation/Efi
6713 + $(EDK_SOURCE)/Foundation/Efi/Include
6714 + $(EDK_SOURCE)/Foundation/FrameWork
6715 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6716 + $(EDK_SOURCE)/Foundation/Core/Dxe
6724 IMAGE_ENTRY_POINT=InitializeVer
6726 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6727 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6728 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6729 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6731 +[nmake.ARM, nmake.AARCH64]
6732 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6733 Index: ver/Ebc/verEbc.c
6734 ===================================================================
6735 --- ver/Ebc/verEbc.c (revision 64)
6736 +++ ver/Ebc/verEbc.c (working copy)
6738 Status = BS->LocateProtocol (
6739 &gEfiEbcProtocolGuid,
6744 if (EFI_ERROR (Status)) {
6747 ===================================================================
6748 --- ver/ver.c (revision 64)
6749 +++ ver/ver.c (working copy)
6755 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6759 Index: dmpstore/dmpstore.h
6760 ===================================================================
6761 --- dmpstore/dmpstore.h (revision 64)
6762 +++ dmpstore/dmpstore.h (working copy)
6764 } DMPSTORE_VARIABLE;
6768 Index: dmpstore/dmpstore.inf
6769 ===================================================================
6770 --- dmpstore/dmpstore.inf (revision 64)
6771 +++ dmpstore/dmpstore.inf (working copy)
6773 COMPONENT_TYPE = APPLICATION
6776 - ..\ShCommonStrings.uni
6777 + ../ShCommonStrings.uni
6786 - $(EDK_SOURCE)\Foundation
6787 - $(EDK_SOURCE)\Foundation\Include
6788 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6789 - $(EDK_SOURCE)\Foundation\Efi
6790 - $(EDK_SOURCE)\Foundation\Efi\Include
6791 - $(EDK_SOURCE)\Foundation\FrameWork
6792 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6793 - $(EDK_SOURCE)\Foundation\Core\Dxe
6797 + $(EDK_SOURCE)/Foundation
6798 + $(EDK_SOURCE)/Foundation/Include
6799 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6800 + $(EDK_SOURCE)/Foundation/Efi
6801 + $(EDK_SOURCE)/Foundation/Efi/Include
6802 + $(EDK_SOURCE)/Foundation/FrameWork
6803 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6804 + $(EDK_SOURCE)/Foundation/Core/Dxe
6810 # we will specify some additional DEFINEs on the compile command line.
6813 + IMAGE_ENTRY_POINT=InitializeDumpStore
6815 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6816 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
6817 - IMAGE_ENTRY_POINT=InitializeDumpStore
6818 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6819 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6820 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6823 +[nmake.ARM, nmake.AARCH64]
6824 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6826 \ No newline at end of file
6827 Index: dmpstore/dmpstore.c
6828 ===================================================================
6829 --- dmpstore/dmpstore.c (revision 64)
6830 +++ dmpstore/dmpstore.c (working copy)
6835 -EFI_HII_HANDLE HiiHandle;
6836 +STATIC EFI_HII_HANDLE HiiHandle;
6837 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
6838 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
6845 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6850 ===================================================================
6851 --- comp/comp.c (revision 64)
6852 +++ comp/comp.c (working copy)
6858 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6863 ===================================================================
6864 --- comp/comp.h (revision 64)
6865 +++ comp/comp.h (working copy)
6867 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \
6871 \ No newline at end of file
6873 Index: comp/comp.inf
6874 ===================================================================
6875 --- comp/comp.inf (revision 64)
6876 +++ comp/comp.inf (working copy)
6881 -..\ShCommonStrings.uni
6882 +../ShCommonStrings.uni
6888 - $(EDK_SOURCE)\Foundation
6889 - $(EDK_SOURCE)\Foundation\Include
6890 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6891 - $(EDK_SOURCE)\Foundation\Efi
6892 - $(EDK_SOURCE)\Foundation\Efi\Include
6893 - $(EDK_SOURCE)\Foundation\FrameWork
6894 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6895 - $(EDK_SOURCE)\Foundation\Core\Dxe
6899 + $(EDK_SOURCE)/Foundation
6900 + $(EDK_SOURCE)/Foundation/Include
6901 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6902 + $(EDK_SOURCE)/Foundation/Efi
6903 + $(EDK_SOURCE)/Foundation/Efi/Include
6904 + $(EDK_SOURCE)/Foundation/FrameWork
6905 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6906 + $(EDK_SOURCE)/Foundation/Core/Dxe
6912 # we will specify some additional DEFINEs on the compile command line.
6915 + IMAGE_ENTRY_POINT=InitializeComp
6917 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6918 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
6919 - IMAGE_ENTRY_POINT=InitializeComp
6920 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6921 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6922 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6924 +[nmake.ARM, nmake.AARCH64]
6925 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6929 \ No newline at end of file
6930 Index: IpConfig/IpConfig.c
6931 ===================================================================
6932 --- IpConfig/IpConfig.c (revision 64)
6933 +++ IpConfig/IpConfig.c (working copy)
6938 -EFI_HII_HANDLE HiiHandle;
6939 +STATIC EFI_HII_HANDLE HiiHandle;
6940 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
6941 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
6948 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6952 Index: IpConfig/IpConfig.h
6953 ===================================================================
6954 --- IpConfig/IpConfig.h (revision 64)
6955 +++ IpConfig/IpConfig.h (working copy)
6957 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
6961 \ No newline at end of file
6963 Index: IpConfig/IpConfig.inf
6964 ===================================================================
6965 --- IpConfig/IpConfig.inf (revision 64)
6966 +++ IpConfig/IpConfig.inf (working copy)
6968 COMPONENT_TYPE = APPLICATION
6971 - ..\ShCommonStrings.uni
6972 + ../ShCommonStrings.uni
6981 - $(EDK_SOURCE)\Foundation
6982 - $(EDK_SOURCE)\Foundation\Include
6983 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6984 - $(EDK_SOURCE)\Foundation\Efi
6985 - $(EDK_SOURCE)\Foundation\Efi\Include
6986 - $(EDK_SOURCE)\Foundation\FrameWork
6987 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6988 - $(EDK_SOURCE)\Foundation\Core\Dxe
6992 + $(EDK_SOURCE)/Foundation
6993 + $(EDK_SOURCE)/Foundation/Include
6994 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6995 + $(EDK_SOURCE)/Foundation/Efi
6996 + $(EDK_SOURCE)/Foundation/Efi/Include
6997 + $(EDK_SOURCE)/Foundation/FrameWork
6998 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6999 + $(EDK_SOURCE)/Foundation/Core/Dxe
7008 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
7009 IMAGE_ENTRY_POINT=InitializeIpConfig
7011 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7012 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7013 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7014 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7016 +[nmake.ARM, nmake.AARCH64]
7017 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7018 Index: sermode/sermode.c
7019 ===================================================================
7020 --- sermode/sermode.c (revision 64)
7021 +++ sermode/sermode.c (working copy)
7024 #include EFI_PROTOCOL_DEFINITION (SerialIo)
7026 -EFI_HII_HANDLE HiiHandle;
7027 +STATIC EFI_HII_HANDLE HiiHandle;
7028 EFI_GUID EfiSermodeGuid = EFI_SERMODEB_GUID;
7029 SHELL_VAR_CHECK_ITEM SermodeCheckList[] = {
7036 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
7044 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
7045 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
7046 if (!EFI_ERROR (Status)) {
7047 switch (SerialIo->Mode->Parity) {
7053 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
7054 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
7055 if (!EFI_ERROR (Status)) {
7056 Status = SerialIo->SetAttributes (
7058 Index: sermode/sermode.h
7059 ===================================================================
7060 --- sermode/sermode.h (revision 64)
7061 +++ sermode/sermode.h (working copy)
7067 Index: sermode/sermode.inf
7068 ===================================================================
7069 --- sermode/sermode.inf (revision 64)
7070 +++ sermode/sermode.inf (working copy)
7075 - ..\ShCommonStrings.uni
7076 + ../ShCommonStrings.uni
7085 - $(EDK_SOURCE)\Foundation
7086 - $(EDK_SOURCE)\Foundation\Include
7087 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7088 - $(EDK_SOURCE)\Foundation\Efi
7089 - $(EDK_SOURCE)\Foundation\Efi\Include
7090 - $(EDK_SOURCE)\Foundation\FrameWork
7091 - $(EDK_SOURCE)\Foundation\FrameWork\Include
7092 - $(EDK_SOURCE)\Foundation\Core\Dxe
7096 + $(EDK_SOURCE)/Foundation
7097 + $(EDK_SOURCE)/Foundation/Include
7098 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7099 + $(EDK_SOURCE)/Foundation/Efi
7100 + $(EDK_SOURCE)/Foundation/Efi/Include
7101 + $(EDK_SOURCE)/Foundation/FrameWork
7102 + $(EDK_SOURCE)/Foundation/FrameWork/Include
7103 + $(EDK_SOURCE)/Foundation/Core/Dxe
7111 IMAGE_ENTRY_POINT=InitializeSerialMode
7113 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7114 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7115 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7116 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7118 +[nmake.ARM, nmake.AARCH64]
7119 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7120 Index: tzone/tzone.c
7121 ===================================================================
7122 --- tzone/tzone.c (revision 64)
7123 +++ tzone/tzone.c (working copy)
7129 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
7138 SHELL_VAR_CHECK_CODE RetCode;
7140 SHELL_VAR_CHECK_PACKAGE ChkPck;
7145 - uValueSize = sizeof (INTN);
7146 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
7147 ZeroMem (&Time, sizeof (EFI_TIME));
7149 Index: tzone/timezone.inf
7150 ===================================================================
7151 --- tzone/timezone.inf (revision 64)
7152 +++ tzone/timezone.inf (working copy)
7154 COMPONENT_TYPE = APPLICATION
7157 - ..\ShCommonStrings.uni
7158 + ../ShCommonStrings.uni
7167 - $(EDK_SOURCE)\Foundation
7168 - $(EDK_SOURCE)\Foundation\Include
7169 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7170 - $(EDK_SOURCE)\Foundation\Efi
7171 - $(EDK_SOURCE)\Foundation\Efi\Include
7172 - $(EDK_SOURCE)\Foundation\FrameWork
7173 - $(EDK_SOURCE)\Foundation\FrameWork\Include
7174 - $(EDK_SOURCE)\Foundation\Core\Dxe
7178 + $(EDK_SOURCE)/Foundation
7179 + $(EDK_SOURCE)/Foundation/Include
7180 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7181 + $(EDK_SOURCE)/Foundation/Efi
7182 + $(EDK_SOURCE)/Foundation/Efi/Include
7183 + $(EDK_SOURCE)/Foundation/FrameWork
7184 + $(EDK_SOURCE)/Foundation/FrameWork/Include
7185 + $(EDK_SOURCE)/Foundation/Core/Dxe
7191 # we will specify some additional DEFINEs on the compile command line.
7194 + IMAGE_ENTRY_POINT=InitializeTZone
7196 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7197 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
7198 - IMAGE_ENTRY_POINT=InitializeTZone
7199 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7200 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7201 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7205 \ No newline at end of file
7206 +[nmake.ARM, nmake.AARCH64]
7207 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7208 Index: tzone/tzone.h
7209 ===================================================================
7210 --- tzone/tzone.h (revision 64)
7211 +++ tzone/tzone.h (working copy)
7218 ===================================================================
7219 --- vol/vol.c (revision 64)
7220 +++ vol/vol.c (working copy)
7223 #include STRING_DEFINES_FILE
7225 -EFI_HII_HANDLE HiiHandle;
7226 +STATIC EFI_HII_HANDLE HiiHandle;
7227 EFI_GUID EfiVolGuid = EFI_VOL_GUID;
7228 SHELL_VAR_CHECK_ITEM VolCheckList[] = {
7235 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
7240 ===================================================================
7241 --- vol/vol.h (revision 64)
7242 +++ vol/vol.h (working copy)
7249 ===================================================================
7250 --- vol/Vol.inf (revision 64)
7251 +++ vol/Vol.inf (working copy)
7256 - ..\ShCommonStrings.uni
7257 + ../ShCommonStrings.uni
7266 - $(EDK_SOURCE)\Foundation
7267 - $(EDK_SOURCE)\Foundation\Include
7268 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7269 - $(EDK_SOURCE)\Foundation\Efi
7270 - $(EDK_SOURCE)\Foundation\Efi\Include
7271 - $(EDK_SOURCE)\Foundation\FrameWork
7272 - $(EDK_SOURCE)\Foundation\FrameWork\Include
7273 - $(EDK_SOURCE)\Foundation\Core\Dxe
7277 + $(EDK_SOURCE)/Foundation
7278 + $(EDK_SOURCE)/Foundation/Include
7279 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7280 + $(EDK_SOURCE)/Foundation/Efi
7281 + $(EDK_SOURCE)/Foundation/Efi/Include
7282 + $(EDK_SOURCE)/Foundation/FrameWork
7283 + $(EDK_SOURCE)/Foundation/FrameWork/Include
7284 + $(EDK_SOURCE)/Foundation/Core/Dxe
7292 IMAGE_ENTRY_POINT=InitializeVol
7294 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7295 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7296 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7297 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7299 +[nmake.ARM, nmake.AARCH64]
7300 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7302 ===================================================================
7303 --- cp/cp.c (revision 64)
7304 +++ cp/cp.c (working copy)
7310 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
7316 if (SrcArg->Status == EFI_SUCCESS &&
7317 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
7318 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
7319 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))
7321 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
7322 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
7324 // we need to compose a full name of dir\file for the source
7326 if (SrcArg->Status == EFI_SUCCESS &&
7327 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
7328 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) {
7330 FreePool (DstFullName);
7334 EFI_FILE_INFO *SrcInfo;
7335 EFI_FILE_INFO *DstInfo;
7336 - EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *DstVol;
7337 EFI_FILE_SYSTEM_INFO *DstFsInfo;
7338 CHAR16 InputString[10];
7348 @@ -1789,7 +1787,7 @@
7350 if (SrcArg->Status == EFI_SUCCESS &&
7351 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
7352 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
7353 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle)))
7356 FreePool (DstFullName);
7358 ===================================================================
7359 --- cp/cp.h (revision 64)
7360 +++ cp/cp.h (working copy)
7362 IN EFI_SYSTEM_TABLE *SystemTable
7366 \ No newline at end of file
7370 ===================================================================
7371 --- cp/cp.inf (revision 64)
7372 +++ cp/cp.inf (working copy)
7377 - ..\ShCommonStrings.uni
7378 + ../ShCommonStrings.uni
7386 - $(EDK_SOURCE)\Foundation
7387 - $(EDK_SOURCE)\Foundation\Include
7388 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7389 - $(EDK_SOURCE)\Foundation\Efi
7390 - $(EDK_SOURCE)\Foundation\Efi\Include
7391 - $(EDK_SOURCE)\Foundation\FrameWork
7392 - $(EDK_SOURCE)\Foundation\FrameWork\Include
7393 - $(EDK_SOURCE)\Foundation\Core\Dxe
7397 + $(EDK_SOURCE)/Foundation
7398 + $(EDK_SOURCE)/Foundation/Include
7399 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7400 + $(EDK_SOURCE)/Foundation/Efi
7401 + $(EDK_SOURCE)/Foundation/Efi/Include
7402 + $(EDK_SOURCE)/Foundation/FrameWork
7403 + $(EDK_SOURCE)/Foundation/FrameWork/Include
7404 + $(EDK_SOURCE)/Foundation/Core/Dxe
7412 IMAGE_ENTRY_POINT=InitializeCP
7414 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7415 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7416 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7417 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7419 +[nmake.ARM, nmake.AARCH64]
7420 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7422 Index: Library/EfiPart.h
7423 ===================================================================
7424 --- Library/EfiPart.h (revision 64)
7425 +++ Library/EfiPart.h (working copy)
7431 Index: Library/X64/efilibplat.h
7432 ===================================================================
7433 --- Library/X64/efilibplat.h (revision 64)
7434 +++ Library/X64/efilibplat.h (working copy)
7436 #define MIN_ALIGNMENT_SIZE 8
7440 Index: Library/ShellEnvInt.h
7441 ===================================================================
7442 --- Library/ShellEnvInt.h (revision 64)
7443 +++ Library/ShellEnvInt.h (working copy)
7449 \ No newline at end of file
7453 Index: Library/LinkedList.h
7454 ===================================================================
7455 --- Library/LinkedList.h (revision 64)
7456 +++ Library/LinkedList.h (working copy)
7460 #define SwapListEntries(Entry1, Entry2) { \
7461 - EFI_LIST_ENTRY *Entry1Flink, *Entry1Blink; \
7462 + EFI_LIST_ENTRY *Entry1Blink; \
7463 EFI_LIST_ENTRY *Entry2Flink, *Entry2Blink; \
7464 Entry2Flink = (Entry2)->Flink; \
7465 Entry2Blink = (Entry2)->Blink; \
7466 - Entry1Flink = (Entry1)->Flink; \
7467 Entry1Blink = (Entry1)->Blink; \
7468 Entry2Blink->Flink = Entry2Flink; \
7469 Entry2Flink->Blink = Entry2Blink; \
7476 ===================================================================
7477 --- Library/IO.c (revision 64)
7478 +++ Library/IO.c (working copy)
7483 -#include "EfiShelllib.h"
7484 +#include "EfiShellLib.h"
7486 #define PRINT_STRING_LEN 1024
7487 #define PRINT_ITEM_BUFFER_LEN 100
7499 @@ -1575,7 +1575,7 @@
7508 @@ -1769,7 +1769,7 @@
7510 // If we need to update the output do so now
7512 - if (Update != -1) {
7513 + if (Update != (UINTN) -1) {
7514 PrintAt (Column, Row, L"%s%.*s", InStr + Update, Delete, L"");
7515 Len = StrLen (InStr);
7517 @@ -1928,8 +1928,8 @@
7518 return mPrintMode.PageBreak;
7527 @@ -1937,6 +1937,7 @@
7529 return mPrintMode.OutputPause;
7535 Index: Library/FileIO.c
7536 ===================================================================
7537 --- Library/FileIO.c (revision 64)
7538 +++ Library/FileIO.c (working copy)
7543 -#include "EfiShelllib.h"
7544 +#include "EfiShellLib.h"
7546 typedef struct _PATH_COMPONENTS {
7549 IN OUT CHAR16 **Path
7552 - EFI_STATUS Status;
7560 - Status = EFI_SUCCESS;
7564 @@ -1017,13 +1015,11 @@
7565 EFI_LIST_ENTRY SrcList;
7566 EFI_LIST_ENTRY DstList;
7568 - EFI_LIST_ENTRY *Link;
7569 SHELL_FILE_ARG *SrcArg;
7570 SHELL_FILE_ARG *DstArg;
7572 ASSERT (IsSame != NULL);
7577 InitializeListHead (&SrcList);
7578 Index: Library/Ebc/EfiLibPlat.h
7579 ===================================================================
7580 --- Library/Ebc/EfiLibPlat.h (revision 64)
7581 +++ Library/Ebc/EfiLibPlat.h (working copy)
7585 #define MIN_ALIGNMENT_SIZE 8
7587 Index: Library/Str.c
7588 ===================================================================
7589 --- Library/Str.c (revision 64)
7590 +++ Library/Str.c (working copy)
7595 -#include "EfiShelllib.h"
7596 +#include "EfiShellLib.h"
7604 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
7605 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
7612 if (c >= '0' && c <= '9') {
7613 - if (u > m || u == m && c - '0' > (INTN) n) {
7614 + if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) {
7618 Index: Library/Data.c
7619 ===================================================================
7620 --- Library/Data.c (revision 64)
7621 +++ Library/Data.c (working copy)
7626 -#include "EfiShelllib.h"
7627 +#include "EfiShellLib.h"
7630 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
7632 ===================================================================
7633 --- Library/IO.h (revision 64)
7634 +++ Library/IO.h (working copy)
7640 \ No newline at end of file
7644 Index: Library/FileIO.h
7645 ===================================================================
7646 --- Library/FileIO.h (revision 64)
7647 +++ Library/FileIO.h (working copy)
7649 IN SIMPLE_READ_FILE SimpleReadHandle
7653 \ No newline at end of file
7657 Index: Library/Str.h
7658 ===================================================================
7659 --- Library/Str.h (revision 64)
7660 +++ Library/Str.h (working copy)
7666 Index: Library/Mem.c
7667 ===================================================================
7668 --- Library/Mem.c (revision 64)
7669 +++ Library/Mem.c (working copy)
7674 -#include "EfiShelllib.h"
7675 +#include "EfiShellLib.h"
7679 Index: Library/RtData.c
7680 ===================================================================
7681 --- Library/RtData.c (revision 64)
7682 +++ Library/RtData.c (working copy)
7687 -#include "EfiShelllib.h"
7688 +#include "EfiShellLib.h"
7691 // RT - pointer to the runtime table
7692 Index: Library/Event.c
7693 ===================================================================
7694 --- Library/Event.c (revision 64)
7695 +++ Library/Event.c (working copy)
7700 -#include "EfiShelllib.h"
7701 +#include "EfiShellLib.h"
7704 LibCreateProtocolNotifyEvent (
7705 Index: Library/Mem.h
7706 ===================================================================
7707 --- Library/Mem.h (revision 64)
7708 +++ Library/Mem.h (working copy)
7714 \ No newline at end of file
7718 Index: Library/Event.h
7719 ===================================================================
7720 --- Library/Event.h (revision 64)
7721 +++ Library/Event.h (working copy)
7723 OUT EFI_INPUT_KEY *Key
7727 \ No newline at end of file
7731 Index: Library/EfiShellLib.h
7732 ===================================================================
7733 --- Library/EfiShellLib.h (revision 64)
7734 +++ Library/EfiShellLib.h (working copy)
7736 #define _EFI_SHELL_LIB_INCLUDE_
7739 -#include "ShellEnv.h"
7740 +#include "shellenv.h"
7743 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
7745 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
7746 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
7747 #include EFI_GUID_DEFINITION (SalSystemTable)
7748 -#include EFI_GUID_DEFINITION (Smbios)
7749 +#include EFI_GUID_DEFINITION (SmBios)
7750 #include EFI_GUID_DEFINITION (StandardErrorDevice)
7751 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
7752 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
7754 #include EFI_PROTOCOL_DEFINITION (DebugPort)
7755 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
7756 #include EFI_PROTOCOL_DEFINITION (Decompress)
7757 -#include EFI_PROTOCOL_DEFINITION (DeviceIO)
7758 +#include EFI_PROTOCOL_DEFINITION (DeviceIo)
7759 #include EFI_PROTOCOL_DEFINITION (DevicePath)
7760 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
7761 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
7763 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
7764 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
7765 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
7766 -#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
7767 +#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
7768 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
7769 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
7770 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
7772 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
7774 #include "efilibplat.h"
7775 -#include "efipart.h"
7776 +#include "EfiPart.h"
7777 #include "ShellDebug.h"
7785 Index: Library/Handle.c
7786 ===================================================================
7787 --- Library/Handle.c (revision 64)
7788 +++ Library/Handle.c (working copy)
7793 -#include "EfiShelllib.h"
7794 +#include "EfiShellLib.h"
7799 EFI_HANDLE *BlockIoBuffer;
7800 EFI_DEVICE_PATH_PROTOCOL *DevicePath;
7802 - EFI_DEVICE_PATH_PROTOCOL *Start;
7803 EFI_DEVICE_PATH_PROTOCOL *Next;
7804 EFI_DEVICE_PATH_PROTOCOL *DevPath;
7805 HARDDRIVE_DEVICE_PATH *HardDriveDevicePath;
7807 PreviousNodeIsHardDriveDevicePath = FALSE;
7809 DevPath = DevicePath;
7812 // Check for end of device path type
7814 @@ -796,14 +794,12 @@
7815 UINTN OpenInfoIndex;
7817 BOOLEAN DriverBindingHandleIndexValid;
7818 - BOOLEAN ControllerHandleIndexValid;
7820 DriverBindingHandleIndexValid = FALSE;
7821 if (DriverBindingHandleIndex != NULL) {
7822 *DriverBindingHandleIndex = 0xffffffff;
7825 - ControllerHandleIndexValid = FALSE;
7826 if (ControllerHandleIndex != NULL) {
7827 *ControllerHandleIndex = 0xffffffff;
7831 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
7832 *ControllerHandleIndex = (UINT32) HandleIndex;
7833 - ControllerHandleIndexValid = TRUE;
7837 @@ -1305,7 +1300,7 @@
7838 Status = BS->HandleProtocol (
7845 if (!EFI_ERROR (Status)) {
7846 Index: Library/Misc.c
7847 ===================================================================
7848 --- Library/Misc.c (revision 64)
7849 +++ Library/Misc.c (working copy)
7854 -#include "EfiShelllib.h"
7855 +#include "EfiShellLib.h"
7857 #if (PLATFORM == NT32)
7858 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \
7860 ASSERT (Buffer != NULL);
7862 if (mShellEnv == NULL) {
7863 - Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv);
7864 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv);
7865 if (EFI_ERROR (Status)) {
7868 @@ -1171,7 +1171,7 @@
7869 Status = BS->HandleProtocol (
7870 Image->DeviceHandle,
7871 &gEfiFirmwareVolumeProtocolGuid,
7875 if (!EFI_ERROR (Status)) {
7876 Status = FV->ReadSection (
7877 @@ -1192,7 +1192,7 @@
7878 Status = BS->HandleProtocol (
7879 Image->DeviceHandle,
7880 &gEfiFirmwareVolume2ProtocolGuid,
7884 if (!EFI_ERROR (Status)) {
7885 Status = FV2->ReadSection (
7886 @@ -1339,7 +1339,7 @@
7890 - EFI_HII_HANDLE HiiHandle;
7891 + STATIC EFI_HII_HANDLE HiiHandle;
7895 @@ -1730,6 +1730,8 @@
7897 case EFI_IMAGE_MACHINE_IA64:
7899 + case EFI_IMAGE_MACHINE_AARCH64:
7900 + return L"AARCH64";
7904 @@ -2544,4 +2546,5 @@
7909 \ No newline at end of file
7912 Index: Library/Perf.c
7913 ===================================================================
7914 --- Library/Perf.c (revision 64)
7915 +++ Library/Perf.c (working copy)
7920 -#include "EfiShelllib.h"
7921 +#include "EfiShellLib.h"
7923 #include EFI_PROTOCOL_DEFINITION (Performance)
7925 Index: Library/IPF/efilibplat.h
7926 ===================================================================
7927 --- Library/IPF/efilibplat.h (revision 64)
7928 +++ Library/IPF/efilibplat.h (working copy)
7930 #define MIN_ALIGNMENT_SIZE 8
7934 Index: Library/IPF/palproc.h
7935 ===================================================================
7936 --- Library/IPF/palproc.h (revision 64)
7937 +++ Library/IPF/palproc.h (working copy)
7939 #define PAL_MC_REGISTER_MEM 0x001b
7941 #endif // _PALPROC_H
7943 Index: Library/IPF/libsalpal.h
7944 ===================================================================
7945 --- Library/IPF/libsalpal.h (revision 64)
7946 +++ Library/IPF/libsalpal.h (working copy)
7952 \ No newline at end of file
7954 Index: Library/ConsistMapping.c
7955 ===================================================================
7956 --- Library/ConsistMapping.c (revision 64)
7957 +++ Library/ConsistMapping.c (working copy)
7962 -#include "EfiShelllib.h"
7963 +#include "EfiShellLib.h"
7965 MTD_NAME mMTDName[] = {
7967 Index: Library/DPath.c
7968 ===================================================================
7969 --- Library/DPath.c (revision 64)
7970 +++ Library/DPath.c (working copy)
7975 -#include "EfiShelllib.h"
7976 +#include "EfiShellLib.h"
7978 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
7980 @@ -1468,7 +1468,7 @@
7982 Status = LibLocateProtocol (
7983 &gEfiDevicePathToTextProtocolGuid,
7985 + (VOID**)&DevPathToText
7987 if (!EFI_ERROR (Status)) {
7988 ToText = DevPathToText->ConvertDevicePathToText (
7989 @@ -1766,7 +1766,7 @@
7990 Status = BS->HandleProtocol (
7998 Index: Library/Handle.h
7999 ===================================================================
8000 --- Library/Handle.h (revision 64)
8001 +++ Library/Handle.h (working copy)
8007 Index: Library/Misc.h
8008 ===================================================================
8009 --- Library/Misc.h (revision 64)
8010 +++ Library/Misc.h (working copy)
8016 Index: Library/ConsistMapping.h
8017 ===================================================================
8018 --- Library/ConsistMapping.h (revision 64)
8019 +++ Library/ConsistMapping.h (working copy)
8025 \ No newline at end of file
8029 Index: Library/Init.c
8030 ===================================================================
8031 --- Library/Init.c (revision 64)
8032 +++ Library/Init.c (working copy)
8037 -#include "EfiShelllib.h"
8038 +#include "EfiShellLib.h"
8040 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
8042 Index: Library/DPath.h
8043 ===================================================================
8044 --- Library/DPath.h (revision 64)
8045 +++ Library/DPath.h (working copy)
8050 -#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
8051 +#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
8053 #include EFI_GUID_DEFINITION (PcAnsi)
8060 Index: Library/HiiSupport.c
8061 ===================================================================
8062 --- Library/HiiSupport.c (revision 64)
8063 +++ Library/HiiSupport.c (working copy)
8068 -#include "EfiShelllib.h"
8069 +#include "EfiShellLib.h"
8071 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
8077 - Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);
8078 + Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);
8079 if (EFI_ERROR (Status)) {
8082 - Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);
8083 + Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);
8084 if (EFI_ERROR (Status)) {
8087 Index: Library/CRC.c
8088 ===================================================================
8089 --- Library/CRC.c (revision 64)
8090 +++ Library/CRC.c (working copy)
8095 -#include "EfiShelllib.h"
8096 +#include "EfiShellLib.h"
8098 UINT32 CRCTable[256] = {
8100 Index: Library/HiiSupport.h
8101 ===================================================================
8102 --- Library/HiiSupport.h (revision 64)
8103 +++ Library/HiiSupport.h (working copy)
8109 Index: Library/CRC.h
8110 ===================================================================
8111 --- Library/CRC.h (revision 64)
8112 +++ Library/CRC.h (working copy)
8118 \ No newline at end of file
8122 Index: Library/EfiShellLib.inf
8123 ===================================================================
8124 --- Library/EfiShellLib.inf (revision 64)
8125 +++ Library/EfiShellLib.inf (working copy)
8169 - $(EDK_SOURCE)\Foundation
8170 - $(EDK_SOURCE)\Foundation\Include
8171 - $(EDK_SOURCE)\Foundation\Efi
8172 - $(EDK_SOURCE)\Foundation\Efi\Include
8173 - $(EDK_SOURCE)\Foundation\FrameWork
8174 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8175 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8176 - $(EDK_SOURCE)\Foundation\Core\Dxe
8178 + $(EDK_SOURCE)/Foundation
8179 + $(EDK_SOURCE)/Foundation/Include
8180 + $(EDK_SOURCE)/Foundation/Efi
8181 + $(EDK_SOURCE)/Foundation/Efi/Include
8182 + $(EDK_SOURCE)/Foundation/FrameWork
8183 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8184 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8185 + $(EDK_SOURCE)/Foundation/Core/Dxe
8188 EdkFrameworkProtocolLib
8194 + CompilerIntrinsicsLib, CompilerIntrinsicsLib
8197 Index: Library/IA32/efilibplat.h
8198 ===================================================================
8199 --- Library/IA32/efilibplat.h (revision 64)
8200 +++ Library/IA32/efilibplat.h (working copy)
8203 #define MIN_ALIGNMENT_SIZE 4
8206 \ No newline at end of file
8208 Index: Library/ShellDebug.c
8209 ===================================================================
8210 --- Library/ShellDebug.c (revision 64)
8211 +++ Library/ShellDebug.c (working copy)
8216 -#include "EfiShelllib.h"
8217 +#include "EfiShellLib.h"
8218 #include EFI_PROTOCOL_DEFINITION (DebugAssert)
8220 EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL;
8221 Index: Library/ShellDebug.h
8222 ===================================================================
8223 --- Library/ShellDebug.h (revision 64)
8224 +++ Library/ShellDebug.h (working copy)
8230 Index: Library/VarCheck.c
8231 ===================================================================
8232 --- Library/VarCheck.c (revision 64)
8233 +++ Library/VarCheck.c (working copy)
8238 -#include "EfiShelllib.h"
8239 +#include "EfiShellLib.h"
8242 LibCheckVarFreeVarList (
8243 Index: Library/Lock.c
8244 ===================================================================
8245 --- Library/Lock.c (revision 64)
8246 +++ Library/Lock.c (working copy)
8251 -#include "EfiShelllib.h"
8252 +#include "EfiShellLib.h"
8256 Index: Library/ShellEnvInt.c
8257 ===================================================================
8258 --- Library/ShellEnvInt.c (revision 64)
8259 +++ Library/ShellEnvInt.c (working copy)
8264 -#include "EfiShelllib.h"
8265 +#include "EfiShellLib.h"
8269 Index: Library/VarCheck.h
8270 ===================================================================
8271 --- Library/VarCheck.h (revision 64)
8272 +++ Library/VarCheck.h (working copy)
8274 ARG_PARTIALLY_QUOTED = 0x2,
8275 ARG_FIRST_HALF_QUOTED = 0x4,
8276 ARG_FIRST_CHAR_IS_ESC = 0x8
8287 Index: Library/Lock.h
8288 ===================================================================
8289 --- Library/Lock.h (revision 64)
8290 +++ Library/Lock.h (working copy)
8296 \ No newline at end of file
8300 Index: ShellFull.inf
8301 ===================================================================
8302 --- ShellFull.inf (revision 64)
8303 +++ ShellFull.inf (working copy)
8304 @@ -20,300 +20,310 @@
8309 -FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
8310 +BASE_NAME = ShellFull
8311 +FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20
8312 COMPONENT_TYPE = APPLICATION
8315 - Library\ShellDebug.c
8325 - Library\ShellEnvInt.c
8328 - Library\ConsistMapping.c
8332 - Library\VarCheck.c
8333 - Library\HiiSupport.c
8334 + Library/ShellDebug.c
8344 + Library/ShellEnvInt.c
8347 + Library/ConsistMapping.c
8351 + Library/VarCheck.c
8352 + Library/HiiSupport.c
8354 - newshell\NshellStrings.uni
8357 - newshell\fakehii.c
8358 + newshell/NshellStrings.uni
8361 + newshell/fakehii.c
8364 - shellenv\ShellenvHelpStrings.uni
8365 - shellenv\ShellenvStrings.uni
8366 - shellenv\ScriptCmdStrings.uni
8367 - shellenv\ConnectStrings.uni
8368 - shellenv\EchoStrings.uni
8369 - shellenv\HelpStrings.uni
8370 - shellenv\MapStrings.uni
8371 - shellenv\CdStrings.uni
8372 - shellenv\DhStrings.uni
8373 + shellenv/ShellenvHelpStrings.uni
8374 + shellenv/ShellenvStrings.uni
8375 + shellenv/ScriptCmdStrings.uni
8376 + shellenv/ConnectStrings.uni
8377 + shellenv/EchoStrings.uni
8378 + shellenv/HelpStrings.uni
8379 + shellenv/MapStrings.uni
8380 + shellenv/CdStrings.uni
8381 + shellenv/DhStrings.uni
8383 - shellenv\cmddisp.c
8384 - shellenv\connect.c
8391 - shellenv\consoleproxy.c
8405 - shellenv\shellenvguid.h
8406 - shellenv\parsecmd.c
8408 + shellenv/cmddisp.c
8409 + shellenv/connect.c
8416 + shellenv/consoleproxy.c
8430 + shellenv/shellenvguid.h
8431 + shellenv/parsecmd.c
8434 - unload\UnloadStrings.uni
8436 + unload/UnloadStrings.uni
8439 - attrib\AttribStrings.uni
8442 + attrib/AttribStrings.uni
8446 - cls\clsstrings.uni
8448 + cls/clsstrings.uni
8458 - date\DateStrings.uni
8461 + date/DateStrings.uni
8465 - load\LoadStrings.uni
8468 + load/LoadStrings.uni
8479 - mkdir\MkdirStrings.uni
8482 + mkdir/MkdirStrings.uni
8493 - reset\ResetStrings.uni
8496 + reset/ResetStrings.uni
8507 - type\TypeStrings.uni
8510 - time\TimeStrings.uni
8513 + type/TypeStrings.uni
8516 + time/TimeStrings.uni
8520 - touch\TouchStrings.uni
8523 + touch/TouchStrings.uni
8527 - vol\VolStrings.uni
8530 + vol/VolStrings.uni
8534 - ver\VerStrings.uni
8537 + ver/VerStrings.uni
8541 - drivers\driversStrings.uni
8544 + drivers/driversStrings.uni
8548 - drvcfg\DrvcfgStrings.uni
8551 + drvcfg/DrvcfgStrings.uni
8555 - drvdiag\DrvdiagStrings.uni
8558 + drvdiag/DrvdiagStrings.uni
8562 - comp\CompStrings.uni
8564 + comp/CompStrings.uni
8567 - dblk\dblkStrings.uni
8570 + dblk/dblkStrings.uni
8574 - devices\DevicesStrings.uni
8576 + devices/DevicesStrings.uni
8579 - devicetree\DevicetreeStrings.uni
8580 - devicetree\devicetree.c
8581 + devicetree/DevicetreeStrings.uni
8582 + devicetree/devicetree.c
8584 - dmem\MemStrings.uni
8585 - dmem\DebugStrings.uni
8587 - dmem\MemCommonPart.c
8589 + dmem/MemStrings.uni
8590 + dmem/DebugStrings.uni
8592 + dmem/MemCommonPart.c
8595 - dmpstore\DmpstoreStrings.uni
8596 - dmpstore\dmpstore.c
8597 + dmpstore/DmpstoreStrings.uni
8598 + dmpstore/dmpstore.c
8600 - edit\EditStrings.uni
8602 - edit\libFileBuffer.c
8604 - edit\libTitleBar.c
8605 - edit\libStatusBar.c
8606 - edit\libInputBar.c
8609 + edit/EditStrings.uni
8611 + edit/libFileBuffer.c
8613 + edit/libTitleBar.c
8614 + edit/libStatusBar.c
8615 + edit/libInputBar.c
8619 - eficompress\CompressStrings.uni
8620 - eficompress\compressMain.c
8621 - eficompress\compress.c
8622 + eficompress/CompressStrings.uni
8623 + eficompress/compressMain.c
8624 + eficompress/compress.c
8626 - efidecompress\DecompressStrings.uni
8627 - efidecompress\decompress.c
8628 + efidecompress/DecompressStrings.uni
8629 + efidecompress/decompress.c
8631 - err\ErrStrings.uni
8633 + err/ErrStrings.uni
8636 - guid\GuidStrings.uni
8638 + guid/GuidStrings.uni
8641 - hexedit\HexeditStrings.uni
8643 - hexedit\libBufferImage.c
8644 - hexedit\libFileImage.c
8645 - hexedit\libDiskImage.c
8646 - hexedit\libMemImage.c
8647 - hexedit\libEditor.c
8648 - hexedit\libTitleBar.c
8649 - hexedit\libStatusBar.c
8650 - hexedit\libInputBar.c
8651 - hexedit\libMenuBar.c
8652 - hexedit\libClipBoard.c
8654 + hexedit/HexeditStrings.uni
8656 + hexedit/libBufferImage.c
8657 + hexedit/libFileImage.c
8658 + hexedit/libDiskImage.c
8659 + hexedit/libMemImage.c
8660 + hexedit/libEditor.c
8661 + hexedit/libTitleBar.c
8662 + hexedit/libStatusBar.c
8663 + hexedit/libInputBar.c
8664 + hexedit/libMenuBar.c
8665 + hexedit/libClipBoard.c
8668 - IfConfig\IfConfigStrings.uni
8669 - IfConfig\IfConfig.c
8670 - IfConfig\IfConfig.h
8671 - IfConfig\ShellNetHelper.c
8672 + IfConfig/IfConfigStrings.uni
8673 + IfConfig/IfConfig.c
8674 + IfConfig/IfConfig.h
8675 + IfConfig/ShellNetHelper.c
8677 - ipconfig\IpConfigStrings.uni
8678 - ipconfig\IpConfig.c
8679 + IpConfig/IpConfigStrings.uni
8680 + IpConfig/IpConfig.c
8682 - loadpcirom\LoadPciRomStrings.uni
8683 - loadpcirom\LoadPciRom.c
8684 + loadpcirom/LoadPciRomStrings.uni
8685 + loadpcirom/LoadPciRom.c
8687 - mem\MemStrings.uni
8688 - mem\DebugStrings.uni
8690 - mem\MemCommonPart.c
8692 + mem/MemStrings.uni
8693 + mem/DebugStrings.uni
8695 + mem/MemCommonPart.c
8698 - memmap\memmapStrings.uni
8700 + memmap/memmapStrings.uni
8708 - mode\ModeStrings.uni
8710 + mode/ModeStrings.uni
8713 - mount\MountStrings.uni
8715 + mount/MountStrings.uni
8718 - openinfo\OPeninfoStrings.uni
8719 - openinfo\openinfo.c
8720 + openinfo/OPeninfoStrings.uni
8721 + openinfo/openinfo.c
8723 - Ping\PingStrings.uni
8725 + Ping/PingStrings.uni
8728 - pci\PciStrings.uni
8731 + pci/PciStrings.uni
8735 - sermode\SermodeStrings.uni
8737 + sermode/SermodeStrings.uni
8740 - smbiosview\SmBiosViewStrings.uni
8741 - smbiosview\QueryTable.c
8742 - smbiosview\EventLogInfo.c
8743 - smbiosview\PrintInfo.c
8744 - smbiosview\LibSmbiosView.c
8745 - smbiosview\smbiosview.c
8746 - smbiosview\smbios.c
8747 + smbiosview/SmBiosViewStrings.uni
8748 + smbiosview/QueryTable.c
8749 + smbiosview/EventLogInfo.c
8750 + smbiosview/PrintInfo.c
8751 + smbiosview/LibSmbiosView.c
8752 + smbiosview/smbiosview.c
8753 + smbiosview/smbios.c
8755 - stall\stallStrings.uni
8757 + stall/stallStrings.uni
8760 - telnetmgmt\TelnetMgmtStrings.uni
8761 - telnetmgmt\TelnetMgmt.c
8762 + telnetmgmt/TelnetMgmtStrings.uni
8763 + telnetmgmt/TelnetMgmt.c
8765 - tzone\TZoneStrings.uni
8767 + tzone/TZoneStrings.uni
8772 - Library\ia32\math.c
8773 - Library\ia32\initplat.c
8775 + Library/IA32/math.c
8776 + Library/IA32/initplat.c
8780 - Library\ipf\math.c
8781 - Library\ipf\initplat.c
8782 - Library\ipf\palproc.s
8783 - Library\ipf\salpal.c
8785 + Library/IPF/math.c
8786 + Library/IPF/initplat.c
8787 + Library/IPF/palproc.s
8788 + Library/IPF/salpal.c
8792 - Library\EBC\math.c
8793 - Library\EBC\initplat.c
8795 + Library/Ebc/math.c
8796 + Library/Ebc/initplat.c
8800 - Library\ipf\math.c
8801 - Library\ia32\initplat.c
8803 + Library/IPF/math.c
8804 + Library/IA32/initplat.c
8808 + Library/IPF/math.c
8809 + Library/IA32/initplat.c
8813 + Library/IPF/math.c
8814 + Library/IA32/initplat.c
8821 - $(EDK_SOURCE)\Foundation
8822 - $(EDK_SOURCE)\Foundation\Include
8823 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8824 - $(EDK_SOURCE)\Foundation\Efi
8825 - $(EDK_SOURCE)\Foundation\Efi\Include
8826 - $(EDK_SOURCE)\Foundation\FrameWork
8827 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8828 - $(EDK_SOURCE)\Foundation\Core\Dxe
8829 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
8833 + $(EDK_SOURCE)/Foundation
8834 + $(EDK_SOURCE)/Foundation/Include
8835 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8836 + $(EDK_SOURCE)/Foundation/Efi
8837 + $(EDK_SOURCE)/Foundation/Efi/Include
8838 + $(EDK_SOURCE)/Foundation/FrameWork
8839 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8840 + $(EDK_SOURCE)/Foundation/Core/Dxe
8841 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
8845 @@ -341,16 +351,18 @@
8846 # we will specify some additional DEFINEs on the compile command line.
8849 + IMAGE_ENTRY_POINT=InitializeShell
8851 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
8852 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
8853 - IMAGE_ENTRY_POINT=InitializeShell
8854 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8855 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
8856 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8857 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8859 +[nmake.ARM, nmake.AARCH64]
8860 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL -DEFI_FULLSHELL
8863 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8864 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
8865 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8869 \ No newline at end of file
8870 Index: inc/shelltypes.h
8871 ===================================================================
8872 --- inc/shelltypes.h (revision 64)
8873 +++ inc/shelltypes.h (working copy)
8878 -#include "linkedlist.h"
8879 +#include "LinkedList.h"
8881 #include EFI_PROTOCOL_DEFINITION (FileInfo)
8882 #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
8888 Index: inc/shellenv.h
8889 ===================================================================
8890 --- inc/shellenv.h (revision 64)
8891 +++ inc/shellenv.h (working copy)
8895 #endif // _SHELLENV_H_
8898 ===================================================================
8899 --- mm/mm.h (revision 64)
8900 +++ mm/mm.h (working copy)
8907 ===================================================================
8908 --- mm/mm.inf (revision 64)
8909 +++ mm/mm.inf (working copy)
8914 - ..\ShCommonStrings.uni
8915 + ../ShCommonStrings.uni
8923 - $(EDK_SOURCE)\Foundation
8924 - $(EDK_SOURCE)\Foundation\Include
8925 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8926 - $(EDK_SOURCE)\Foundation\Efi
8927 - $(EDK_SOURCE)\Foundation\Efi\Include
8928 - $(EDK_SOURCE)\Foundation\FrameWork
8929 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8930 - $(EDK_SOURCE)\Foundation\Core\Dxe
8934 + $(EDK_SOURCE)/Foundation
8935 + $(EDK_SOURCE)/Foundation/Include
8936 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8937 + $(EDK_SOURCE)/Foundation/Efi
8938 + $(EDK_SOURCE)/Foundation/Efi/Include
8939 + $(EDK_SOURCE)/Foundation/FrameWork
8940 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8941 + $(EDK_SOURCE)/Foundation/Core/Dxe
8949 IMAGE_ENTRY_POINT=DumpIoModify
8951 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
8952 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
8953 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8954 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
8956 +[nmake.ARM, nmake.AARCH64]
8957 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
8959 ===================================================================
8960 --- mm/mm.c (revision 64)
8961 +++ mm/mm.c (working copy)
8966 - IN EFI_IO_WIDTH Width,
8967 - IN UINT64 Address,
8970 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8971 + IN UINT64 Address,
8978 - IN EFI_IO_WIDTH Width,
8979 - IN UINT64 Address,
8982 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8983 + IN UINT64 Address,
8993 -EFI_HII_HANDLE HiiHandle;
8994 +STATIC EFI_HII_HANDLE HiiHandle;
8995 EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID;
8996 SHELL_VAR_CHECK_ITEM IomodCheckList[] = {
9003 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
9007 @@ -146,13 +146,13 @@
9011 - OUT EFI_IO_WIDTH *Width,
9012 - OUT EFI_ACCESS_TYPE *AccessType,
9013 - OUT UINT64 *Address,
9014 - OUT UINT64 *Value,
9016 - OUT BOOLEAN *Interactive,
9017 - OUT CHAR16 **ValueStr
9018 + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
9019 + OUT EFI_ACCESS_TYPE *AccessType,
9020 + OUT UINT64 *Address,
9021 + OUT UINT64 *Value,
9023 + OUT BOOLEAN *Interactive,
9024 + OUT CHAR16 **ValueStr
9028 @@ -207,12 +207,11 @@
9031 UINT32 SegmentNumber;
9032 - EFI_IO_WIDTH Width;
9033 + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width;
9034 EFI_ACCESS_TYPE AccessType;
9038 - CHAR16 *AddressStr;
9041 CHAR16 InputStr[80];
9044 Status = OldShellParserMM (&Width, &AccessType, &Address, &Value, &Size, &Interactive, &ValueStr);
9045 if (EFI_ERROR (Status)) {
9046 - if (-1 == Status) {
9047 + if ((EFI_STATUS)-1 == Status) {
9048 PrintToken (STRING_TOKEN (STR_HELPINFO_MM_VERBOSEHELP), HiiHandle);
9049 Status = EFI_SUCCESS;
9052 Width = EfiPciWidthUint8;
9054 AccessType = EfiMemory;
9055 - AddressStr = NULL;
9059 @@ -662,10 +660,10 @@
9063 - IN EFI_IO_WIDTH Width,
9064 - IN UINT64 Address,
9067 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
9068 + IN UINT64 Address,
9074 @@ -694,10 +692,10 @@
9078 - IN EFI_IO_WIDTH Width,
9079 - IN UINT64 Address,
9082 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
9083 + IN UINT64 Address,
9092 if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
9093 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
9094 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
9098 @@ -766,13 +764,13 @@
9102 - OUT EFI_IO_WIDTH *Width,
9103 - OUT EFI_ACCESS_TYPE *AccessType,
9104 - OUT UINT64 *Address,
9105 - OUT UINT64 *Value,
9107 - OUT BOOLEAN *Interactive,
9108 - OUT CHAR16 **ValueStr
9109 + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
9110 + OUT EFI_ACCESS_TYPE *AccessType,
9111 + OUT UINT64 *Address,
9112 + OUT UINT64 *Value,
9114 + OUT BOOLEAN *Interactive,
9115 + OUT CHAR16 **ValueStr
9119 Index: drvcfg/drvcfg.h
9120 ===================================================================
9121 --- drvcfg/drvcfg.h (revision 64)
9122 +++ drvcfg/drvcfg.h (working copy)
9128 Index: drvcfg/drvcfg.inf
9129 ===================================================================
9130 --- drvcfg/drvcfg.inf (revision 64)
9131 +++ drvcfg/drvcfg.inf (working copy)
9136 - ..\ShCommonStrings.uni
9137 + ../ShCommonStrings.uni
9146 - $(EDK_SOURCE)\Foundation
9147 - $(EDK_SOURCE)\Foundation\Include
9148 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9149 - $(EDK_SOURCE)\Foundation\Efi
9150 - $(EDK_SOURCE)\Foundation\Efi\Include
9151 - $(EDK_SOURCE)\Foundation\FrameWork
9152 - $(EDK_SOURCE)\Foundation\FrameWork\Include
9153 - $(EDK_SOURCE)\Foundation\Core\Dxe
9157 + $(EDK_SOURCE)/Foundation
9158 + $(EDK_SOURCE)/Foundation/Include
9159 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9160 + $(EDK_SOURCE)/Foundation/Efi
9161 + $(EDK_SOURCE)/Foundation/Efi/Include
9162 + $(EDK_SOURCE)/Foundation/FrameWork
9163 + $(EDK_SOURCE)/Foundation/FrameWork/Include
9164 + $(EDK_SOURCE)/Foundation/Core/Dxe
9172 IMAGE_ENTRY_POINT=DrvcfgMain
9174 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9175 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9176 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9177 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9179 +[nmake.ARM, nmake.AARCH64]
9180 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
9181 Index: drvcfg/drvcfg.c
9182 ===================================================================
9183 --- drvcfg/drvcfg.c (revision 64)
9184 +++ drvcfg/drvcfg.c (working copy)
9189 -EFI_HII_HANDLE HiiHandle;
9190 +STATIC EFI_HII_HANDLE HiiHandle;
9191 EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID;
9192 SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = {
9199 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
9203 Index: openinfo/openinfo.h
9204 ===================================================================
9205 --- openinfo/openinfo.h (revision 64)
9206 +++ openinfo/openinfo.h (working copy)
9212 Index: openinfo/openinfo.inf
9213 ===================================================================
9214 --- openinfo/openinfo.inf (revision 64)
9215 +++ openinfo/openinfo.inf (working copy)
9220 - ..\ShCommonStrings.uni
9221 + ../ShCommonStrings.uni
9230 - $(EDK_SOURCE)\Foundation
9231 - $(EDK_SOURCE)\Foundation\Include
9232 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9233 - $(EDK_SOURCE)\Foundation\Efi
9234 - $(EDK_SOURCE)\Foundation\Efi\Include
9235 - $(EDK_SOURCE)\Foundation\FrameWork
9236 - $(EDK_SOURCE)\Foundation\FrameWork\Include
9237 - $(EDK_SOURCE)\Foundation\Core\Dxe
9241 + $(EDK_SOURCE)/Foundation
9242 + $(EDK_SOURCE)/Foundation/Include
9243 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9244 + $(EDK_SOURCE)/Foundation/Efi
9245 + $(EDK_SOURCE)/Foundation/Efi/Include
9246 + $(EDK_SOURCE)/Foundation/FrameWork
9247 + $(EDK_SOURCE)/Foundation/FrameWork/Include
9248 + $(EDK_SOURCE)/Foundation/Core/Dxe
9256 IMAGE_ENTRY_POINT=OpeninfoMain
9258 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9259 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9260 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9261 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9263 +[nmake.ARM, nmake.AARCH64]
9264 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
9265 Index: openinfo/openinfo.c
9266 ===================================================================
9267 --- openinfo/openinfo.c (revision 64)
9268 +++ openinfo/openinfo.c (working copy)
9273 -EFI_HII_HANDLE HiiHandle;
9274 +STATIC EFI_HII_HANDLE HiiHandle;
9275 EFI_GUID EfiOpeninfoGuid = EFI_OPENINFO_GUID;
9276 SHELL_VAR_CHECK_ITEM OpeninfoCheckList[] = {
9283 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
9287 Index: drivers/drivers.c
9288 ===================================================================
9289 --- drivers/drivers.c (revision 64)
9290 +++ drivers/drivers.c (working copy)
9295 -EFI_HII_HANDLE HiiHandle;
9296 +STATIC EFI_HII_HANDLE HiiHandle;
9297 EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID;
9298 SHELL_VAR_CHECK_ITEM DriversCheckList[] = {
9305 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
9310 EFI_HANDLE *ControllerHandleBuffer;
9311 UINTN ChildControllerHandleCount;
9314 SHELL_VAR_CHECK_CODE RetCode;
9316 SHELL_ARG_LIST *Item;
9319 DriverImageHandleCount = 0;
9320 DriverImageHandleBuffer = NULL;
9322 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
9324 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
9325 Index: drivers/drivers.h
9326 ===================================================================
9327 --- drivers/drivers.h (revision 64)
9328 +++ drivers/drivers.h (working copy)
9334 Index: drivers/drivers.inf
9335 ===================================================================
9336 --- drivers/drivers.inf (revision 64)
9337 +++ drivers/drivers.inf (working copy)
9342 - ..\ShCommonStrings.uni
9343 + ../ShCommonStrings.uni
9353 - $(EDK_SOURCE)\Foundation
9354 - $(EDK_SOURCE)\Foundation\Include
9355 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9356 - $(EDK_SOURCE)\Foundation\Efi
9357 - $(EDK_SOURCE)\Foundation\Efi\Include
9358 - $(EDK_SOURCE)\Foundation\FrameWork
9359 - $(EDK_SOURCE)\Foundation\FrameWork\Include
9360 - $(EDK_SOURCE)\Foundation\Core\Dxe
9364 + $(EDK_SOURCE)/Foundation
9365 + $(EDK_SOURCE)/Foundation/Include
9366 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9367 + $(EDK_SOURCE)/Foundation/Efi
9368 + $(EDK_SOURCE)/Foundation/Efi/Include
9369 + $(EDK_SOURCE)/Foundation/FrameWork
9370 + $(EDK_SOURCE)/Foundation/FrameWork/Include
9371 + $(EDK_SOURCE)/Foundation/Core/Dxe
9379 IMAGE_ENTRY_POINT=DriversMain
9381 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9382 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9383 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9384 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9386 +[nmake.ARM, nmake.AARCH64]
9387 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL