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
67 Index: EfiCompress/compress.c
68 ===================================================================
69 --- EfiCompress/compress.c (revision 64)
70 +++ EfiCompress/compress.c (working copy)
72 STATIC UINT32 mCompSize, mOrigSize;
74 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
75 - mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
76 + mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
77 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
79 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
81 ===================================================================
82 --- load/load.c (revision 64)
83 +++ load/load.c (working copy)
89 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
94 ===================================================================
95 --- load/load.h (revision 64)
96 +++ load/load.h (working copy)
103 ===================================================================
104 --- load/load.inf (revision 64)
105 +++ load/load.inf (working copy)
107 COMPONENT_TYPE = APPLICATION
110 - ..\ShCommonStrings.uni
111 + ../ShCommonStrings.uni
119 - $(EDK_SOURCE)\Foundation
120 - $(EDK_SOURCE)\Foundation\Include
121 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
122 - $(EDK_SOURCE)\Foundation\Efi
123 - $(EDK_SOURCE)\Foundation\Efi\Include
124 - $(EDK_SOURCE)\Foundation\FrameWork
125 - $(EDK_SOURCE)\Foundation\FrameWork\Include
126 - $(EDK_SOURCE)\Foundation\Core\Dxe
130 + $(EDK_SOURCE)/Foundation
131 + $(EDK_SOURCE)/Foundation/Include
132 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
133 + $(EDK_SOURCE)/Foundation/Efi
134 + $(EDK_SOURCE)/Foundation/Efi/Include
135 + $(EDK_SOURCE)/Foundation/FrameWork
136 + $(EDK_SOURCE)/Foundation/FrameWork/Include
137 + $(EDK_SOURCE)/Foundation/Core/Dxe
142 Index: drvdiag/drvdiag.c
143 ===================================================================
144 --- drvdiag/drvdiag.c (revision 64)
145 +++ drvdiag/drvdiag.c (working copy)
150 -EFI_HII_HANDLE HiiHandle;
151 +STATIC EFI_HII_HANDLE HiiHandle;
152 EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID;
153 SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = {
160 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
164 Index: drvdiag/drvdiag.h
165 ===================================================================
166 --- drvdiag/drvdiag.h (revision 64)
167 +++ drvdiag/drvdiag.h (working copy)
173 Index: drvdiag/drvdiag.inf
174 ===================================================================
175 --- drvdiag/drvdiag.inf (revision 64)
176 +++ drvdiag/drvdiag.inf (working copy)
181 - ..\ShCommonStrings.uni
182 + ../ShCommonStrings.uni
192 - $(EDK_SOURCE)\Foundation
193 - $(EDK_SOURCE)\Foundation\Include
194 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
195 - $(EDK_SOURCE)\Foundation\Efi
196 - $(EDK_SOURCE)\Foundation\Efi\Include
197 - $(EDK_SOURCE)\Foundation\FrameWork
198 - $(EDK_SOURCE)\Foundation\FrameWork\Include
199 - $(EDK_SOURCE)\Foundation\Core\Dxe
203 + $(EDK_SOURCE)/Foundation
204 + $(EDK_SOURCE)/Foundation/Include
205 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
206 + $(EDK_SOURCE)/Foundation/Efi
207 + $(EDK_SOURCE)/Foundation/Efi/Include
208 + $(EDK_SOURCE)/Foundation/FrameWork
209 + $(EDK_SOURCE)/Foundation/FrameWork/Include
210 + $(EDK_SOURCE)/Foundation/Core/Dxe
216 ===================================================================
217 --- cls/cls.c (revision 64)
218 +++ cls/cls.c (working copy)
221 #include STRING_DEFINES_FILE
223 -EFI_HII_HANDLE HiiHandle;
224 +STATIC EFI_HII_HANDLE HiiHandle;
225 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
226 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
233 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
238 ===================================================================
239 --- cls/cls.h (revision 64)
240 +++ cls/cls.h (working copy)
247 ===================================================================
248 --- cls/cls.inf (revision 64)
249 +++ cls/cls.inf (working copy)
254 - ..\ShCommonStrings.uni
255 + ../ShCommonStrings.uni
264 - $(EDK_SOURCE)\Foundation
265 - $(EDK_SOURCE)\Foundation\Include
266 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
267 - $(EDK_SOURCE)\Foundation\Efi
268 - $(EDK_SOURCE)\Foundation\Efi\Include
269 - $(EDK_SOURCE)\Foundation\FrameWork
270 - $(EDK_SOURCE)\Foundation\FrameWork\Include
271 - $(EDK_SOURCE)\Foundation\Core\Dxe
275 + $(EDK_SOURCE)/Foundation
276 + $(EDK_SOURCE)/Foundation/Include
277 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
278 + $(EDK_SOURCE)/Foundation/Efi
279 + $(EDK_SOURCE)/Foundation/Efi/Include
280 + $(EDK_SOURCE)/Foundation/FrameWork
281 + $(EDK_SOURCE)/Foundation/FrameWork/Include
282 + $(EDK_SOURCE)/Foundation/Core/Dxe
287 Index: newshell/nshell.inf
288 ===================================================================
289 --- newshell/nshell.inf (revision 64)
290 +++ newshell/nshell.inf (working copy)
295 - ..\ShCommonStrings.uni
296 + ../ShCommonStrings.uni
305 - $(EDK_SOURCE)\Foundation
306 - $(EDK_SOURCE)\Foundation\Include
307 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
308 - $(EDK_SOURCE)\Foundation\Efi
309 - $(EDK_SOURCE)\Foundation\Efi\Include
310 - $(EDK_SOURCE)\Foundation\FrameWork
311 - $(EDK_SOURCE)\Foundation\FrameWork\Include
312 - $(EDK_SOURCE)\Foundation\Core\Dxe
316 + $(EDK_SOURCE)/Foundation
317 + $(EDK_SOURCE)/Foundation/Include
318 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
319 + $(EDK_SOURCE)/Foundation/Efi
320 + $(EDK_SOURCE)/Foundation/Efi/Include
321 + $(EDK_SOURCE)/Foundation/FrameWork
322 + $(EDK_SOURCE)/Foundation/FrameWork/Include
323 + $(EDK_SOURCE)/Foundation/Core/Dxe
328 Index: newshell/FakeHii.c
329 ===================================================================
330 --- newshell/FakeHii.c (revision 64)
331 +++ newshell/FakeHii.c (working copy)
333 Status = BS->HandleProtocol (
335 &gEfiHiiProtocolGuid,
339 Status = BS->UninstallProtocolInterface (
342 if (Language == NULL) {
343 return EFI_OUT_OF_RESOURCES;
345 - strcpya (Language, (UINT8 *) PackageHdr + HeaderSize - LanguageSize);
346 + strcpya (Language, (CHAR8*) ((UINT8 *) PackageHdr + HeaderSize - LanguageSize));
347 for (Link = PackageList->StringPkgHdr.Flink; Link != &PackageList->StringPkgHdr; Link = Link->Flink) {
348 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
349 if (CompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
351 StringPackage = NULL;
352 for (Link = DatabaseRecord->StringPkgHdr.Flink; Link != &DatabaseRecord->StringPkgHdr; Link = Link->Flink) {
353 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
354 - if (CompareLanguage (StringPackage->StringPkgHdr->Language, (UINT8 *) Language)) {
355 + if (CompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) Language)) {
359 Index: newshell/init.c
360 ===================================================================
361 --- newshell/init.c (revision 64)
362 +++ newshell/init.c (working copy)
366 extern UINT8 STRING_ARRAY_NAME[];
367 -extern BOOLEAN gHiiInitialized = FALSE;
368 +BOOLEAN gHiiInitialized = FALSE;
371 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
373 Status = BS->HandleProtocol (
375 &gEfiLoadedImageProtocolGuid,
379 if (!EFI_ERROR (Status)) {
380 Status = BS->HandleProtocol (
382 &gEfiDevicePathProtocolGuid,
386 if (!EFI_ERROR (Status)) {
387 *DevPath = DuplicateDevicePath (dp);
390 Status = LibLocateProtocol (
391 &gEfiConsoleControlProtocolGuid,
393 + (VOID**)&ConsoleControl
395 if (!EFI_ERROR (Status)) {
396 Status = ConsoleControl->GetMode (ConsoleControl, &mOldCurrentMode, NULL, NULL);
398 Status = _ShellLoadEnvDriver (ImageHandle);
400 if (EFI_ERROR (Status)) {
401 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
402 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
403 if (EFI_ERROR (Status)) {
404 PrintToken (STRING_TOKEN (STR_NSHELL_ENV_DRIVER), HiiNewshellHandle);
407 *IsRootInstance = TRUE;
410 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
411 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
412 ASSERT (!EFI_ERROR (Status));
413 SI = SE->NewShell (ImageHandle);
417 ConsoleControlStatus = LibLocateProtocol (
418 &gEfiConsoleControlProtocolGuid,
420 + (VOID**)&ConsoleControl
422 if (!EFI_ERROR (ConsoleControlStatus)) {
423 ConsoleControlStatus = ConsoleControl->GetMode (ConsoleControl, &CurrentMode, NULL, NULL);
426 SE2->IncrementShellNestingLevel ();
428 - while (Status != -1) {
429 + while (Status != (EFI_STATUS) -1) {
430 Status = NShellPrompt (ImageHandle);
431 EFI_NT_EMULATOR_CODE (
434 Status = BS->HandleProtocol (
436 &ShellInterfaceProtocol,
440 ASSERT (!EFI_ERROR (Status));
442 Index: newshell/FakeHii.h
443 ===================================================================
444 --- newshell/FakeHii.h (revision 64)
445 +++ newshell/FakeHii.h (working copy)
451 Index: newshell/nshell.h
452 ===================================================================
453 --- newshell/nshell.h (revision 64)
454 +++ newshell/nshell.h (working copy)
456 #define EFI_NO_MONOSHELL_CODE(code) code
460 \ No newline at end of file
464 ===================================================================
465 --- type/type.c (revision 64)
466 +++ type/type.c (working copy)
471 -EFI_HII_HANDLE HiiHandle;
472 +STATIC EFI_HII_HANDLE HiiHandle;
473 EFI_GUID EfiTypeGuid = EFI_TYPE_GUID;
474 SHELL_VAR_CHECK_ITEM TypeCheckList[] = {
481 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
486 ===================================================================
487 --- type/type.h (revision 64)
488 +++ type/type.h (working copy)
495 ===================================================================
496 --- type/type.inf (revision 64)
497 +++ type/type.inf (working copy)
502 - ..\ShCommonStrings.uni
503 + ../ShCommonStrings.uni
512 - $(EDK_SOURCE)\Foundation
513 - $(EDK_SOURCE)\Foundation\Include
514 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
515 - $(EDK_SOURCE)\Foundation\Efi
516 - $(EDK_SOURCE)\Foundation\Efi\Include
517 - $(EDK_SOURCE)\Foundation\FrameWork
518 - $(EDK_SOURCE)\Foundation\FrameWork\Include
519 - $(EDK_SOURCE)\Foundation\Core\Dxe
523 + $(EDK_SOURCE)/Foundation
524 + $(EDK_SOURCE)/Foundation/Include
525 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
526 + $(EDK_SOURCE)/Foundation/Efi
527 + $(EDK_SOURCE)/Foundation/Efi/Include
528 + $(EDK_SOURCE)/Foundation/FrameWork
529 + $(EDK_SOURCE)/Foundation/FrameWork/Include
530 + $(EDK_SOURCE)/Foundation/Core/Dxe
535 Index: dmem/MemCommonPart.c
536 ===================================================================
537 --- dmem/MemCommonPart.c (revision 64)
538 +++ dmem/MemCommonPart.c (working copy)
544 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
552 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
553 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
554 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
559 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
561 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
562 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
563 if (EFI_ERROR (Status)) {
564 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
570 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
571 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
573 Buffer = (UINT8 *) (UINTN) Address;
578 AddressStr = SizeStr = NULL;
579 - Address = (UINT64) SystemTable;
580 + Address = (UINT64)(UINTN) SystemTable;
582 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
583 if (VarCheckOk != RetCode) {
586 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
588 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
589 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
590 if (EFI_ERROR (Status)) {
591 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
597 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
598 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
600 Buffer = (UINT8 *) (UINTN) Address;
602 Index: dmem/MemCommonPart.h
603 ===================================================================
604 --- dmem/MemCommonPart.h (revision 64)
605 +++ dmem/MemCommonPart.h (working copy)
607 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
611 \ No newline at end of file
613 Index: dmem/efidump.c
614 ===================================================================
615 --- dmem/efidump.c (revision 64)
616 +++ dmem/efidump.c (working copy)
621 -#include "Efipart.h"
622 +#include "EfiPart.h"
623 #include "EfiShellLib.h"
625 #include STRING_DEFINES_FILE
626 @@ -320,13 +320,11 @@
630 - VOID *SalSystemTable;
636 - SalSystemTable = NULL;
640 @@ -352,11 +350,13 @@
641 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
644 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
645 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
646 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
647 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
650 - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
651 + VOID *SalSystemTable;
653 + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
654 if (!EFI_ERROR(Status)) {
655 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable);
657 @@ -364,22 +364,22 @@
659 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
660 if (!EFI_ERROR (Status)) {
661 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
662 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable);
665 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
666 if (!EFI_ERROR (Status)) {
667 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
668 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table);
671 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
672 if (!EFI_ERROR (Status)) {
673 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
674 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable);
677 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
678 if (!EFI_ERROR (Status)) {
679 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
680 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable);
685 ===================================================================
686 --- dmem/debug.h (revision 64)
687 +++ dmem/debug.h (working copy)
689 extern EFI_HII_HANDLE HiiDmemHandle;
694 ===================================================================
695 --- dmem/dmem.inf (revision 64)
696 +++ dmem/dmem.inf (working copy)
698 COMPONENT_TYPE = APPLICATION
701 - ..\ShCommonStrings.uni
702 + ../ShCommonStrings.uni
712 - $(EDK_SOURCE)\Foundation
713 - $(EDK_SOURCE)\Foundation\Include
714 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
715 - $(EDK_SOURCE)\Foundation\Efi
716 - $(EDK_SOURCE)\Foundation\Efi\Include
717 - $(EDK_SOURCE)\Foundation\FrameWork
718 - $(EDK_SOURCE)\Foundation\FrameWork\Include
719 - $(EDK_SOURCE)\Foundation\Core\Dxe
723 + $(EDK_SOURCE)/Foundation
724 + $(EDK_SOURCE)/Foundation/Include
725 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
726 + $(EDK_SOURCE)/Foundation/Efi
727 + $(EDK_SOURCE)/Foundation/Efi/Include
728 + $(EDK_SOURCE)/Foundation/FrameWork
729 + $(EDK_SOURCE)/Foundation/FrameWork/Include
730 + $(EDK_SOURCE)/Foundation/Core/Dxe
735 Index: devices/devices.c
736 ===================================================================
737 --- devices/devices.c (revision 64)
738 +++ devices/devices.c (working copy)
743 -EFI_HII_HANDLE HiiHandle;
744 +STATIC EFI_HII_HANDLE HiiHandle;
745 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
746 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
753 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
757 Index: devices/devices.h
758 ===================================================================
759 --- devices/devices.h (revision 64)
760 +++ devices/devices.h (working copy)
762 0x6fabed98, 0x2a7, 0x46a4, 0x84, 0xd1, 0x76, 0xcd, 0x5c, 0x49, 0x78, 0x74 \
766 Index: devices/devices.inf
767 ===================================================================
768 --- devices/devices.inf (revision 64)
769 +++ devices/devices.inf (working copy)
774 - ..\ShCommonStrings.uni
775 + ../ShCommonStrings.uni
783 - $(EDK_SOURCE)\Foundation
784 - $(EDK_SOURCE)\Foundation\Include
785 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
786 - $(EDK_SOURCE)\Foundation\Efi
787 - $(EDK_SOURCE)\Foundation\Efi\Include
788 - $(EDK_SOURCE)\Foundation\FrameWork
789 - $(EDK_SOURCE)\Foundation\FrameWork\Include
790 - $(EDK_SOURCE)\Foundation\Core\Dxe
794 + $(EDK_SOURCE)/Foundation
795 + $(EDK_SOURCE)/Foundation/Include
796 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
797 + $(EDK_SOURCE)/Foundation/Efi
798 + $(EDK_SOURCE)/Foundation/Efi/Include
799 + $(EDK_SOURCE)/Foundation/FrameWork
800 + $(EDK_SOURCE)/Foundation/FrameWork/Include
801 + $(EDK_SOURCE)/Foundation/Core/Dxe
807 ===================================================================
808 --- mv/mv.c (revision 64)
809 +++ mv/mv.c (working copy)
814 -EFI_HII_HANDLE HiiHandle;
815 +STATIC EFI_HII_HANDLE HiiHandle;
816 EFI_GUID EfiMvGuid = EFI_MV_GUID;
817 SHELL_VAR_CHECK_ITEM MvCheckList[] = {
824 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
829 ===================================================================
830 --- mv/mv.h (revision 64)
831 +++ mv/mv.h (working copy)
834 #define EFI_FILE_STRING_SIZE 260
837 \ No newline at end of file
840 ===================================================================
841 --- mv/mv.inf (revision 64)
842 +++ mv/mv.inf (working copy)
847 - ..\ShCommonStrings.uni
848 + ../ShCommonStrings.uni
857 - $(EDK_SOURCE)\Foundation
858 - $(EDK_SOURCE)\Foundation\Include
859 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
860 - $(EDK_SOURCE)\Foundation\Efi
861 - $(EDK_SOURCE)\Foundation\Efi\Include
862 - $(EDK_SOURCE)\Foundation\FrameWork
863 - $(EDK_SOURCE)\Foundation\FrameWork\Include
864 - $(EDK_SOURCE)\Foundation\Core\Dxe
868 + $(EDK_SOURCE)/Foundation
869 + $(EDK_SOURCE)/Foundation/Include
870 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
871 + $(EDK_SOURCE)/Foundation/Efi
872 + $(EDK_SOURCE)/Foundation/Efi/Include
873 + $(EDK_SOURCE)/Foundation/FrameWork
874 + $(EDK_SOURCE)/Foundation/FrameWork/Include
875 + $(EDK_SOURCE)/Foundation/Core/Dxe
880 Index: unload/unload.c
881 ===================================================================
882 --- unload/unload.c (revision 64)
883 +++ unload/unload.c (working copy)
889 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
894 *DriverName = LibDevicePathToStr (Image->FilePath);
897 - LibGetDriverName(DriverBindingHandle, Language, DriverName);
898 + LibGetDriverName(DriverBindingHandle, (CHAR8*)Language, DriverName);
905 BestDeviceName = NULL;
906 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
907 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
910 PrintToken (STRING_TOKEN (STR_UNLOAD_CONTROLLER_NAME), HiiUnloadHandle);
911 @@ -242,14 +242,14 @@
913 Status = _UnloadGetDriverName (
914 DriverBindingHandleBuffer[Index],
920 if (DriverName == NULL) {
921 Status = _UnloadGetDriverName (
922 DriverBindingHandleBuffer[Index],
930 Status = _UnloadGetDriverName (
939 Status = _UnloadGetDriverName (
948 if (Prot->Handles[Index] == Handle) {
949 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
950 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
951 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
952 if (!EFI_ERROR (Status)) {
954 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
959 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
960 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
961 if (!EFI_ERROR (Status)) {
962 PrintToken (STRING_TOKEN (STR_UNLOAD_TWO_VARS_HG_NEW), HiiUnloadHandle, ProtocolBuffer[Index1], Interface);
964 Index: unload/unload.h
965 ===================================================================
966 --- unload/unload.h (revision 64)
967 +++ unload/unload.h (working copy)
973 Index: unload/unload.inf
974 ===================================================================
975 --- unload/unload.inf (revision 64)
976 +++ unload/unload.inf (working copy)
978 COMPONENT_TYPE = APPLICATION
981 - ..\ShCommonStrings.uni
982 + ../ShCommonStrings.uni
990 - $(EDK_SOURCE)\Foundation
991 - $(EDK_SOURCE)\Foundation\Include
992 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
993 - $(EDK_SOURCE)\Foundation\Efi
994 - $(EDK_SOURCE)\Foundation\Efi\Include
995 - $(EDK_SOURCE)\Foundation\FrameWork
996 - $(EDK_SOURCE)\Foundation\FrameWork\Include
997 - $(EDK_SOURCE)\Foundation\Core\Dxe
1001 + $(EDK_SOURCE)/Foundation
1002 + $(EDK_SOURCE)/Foundation/Include
1003 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1004 + $(EDK_SOURCE)/Foundation/Efi
1005 + $(EDK_SOURCE)/Foundation/Efi/Include
1006 + $(EDK_SOURCE)/Foundation/FrameWork
1007 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1008 + $(EDK_SOURCE)/Foundation/Core/Dxe
1013 Index: mode/mode.inf
1014 ===================================================================
1015 --- mode/mode.inf (revision 64)
1016 +++ mode/mode.inf (working copy)
1021 - ..\ShCommonStrings.uni
1022 + ../ShCommonStrings.uni
1031 - $(EDK_SOURCE)\Foundation
1032 - $(EDK_SOURCE)\Foundation\Include
1033 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1034 - $(EDK_SOURCE)\Foundation\Efi
1035 - $(EDK_SOURCE)\Foundation\Efi\Include
1036 - $(EDK_SOURCE)\Foundation\FrameWork
1037 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1038 - $(EDK_SOURCE)\Foundation\Core\Dxe
1042 + $(EDK_SOURCE)/Foundation
1043 + $(EDK_SOURCE)/Foundation/Include
1044 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1045 + $(EDK_SOURCE)/Foundation/Efi
1046 + $(EDK_SOURCE)/Foundation/Efi/Include
1047 + $(EDK_SOURCE)/Foundation/FrameWork
1048 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1049 + $(EDK_SOURCE)/Foundation/Core/Dxe
1055 ===================================================================
1056 --- mode/mode.c (revision 64)
1057 +++ mode/mode.c (working copy)
1063 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1068 ===================================================================
1069 --- mode/mode.h (revision 64)
1070 +++ mode/mode.h (working copy)
1076 Index: attrib/attrib.inf
1077 ===================================================================
1078 --- attrib/attrib.inf (revision 64)
1079 +++ attrib/attrib.inf (working copy)
1084 - ..\ShCommonStrings.uni
1085 + ../ShCommonStrings.uni
1094 - $(EDK_SOURCE)\Foundation
1095 - $(EDK_SOURCE)\Foundation\Include
1096 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1097 - $(EDK_SOURCE)\Foundation\Efi
1098 - $(EDK_SOURCE)\Foundation\Efi\Include
1099 - $(EDK_SOURCE)\Foundation\FrameWork
1100 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1101 - $(EDK_SOURCE)\Foundation\Core\Dxe
1105 + $(EDK_SOURCE)/Foundation
1106 + $(EDK_SOURCE)/Foundation/Include
1107 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1108 + $(EDK_SOURCE)/Foundation/Efi
1109 + $(EDK_SOURCE)/Foundation/Efi/Include
1110 + $(EDK_SOURCE)/Foundation/FrameWork
1111 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1112 + $(EDK_SOURCE)/Foundation/Core/Dxe
1117 Index: attrib/attrib.c
1118 ===================================================================
1119 --- attrib/attrib.c (revision 64)
1120 +++ attrib/attrib.c (working copy)
1125 -EFI_HII_HANDLE HiiHandle;
1126 +STATIC EFI_HII_HANDLE HiiHandle;
1127 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
1128 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
1135 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1142 if (Add || Remove) {
1143 - Info->Attribute = Info->Attribute & (~Remove) | Add;
1144 + Info->Attribute = (Info->Attribute & (~Remove)) | Add;
1145 Status = Arg->Handle->SetInfo (
1148 Index: attrib/attrib.h
1149 ===================================================================
1150 --- attrib/attrib.h (revision 64)
1151 +++ attrib/attrib.h (working copy)
1153 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \
1157 \ No newline at end of file
1161 ===================================================================
1162 --- err/err.inf (revision 64)
1163 +++ err/err.inf (working copy)
1165 COMPONENT_TYPE = APPLICATION
1168 -..\ShCommonStrings.uni
1169 +../ShCommonStrings.uni
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
1190 + $(EDK_SOURCE)/Foundation
1191 + $(EDK_SOURCE)/Foundation/Include
1192 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1193 + $(EDK_SOURCE)/Foundation/Efi
1194 + $(EDK_SOURCE)/Foundation/Efi/Include
1195 + $(EDK_SOURCE)/Foundation/FrameWork
1196 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1197 + $(EDK_SOURCE)/Foundation/Core/Dxe
1202 Index: err/DebugMask.h
1203 ===================================================================
1204 --- err/DebugMask.h (revision 64)
1205 +++ err/DebugMask.h (working copy)
1207 extern EFI_GUID gEfiDebugMaskProtocolGuid;
1212 ===================================================================
1213 --- err/err.c (revision 64)
1214 +++ err/err.c (working copy)
1219 -EFI_HII_HANDLE HiiHandle;
1220 +STATIC EFI_HII_HANDLE HiiHandle;
1221 EFI_GUID EfiErrGuid = EFI_ERR_GUID;
1222 SHELL_VAR_CHECK_ITEM ErrCheckList[] = {
1229 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1234 EFI_DEBUG_MASK_PROTOCOL *dmp;
1237 - Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp);
1238 + Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1239 if (!EFI_ERROR (Status)) {
1240 Status = dmp->GetDebugMask (dmp, &Mask);
1241 if (!EFI_ERROR (Status)) {
1242 @@ -170,13 +170,11 @@
1251 Status = EFI_SUCCESS;
1254 if (NULL != Handle) {
1255 DrvHandle = (UINTN) StrToUIntegerBase (Handle, 16, &Status) - 1;
1260 - Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp);
1261 + Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1262 if (EFI_ERROR (Status)) {
1263 PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1);
1268 for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) {
1269 - Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp);
1270 + Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1271 Status = dmp->SetDebugMask (dmp, Msk);
1275 ===================================================================
1276 --- err/err.h (revision 64)
1277 +++ err/err.h (working copy)
1279 0xdaab229b, 0x7883, 0x4f5f, 0xac, 0x6e, 0x15, 0x20, 0xc7, 0xe7, 0x8f, 0xd4 \
1283 \ No newline at end of file
1285 Index: EfiDecompress/Decompress.inf
1286 ===================================================================
1287 --- EfiDecompress/Decompress.inf (revision 64)
1288 +++ EfiDecompress/Decompress.inf (working copy)
1290 COMPONENT_TYPE = APPLICATION
1293 -..\ShCommonStrings.uni
1294 +../ShCommonStrings.uni
1295 DecompressStrings.uni
1304 - $(EDK_SOURCE)\Foundation
1305 - $(EDK_SOURCE)\Foundation\Include
1306 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1307 - $(EDK_SOURCE)\Foundation\Efi
1308 - $(EDK_SOURCE)\Foundation\Efi\Include
1309 - $(EDK_SOURCE)\Foundation\FrameWork
1310 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1311 - $(EDK_SOURCE)\Foundation\Core\Dxe
1315 + $(EDK_SOURCE)/Foundation
1316 + $(EDK_SOURCE)/Foundation/Include
1317 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1318 + $(EDK_SOURCE)/Foundation/Efi
1319 + $(EDK_SOURCE)/Foundation/Efi/Include
1320 + $(EDK_SOURCE)/Foundation/FrameWork
1321 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1322 + $(EDK_SOURCE)/Foundation/Core/Dxe
1327 Index: EfiDecompress/Decompress.c
1328 ===================================================================
1329 --- EfiDecompress/Decompress.c (revision 64)
1330 +++ EfiDecompress/Decompress.c (working copy)
1334 #include "EfiShellLib.h"
1335 -#include "decompress.h"
1336 +#include "Decompress.h"
1338 extern UINT8 STRING_ARRAY_NAME[];
1342 #include STRING_DEFINES_FILE
1344 -#include EFI_PROTOCOL_DEFINITION (decompress)
1345 +#include EFI_PROTOCOL_DEFINITION (Decompress)
1347 EFI_HII_HANDLE HiiDecompressHandle;
1348 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
1354 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1362 - Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
1363 + Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
1364 if (EFI_ERROR (Status)) {
1365 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
1366 Status = EFI_UNSUPPORTED;
1367 Index: EfiDecompress/Decompress.h
1368 ===================================================================
1369 --- EfiDecompress/Decompress.h (revision 64)
1370 +++ EfiDecompress/Decompress.h (working copy)
1372 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
1376 \ No newline at end of file
1378 Index: hexedit/libStatusBar.c
1379 ===================================================================
1380 --- hexedit/libStatusBar.c (revision 64)
1381 +++ hexedit/libStatusBar.c (working copy)
1383 // back up the screen attributes
1385 Orig = HMainEditor.ColorAttributes;
1387 New.Colors.Foreground = Orig.Colors.Background;
1388 New.Colors.Background = Orig.Colors.Foreground;
1390 Index: hexedit/libtitlebar.h
1391 ===================================================================
1392 --- hexedit/libtitlebar.h (revision 64)
1393 +++ hexedit/libtitlebar.h (working copy)
1399 Index: hexedit/heditor.h
1400 ===================================================================
1401 --- hexedit/heditor.h (revision 64)
1402 +++ hexedit/heditor.h (working copy)
1404 #include "libinputbar.h"
1405 #include "libmenubar.h"
1407 -#include "libmisc.h"
1408 +#include "libMisc.h"
1410 #include "libclipboard.h"
1413 extern BOOLEAN HEditorFirst;
1414 extern BOOLEAN HEditorExit;
1416 -extern EFI_HII_HANDLE HiiHandle;
1417 +extern EFI_HII_HANDLE gHexEditHiiHandle;
1418 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1419 extern EFI_HII_PROTOCOL *Hii;
1422 #endif // _HEDITOR_H
1424 Index: hexedit/libBufferImage.c
1425 ===================================================================
1426 --- hexedit/libBufferImage.c (revision 64)
1427 +++ hexedit/libBufferImage.c (working copy)
1444 if (HMainEditor.MouseSupported) {
1446 if (HBufferImageMouseNeedRefresh) {
1448 // backup the old screen attributes
1450 Orig = HMainEditor.ColorAttributes;
1452 New.Colors.Foreground = Orig.Colors.Background;
1453 New.Colors.Background = Orig.Colors.Foreground;
1455 @@ -801,10 +805,10 @@
1462 Orig = HMainEditor.ColorAttributes;
1464 New.Colors.Foreground = Orig.Colors.Background;
1465 New.Colors.Background = Orig.Colors.Foreground;
1470 FStartRow = StartRow;
1473 StartRow = TEXT_START_ROW + StartRow - HBufferImage.LowVisibleRow;
1474 EndRow = TEXT_START_ROW + EndRow - HBufferImage.LowVisibleRow;
1475 @@ -980,6 +983,10 @@
1477 Status = HMemImageRead (MemOffset, MemSize, Recover);
1481 + Status = EFI_UNSUPPORTED;
1485 if (EFI_ERROR (Status)) {
1486 @@ -1030,6 +1037,10 @@
1488 Status = HMemImageSave (MemOffset, MemSize);
1492 + Status = EFI_UNSUPPORTED;
1496 if (EFI_ERROR (Status)) {
1497 @@ -1967,14 +1978,11 @@
1501 - HEFI_EDITOR_LINE *Line;
1507 - Line = HBufferImage.CurrentLine;
1509 FRow = HBufferImage.BufferPosition.Row;
1510 FCol = HBufferImage.BufferPosition.Column;
1512 @@ -1996,7 +2004,7 @@
1516 - Line = HMoveLine (Retreat);
1517 + HMoveLine (Retreat);
1521 @@ -2025,13 +2033,10 @@
1525 - HEFI_EDITOR_LINE *Line;
1530 - Line = HBufferImage.CurrentLine;
1533 // curosr will at the high bit
1535 @@ -2157,7 +2162,6 @@
1537 HEFI_EDITOR_LINE *Line;
1538 EFI_LIST_ENTRY *Link;
1543 @@ -2167,11 +2171,6 @@
1548 - // get the line that start position is at
1550 - StartRow = Pos / 0x10;
1552 Size = HBufferImageGetTotalSize ();
1555 @@ -2300,7 +2299,6 @@
1556 HEFI_EDITOR_LINE *Line;
1558 EFI_LIST_ENTRY *Link;
1563 @@ -2308,11 +2306,6 @@
1568 - // get the line that start position is at
1570 - StartRow = Pos / 0x10;
1572 Size = HBufferImageGetTotalSize ();
1575 Index: hexedit/libstatusbar.h
1576 ===================================================================
1577 --- hexedit/libstatusbar.h (revision 64)
1578 +++ hexedit/libstatusbar.h (working copy)
1584 Index: hexedit/heditortype.h
1585 ===================================================================
1586 --- hexedit/heditortype.h (revision 64)
1587 +++ hexedit/heditortype.h (working copy)
1589 #define EDITOR_NAME L"EFI Hex Editor\0"
1590 #define EDITOR_VERSION L"0.99\0"
1592 -#define EFI_EDITOR_LINE_LIST 'eell'
1593 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
1595 #define FILE_ATTRIBUTES EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE
1596 #define FILE_READ_WRITE EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE
1598 } HEFI_EDITOR_MENU_ITEM;
1601 - UINT32 Foreground : 4;
1602 - UINT32 Background : 4;
1603 + UINT8 Foreground : 4;
1604 + UINT8 Background : 4;
1605 } HEFI_EDITOR_COLOR_ATTRIBUTES;
1609 } HEFI_EDITOR_GLOBAL_EDITOR;
1613 Index: hexedit/libMemImage.c
1614 ===================================================================
1615 --- hexedit/libMemImage.c (revision 64)
1616 +++ hexedit/libMemImage.c (working copy)
1618 Status = BS->LocateProtocol (
1619 &gEfiPciRootBridgeIoProtocolGuid,
1622 + (VOID**)&HMemImage.IoFncs
1624 if (Status == EFI_NOT_FOUND) {
1628 HEFI_EDITOR_LINE *Line;
1630 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
1632 - BufferTypeBackup = HBufferImage.BufferType;
1633 HBufferImage.BufferType = MEM_BUFFER;
1635 Buffer = AllocatePool (Size);
1640 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
1643 // not modified, so directly return
1649 - BufferTypeBackup = HBufferImage.BufferType;
1650 HBufferImage.BufferType = MEM_BUFFER;
1652 Buffer = AllocatePool (Size);
1653 Index: hexedit/libbufferimage.h
1654 ===================================================================
1655 --- hexedit/libbufferimage.h (revision 64)
1656 +++ hexedit/libbufferimage.h (working copy)
1662 Index: hexedit/libInputBar.c
1663 ===================================================================
1664 --- hexedit/libInputBar.c (revision 64)
1665 +++ hexedit/libInputBar.c (working copy)
1674 // variable initialization
1676 // back up the old screen attributes
1678 Orig = HMainEditor.ColorAttributes;
1680 New.Colors.Foreground = Orig.Colors.Background;
1681 New.Colors.Background = Orig.Colors.Foreground;
1683 @@ -201,15 +200,9 @@
1684 HEditorClearLine (INPUT_BAR_LOCATION);
1686 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
1687 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
1688 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
1691 - // that's the maximum input length that can be displayed on screen
1693 - PromptLen = StrLen (HMainInputBar.Prompt);
1694 - Limit = HMainEditor.ScreenSize.Column - PromptLen;
1697 // this is a selection prompt, cursor will stay in edit area
1698 // actually this is for search , search/replace
1700 Index: hexedit/libmemimage.h
1701 ===================================================================
1702 --- hexedit/libmemimage.h (revision 64)
1703 +++ hexedit/libmemimage.h (working copy)
1709 Index: hexedit/libEditor.c
1710 ===================================================================
1711 --- hexedit/libEditor.c (revision 64)
1712 +++ hexedit/libEditor.c (working copy)
1717 -#include "Heditor.h"
1718 +#include "heditor.h"
1720 HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
1723 Status = BS->HandleProtocol (
1725 &gEfiSimplePointerProtocolGuid,
1726 - &HMainEditor.MouseInterface
1727 + (VOID**)&HMainEditor.MouseInterface
1729 if (EFI_ERROR (Status)) {
1732 Status = BS->HandleProtocol (
1733 HandleBuffer[Index],
1734 &gEfiSimplePointerProtocolGuid,
1735 - &HMainEditor.MouseInterface
1736 + (VOID**)&HMainEditor.MouseInterface
1738 if (!EFI_ERROR (Status)) {
1740 @@ -182,37 +182,37 @@
1742 Status = HMainTitleBarInit ();
1743 if (EFI_ERROR (Status)) {
1744 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
1745 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
1746 return EFI_LOAD_ERROR;
1749 Status = HMainMenuBarInit ();
1750 if (EFI_ERROR (Status)) {
1751 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
1752 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
1753 return EFI_LOAD_ERROR;
1756 Status = HMainStatusBarInit ();
1757 if (EFI_ERROR (Status)) {
1758 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
1759 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
1760 return EFI_LOAD_ERROR;
1763 Status = HMainInputBarInit ();
1764 if (EFI_ERROR (Status)) {
1765 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
1766 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
1767 return EFI_LOAD_ERROR;
1770 Status = HBufferImageInit ();
1771 if (EFI_ERROR (Status)) {
1772 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
1773 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
1774 return EFI_LOAD_ERROR;
1777 Status = HClipBoardInit ();
1778 if (EFI_ERROR (Status)) {
1779 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
1780 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
1781 return EFI_LOAD_ERROR;
1784 @@ -259,32 +259,32 @@
1786 Status = HMainTitleBarCleanup ();
1787 if (EFI_ERROR (Status)) {
1788 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
1789 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
1792 Status = HMainMenuBarCleanup ();
1793 if (EFI_ERROR (Status)) {
1794 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
1795 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
1798 Status = HMainStatusBarCleanup ();
1799 if (EFI_ERROR (Status)) {
1800 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
1801 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
1804 Status = HMainInputBarCleanup ();
1805 if (EFI_ERROR (Status)) {
1806 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
1807 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
1810 Status = HBufferImageCleanup ();
1811 if (EFI_ERROR (Status)) {
1812 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
1813 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
1816 Status = HClipBoardCleanup ();
1817 if (EFI_ERROR (Status)) {
1818 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
1819 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
1825 OldSize = HBufferImage.MemImage->Size;
1832 if (LengthChange == FALSE) {
1833 Index: hexedit/libfileimage.h
1834 ===================================================================
1835 --- hexedit/libfileimage.h (revision 64)
1836 +++ hexedit/libfileimage.h (working copy)
1842 Index: hexedit/libinputbar.h
1843 ===================================================================
1844 --- hexedit/libinputbar.h (revision 64)
1845 +++ hexedit/libinputbar.h (working copy)
1851 Index: hexedit/libMenuBar.c
1852 ===================================================================
1853 --- hexedit/libMenuBar.c (revision 64)
1854 +++ hexedit/libMenuBar.c (working copy)
1857 CHAR16 *FunctionKeyString;
1859 - EFI_STATUS Status;
1862 // variable initialization
1864 FunctionKeyString = AllocatePool (BufferSize);
1866 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1867 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
1868 + Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
1870 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
1871 + LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
1874 Width = max ((StrLen (NameString) + 6), 18);
1878 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1879 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
1880 + Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
1882 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
1883 + LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
1886 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
1887 @@ -1138,7 +1137,6 @@
1888 // the file won't be saved
1895 @@ -1567,7 +1565,6 @@
1899 - HEFI_EDITOR_LINE *Line;
1900 EFI_LIST_ENTRY *Link;
1903 @@ -1592,8 +1589,6 @@
1907 - Line = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);
1909 Count = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;
1910 Buffer = AllocatePool (Count);
1911 if (Buffer == NULL) {
1912 Index: hexedit/libeditor.h
1913 ===================================================================
1914 --- hexedit/libeditor.h (revision 64)
1915 +++ hexedit/libeditor.h (working copy)
1921 Index: hexedit/hexedit.inf
1922 ===================================================================
1923 --- hexedit/hexedit.inf (revision 64)
1924 +++ hexedit/hexedit.inf (working copy)
1926 COMPONENT_TYPE = APPLICATION
1929 - ..\ShCommonStrings.uni
1930 + ../ShCommonStrings.uni
1940 - $(EDK_SOURCE)\Foundation
1941 - $(EDK_SOURCE)\Foundation\Include
1942 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1943 - $(EDK_SOURCE)\Foundation\Efi
1944 - $(EDK_SOURCE)\Foundation\Efi\Include
1945 - $(EDK_SOURCE)\Foundation\FrameWork
1946 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1947 - $(EDK_SOURCE)\Foundation\Core\Dxe
1951 + $(EDK_SOURCE)/Foundation
1952 + $(EDK_SOURCE)/Foundation/Include
1953 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1954 + $(EDK_SOURCE)/Foundation/Efi
1955 + $(EDK_SOURCE)/Foundation/Efi/Include
1956 + $(EDK_SOURCE)/Foundation/FrameWork
1957 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1958 + $(EDK_SOURCE)/Foundation/Core/Dxe
1963 Index: hexedit/libdiskimage.c
1964 ===================================================================
1965 --- hexedit/libdiskimage.c (revision 64)
1966 +++ hexedit/libdiskimage.c (working copy)
1967 @@ -228,11 +228,7 @@
1970 HEFI_EDITOR_LINE *Line;
1971 - UINT64 ByteOffset;
1973 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
1975 - BufferTypeBackup = HBufferImage.BufferType;
1976 HBufferImage.BufferType = DISK_BUFFER;
1978 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
1980 Status = LibDevicePathToInterface (
1981 &gEfiBlockIoProtocolGuid,
1986 if (EFI_ERROR (Status)) {
1987 HMainStatusBarSetStatusString (L"Read Disk Failed");
1989 return EFI_OUT_OF_RESOURCES;
1992 - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
1997 @@ -405,10 +399,6 @@
2001 - UINT64 ByteOffset;
2003 - HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
2006 // if not modified, directly return
2012 - BufferTypeBackup = HBufferImage.BufferType;
2013 HBufferImage.BufferType = DISK_BUFFER;
2015 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
2017 Status = LibDevicePathToInterface (
2018 &gEfiBlockIoProtocolGuid,
2023 if (EFI_ERROR (Status)) {
2029 - ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
2032 // write the buffer to disk
2034 Index: hexedit/main.c
2035 ===================================================================
2036 --- hexedit/main.c (revision 64)
2037 +++ hexedit/main.c (working copy)
2042 -EFI_HII_HANDLE HiiHandle;
2043 +EFI_HII_HANDLE gHexEditHiiHandle;
2044 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2045 EFI_HII_PROTOCOL *Hii;
2052 + (SHELL_VAR_CHECK_FLAG_TYPE)0
2060 - PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle);
2061 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle);
2062 - PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle);
2063 - PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle);
2064 + PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle);
2065 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle);
2066 + PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle);
2067 + PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle);
2072 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
2074 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2075 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
2076 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
2077 if (EFI_ERROR (Status)) {
2080 @@ -158,12 +158,12 @@
2081 // Register our string package with HII and return the handle to it.
2082 // If previously registered we will simply receive the handle
2084 - EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2085 + EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2087 if (!EFI_PROPER_VERSION (1, 10)) {
2089 STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT),
2091 + gHexEditHiiHandle,
2095 @@ -187,17 +187,17 @@
2097 case VarCheckConflict:
2099 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful);
2100 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful);
2103 case VarCheckDuplicate:
2105 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful);
2106 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2109 case VarCheckUnknown:
2111 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful);
2112 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2116 @@ -220,10 +220,10 @@
2117 ChkPck.FlagCount > 2 ||
2118 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
2120 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2121 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2122 Status = EFI_INVALID_PARAMETER;
2124 - PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle);
2125 + PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle);
2126 Status = EFI_SUCCESS;
2129 @@ -233,13 +233,13 @@
2130 Item = LibCheckVarGetFlag (&ChkPck, L"-d");
2132 if (3 < ChkPck.ValueCount) {
2133 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2134 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2135 Status = EFI_INVALID_PARAMETER;
2139 if (3 > ChkPck.ValueCount) {
2140 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2141 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2142 Status = EFI_INVALID_PARAMETER;
2147 Result = HXtoi (Item->VarStr, &Offset);
2148 if (EFI_ERROR (Result)) {
2149 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2150 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2151 Status = EFI_INVALID_PARAMETER;
2154 @@ -257,13 +257,13 @@
2156 Result = HXtoi (Item->VarStr, &Size);
2157 if (EFI_ERROR (Result)) {
2158 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2159 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2160 Status = EFI_INVALID_PARAMETER;
2164 if (Offset < 0 || Size <= 0) {
2165 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2166 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2167 Status = EFI_INVALID_PARAMETER;
2170 @@ -274,13 +274,13 @@
2171 Item = LibCheckVarGetFlag (&ChkPck, L"-m");
2173 if (2 < ChkPck.ValueCount) {
2174 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2175 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2176 Status = EFI_INVALID_PARAMETER;
2180 if (2 > ChkPck.ValueCount) {
2181 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2182 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2183 Status = EFI_INVALID_PARAMETER;
2187 Item = ChkPck.VarList;
2188 Result = HXtoi (Item->VarStr, &Offset);
2189 if (EFI_ERROR (Result)) {
2190 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2191 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2192 Status = EFI_INVALID_PARAMETER;
2195 @@ -296,20 +296,20 @@
2197 Result = HXtoi (Item->VarStr, &Size);
2198 if (EFI_ERROR (Result)) {
2199 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2200 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2201 Status = EFI_INVALID_PARAMETER;
2205 if (Offset < 0 || Size <= 0) {
2206 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2207 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2208 Status = EFI_INVALID_PARAMETER;
2212 LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1;
2213 if (LastOffset > 0xffffffff) {
2214 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2215 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2219 @@ -319,13 +319,13 @@
2220 Item = LibCheckVarGetFlag (&ChkPck, L"-f");
2222 if (1 < ChkPck.ValueCount) {
2223 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2224 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2225 Status = EFI_INVALID_PARAMETER;
2229 if (1 > ChkPck.ValueCount) {
2230 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2231 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2232 Status = EFI_INVALID_PARAMETER;
2236 Item = ChkPck.VarList;
2237 Name = Item->VarStr;
2238 if (!HIsValidFileName (Name)) {
2239 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2240 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2241 Status = EFI_INVALID_PARAMETER;
2244 @@ -345,20 +345,20 @@
2248 - PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), HiiHandle, L"hexedit");
2249 + PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), gHexEditHiiHandle, L"hexedit");
2250 Status = EFI_INVALID_PARAMETER;
2253 } else if (1 == ChkPck.ValueCount) {
2254 Name = ChkPck.VarList->VarStr;
2256 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2257 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2258 Status = EFI_INVALID_PARAMETER;
2262 if (!HIsValidFileName (Name)) {
2263 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2264 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2265 Status = EFI_INVALID_PARAMETER;
2271 if (SI->RedirArgc != 0) {
2272 - PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle);
2273 + PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle);
2274 Status = EFI_INVALID_PARAMETER;
2278 if (EFI_ERROR (Status)) {
2279 Out->ClearScreen (Out);
2280 Out->EnableCursor (Out, TRUE);
2281 - PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle);
2282 + PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle);
2292 + Status = EFI_UNSUPPORTED;
2296 if (!EFI_ERROR (Status)) {
2297 @@ -453,19 +455,19 @@
2299 if (Status == EFI_SUCCESS) {
2300 } else if (Status == EFI_OUT_OF_RESOURCES) {
2301 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit");
2302 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit");
2304 if (Buffer != NULL) {
2305 if (StrCmp (Buffer, L"") != 0) {
2307 // print out the status string
2309 - PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer);
2310 + PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer);
2312 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2313 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2316 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2317 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2321 Index: hexedit/libmenubar.h
2322 ===================================================================
2323 --- hexedit/libmenubar.h (revision 64)
2324 +++ hexedit/libmenubar.h (working copy)
2326 #ifndef _LIB_MENU_BAR_H_
2327 #define _LIB_MENU_BAR_H_
2329 -#include "Heditortype.h"
2330 +#include "heditortype.h"
2339 Index: hexedit/libMisc.h
2340 ===================================================================
2341 --- hexedit/libMisc.h (revision 64)
2342 +++ hexedit/libMisc.h (working copy)
2344 #ifndef _LIB_MISC_H_
2345 #define _LIB_MISC_H_
2347 -#include "Heditortype.h"
2348 +#include "heditortype.h"
2357 Index: hexedit/libdiskimage.h
2358 ===================================================================
2359 --- hexedit/libdiskimage.h (revision 64)
2360 +++ hexedit/libdiskimage.h (working copy)
2366 Index: hexedit/libclipboard.h
2367 ===================================================================
2368 --- hexedit/libclipboard.h (revision 64)
2369 +++ hexedit/libclipboard.h (working copy)
2375 Index: hexedit/libTitleBar.c
2376 ===================================================================
2377 --- hexedit/libTitleBar.c (revision 64)
2378 +++ hexedit/libTitleBar.c (working copy)
2380 // backup the old screen attributes
2382 Orig = HMainEditor.ColorAttributes;
2384 New.Colors.Foreground = Orig.Colors.Background;
2385 New.Colors.Background = Orig.Colors.Foreground;
2388 // the space for file name is 35 characters
2390 if (StrLen (FileNameTmp) <= 35) {
2391 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp);
2392 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp);
2394 for (Index = StrLen (FileNameTmp); Index < 35; Index++) {
2399 for (Index = 0; Index < 32; Index++) {
2400 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]);
2401 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]);
2405 @@ -234,14 +235,14 @@
2406 if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) {
2408 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR),
2410 + gHexEditHiiHandle,
2411 HMainEditor.BufferImage->DiskImage->Name
2414 for (Index = 0; Index < 6; Index++) {
2416 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C),
2418 + gHexEditHiiHandle,
2419 HMainEditor.BufferImage->DiskImage->Name[Index]
2425 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2427 + gHexEditHiiHandle,
2428 HMainEditor.BufferImage->DiskImage->Offset,
2429 HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1
2434 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2436 + gHexEditHiiHandle,
2437 HMainEditor.BufferImage->MemImage->Offset,
2438 HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1
2440 @@ -280,22 +281,27 @@
2450 switch (HMainEditor.BufferImage->BufferType) {
2452 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle);
2453 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle);
2457 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle);
2458 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle);
2462 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle);
2463 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle);
2470 // print modified field
2472 ===================================================================
2473 --- Ping/Ping.h (revision 64)
2474 +++ Ping/Ping.h (working copy)
2480 Index: Ping/Ping.inf
2481 ===================================================================
2482 --- Ping/Ping.inf (revision 64)
2483 +++ Ping/Ping.inf (working copy)
2485 COMPONENT_TYPE = APPLICATION
2488 - ..\ShCommonStrings.uni
2489 + ../ShCommonStrings.uni
2497 - $(EDK_SOURCE)\Foundation\Efi
2498 - $(EDK_SOURCE)\Foundation
2499 - $(EDK_SOURCE)\Foundation\Efi\Include
2500 - $(EDK_SOURCE)\Foundation\Include
2501 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2502 - $(EDK_SOURCE)\Foundation\FrameWork
2503 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2504 - $(EDK_SOURCE)\Foundation\Core\Dxe
2505 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2509 + $(EDK_SOURCE)/Foundation/Efi
2510 + $(EDK_SOURCE)/Foundation
2511 + $(EDK_SOURCE)/Foundation/Efi/Include
2512 + $(EDK_SOURCE)/Foundation/Include
2513 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2514 + $(EDK_SOURCE)/Foundation/FrameWork
2515 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2516 + $(EDK_SOURCE)/Foundation/Core/Dxe
2517 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2531 ===================================================================
2532 --- Ping/Ping.c (revision 64)
2533 +++ Ping/Ping.c (working copy)
2537 #include "EfiShellLib.h"
2538 -#include "CpuFuncs.h"
2539 +//#include "CpuFuncs.h"
2540 #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu)
2541 #include EFI_PROTOCOL_DEFINITION (Ip4)
2543 #include STRING_DEFINES_FILE
2544 extern UINT8 STRING_ARRAY_NAME[];
2546 -EFI_HII_HANDLE HiiHandle;
2547 +STATIC EFI_HII_HANDLE HiiHandle;
2549 EFI_GUID EfiPingGuid = EFI_PING_GUID;
2550 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
2556 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2564 +EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
2569 @@ -135,7 +137,22 @@
2573 - return EfiReadTsc ();
2574 + static UINT64 CurrentTick = 0;
2575 + UINT64 TimerPeriod;
2576 + EFI_STATUS Status;
2578 + ASSERT (gCpu != NULL);
2580 + Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);
2581 + if (EFI_ERROR (Status)) {
2583 + // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the
2584 + // TimerPeriod by ourselves.
2586 + CurrentTick += 1000000;
2589 + return CurrentTick;
2595 // Locate the Cpu Arch Protocol.
2597 - Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
2598 + Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu);
2599 if (EFI_ERROR (Status)) {
2603 ===================================================================
2604 --- time/time.c (revision 64)
2605 +++ time/time.c (working copy)
2611 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2619 - IN OUT INTN *Offset,
2620 - IN OUT INTN *number,
2621 + IN OUT UINTN *Offset,
2622 + IN OUT UINTN *number,
2623 IN BOOLEAN GetSecond
2630 - IN OUT INTN *Offset,
2631 - IN OUT INTN *Number,
2632 + IN OUT UINTN *Offset,
2633 + IN OUT UINTN *Number,
2634 IN BOOLEAN GetSecond
2638 ===================================================================
2639 --- time/time.h (revision 64)
2640 +++ time/time.h (working copy)
2646 Index: time/time.inf
2647 ===================================================================
2648 --- time/time.inf (revision 64)
2649 +++ time/time.inf (working copy)
2654 - ..\ShCommonStrings.uni
2655 + ../ShCommonStrings.uni
2664 - $(EDK_SOURCE)\Foundation
2665 - $(EDK_SOURCE)\Foundation\Include
2666 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2667 - $(EDK_SOURCE)\Foundation\Efi
2668 - $(EDK_SOURCE)\Foundation\Efi\Include
2669 - $(EDK_SOURCE)\Foundation\FrameWork
2670 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2671 - $(EDK_SOURCE)\Foundation\Core\Dxe
2675 + $(EDK_SOURCE)/Foundation
2676 + $(EDK_SOURCE)/Foundation/Include
2677 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2678 + $(EDK_SOURCE)/Foundation/Efi
2679 + $(EDK_SOURCE)/Foundation/Efi/Include
2680 + $(EDK_SOURCE)/Foundation/FrameWork
2681 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2682 + $(EDK_SOURCE)/Foundation/Core/Dxe
2687 Index: mount/mount.c
2688 ===================================================================
2689 --- mount/mount.c (revision 64)
2690 +++ mount/mount.c (working copy)
2695 -EFI_HII_HANDLE HiiHandle;
2696 +STATIC EFI_HII_HANDLE HiiHandle;
2697 EFI_GUID EfiMountGuid = EFI_MOUNT_GUID;
2698 SHELL_VAR_CHECK_ITEM MountCheckList[] = {
2705 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2709 Index: mount/mount.h
2710 ===================================================================
2711 --- mount/mount.h (revision 64)
2712 +++ mount/mount.h (working copy)
2718 Index: mount/mount.inf
2719 ===================================================================
2720 --- mount/mount.inf (revision 64)
2721 +++ mount/mount.inf (working copy)
2726 - ..\ShCommonStrings.uni
2727 + ../ShCommonStrings.uni
2736 - $(EDK_SOURCE)\Foundation
2737 - $(EDK_SOURCE)\Foundation\Include
2738 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2739 - $(EDK_SOURCE)\Foundation\Efi
2740 - $(EDK_SOURCE)\Foundation\Efi\Include
2741 - $(EDK_SOURCE)\Foundation\FrameWork
2742 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2743 - $(EDK_SOURCE)\Foundation\Core\Dxe
2747 + $(EDK_SOURCE)/Foundation
2748 + $(EDK_SOURCE)/Foundation/Include
2749 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2750 + $(EDK_SOURCE)/Foundation/Efi
2751 + $(EDK_SOURCE)/Foundation/Efi/Include
2752 + $(EDK_SOURCE)/Foundation/FrameWork
2753 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2754 + $(EDK_SOURCE)/Foundation/Core/Dxe
2759 Index: mkdir/mkdir.inf
2760 ===================================================================
2761 --- mkdir/mkdir.inf (revision 64)
2762 +++ mkdir/mkdir.inf (working copy)
2767 - ..\ShCommonStrings.uni
2768 + ../ShCommonStrings.uni
2776 - $(EDK_SOURCE)\Foundation
2777 - $(EDK_SOURCE)\Foundation\Include
2778 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2779 - $(EDK_SOURCE)\Foundation\Efi
2780 - $(EDK_SOURCE)\Foundation\Efi\Include
2781 - $(EDK_SOURCE)\Foundation\FrameWork
2782 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2783 - $(EDK_SOURCE)\Foundation\Core\Dxe
2787 + $(EDK_SOURCE)/Foundation
2788 + $(EDK_SOURCE)/Foundation/Include
2789 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2790 + $(EDK_SOURCE)/Foundation/Efi
2791 + $(EDK_SOURCE)/Foundation/Efi/Include
2792 + $(EDK_SOURCE)/Foundation/FrameWork
2793 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2794 + $(EDK_SOURCE)/Foundation/Core/Dxe
2799 Index: mkdir/mkdir.c
2800 ===================================================================
2801 --- mkdir/mkdir.c (revision 64)
2802 +++ mkdir/mkdir.c (working copy)
2807 -EFI_HII_HANDLE HiiHandle;
2808 +STATIC EFI_HII_HANDLE HiiHandle;
2809 EFI_GUID EfiMkdirGuid = EFI_MKDIR_GUID;
2810 SHELL_VAR_CHECK_ITEM MkdirCheckList[] = {
2817 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2821 Index: mkdir/mkdir.h
2822 ===================================================================
2823 --- mkdir/mkdir.h (revision 64)
2824 +++ mkdir/mkdir.h (working copy)
2826 0x75ecb57f, 0x4264, 0x49d2, 0x98, 0xe6, 0x39, 0x1a, 0x32, 0x17, 0x9d, 0xf2 \
2830 \ No newline at end of file
2834 ===================================================================
2835 --- pci/pci.h (revision 64)
2836 +++ pci/pci.h (working copy)
2838 0x388da6c3, 0x3447, 0x4b1f, 0xa0, 0xba, 0xa9, 0xe8, 0xa2, 0x87, 0xf1, 0x76 \
2851 Index: pci/pci_class.c
2852 ===================================================================
2853 --- pci/pci_class.c (revision 64)
2854 +++ pci/pci_class.c (working copy)
2859 -EFI_HII_HANDLE HiiHandle;
2860 +STATIC EFI_HII_HANDLE HiiHandle;
2862 PCI_CLASS_ENTRY gClassStringList[];
2865 ===================================================================
2866 --- pci/pci.inf (revision 64)
2867 +++ pci/pci.inf (working copy)
2872 - ..\ShCommonStrings.uni
2873 + ../ShCommonStrings.uni
2883 - $(EDK_SOURCE)\Foundation
2884 - $(EDK_SOURCE)\Foundation\Include
2885 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2886 - $(EDK_SOURCE)\Foundation\Efi
2887 - $(EDK_SOURCE)\Foundation\Efi\Include
2888 - $(EDK_SOURCE)\Foundation\FrameWork
2889 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2890 - $(EDK_SOURCE)\Foundation\Core\Dxe
2894 + $(EDK_SOURCE)/Foundation
2895 + $(EDK_SOURCE)/Foundation/Include
2896 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2897 + $(EDK_SOURCE)/Foundation/Efi
2898 + $(EDK_SOURCE)/Foundation/Efi/Include
2899 + $(EDK_SOURCE)/Foundation/FrameWork
2900 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2901 + $(EDK_SOURCE)/Foundation/Core/Dxe
2906 Index: pci/pci_class.h
2907 ===================================================================
2908 --- pci/pci_class.h (revision 64)
2909 +++ pci/pci_class.h (working copy)
2911 #ifndef _PCI_CLASS_H_
2912 #define _PCI_CLASS_H_
2914 -#include "TIANO.h" // for UINT32 etc.
2915 +#include "Tiano.h" // for UINT32 etc.
2916 #define PCI_CLASS_STRING_LIMIT 54
2918 // Printable strings for Pci class code
2922 #endif // _PCI_CLASS_H_
2925 ===================================================================
2926 --- pci/pci.c (revision 64)
2927 +++ pci/pci.c (working copy)
2933 + (PCIE_CAPREG_FIELD_WIDTH)0,
2940 PCI_CONFIG_SPACE *mConfigSpace;
2941 -EFI_HII_HANDLE HiiHandle;
2942 +STATIC EFI_HII_HANDLE HiiHandle;
2943 EFI_GUID EfiPciGuid = EFI_PCI_GUID;
2944 SHELL_VAR_CHECK_ITEM PciCheckList[] = {
2951 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
2955 @@ -1034,7 +1034,7 @@
2956 Status = BS->HandleProtocol (
2958 &gEfiPciRootBridgeIoProtocolGuid,
2963 if (EFI_ERROR (Status)) {
2964 @@ -1043,7 +1043,7 @@
2966 // Call Configuration() to get address space descriptors
2968 - Status = (*IoDev)->Configuration (*IoDev, Descriptors);
2969 + Status = (*IoDev)->Configuration (*IoDev, (VOID**)Descriptors);
2970 if (Status == EFI_UNSUPPORTED) {
2971 *Descriptors = NULL;
2973 @@ -1237,7 +1237,7 @@
2974 PrintToken (STRING_TOKEN (STR_PCI2_SINGLE_FUNCTION), HiiHandle);
2977 - HeaderType = (UINT8) (Common->HeaderType & 0x7f);
2978 + HeaderType = (PCI_HEADER_TYPE) (Common->HeaderType & 0x7f);
2979 switch (HeaderType) {
2981 PrintToken (STRING_TOKEN (STR_PCI2_PCI_DEVICE), HiiHandle);
2982 @@ -1300,6 +1300,9 @@
2984 CapPtr = ConfigSpace->NonCommon.CardBus.CapabilitiesPtr;
2988 + Status = EFI_UNSUPPORTED;
2991 // If Status bit4 is 1, dump or explain capability structure
2992 @@ -1956,7 +1959,7 @@
2993 INDEX_OF (&(CardBus->IoBase0)),
2994 Io32Bit ? L" 32 bit" : L" 16 bit",
2995 CardBus->IoBase0 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
2996 - CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
2997 + (CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3000 Io32Bit = (BOOLEAN) (CardBus->IoBase1 & PCI_BIT_0);
3001 @@ -1966,7 +1969,7 @@
3002 INDEX_OF (&(CardBus->IoBase1)),
3003 Io32Bit ? L" 32 bit" : L" 16 bit",
3004 CardBus->IoBase1 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
3005 - CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
3006 + (CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3010 Index: memmap/memmap.h
3011 ===================================================================
3012 --- memmap/memmap.h (revision 64)
3013 +++ memmap/memmap.h (working copy)
3019 Index: memmap/memmap.inf
3020 ===================================================================
3021 --- memmap/memmap.inf (revision 64)
3022 +++ memmap/memmap.inf (working copy)
3027 - ..\ShCommonStrings.uni
3028 + ../ShCommonStrings.uni
3038 - $(EDK_SOURCE)\Foundation
3039 - $(EDK_SOURCE)\Foundation\Include
3040 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3041 - $(EDK_SOURCE)\Foundation\Efi
3042 - $(EDK_SOURCE)\Foundation\Efi\Include
3043 - $(EDK_SOURCE)\Foundation\FrameWork
3044 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3045 - $(EDK_SOURCE)\Foundation\Core\Dxe
3049 + $(EDK_SOURCE)/Foundation
3050 + $(EDK_SOURCE)/Foundation/Include
3051 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3052 + $(EDK_SOURCE)/Foundation/Efi
3053 + $(EDK_SOURCE)/Foundation/Efi/Include
3054 + $(EDK_SOURCE)/Foundation/FrameWork
3055 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3056 + $(EDK_SOURCE)/Foundation/Core/Dxe
3061 Index: memmap/memmap.c
3062 ===================================================================
3063 --- memmap/memmap.c (revision 64)
3064 +++ memmap/memmap.c (working copy)
3069 -EFI_HII_HANDLE HiiHandle;
3070 +STATIC EFI_HII_HANDLE HiiHandle;
3071 EFI_GUID EfiMemmapGuid = EFI_MEMMAP_GUID;
3072 SHELL_VAR_CHECK_ITEM MemmapCheckList[] = {
3079 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3086 Bytes = LShiftU64 (Desc->NumberOfPages, 12);
3087 - Ptr = MemoryTypeStr (Desc->Type);
3088 + Ptr = MemoryTypeStr ((EFI_MEMORY_TYPE)Desc->Type);
3090 STRING_TOKEN (STR_MEMMAP_FIVE_ARGS),
3093 ===================================================================
3094 --- dblk/dblk.h (revision 64)
3095 +++ dblk/dblk.h (working copy)
3097 extern EFI_HII_HANDLE HiiDblkHandle;
3101 Index: dblk/dblk.inf
3102 ===================================================================
3103 --- dblk/dblk.inf (revision 64)
3104 +++ dblk/dblk.inf (working copy)
3109 - ..\ShCommonStrings.uni
3110 + ../ShCommonStrings.uni
3118 - $(EDK_SOURCE)\Foundation
3119 - $(EDK_SOURCE)\Foundation\Include
3120 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3121 - $(EDK_SOURCE)\Foundation\Efi
3122 - $(EDK_SOURCE)\Foundation\Efi\Include
3123 - $(EDK_SOURCE)\Foundation\FrameWork
3124 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3125 - $(EDK_SOURCE)\Foundation\Core\Dxe
3129 + $(EDK_SOURCE)/Foundation
3130 + $(EDK_SOURCE)/Foundation/Include
3131 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3132 + $(EDK_SOURCE)/Foundation/Efi
3133 + $(EDK_SOURCE)/Foundation/Efi/Include
3134 + $(EDK_SOURCE)/Foundation/FrameWork
3135 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3136 + $(EDK_SOURCE)/Foundation/Core/Dxe
3141 Index: dblk/efidump.c
3142 ===================================================================
3143 --- dblk/efidump.c (revision 64)
3144 +++ dblk/efidump.c (working copy)
3149 -#include "Efipart.h"
3150 +#include "EfiPart.h"
3151 #include "EfiShellLib.h"
3153 #include STRING_DEFINES_FILE
3154 @@ -320,13 +320,11 @@
3158 - VOID *SalSystemTable;
3164 - SalSystemTable = NULL;
3168 @@ -352,10 +350,12 @@
3169 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
3172 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
3173 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
3174 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3175 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3178 + VOID *SalSystemTable;
3180 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3181 if (!EFI_ERROR(Status)) {
3182 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable);
3183 @@ -364,22 +364,22 @@
3185 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3186 if (!EFI_ERROR (Status)) {
3187 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
3188 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable);
3191 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3192 if (!EFI_ERROR (Status)) {
3193 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
3194 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table);
3197 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3198 if (!EFI_ERROR (Status)) {
3199 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
3200 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable);
3203 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3204 if (!EFI_ERROR (Status)) {
3205 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
3206 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable);
3211 ===================================================================
3212 --- dblk/dblk.c (revision 64)
3213 +++ dblk/dblk.c (working copy)
3219 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3224 ===================================================================
3225 --- date/date.h (revision 64)
3226 +++ date/date.h (working copy)
3232 Index: date/date.inf
3233 ===================================================================
3234 --- date/date.inf (revision 64)
3235 +++ date/date.inf (working copy)
3240 - ..\ShCommonStrings.uni
3241 + ../ShCommonStrings.uni
3250 - $(EDK_SOURCE)\Foundation
3251 - $(EDK_SOURCE)\Foundation\Include
3252 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3253 - $(EDK_SOURCE)\Foundation\Efi
3254 - $(EDK_SOURCE)\Foundation\Efi\Include
3255 - $(EDK_SOURCE)\Foundation\FrameWork
3256 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3257 - $(EDK_SOURCE)\Foundation\Core\Dxe
3261 + $(EDK_SOURCE)/Foundation
3262 + $(EDK_SOURCE)/Foundation/Include
3263 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3264 + $(EDK_SOURCE)/Foundation/Efi
3265 + $(EDK_SOURCE)/Foundation/Efi/Include
3266 + $(EDK_SOURCE)/Foundation/FrameWork
3267 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3268 + $(EDK_SOURCE)/Foundation/Core/Dxe
3274 ===================================================================
3275 --- date/date.c (revision 64)
3276 +++ date/date.c (working copy)
3281 - IN OUT INTN *Position,
3282 - IN OUT INTN *Number,
3283 + IN OUT UINTN *Position,
3284 + IN OUT UINTN *Number,
3293 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3301 - IN OUT INTN *Position,
3302 - IN OUT INTN *Number,
3303 + IN OUT UINTN *Position,
3304 + IN OUT UINTN *Number,
3309 ===================================================================
3310 --- rm/rm.c (revision 64)
3311 +++ rm/rm.c (working copy)
3317 + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
3322 ===================================================================
3323 --- rm/rm.h (revision 64)
3324 +++ rm/rm.h (working copy)
3331 ===================================================================
3332 --- rm/rm.inf (revision 64)
3333 +++ rm/rm.inf (working copy)
3338 - ..\ShCommonStrings.uni
3339 + ../ShCommonStrings.uni
3347 - $(EDK_SOURCE)\Foundation
3348 - $(EDK_SOURCE)\Foundation\Include
3349 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3350 - $(EDK_SOURCE)\Foundation\Efi
3351 - $(EDK_SOURCE)\Foundation\Efi\Include
3352 - $(EDK_SOURCE)\Foundation\FrameWork
3353 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3354 - $(EDK_SOURCE)\Foundation\Core\Dxe
3358 + $(EDK_SOURCE)/Foundation
3359 + $(EDK_SOURCE)/Foundation/Include
3360 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3361 + $(EDK_SOURCE)/Foundation/Efi
3362 + $(EDK_SOURCE)/Foundation/Efi/Include
3363 + $(EDK_SOURCE)/Foundation/FrameWork
3364 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3365 + $(EDK_SOURCE)/Foundation/Core/Dxe
3370 Index: mem/MemCommonPart.c
3371 ===================================================================
3372 --- mem/MemCommonPart.c (revision 64)
3373 +++ mem/MemCommonPart.c (working copy)
3379 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3387 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
3388 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
3389 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
3394 PrintToken (STRING_TOKEN (STR_MEM_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3396 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3397 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3398 if (EFI_ERROR (Status)) {
3399 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3405 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3406 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3408 Buffer = (UINT8 *) (UINTN) Address;
3414 - Address = (UINT64) SystemTable;
3415 + Address = (UINT64)(UINTN) SystemTable;
3417 RetCode = LibCheckVariables (SI, MemCheckList, &ChkPck, &Useful);
3418 if (VarCheckOk != RetCode) {
3421 PrintToken (STRING_TOKEN (STR_MEM_NEW_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3423 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3424 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3425 if (EFI_ERROR (Status)) {
3426 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3432 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3433 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3435 Buffer = (UINT8 *) (UINTN) Address;
3437 Index: mem/MemCommonPart.h
3438 ===================================================================
3439 --- mem/MemCommonPart.h (revision 64)
3440 +++ mem/MemCommonPart.h (working copy)
3442 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
3446 \ No newline at end of file
3449 ===================================================================
3450 --- mem/mem.inf (revision 64)
3451 +++ mem/mem.inf (working copy)
3453 COMPONENT_TYPE = APPLICATION
3456 - ..\ShCommonStrings.uni
3457 + ../ShCommonStrings.uni
3467 - $(EDK_SOURCE)\Foundation
3468 - $(EDK_SOURCE)\Foundation\Include
3469 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3470 - $(EDK_SOURCE)\Foundation\Efi
3471 - $(EDK_SOURCE)\Foundation\Efi\Include
3472 - $(EDK_SOURCE)\Foundation\FrameWork
3473 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3474 - $(EDK_SOURCE)\Foundation\Core\Dxe
3478 + $(EDK_SOURCE)/Foundation
3479 + $(EDK_SOURCE)/Foundation/Include
3480 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3481 + $(EDK_SOURCE)/Foundation/Efi
3482 + $(EDK_SOURCE)/Foundation/Efi/Include
3483 + $(EDK_SOURCE)/Foundation/FrameWork
3484 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3485 + $(EDK_SOURCE)/Foundation/Core/Dxe
3490 Index: mem/efidump.c
3491 ===================================================================
3492 --- mem/efidump.c (revision 64)
3493 +++ mem/efidump.c (working copy)
3498 -#include "Efipart.h"
3499 +#include "EfiPart.h"
3500 #include "EfiShellLib.h"
3502 #include STRING_DEFINES_FILE
3503 @@ -320,13 +320,11 @@
3507 - VOID *SalSystemTable;
3513 - SalSystemTable = NULL;
3517 @@ -352,11 +350,13 @@
3518 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiMemHandle, LibDevicePathToStr (DevicePath));
3521 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->RuntimeServices);
3522 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->BootServices);
3523 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3524 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3527 - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3528 + VOID *SalSystemTable;
3530 + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3531 if (!EFI_ERROR(Status)) {
3532 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiMemHandle, (UINT64)SalSystemTable);
3534 @@ -364,22 +364,22 @@
3536 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3537 if (!EFI_ERROR (Status)) {
3538 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64) AcpiTable);
3539 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64)(UINTN) AcpiTable);
3542 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3543 if (!EFI_ERROR (Status)) {
3544 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64) Acpi20Table);
3545 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64)(UINTN) Acpi20Table);
3548 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3549 if (!EFI_ERROR (Status)) {
3550 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64) MpsTable);
3551 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64)(UINTN) MpsTable);
3554 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3555 if (!EFI_ERROR (Status)) {
3556 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64) SMBIOSTable);
3557 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64)(UINTN) SMBIOSTable);
3562 ===================================================================
3563 --- mem/debug.h (revision 64)
3564 +++ mem/debug.h (working copy)
3566 extern EFI_HII_HANDLE HiiMemHandle;
3571 ===================================================================
3572 --- ls/ls.c (revision 64)
3573 +++ ls/ls.c (working copy)
3579 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3586 EFI_LIST_ENTRY DirList;
3587 - EFI_LIST_ENTRY *Link;
3588 SHELL_FILE_ARG *Arg;
3589 BOOLEAN WildcardsEncountered;
3594 InitializeListHead (&DirList);
3598 Status = EFI_SUCCESS;
3604 - EFI_STATUS Status;
3609 BOOLEAN LeadingBlanks;
3611 LeadingBlanks = TRUE;
3612 - Status = EFI_SUCCESS;
3614 for (PtrOne = PtrTwo = Path; PtrOne < Path + StrLen (Path); PtrOne++) {
3615 if ((*PtrOne) == ' ' && LeadingBlanks) {
3616 @@ -917,14 +912,14 @@
3618 if ((IsMatch && mIgnoreAttribute) ||
3619 (IsMatch && !mAttributes && !(Info->Attribute & EFI_FILE_HIDDEN) && !(Info->Attribute & EFI_FILE_SYSTEM)) ||
3624 (mAttribA ? (Info->Attribute & EFI_FILE_ARCHIVE ? TRUE : FALSE) : TRUE) &&
3625 (mAttribH ? (Info->Attribute & EFI_FILE_HIDDEN ? TRUE : FALSE) : TRUE) &&
3626 (mAttribR ? (Info->Attribute & EFI_FILE_READ_ONLY ? TRUE : FALSE) : TRUE) &&
3627 (mAttribS ? (Info->Attribute & EFI_FILE_SYSTEM ? TRUE : FALSE) : TRUE) &&
3628 - (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE)
3629 + (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE))
3634 ===================================================================
3635 --- ls/ls.h (revision 64)
3636 +++ ls/ls.h (working copy)
3642 \ No newline at end of file
3646 ===================================================================
3647 --- ls/ls.inf (revision 64)
3648 +++ ls/ls.inf (working copy)
3653 - ..\ShCommonStrings.uni
3654 + ../ShCommonStrings.uni
3663 - $(EDK_SOURCE)\Foundation
3664 - $(EDK_SOURCE)\Foundation\Include
3665 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3666 - $(EDK_SOURCE)\Foundation\Efi
3667 - $(EDK_SOURCE)\Foundation\Efi\Include
3668 - $(EDK_SOURCE)\Foundation\FrameWork
3669 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3670 - $(EDK_SOURCE)\Foundation\Core\Dxe
3674 + $(EDK_SOURCE)/Foundation
3675 + $(EDK_SOURCE)/Foundation/Include
3676 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3677 + $(EDK_SOURCE)/Foundation/Efi
3678 + $(EDK_SOURCE)/Foundation/Efi/Include
3679 + $(EDK_SOURCE)/Foundation/FrameWork
3680 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3681 + $(EDK_SOURCE)/Foundation/Core/Dxe
3686 Index: stall/stall.c
3687 ===================================================================
3688 --- stall/stall.c (revision 64)
3689 +++ stall/stall.c (working copy)
3695 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3699 Index: stall/stall.h
3700 ===================================================================
3701 --- stall/stall.h (revision 64)
3702 +++ stall/stall.h (working copy)
3708 Index: stall/stall.inf
3709 ===================================================================
3710 --- stall/stall.inf (revision 64)
3711 +++ stall/stall.inf (working copy)
3716 - ..\ShCommonStrings.uni
3717 + ../ShCommonStrings.uni
3726 - $(EDK_SOURCE)\Foundation
3727 - $(EDK_SOURCE)\Foundation\Include
3728 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3729 - $(EDK_SOURCE)\Foundation\Efi
3730 - $(EDK_SOURCE)\Foundation\Efi\Include
3731 - $(EDK_SOURCE)\Foundation\FrameWork
3732 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3733 - $(EDK_SOURCE)\Foundation\Core\Dxe
3737 + $(EDK_SOURCE)/Foundation
3738 + $(EDK_SOURCE)/Foundation/Include
3739 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3740 + $(EDK_SOURCE)/Foundation/Efi
3741 + $(EDK_SOURCE)/Foundation/Efi/Include
3742 + $(EDK_SOURCE)/Foundation/FrameWork
3743 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3744 + $(EDK_SOURCE)/Foundation/Core/Dxe
3749 Index: DeviceTree/devicetree.c
3750 ===================================================================
3751 --- DeviceTree/devicetree.c (revision 64)
3752 +++ DeviceTree/devicetree.c (working copy)
3757 -EFI_HII_HANDLE HiiHandle;
3758 +STATIC EFI_HII_HANDLE HiiHandle;
3759 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
3760 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
3767 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3771 Index: DeviceTree/devicetree.h
3772 ===================================================================
3773 --- DeviceTree/devicetree.h (revision 64)
3774 +++ DeviceTree/devicetree.h (working copy)
3776 0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
3780 Index: DeviceTree/devicetree.inf
3781 ===================================================================
3782 --- DeviceTree/devicetree.inf (revision 64)
3783 +++ DeviceTree/devicetree.inf (working copy)
3788 - ..\ShCommonStrings.uni
3789 + ../ShCommonStrings.uni
3790 DevicetreeStrings.uni
3798 - $(EDK_SOURCE)\Foundation
3799 - $(EDK_SOURCE)\Foundation\Include
3800 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3801 - $(EDK_SOURCE)\Foundation\Efi
3802 - $(EDK_SOURCE)\Foundation\Efi\Include
3803 - $(EDK_SOURCE)\Foundation\FrameWork
3804 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3805 - $(EDK_SOURCE)\Foundation\Core\Dxe
3809 + $(EDK_SOURCE)/Foundation
3810 + $(EDK_SOURCE)/Foundation/Include
3811 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3812 + $(EDK_SOURCE)/Foundation/Efi
3813 + $(EDK_SOURCE)/Foundation/Efi/Include
3814 + $(EDK_SOURCE)/Foundation/FrameWork
3815 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3816 + $(EDK_SOURCE)/Foundation/Core/Dxe
3821 Index: TelnetMgmt/TelnetMgmt.c
3822 ===================================================================
3823 --- TelnetMgmt/TelnetMgmt.c (revision 64)
3824 +++ TelnetMgmt/TelnetMgmt.c (working copy)
3827 #include STRING_DEFINES_FILE
3829 -EFI_HII_HANDLE HiiHandle;
3830 +STATIC EFI_HII_HANDLE HiiHandle;
3831 EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID;
3832 EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID;
3833 SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
3839 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3843 Index: TelnetMgmt/TelnetMgmt.h
3844 ===================================================================
3845 --- TelnetMgmt/TelnetMgmt.h (revision 64)
3846 +++ TelnetMgmt/TelnetMgmt.h (working copy)
3848 0x55d41b9a, 0x954d, 0x4fbb, 0x8d, 0x6d, 0x24, 0x75, 0xf5, 0x30, 0x9d, 0x37 \
3852 \ No newline at end of file
3854 Index: TelnetMgmt/TelnetServer.h
3855 ===================================================================
3856 --- TelnetMgmt/TelnetServer.h (revision 64)
3857 +++ TelnetMgmt/TelnetServer.h (working copy)
3859 extern EFI_GUID gEfiTelnetServerGuid;
3863 Index: TelnetMgmt/TelnetMgmt.inf
3864 ===================================================================
3865 --- TelnetMgmt/TelnetMgmt.inf (revision 64)
3866 +++ TelnetMgmt/TelnetMgmt.inf (working copy)
3868 COMPONENT_TYPE = APPLICATION
3871 - ..\ShCommonStrings.uni
3872 + ../ShCommonStrings.uni
3873 TelnetMgmtStrings.uni
3880 - $(EDK_SOURCE)\Foundation
3881 - $(EDK_SOURCE)\Foundation\Include
3882 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3883 - $(EDK_SOURCE)\Foundation\Efi
3884 - $(EDK_SOURCE)\Foundation\Efi\Include
3885 - $(EDK_SOURCE)\Foundation\FrameWork
3886 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3887 - $(EDK_SOURCE)\Foundation\Core\Dxe
3891 + $(EDK_SOURCE)/Foundation
3892 + $(EDK_SOURCE)/Foundation/Include
3893 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3894 + $(EDK_SOURCE)/Foundation/Efi
3895 + $(EDK_SOURCE)/Foundation/Efi/Include
3896 + $(EDK_SOURCE)/Foundation/FrameWork
3897 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3898 + $(EDK_SOURCE)/Foundation/Core/Dxe
3903 Index: shellenv/if.c
3904 ===================================================================
3905 --- shellenv/if.c (revision 64)
3906 +++ shellenv/if.c (working copy)
3915 @@ -122,10 +121,8 @@
3917 if ((StriCmp (SI->Argv[1], L"/i") == 0)) {
3925 NotPos = ExistI ? 2 : 1;
3926 Index: shellenv/init.c
3927 ===================================================================
3928 --- shellenv/init.c (revision 64)
3929 +++ shellenv/init.c (working copy)
3931 Status = BS->HandleProtocol (
3934 - &(mOldSEnv->Interface)
3935 + (VOID**)&(mOldSEnv->Interface)
3937 ASSERT (!EFI_ERROR (Status));
3938 Status = BS->ReinstallProtocolInterface (
3939 Index: shellenv/echo.c
3940 ===================================================================
3941 --- shellenv/echo.c (revision 64)
3942 +++ shellenv/echo.c (working copy)
3948 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3952 Index: shellenv/shelle.h
3953 ===================================================================
3954 --- shellenv/shelle.h (revision 64)
3955 +++ shellenv/shelle.h (working copy)
3956 @@ -2074,3 +2074,4 @@
3959 #endif // _SHELLE_H_
3961 Index: shellenv/batch.c
3962 ===================================================================
3963 --- shellenv/batch.c (revision 64)
3964 +++ shellenv/batch.c (working copy)
3965 @@ -2388,7 +2388,6 @@
3969 - BOOLEAN EndOfFile;
3972 CHAR16 *CommandLine;
3973 @@ -2396,7 +2395,6 @@
3974 EFI_BATCH_STATEMENT *Stmt;
3975 ENV_SHELL_INTERFACE NewShell;
3976 UINTN GotoTargetStatus;
3977 - UINTN SkippedIfCount;
3978 BOOLEAN EchoStateValid;
3980 EFI_STATUS ExecuteResult;
3981 @@ -2409,7 +2407,6 @@
3984 Status = EFI_SUCCESS;
3985 - EndOfFile = FALSE;
3987 EchoStateValid = FALSE;
3989 @@ -2468,14 +2465,6 @@
3990 EFI_BATCH_SCRIPT_SIGNATURE
3994 - // Iterate through the file, reading a line at a time and executing each
3995 - // line as a shell command. Nested shell scripts will come through
3996 - // this code path recursively.
3998 - EndOfFile = FALSE;
3999 - SkippedIfCount = 0;
4003 // Read a command line from the file
4004 @@ -2681,7 +2670,7 @@
4005 LastError = ExecuteResult;
4008 - if (ExecuteResult == -1) {
4009 + if (ExecuteResult == (EFI_STATUS) -1) {
4010 SE2->DecrementShellNestingLevel ();
4011 if (SE2->IsRootShell ()) {
4013 @@ -2774,7 +2763,7 @@
4014 Status = _ResumePreviousMode ();
4017 - if (LastError == -1) {
4018 + if (LastError == (UINTN) -1) {
4022 Index: shellenv/dprot.c
4023 ===================================================================
4024 --- shellenv/dprot.c (revision 64)
4025 +++ shellenv/dprot.c (working copy)
4029 #include "shellenvguid.h"
4033 STATIC CHAR16 *SEnvDP_IlleagalStr[] = { L"Illegal" };
4036 I2O_DEVICE_PATH *I2ODevicePath;
4037 MAC_ADDR_DEVICE_PATH *MacAddrDevicePath;
4038 IPv4_DEVICE_PATH *IPv4DevicePath;
4039 - IPv6_DEVICE_PATH *IPv6DevicePath;
4040 INFINIBAND_DEVICE_PATH *InfinibandDevicePath;
4041 UART_DEVICE_PATH *UartDevicePath;
4042 VENDOR_DEVICE_PATH *VendorDevicePath;
4047 - IPv6DevicePath = (IPv6_DEVICE_PATH *) DevicePath;
4048 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_NOT_AVAIL), HiiEnvHandle);
4051 @@ -1054,6 +1052,8 @@
4052 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4053 } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) {
4054 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4055 + } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_AARCH64) {
4056 + Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4058 Magic = NtHdr->OptionalHeader.Magic;
4060 @@ -1294,6 +1294,8 @@
4061 case EfiIsaAcpiResourceInterrupt:
4062 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_INT), HiiEnvHandle);
4064 + case EfiIsaAcpiResourceEndOfList:
4068 if (IsaIo->ResourceList->ResourceItem[Index].StartRange == IsaIo->ResourceList->ResourceItem[Index].EndRange) {
4069 Index: shellenv/Connect.c
4070 ===================================================================
4071 --- shellenv/Connect.c (revision 64)
4072 +++ shellenv/Connect.c (working copy)
4078 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4087 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4096 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4101 Status = BS->HandleProtocol (
4103 &gEfiDevicePathProtocolGuid,
4107 if (EFI_ERROR (Status)) {
4108 DriverBindingHandleCount = 1;
4110 Status = BS->HandleProtocol (
4112 &gEfiDevicePathProtocolGuid,
4116 if (EFI_ERROR (Status)) {
4119 Status = BS->HandleProtocol (
4121 &gEfiDriverBindingProtocolGuid,
4125 if (EFI_ERROR (Status)) {
4128 Status = BS->HandleProtocol (
4129 AllHandleBuffer[Index],
4130 &gEfiDriverBindingProtocolGuid,
4134 if (EFI_ERROR (Status)) {
4135 DeviceHandleBuffer[DeviceHandleCount++] = AllHandleBuffer[Index];
4136 @@ -1052,7 +1052,7 @@
4137 Status = BS->HandleProtocol (
4141 + (VOID**)&Interface
4145 @@ -1079,7 +1079,7 @@
4146 Status = BS->HandleProtocol (
4147 AllHandleBuffer[Index],
4148 &gEfiDevicePathProtocolGuid,
4150 + (VOID**)&Interface
4152 if (!EFI_ERROR (Status)) {
4153 ConsoleIndex = Index;
4154 @@ -1095,7 +1095,7 @@
4155 BS->HandleProtocol (
4159 + (VOID**)ConsoleInterface
4163 Index: shellenv/shellenvguid.h
4164 ===================================================================
4165 --- shellenv/shellenvguid.h (revision 64)
4166 +++ shellenv/shellenvguid.h (working copy)
4168 extern EFI_HII_HANDLE HiiEnvHandle;
4172 Index: shellenv/protid.c
4173 ===================================================================
4174 --- shellenv/protid.c (revision 64)
4175 +++ shellenv/protid.c (working copy)
4181 + (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
4185 @@ -1183,7 +1183,7 @@
4186 *DriverName = LibDevicePathToStr (Image->FilePath);
4189 - LibGetDriverName (DriverBindingHandle, Language, DriverName);
4190 + LibGetDriverName (DriverBindingHandle, (CHAR8*)Language, DriverName);
4194 @@ -1539,7 +1539,7 @@
4197 BestDeviceName = NULL;
4198 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
4199 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
4202 PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_CONTROLLER_NAME), HiiEnvHandle);
4203 @@ -1598,14 +1598,14 @@
4205 Status = GetDriverName (
4206 DriverBindingHandleBuffer[Index],
4212 if (DriverName == NULL) {
4213 Status = GetDriverName (
4214 DriverBindingHandleBuffer[Index],
4220 @@ -1792,7 +1792,7 @@
4222 Status = GetDriverName (
4229 @@ -1806,7 +1806,7 @@
4231 Status = GetDriverName (
4238 @@ -1979,7 +1979,7 @@
4240 if (Prot->Handles[Index] == Handle) {
4241 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
4242 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
4243 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
4244 if (!EFI_ERROR (Status)) {
4246 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
4247 @@ -2027,7 +2027,7 @@
4251 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
4252 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
4253 if (!EFI_ERROR (Status)) {
4255 STRING_TOKEN (STR_SHELLENV_PROTID_TWO_VARS_HG_NEW),
4256 @@ -2660,8 +2660,6 @@
4260 - EFI_STATUS Status;
4262 DEVICEPATH_INFO *DevicePathInfo;
4265 @@ -2688,7 +2686,7 @@
4267 // Establish current device path info list
4269 - Status = LibLocateHandle (
4274 Index: shellenv/parsecmd.h
4275 ===================================================================
4276 --- shellenv/parsecmd.h (revision 64)
4277 +++ shellenv/parsecmd.h (working copy)
4279 IN OUT SHELL_PARSED_ARGS *args
4283 \ No newline at end of file
4286 Index: shellenv/ConsoleProxy.c
4287 ===================================================================
4288 --- shellenv/ConsoleProxy.c (revision 64)
4289 +++ shellenv/ConsoleProxy.c (working copy)
4290 @@ -1483,7 +1483,7 @@
4292 if (!EFI_ERROR (TimerStatus)) {
4293 mConInProxy.InputState = INPUT_STATE_DEFAULT;
4295 + Status = BS->SetTimer (
4296 mConInProxy.TwoSecondTimeOut,
4299 @@ -1496,9 +1496,11 @@
4302 mConInProxy.InputState = INPUT_STATE_ESC;
4304 + Status = EFI_UNSUPPORTED;
4307 - return EFI_SUCCESS;
4312 Index: shellenv/conio.c
4313 ===================================================================
4314 --- shellenv/conio.c (revision 64)
4315 +++ shellenv/conio.c (working copy)
4318 // If we need to update the output do so now
4320 - if (Update != -1) {
4321 + if (Update != (UINTN) -1) {
4322 if ((ConOut->Mode->CursorColumn != (INT32) Column) || (ConOut->Mode->CursorRow != (INT32) Row)) {
4323 PrintAt (Column, Row, L"%s%.*s", Str + Update, Delete, L"");
4325 Index: shellenv/map.c
4326 ===================================================================
4327 --- shellenv/map.c (revision 64)
4328 +++ shellenv/map.c (working copy)
4334 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4343 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4347 @@ -2038,13 +2038,13 @@
4351 - Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, &BlockIo);
4352 + Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID**)&BlockIo);
4354 // This is just for NT32, because fsntx has no block io protocol installed
4355 // but fsntx has installed simple file system protocol
4357 if (EFI_ERROR (Status)) {
4358 - Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, &BlockIo);
4359 + Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&BlockIo);
4362 if (EFI_ERROR (Status)) {
4363 @@ -2630,7 +2630,6 @@
4369 EFI_LIST_ENTRY *Link;
4370 EFI_LIST_ENTRY *Head;
4371 @@ -2729,11 +2728,6 @@
4376 - // New code, try to make mapping list sequence unchanged if current device
4377 - // paths and original device paths are the same
4382 // Load handle table and handle protocol info so that we can get
4383 @@ -3410,4 +3404,4 @@
4384 FreePool (HistoryNode->DevicePath);
4385 FreePool (HistoryNode);
4388 \ No newline at end of file
4390 Index: shellenv/pause.c
4391 ===================================================================
4392 --- shellenv/pause.c (revision 64)
4393 +++ shellenv/pause.c (working copy)
4399 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4403 Index: shellenv/exec.c
4404 ===================================================================
4405 --- shellenv/exec.c (revision 64)
4406 +++ shellenv/exec.c (working copy)
4412 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4421 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4425 @@ -1270,7 +1270,6 @@
4426 SHELLENV_INTERNAL_COMMAND InternalCommand;
4427 EFI_HANDLE NewImage;
4428 EFI_FILE_HANDLE Script;
4430 BOOLEAN ConsoleContextSaved;
4431 EFI_HANDLE SavedConsoleInHandle;
4432 EFI_HANDLE SavedConsoleOutHandle;
4433 @@ -1292,7 +1291,6 @@
4435 Status = EFI_SUCCESS;
4438 ConsoleContextSaved = FALSE;
4441 @@ -1557,7 +1555,7 @@
4444 EFI_SHELL_APP_INIT (ParentImageHandle, ParentSystemTable);
4445 - if (-2 == Status) {
4446 + if ((EFI_STATUS) -2 == Status) {
4448 // if status = -2 we assume that a nested shell has just exited.
4450 @@ -1613,7 +1611,9 @@
4453 if (EFI_ERROR (Status) && Output) {
4454 - if ((Status == -1) || (Status == -2) || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4455 + if ((Status == (EFI_STATUS) -1)
4456 + || (Status == (EFI_STATUS) -2)
4457 + || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4458 || (Status == EFI_REDIRECTION_SAME)) {
4460 PrintToken (STRING_TOKEN (STR_SHELLENV_EXEC_EXIT_STATUS_CODE), HiiEnvHandle, Status);
4461 @@ -1674,7 +1674,7 @@
4462 PrintToken (STRING_TOKEN (STR_SHELLENV_REDIR_NOT_ALLOWED), HiiEnvHandle);
4465 - if (Status != -1) {
4466 + if (Status != (EFI_STATUS) -1) {
4468 // Don't Print on a "Disconnect All" exit. The ConOut device may not exist
4470 @@ -1872,7 +1872,7 @@
4474 - // Processing foo: or foo:\
4475 + // Processing foo:\ or foo:
4477 if (PathPos != -1 && Ptr1 == NULL) {
4479 @@ -2638,7 +2638,6 @@
4482 CHAR16 *SubstituteStr;
4483 - CHAR16 *OldSubstituteStr;
4487 @@ -2735,7 +2734,6 @@
4488 // Try to find a shell enviroment variable
4491 - OldSubstituteStr = SubstituteStr;
4492 SubstituteStr = Str + 1;
4493 while (*SubstituteStr != '%' && *SubstituteStr != 0 && (!IsWhiteSpace (*SubstituteStr) || ParseState->Quote)) {
4494 if (*SubstituteStr == '"') {
4495 Index: shellenv/for.c
4496 ===================================================================
4497 --- shellenv/for.c (revision 64)
4498 +++ shellenv/for.c (working copy)
4501 #include "shellenvguid.h"
4507 IN CHAR16 *wszValueStr,
4510 EFI_SUCCESS The function finished sucessfully
4515 EFI_BATCH_STATEMENT *Stmt;
4516 EFI_LIST_ENTRY FileList;
4526 IN EFI_HANDLE hImageHandle,
4527 Index: shellenv/help.c
4528 ===================================================================
4529 --- shellenv/help.c (revision 64)
4530 +++ shellenv/help.c (working copy)
4536 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4540 Index: shellenv/var.c
4541 ===================================================================
4542 --- shellenv/var.c (revision 64)
4543 +++ shellenv/var.c (working copy)
4549 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4554 EFI_LIST_ENTRY *ListHead;
4561 @@ -175,15 +174,12 @@
4562 // See if it's a shellenv variable
4566 if (CompareGuid (&Id, &SEnvEnvId) == 0) {
4567 ListHead = &SEnvEnv;
4571 if (CompareGuid (&Id, &SEnvAliasId) == 0) {
4572 ListHead = &SEnvAlias;
4577 Index: reset/reset.c
4578 ===================================================================
4579 --- reset/reset.c (revision 64)
4580 +++ reset/reset.c (working copy)
4586 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4590 Index: reset/reset.h
4591 ===================================================================
4592 --- reset/reset.h (revision 64)
4593 +++ reset/reset.h (working copy)
4599 Index: reset/reset.inf
4600 ===================================================================
4601 --- reset/reset.inf (revision 64)
4602 +++ reset/reset.inf (working copy)
4607 - ..\ShCommonStrings.uni
4608 + ../ShCommonStrings.uni
4617 - $(EDK_SOURCE)\Foundation
4618 - $(EDK_SOURCE)\Foundation\Include
4619 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4620 - $(EDK_SOURCE)\Foundation\Efi
4621 - $(EDK_SOURCE)\Foundation\Efi\Include
4622 - $(EDK_SOURCE)\Foundation\FrameWork
4623 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4624 - $(EDK_SOURCE)\Foundation\Core\Dxe
4628 + $(EDK_SOURCE)/Foundation
4629 + $(EDK_SOURCE)/Foundation/Include
4630 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4631 + $(EDK_SOURCE)/Foundation/Efi
4632 + $(EDK_SOURCE)/Foundation/Efi/Include
4633 + $(EDK_SOURCE)/Foundation/FrameWork
4634 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4635 + $(EDK_SOURCE)/Foundation/Core/Dxe
4640 Index: touch/touch.c
4641 ===================================================================
4642 --- touch/touch.c (revision 64)
4643 +++ touch/touch.c (working copy)
4648 -EFI_HII_HANDLE HiiHandle;
4649 +STATIC EFI_HII_HANDLE HiiHandle;
4650 EFI_GUID EfiTouchGuid = EFI_TOUCH_GUID;
4651 SHELL_VAR_CHECK_ITEM TouchCheckList[] = {
4653 Index: touch/touch.h
4654 ===================================================================
4655 --- touch/touch.h (revision 64)
4656 +++ touch/touch.h (working copy)
4658 0xa16a4695, 0x5815, 0x4d4f, 0xb8, 0xe, 0x6a, 0xf, 0x88, 0xac, 0xdb, 0x6c \
4662 \ No newline at end of file
4664 Index: touch/touch.inf
4665 ===================================================================
4666 --- touch/touch.inf (revision 64)
4667 +++ touch/touch.inf (working copy)
4669 COMPONENT_TYPE = APPLICATION
4672 - ..\ShCommonStrings.uni
4673 + ../ShCommonStrings.uni
4681 - $(EDK_SOURCE)\Foundation
4682 - $(EDK_SOURCE)\Foundation\Include
4683 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4684 - $(EDK_SOURCE)\Foundation\Efi
4685 - $(EDK_SOURCE)\Foundation\Efi\Include
4686 - $(EDK_SOURCE)\Foundation\FrameWork
4687 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4688 - $(EDK_SOURCE)\Foundation\Core\Dxe
4692 + $(EDK_SOURCE)/Foundation
4693 + $(EDK_SOURCE)/Foundation/Include
4694 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4695 + $(EDK_SOURCE)/Foundation/Efi
4696 + $(EDK_SOURCE)/Foundation/Efi/Include
4697 + $(EDK_SOURCE)/Foundation/FrameWork
4698 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4699 + $(EDK_SOURCE)/Foundation/Core/Dxe
4705 ===================================================================
4706 --- Shell.inf (revision 64)
4707 +++ Shell.inf (working copy)
4708 @@ -25,179 +25,189 @@
4709 COMPONENT_TYPE = APPLICATION
4712 - Library\ShellDebug.c
4722 - Library\ShellEnvInt.c
4725 - Library\ConsistMapping.c
4729 - Library\VarCheck.c
4730 - Library\HiiSupport.c
4731 + Library/ShellDebug.c
4741 + Library/ShellEnvInt.c
4744 + Library/ConsistMapping.c
4748 + Library/VarCheck.c
4749 + Library/HiiSupport.c
4751 - newshell\NshellStrings.uni
4754 - newshell\fakehii.c
4755 + newshell/NshellStrings.uni
4758 + newshell/fakehii.c
4761 - shellenv\ShellenvHelpStrings.uni
4762 - shellenv\ShellenvStrings.uni
4763 - shellenv\ScriptCmdStrings.uni
4764 - shellenv\ConnectStrings.uni
4765 - shellenv\EchoStrings.uni
4766 - shellenv\HelpStrings.uni
4767 - shellenv\MapStrings.uni
4768 - shellenv\CdStrings.uni
4769 - shellenv\DhStrings.uni
4770 + shellenv/ShellenvHelpStrings.uni
4771 + shellenv/ShellenvStrings.uni
4772 + shellenv/ScriptCmdStrings.uni
4773 + shellenv/ConnectStrings.uni
4774 + shellenv/EchoStrings.uni
4775 + shellenv/HelpStrings.uni
4776 + shellenv/MapStrings.uni
4777 + shellenv/CdStrings.uni
4778 + shellenv/DhStrings.uni
4780 - shellenv\cmddisp.c
4781 - shellenv\connect.c
4788 - shellenv\consoleproxy.c
4802 - shellenv\shellenvguid.h
4803 - shellenv\parsecmd.c
4805 + shellenv/cmddisp.c
4806 + shellenv/connect.c
4813 + shellenv/consoleproxy.c
4827 + shellenv/shellenvguid.h
4828 + shellenv/parsecmd.c
4831 - unload\UnloadStrings.uni
4833 + unload/UnloadStrings.uni
4836 - attrib\AttribStrings.uni
4839 + attrib/AttribStrings.uni
4843 - cls\clsstrings.uni
4845 + cls/clsstrings.uni
4855 - date\DateStrings.uni
4858 + date/DateStrings.uni
4862 - load\LoadStrings.uni
4865 + load/LoadStrings.uni
4876 - mkdir\MkdirStrings.uni
4879 + mkdir/MkdirStrings.uni
4890 - reset\ResetStrings.uni
4893 + reset/ResetStrings.uni
4904 - type\TypeStrings.uni
4907 - time\TimeStrings.uni
4910 + type/TypeStrings.uni
4913 + time/TimeStrings.uni
4917 - touch\TouchStrings.uni
4920 + touch/TouchStrings.uni
4924 - vol\VolStrings.uni
4927 + vol/VolStrings.uni
4931 - ver\VerStrings.uni
4934 + ver/VerStrings.uni
4938 - drivers\driversStrings.uni
4941 + drivers/driversStrings.uni
4945 - drvcfg\DrvcfgStrings.uni
4948 + drvcfg/DrvcfgStrings.uni
4952 - drvdiag\DrvdiagStrings.uni
4955 + drvdiag/DrvdiagStrings.uni
4963 - Library\ia32\math.c
4964 - Library\ia32\initplat.c
4966 + Library/IA32/math.c
4967 + Library/IA32/initplat.c
4972 - Library\ipf\math.c
4973 - Library\ipf\initplat.c
4974 - Library\ipf\palproc.s
4975 - Library\ipf\salpal.c
4977 + Library/IPF/math.c
4978 + Library/IPF/initplat.c
4979 + Library/IPF/palproc.s
4980 + Library/IPF/salpal.c
4984 - Library\EBC\math.c
4985 - Library\EBC\initplat.c
4987 + Library/Ebc/math.c
4988 + Library/Ebc/initplat.c
4992 - Library\ipf\math.c
4993 - Library\ia32\initplat.c
4995 + Library/IPF/math.c
4996 + Library/IA32/initplat.c
5000 + Library/IPF/math.c
5001 + Library/IA32/initplat.c
5005 + Library/IPF/math.c
5006 + Library/IA32/initplat.c
5013 - $(EDK_SOURCE)\Foundation
5014 - $(EDK_SOURCE)\Foundation\Include
5015 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5016 - $(EDK_SOURCE)\Foundation\Efi
5017 - $(EDK_SOURCE)\Foundation\Efi\Include
5018 - $(EDK_SOURCE)\Foundation\FrameWork
5019 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5020 - $(EDK_SOURCE)\Foundation\Core\Dxe
5024 + $(EDK_SOURCE)/Foundation
5025 + $(EDK_SOURCE)/Foundation/Include
5026 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5027 + $(EDK_SOURCE)/Foundation/Efi
5028 + $(EDK_SOURCE)/Foundation/Efi/Include
5029 + $(EDK_SOURCE)/Foundation/FrameWork
5030 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5031 + $(EDK_SOURCE)/Foundation/Core/Dxe
5040 \ No newline at end of file
5042 Index: IfConfig/IfConfig.inf
5043 ===================================================================
5044 --- IfConfig/IfConfig.inf (revision 64)
5045 +++ IfConfig/IfConfig.inf (working copy)
5047 COMPONENT_TYPE = APPLICATION
5050 - ..\ShCommonStrings.uni
5051 + ../ShCommonStrings.uni
5061 - $(EDK_SOURCE)\Foundation\Efi
5062 - $(EDK_SOURCE)\Foundation
5063 - $(EDK_SOURCE)\Foundation\Efi\Include
5064 - $(EDK_SOURCE)\Foundation\Include
5065 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5066 - $(EDK_SOURCE)\Foundation\FrameWork
5067 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5068 - $(EDK_SOURCE)\Foundation\Core\Dxe
5069 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
5073 + $(EDK_SOURCE)/Foundation/Efi
5074 + $(EDK_SOURCE)/Foundation
5075 + $(EDK_SOURCE)/Foundation/Efi/Include
5076 + $(EDK_SOURCE)/Foundation/Include
5077 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5078 + $(EDK_SOURCE)/Foundation/FrameWork
5079 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5080 + $(EDK_SOURCE)/Foundation/Core/Dxe
5081 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
5092 C_PROJ_FLAGS = $(C_PROJ_FLAGS)
5093 Index: IfConfig/ShellNetHelper.h
5094 ===================================================================
5095 --- IfConfig/ShellNetHelper.h (revision 64)
5096 +++ IfConfig/ShellNetHelper.h (working copy)
5098 IN EFI_HANDLE ChildHandle
5102 Index: IfConfig/IfConfig.c
5103 ===================================================================
5104 --- IfConfig/IfConfig.c (revision 64)
5105 +++ IfConfig/IfConfig.c (working copy)
5108 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
5110 -EFI_HII_HANDLE HiiHandle;
5111 +STATIC EFI_HII_HANDLE HiiHandle;
5113 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
5120 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
5125 Status = BS->LocateProtocol (
5126 &gEfiHiiConfigRoutingProtocolGuid,
5128 - &mHiiConfigRouting
5129 + (VOID**)&mHiiConfigRouting
5131 if (EFI_ERROR (Status)) {
5132 return EFI_NOT_FOUND;
5133 Index: IfConfig/IfConfig.h
5134 ===================================================================
5135 --- IfConfig/IfConfig.h (revision 64)
5136 +++ IfConfig/IfConfig.h (working copy)
5142 Index: edit/libStatusBar.c
5143 ===================================================================
5144 --- edit/libStatusBar.c (revision 64)
5145 +++ edit/libStatusBar.c (working copy)
5146 @@ -157,11 +157,15 @@
5147 // back up the screen attributes
5149 Orig = MainEditor.ColorAttributes;
5151 New.Colors.Foreground = Orig.Colors.Background;
5152 New.Colors.Background = Orig.Colors.Foreground;
5154 Out->EnableCursor (Out, FALSE);
5155 - Out->SetAttribute (Out, New.Data);
5156 + Out->SetAttribute (
5158 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5163 @@ -191,7 +195,10 @@
5165 // restore the old screen attributes
5167 - Out->SetAttribute (Out, Orig.Data);
5168 + Out->SetAttribute (
5170 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5174 // restore position in edit area
5175 Index: edit/libFileBuffer.c
5176 ===================================================================
5177 --- edit/libFileBuffer.c (revision 64)
5178 +++ edit/libFileBuffer.c (working copy)
5180 // backup the old screen attributes
5182 Orig = MainEditor.ColorAttributes;
5183 - New.Colors.Foreground = Orig.Colors.Background;
5184 - New.Colors.Background = Orig.Colors.Foreground;
5186 + New.Colors.Foreground = Orig.Colors.Foreground;
5187 + New.Colors.Background = Orig.Colors.Background;
5190 // clear the old mouse position
5191 @@ -235,10 +236,14 @@
5197 // set the new mouse position
5199 - Out->SetAttribute (Out, New.Data);
5200 + Out->SetAttribute (
5202 + EFI_TEXT_ATTR (New.Colors.Background, New.Colors.Foreground)
5206 // clear the old mouse position
5207 @@ -278,7 +283,10 @@
5209 // end of HasCharacter
5211 - Out->SetAttribute (Out, Orig.Data);
5212 + Out->SetAttribute (
5214 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5218 // end of MouseNeedRefresh
5222 UnicodeBuffer = NULL;
5224 + Type = DEFAULT_TYPE;
5227 // in this function, when you return error ( except EFI_OUT_OF_RESOURCES )
5228 @@ -2624,15 +2632,9 @@
5232 - EFI_EDITOR_LINE *Line;
5237 - // go to the first column of the line
5239 - Line = FileBuffer.CurrentLine;
5241 FRow = FileBuffer.FilePosition.Row;
5244 Index: edit/libtitlebar.h
5245 ===================================================================
5246 --- edit/libtitlebar.h (revision 64)
5247 +++ edit/libtitlebar.h (working copy)
5253 Index: edit/libstatusbar.h
5254 ===================================================================
5255 --- edit/libstatusbar.h (revision 64)
5256 +++ edit/libstatusbar.h (working copy)
5262 Index: edit/libfilebuffer.h
5263 ===================================================================
5264 --- edit/libfilebuffer.h (revision 64)
5265 +++ edit/libfilebuffer.h (working copy)
5271 Index: edit/libInputBar.c
5272 ===================================================================
5273 --- edit/libInputBar.c (revision 64)
5274 +++ edit/libInputBar.c (working copy)
5283 // variable initialization
5284 @@ -162,10 +160,14 @@
5285 // back up the old screen attributes
5287 Orig = MainEditor.ColorAttributes;
5289 New.Colors.Foreground = Orig.Colors.Background;
5290 New.Colors.Background = Orig.Colors.Foreground;
5292 - Out->SetAttribute (Out, New.Data);
5293 + Out->SetAttribute (
5295 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5300 @@ -173,22 +175,19 @@
5301 EditorClearLine (INPUT_BAR_LOCATION);
5303 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
5304 - PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt);
5305 + PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt);
5308 - // that's the maximum input length that can be displayed on screen
5310 - PromptLen = StrLen (MainInputBar.Prompt);
5311 - Limit = MainEditor.ScreenSize.Column - PromptLen;
5314 // this is a selection prompt, cursor will stay in edit area
5315 // actually this is for search , search/replace
5317 if (StrStr (MainInputBar.Prompt, L"Yes/No")) {
5319 FileBufferRestorePosition ();
5320 - Out->SetAttribute (Out, Orig.Data);
5321 + Out->SetAttribute (
5323 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5328 @@ -265,7 +264,10 @@
5330 // restore screen attributes
5332 - Out->SetAttribute (Out, Orig.Data);
5333 + Out->SetAttribute (
5335 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5338 StatusBarNeedRefresh = TRUE;
5340 Index: edit/libEditor.c
5341 ===================================================================
5342 --- edit/libEditor.c (revision 64)
5343 +++ edit/libEditor.c (working copy)
5345 Status = BS->HandleProtocol (
5347 &gEfiSimplePointerProtocolGuid,
5348 - &MainEditor.MouseInterface
5349 + (VOID**)&MainEditor.MouseInterface
5351 if (EFI_ERROR (Status)) {
5354 Status = BS->HandleProtocol (
5355 HandleBuffer[Index],
5356 &gEfiSimplePointerProtocolGuid,
5357 - &MainEditor.MouseInterface
5358 + (VOID**)&MainEditor.MouseInterface
5360 if (!EFI_ERROR (Status)) {
5362 @@ -169,31 +169,31 @@
5364 Status = MainTitleBarInit ();
5365 if (EFI_ERROR (Status)) {
5366 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle);
5367 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle);
5368 return EFI_LOAD_ERROR;
5371 Status = MainMenuBarInit ();
5372 if (EFI_ERROR (Status)) {
5373 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle);
5374 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle);
5375 return EFI_LOAD_ERROR;
5378 Status = MainStatusBarInit ();
5379 if (EFI_ERROR (Status)) {
5380 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle);
5381 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle);
5382 return EFI_LOAD_ERROR;
5385 Status = MainInputBarInit ();
5386 if (EFI_ERROR (Status)) {
5387 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle);
5388 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle);
5389 return EFI_LOAD_ERROR;
5392 Status = FileBufferInit ();
5393 if (EFI_ERROR (Status)) {
5394 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle);
5395 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle);
5396 return EFI_LOAD_ERROR;
5399 @@ -234,27 +234,27 @@
5401 Status = MainTitleBarCleanup ();
5402 if (EFI_ERROR (Status)) {
5403 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle);
5404 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle);
5407 Status = MainMenuBarCleanup ();
5408 if (EFI_ERROR (Status)) {
5409 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle);
5410 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle);
5413 Status = MainStatusBarCleanup ();
5414 if (EFI_ERROR (Status)) {
5415 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle);
5416 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle);
5419 Status = MainInputBarCleanup ();
5420 if (EFI_ERROR (Status)) {
5421 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle);
5422 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle);
5425 Status = FileBufferCleanup ();
5426 if (EFI_ERROR (Status)) {
5427 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle);
5428 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle);
5432 Index: edit/edit.inf
5433 ===================================================================
5434 --- edit/edit.inf (revision 64)
5435 +++ edit/edit.inf (working copy)
5437 COMPONENT_TYPE = APPLICATION
5440 - ..\ShCommonStrings.uni
5441 + ../ShCommonStrings.uni
5451 - $(EDK_SOURCE)\Foundation
5452 - $(EDK_SOURCE)\Foundation\Include
5453 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5454 - $(EDK_SOURCE)\Foundation\Efi
5455 - $(EDK_SOURCE)\Foundation\Efi\Include
5456 - $(EDK_SOURCE)\Foundation\FrameWork
5457 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5458 - $(EDK_SOURCE)\Foundation\Core\Dxe
5462 + $(EDK_SOURCE)/Foundation
5463 + $(EDK_SOURCE)/Foundation/Include
5464 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5465 + $(EDK_SOURCE)/Foundation/Efi
5466 + $(EDK_SOURCE)/Foundation/Efi/Include
5467 + $(EDK_SOURCE)/Foundation/FrameWork
5468 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5469 + $(EDK_SOURCE)/Foundation/Core/Dxe
5474 Index: edit/libMenuBar.c
5475 ===================================================================
5476 --- edit/libMenuBar.c (revision 64)
5477 +++ edit/libMenuBar.c (working copy)
5480 CHAR16 *FunctionKeyString;
5482 - EFI_STATUS Status;
5485 // variable initialization
5487 FunctionKeyString = AllocatePool (BufferSize);
5489 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5490 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
5491 + Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
5493 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
5494 + LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize);
5497 Width = max ((StrLen (NameString) + 6), 20);
5501 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5502 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
5503 + Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
5505 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
5506 + LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
5508 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
5510 Index: edit/libinputbar.h
5511 ===================================================================
5512 --- edit/libinputbar.h (revision 64)
5513 +++ edit/libinputbar.h (working copy)
5519 Index: edit/libeditor.h
5520 ===================================================================
5521 --- edit/libeditor.h (revision 64)
5522 +++ edit/libeditor.h (working copy)
5529 ===================================================================
5530 --- edit/main.c (revision 64)
5531 +++ edit/main.c (working copy)
5536 -EFI_HII_HANDLE HiiHandle;
5537 +EFI_HII_HANDLE gEditHiiHandle;
5538 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5539 EFI_HII_PROTOCOL *Hii;
5546 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
5550 @@ -121,13 +121,13 @@
5552 // There should only be one HII protocol
5554 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
5555 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
5556 if (EFI_ERROR (Status) || NULL == Hii) {
5561 - Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
5562 + Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
5564 if (EFI_ERROR (Status)) {
5567 if (VarCheckOk != RetCode) {
5569 case VarCheckUnknown:
5570 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful);
5571 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful);
5575 @@ -161,10 +161,10 @@
5576 ChkPck.FlagCount > 2 ||
5577 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
5579 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
5580 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
5581 Status = EFI_INVALID_PARAMETER;
5583 - PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle);
5584 + PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle);
5585 Status = EFI_SUCCESS;
5588 @@ -172,21 +172,21 @@
5591 if (ChkPck.ValueCount > 1) {
5592 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
5593 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
5594 Status = EFI_INVALID_PARAMETER;
5598 if (ChkPck.ValueCount == 1) {
5599 if (!IsValidFileName (ChkPck.VarList->VarStr)) {
5600 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle);
5601 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle);
5602 Status = EFI_INVALID_PARAMETER;
5607 if (SI->RedirArgc != 0) {
5608 - PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle);
5609 + PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle);
5610 Status = EFI_INVALID_PARAMETER;
5614 if (EFI_ERROR (Status)) {
5615 Out->ClearScreen (Out);
5616 Out->EnableCursor (Out, TRUE);
5617 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle);
5618 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle);
5622 @@ -240,19 +240,19 @@
5624 if (Status == EFI_SUCCESS) {
5625 } else if (Status == EFI_OUT_OF_RESOURCES) {
5626 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit");
5627 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit");
5629 if (Buffer != NULL) {
5630 if (StrCmp (Buffer, L"") != 0) {
5632 // print out the status string
5634 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer);
5635 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer);
5637 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
5638 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
5641 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
5642 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
5646 Index: edit/libmenubar.h
5647 ===================================================================
5648 --- edit/libmenubar.h (revision 64)
5649 +++ edit/libmenubar.h (working copy)
5655 Index: edit/libMisc.h
5656 ===================================================================
5657 --- edit/libMisc.h (revision 64)
5658 +++ edit/libMisc.h (working copy)
5664 Index: edit/editor.h
5665 ===================================================================
5666 --- edit/editor.h (revision 64)
5667 +++ edit/editor.h (working copy)
5669 #include "libstatusbar.h"
5670 #include "libinputbar.h"
5671 #include "libmenubar.h"
5672 -#include "libmisc.h"
5673 +#include "libMisc.h"
5675 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
5678 extern BOOLEAN EditorFirst;
5679 extern BOOLEAN EditorExit;
5681 -extern EFI_HII_HANDLE HiiHandle;
5682 +extern EFI_HII_HANDLE gEditHiiHandle;
5683 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5684 extern EFI_HII_PROTOCOL *Hii;
5687 #endif // _EFI_EDITOR_H_
5689 Index: edit/libTitleBar.c
5690 ===================================================================
5691 --- edit/libTitleBar.c (revision 64)
5692 +++ edit/libTitleBar.c (working copy)
5693 @@ -120,10 +120,15 @@
5694 // backup the old screen attributes
5696 Orig = MainEditor.ColorAttributes;
5699 New.Colors.Foreground = Orig.Colors.Background;
5700 New.Colors.Background = Orig.Colors.Foreground;
5702 - Out->SetAttribute (Out, New.Data);
5703 + Out->SetAttribute (
5705 + EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5709 // clear the old title bar
5710 @@ -142,7 +147,10 @@
5713 if (MainEditor.FileBuffer->FileName == NULL) {
5714 - Out->SetAttribute (Out, Orig.Data);
5715 + Out->SetAttribute (
5717 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5719 FileBufferRestorePosition ();
5722 @@ -204,7 +212,10 @@
5724 // restore the old attribute
5726 - Out->SetAttribute (Out, Orig.Data);
5727 + Out->SetAttribute (
5729 + EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5733 // restore edit area cursor position
5734 Index: edit/editortype.h
5735 ===================================================================
5736 --- edit/editortype.h (revision 64)
5737 +++ edit/editortype.h (working copy)
5739 #define EDITOR_NAME L"EFI Editor\0"
5740 #define EDITOR_VERSION L"0.99\0"
5742 -#define EFI_EDITOR_LINE_LIST 'eell'
5743 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
5745 #define INSERT_MODE_STR L"INS"
5746 #define OVERWR_MODE_STR L"OVR"
5748 } EFI_EDITOR_MENU_ITEM;
5751 - UINT32 Foreground : 4;
5752 - UINT32 Background : 4;
5753 + UINT8 Foreground : 4;
5754 + UINT8 Background : 4;
5755 } EFI_EDITOR_COLOR_ATTRIBUTES;
5759 } EFI_EDITOR_GLOBAL_EDITOR;
5763 Index: SmbiosView/EventLogInfo.c
5764 ===================================================================
5765 --- SmbiosView/EventLogInfo.c (revision 64)
5766 +++ SmbiosView/EventLogInfo.c (working copy)
5768 #include "PrintInfo.h"
5769 #include "QueryTable.h"
5770 #include "EventLogInfo.h"
5771 -#include "smbios.h"
5772 +#include "Smbios.h"
5773 #include STRING_DEFINES_FILE
5776 Index: SmbiosView/Smbios.h
5777 ===================================================================
5778 --- SmbiosView/Smbios.h (revision 64)
5779 +++ SmbiosView/Smbios.h (working copy)
5785 Index: SmbiosView/EventLogInfo.h
5786 ===================================================================
5787 --- SmbiosView/EventLogInfo.h (revision 64)
5788 +++ SmbiosView/EventLogInfo.h (working copy)
5794 Index: SmbiosView/PrintInfo.c
5795 ===================================================================
5796 --- SmbiosView/PrintInfo.c (revision 64)
5797 +++ SmbiosView/PrintInfo.c (working copy)
5799 #include "LibSmbiosView.h"
5800 #include "QueryTable.h"
5801 #include "EventLogInfo.h"
5802 -#include "smbios.h"
5803 +#include "Smbios.h"
5804 #include STRING_DEFINES_FILE
5807 Index: SmbiosView/PrintInfo.h
5808 ===================================================================
5809 --- SmbiosView/PrintInfo.h (revision 64)
5810 +++ SmbiosView/PrintInfo.h (working copy)
5816 Index: SmbiosView/QueryTable.c
5817 ===================================================================
5818 --- SmbiosView/QueryTable.c (revision 64)
5819 +++ SmbiosView/QueryTable.c (working copy)
5821 #include "EfiShellLib.h"
5822 #include "QueryTable.h"
5823 #include "PrintInfo.h"
5824 -#include "smbios.h"
5825 +#include "Smbios.h"
5827 #include STRING_DEFINES_FILE
5829 Index: SmbiosView/LibSmbiosView.c
5830 ===================================================================
5831 --- SmbiosView/LibSmbiosView.c (revision 64)
5832 +++ SmbiosView/LibSmbiosView.c (working copy)
5836 #include "EfiShellLib.h"
5837 -#include "LIbSmbios.h"
5838 +#include "LibSmbios.h"
5839 #include "LibSmbiosView.h"
5840 #include "smbiosview.h"
5841 -#include "smbios.h"
5842 +#include "Smbios.h"
5843 #include STRING_DEFINES_FILE
5845 STATIC UINT8 mInit = 0;
5848 // Get SMBIOS table from System Configure table
5850 - Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
5851 + Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
5853 if (mSmbiosTable == NULL) {
5854 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
5855 Index: SmbiosView/Smbiosview.inf
5856 ===================================================================
5857 --- SmbiosView/Smbiosview.inf (revision 64)
5858 +++ SmbiosView/Smbiosview.inf (working copy)
5860 COMPONENT_TYPE = APPLICATION
5863 - ..\ShCommonStrings.uni
5864 + ../ShCommonStrings.uni
5865 SmBiosViewStrings.uni
5874 - $(EDK_SOURCE)\Foundation
5875 - $(EDK_SOURCE)\Foundation\Include
5876 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5877 - $(EDK_SOURCE)\Foundation\Efi
5878 - $(EDK_SOURCE)\Foundation\Efi\Include
5879 - $(EDK_SOURCE)\Foundation\FrameWork
5880 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5881 - $(EDK_SOURCE)\Foundation\Core\Dxe
5883 - $(EFI_SOURCE)\Application\Shell\Inc
5884 - $(EFI_SOURCE)\Application\Shell\Library
5887 + $(EDK_SOURCE)/Foundation
5888 + $(EDK_SOURCE)/Foundation/Include
5889 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5890 + $(EDK_SOURCE)/Foundation/Efi
5891 + $(EDK_SOURCE)/Foundation/Efi/Include
5892 + $(EDK_SOURCE)/Foundation/FrameWork
5893 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5894 + $(EDK_SOURCE)/Foundation/Core/Dxe
5896 + $(EFI_SOURCE)/Applicatio./Shels/Inc
5897 + $(EFI_SOURCE)/Applicatio./Shels/Library
5901 Index: SmbiosView/QueryTable.h
5902 ===================================================================
5903 --- SmbiosView/QueryTable.h (revision 64)
5904 +++ SmbiosView/QueryTable.h (working copy)
5910 Index: SmbiosView/LibSmbiosView.h
5911 ===================================================================
5912 --- SmbiosView/LibSmbiosView.h (revision 64)
5913 +++ SmbiosView/LibSmbiosView.h (working copy)
5919 Index: SmbiosView/smbiosview.c
5920 ===================================================================
5921 --- SmbiosView/smbiosview.c (revision 64)
5922 +++ SmbiosView/smbiosview.c (working copy)
5924 #include "smbiosview.h"
5925 #include "PrintInfo.h"
5926 #include "QueryTable.h"
5927 -#include "smbios.h"
5928 +#include "Smbios.h"
5930 extern UINT8 STRING_ARRAY_NAME[];
5937 + (SHELL_VAR_CHECK_FLAG_TYPE)0
5941 Index: SmbiosView/LibSmbios.h
5942 ===================================================================
5943 --- SmbiosView/LibSmbios.h (revision 64)
5944 +++ SmbiosView/LibSmbios.h (working copy)
5950 Index: SmbiosView/smbiosview.h
5951 ===================================================================
5952 --- SmbiosView/smbiosview.h (revision 64)
5953 +++ SmbiosView/smbiosview.h (working copy)
5955 extern UINT8 gShowType;
5959 Index: guid/guid.inf
5960 ===================================================================
5961 --- guid/guid.inf (revision 64)
5962 +++ guid/guid.inf (working copy)
5964 FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405
5965 COMPONENT_TYPE = APPLICATION
5967 - ..\ShCommonStrings.uni
5968 + ../ShCommonStrings.uni
5976 - $(EDK_SOURCE)\Foundation
5977 - $(EDK_SOURCE)\Foundation\Include
5978 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5979 - $(EDK_SOURCE)\Foundation\Efi
5980 - $(EDK_SOURCE)\Foundation\Efi\Include
5981 - $(EDK_SOURCE)\Foundation\FrameWork
5982 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5983 - $(EDK_SOURCE)\Foundation\Core\Dxe
5987 + $(EDK_SOURCE)/Foundation
5988 + $(EDK_SOURCE)/Foundation/Include
5989 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5990 + $(EDK_SOURCE)/Foundation/Efi
5991 + $(EDK_SOURCE)/Foundation/Efi/Include
5992 + $(EDK_SOURCE)/Foundation/FrameWork
5993 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5994 + $(EDK_SOURCE)/Foundation/Core/Dxe
6000 ===================================================================
6001 --- guid/guid.c (revision 64)
6002 +++ guid/guid.c (working copy)
6007 -EFI_HII_HANDLE HiiHandle;
6008 +STATIC EFI_HII_HANDLE HiiHandle;
6009 EFI_GUID EfiGuidGuid = EFI_GUID_GUID;
6010 SHELL_VAR_CHECK_ITEM GuidCheckList[] = {
6017 + (SHELL_VAR_CHECK_FLAG_TYPE)0
6022 ===================================================================
6023 --- guid/guid.h (revision 64)
6024 +++ guid/guid.h (working copy)
6026 0x425bff44, 0x1cae, 0x4c27, 0x98, 0x2c, 0x25, 0xc8, 0x74, 0x59, 0xdf, 0xd6 \
6030 \ No newline at end of file
6032 Index: LoadPciRom/LoadPciRom.h
6033 ===================================================================
6034 --- LoadPciRom/LoadPciRom.h (revision 64)
6035 +++ LoadPciRom/LoadPciRom.h (working copy)
6041 Index: LoadPciRom/LoadPciRom.inf
6042 ===================================================================
6043 --- LoadPciRom/LoadPciRom.inf (revision 64)
6044 +++ LoadPciRom/LoadPciRom.inf (working copy)
6048 LoadPciRomStrings.uni
6049 - ..\ShCommonStrings.uni
6050 + ../ShCommonStrings.uni
6058 - $(EDK_SOURCE)\Foundation
6059 - $(EDK_SOURCE)\Foundation\Include
6060 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6061 - $(EDK_SOURCE)\Foundation\Efi
6062 - $(EDK_SOURCE)\Foundation\Efi\Include
6063 - $(EDK_SOURCE)\Foundation\FrameWork
6064 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6065 - $(EDK_SOURCE)\Foundation\Core\Dxe
6069 + $(EDK_SOURCE)/Foundation
6070 + $(EDK_SOURCE)/Foundation/Include
6071 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6072 + $(EDK_SOURCE)/Foundation/Efi
6073 + $(EDK_SOURCE)/Foundation/Efi/Include
6074 + $(EDK_SOURCE)/Foundation/FrameWork
6075 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6076 + $(EDK_SOURCE)/Foundation/Core/Dxe
6081 Index: LoadPciRom/LoadPciRom.c
6082 ===================================================================
6083 --- LoadPciRom/LoadPciRom.c (revision 64)
6084 +++ LoadPciRom/LoadPciRom.c (working copy)
6087 #include "EfiShellLib.h"
6088 #include "LoadPciRom.h"
6092 extern UINT8 STRING_ARRAY_NAME[];
6097 EFI_HANDLE gMyImageHandle;
6098 -EFI_HII_HANDLE HiiHandle;
6099 +STATIC EFI_HII_HANDLE HiiHandle;
6100 EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID;
6101 SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
6108 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6115 if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {
6116 - Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress);
6117 + Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);
6118 if (EFI_ERROR (Status)) {
6119 PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle);
6122 ===================================================================
6123 --- ver/ver.h (revision 64)
6124 +++ ver/ver.h (working copy)
6126 IN EFI_SYSTEM_TABLE *SystemTable
6131 ===================================================================
6132 --- ver/Ver.inf (revision 64)
6133 +++ ver/Ver.inf (working copy)
6138 - ..\ShCommonStrings.uni
6139 + ../ShCommonStrings.uni
6144 -[sources.ia32,sources.x64]
6146 +[sources.ia32,sources.x64,sources.ARM,sources.AARCH64]
6161 - $(EDK_SOURCE)\Foundation
6162 - $(EDK_SOURCE)\Foundation\Include
6163 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6164 - $(EDK_SOURCE)\Foundation\Efi
6165 - $(EDK_SOURCE)\Foundation\Efi\Include
6166 - $(EDK_SOURCE)\Foundation\FrameWork
6167 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6168 - $(EDK_SOURCE)\Foundation\Core\Dxe
6172 + $(EDK_SOURCE)/Foundation
6173 + $(EDK_SOURCE)/Foundation/Include
6174 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6175 + $(EDK_SOURCE)/Foundation/Efi
6176 + $(EDK_SOURCE)/Foundation/Efi/Include
6177 + $(EDK_SOURCE)/Foundation/FrameWork
6178 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6179 + $(EDK_SOURCE)/Foundation/Core/Dxe
6184 Index: ver/Ebc/verEbc.c
6185 ===================================================================
6186 --- ver/Ebc/verEbc.c (revision 64)
6187 +++ ver/Ebc/verEbc.c (working copy)
6189 Status = BS->LocateProtocol (
6190 &gEfiEbcProtocolGuid,
6195 if (EFI_ERROR (Status)) {
6198 ===================================================================
6199 --- ver/ver.c (revision 64)
6200 +++ ver/ver.c (working copy)
6206 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6210 Index: dmpstore/dmpstore.h
6211 ===================================================================
6212 --- dmpstore/dmpstore.h (revision 64)
6213 +++ dmpstore/dmpstore.h (working copy)
6215 } DMPSTORE_VARIABLE;
6219 Index: dmpstore/dmpstore.inf
6220 ===================================================================
6221 --- dmpstore/dmpstore.inf (revision 64)
6222 +++ dmpstore/dmpstore.inf (working copy)
6224 COMPONENT_TYPE = APPLICATION
6227 - ..\ShCommonStrings.uni
6228 + ../ShCommonStrings.uni
6237 - $(EDK_SOURCE)\Foundation
6238 - $(EDK_SOURCE)\Foundation\Include
6239 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6240 - $(EDK_SOURCE)\Foundation\Efi
6241 - $(EDK_SOURCE)\Foundation\Efi\Include
6242 - $(EDK_SOURCE)\Foundation\FrameWork
6243 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6244 - $(EDK_SOURCE)\Foundation\Core\Dxe
6248 + $(EDK_SOURCE)/Foundation
6249 + $(EDK_SOURCE)/Foundation/Include
6250 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6251 + $(EDK_SOURCE)/Foundation/Efi
6252 + $(EDK_SOURCE)/Foundation/Efi/Include
6253 + $(EDK_SOURCE)/Foundation/FrameWork
6254 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6255 + $(EDK_SOURCE)/Foundation/Core/Dxe
6260 Index: dmpstore/dmpstore.c
6261 ===================================================================
6262 --- dmpstore/dmpstore.c (revision 64)
6263 +++ dmpstore/dmpstore.c (working copy)
6268 -EFI_HII_HANDLE HiiHandle;
6269 +STATIC EFI_HII_HANDLE HiiHandle;
6270 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
6271 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
6278 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6283 ===================================================================
6284 --- comp/comp.c (revision 64)
6285 +++ comp/comp.c (working copy)
6291 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6296 ===================================================================
6297 --- comp/comp.h (revision 64)
6298 +++ comp/comp.h (working copy)
6300 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \
6304 \ No newline at end of file
6306 Index: comp/comp.inf
6307 ===================================================================
6308 --- comp/comp.inf (revision 64)
6309 +++ comp/comp.inf (working copy)
6314 -..\ShCommonStrings.uni
6315 +../ShCommonStrings.uni
6321 - $(EDK_SOURCE)\Foundation
6322 - $(EDK_SOURCE)\Foundation\Include
6323 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6324 - $(EDK_SOURCE)\Foundation\Efi
6325 - $(EDK_SOURCE)\Foundation\Efi\Include
6326 - $(EDK_SOURCE)\Foundation\FrameWork
6327 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6328 - $(EDK_SOURCE)\Foundation\Core\Dxe
6332 + $(EDK_SOURCE)/Foundation
6333 + $(EDK_SOURCE)/Foundation/Include
6334 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6335 + $(EDK_SOURCE)/Foundation/Efi
6336 + $(EDK_SOURCE)/Foundation/Efi/Include
6337 + $(EDK_SOURCE)/Foundation/FrameWork
6338 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6339 + $(EDK_SOURCE)/Foundation/Core/Dxe
6344 Index: IpConfig/IpConfig.c
6345 ===================================================================
6346 --- IpConfig/IpConfig.c (revision 64)
6347 +++ IpConfig/IpConfig.c (working copy)
6352 -EFI_HII_HANDLE HiiHandle;
6353 +STATIC EFI_HII_HANDLE HiiHandle;
6354 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
6355 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
6362 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6366 Index: IpConfig/IpConfig.h
6367 ===================================================================
6368 --- IpConfig/IpConfig.h (revision 64)
6369 +++ IpConfig/IpConfig.h (working copy)
6371 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
6375 \ No newline at end of file
6377 Index: IpConfig/IpConfig.inf
6378 ===================================================================
6379 --- IpConfig/IpConfig.inf (revision 64)
6380 +++ IpConfig/IpConfig.inf (working copy)
6382 COMPONENT_TYPE = APPLICATION
6385 - ..\ShCommonStrings.uni
6386 + ../ShCommonStrings.uni
6395 - $(EDK_SOURCE)\Foundation
6396 - $(EDK_SOURCE)\Foundation\Include
6397 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6398 - $(EDK_SOURCE)\Foundation\Efi
6399 - $(EDK_SOURCE)\Foundation\Efi\Include
6400 - $(EDK_SOURCE)\Foundation\FrameWork
6401 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6402 - $(EDK_SOURCE)\Foundation\Core\Dxe
6406 + $(EDK_SOURCE)/Foundation
6407 + $(EDK_SOURCE)/Foundation/Include
6408 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6409 + $(EDK_SOURCE)/Foundation/Efi
6410 + $(EDK_SOURCE)/Foundation/Efi/Include
6411 + $(EDK_SOURCE)/Foundation/FrameWork
6412 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6413 + $(EDK_SOURCE)/Foundation/Core/Dxe
6418 Index: sermode/sermode.c
6419 ===================================================================
6420 --- sermode/sermode.c (revision 64)
6421 +++ sermode/sermode.c (working copy)
6424 #include EFI_PROTOCOL_DEFINITION (SerialIo)
6426 -EFI_HII_HANDLE HiiHandle;
6427 +STATIC EFI_HII_HANDLE HiiHandle;
6428 EFI_GUID EfiSermodeGuid = EFI_SERMODEB_GUID;
6429 SHELL_VAR_CHECK_ITEM SermodeCheckList[] = {
6436 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6444 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
6445 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
6446 if (!EFI_ERROR (Status)) {
6447 switch (SerialIo->Mode->Parity) {
6453 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
6454 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
6455 if (!EFI_ERROR (Status)) {
6456 Status = SerialIo->SetAttributes (
6458 Index: sermode/sermode.h
6459 ===================================================================
6460 --- sermode/sermode.h (revision 64)
6461 +++ sermode/sermode.h (working copy)
6467 Index: sermode/sermode.inf
6468 ===================================================================
6469 --- sermode/sermode.inf (revision 64)
6470 +++ sermode/sermode.inf (working copy)
6475 - ..\ShCommonStrings.uni
6476 + ../ShCommonStrings.uni
6485 - $(EDK_SOURCE)\Foundation
6486 - $(EDK_SOURCE)\Foundation\Include
6487 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6488 - $(EDK_SOURCE)\Foundation\Efi
6489 - $(EDK_SOURCE)\Foundation\Efi\Include
6490 - $(EDK_SOURCE)\Foundation\FrameWork
6491 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6492 - $(EDK_SOURCE)\Foundation\Core\Dxe
6496 + $(EDK_SOURCE)/Foundation
6497 + $(EDK_SOURCE)/Foundation/Include
6498 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6499 + $(EDK_SOURCE)/Foundation/Efi
6500 + $(EDK_SOURCE)/Foundation/Efi/Include
6501 + $(EDK_SOURCE)/Foundation/FrameWork
6502 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6503 + $(EDK_SOURCE)/Foundation/Core/Dxe
6508 Index: tzone/tzone.c
6509 ===================================================================
6510 --- tzone/tzone.c (revision 64)
6511 +++ tzone/tzone.c (working copy)
6517 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6526 SHELL_VAR_CHECK_CODE RetCode;
6528 SHELL_VAR_CHECK_PACKAGE ChkPck;
6533 - uValueSize = sizeof (INTN);
6534 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
6535 ZeroMem (&Time, sizeof (EFI_TIME));
6537 Index: tzone/timezone.inf
6538 ===================================================================
6539 --- tzone/timezone.inf (revision 64)
6540 +++ tzone/timezone.inf (working copy)
6542 COMPONENT_TYPE = APPLICATION
6545 - ..\ShCommonStrings.uni
6546 + ../ShCommonStrings.uni
6555 - $(EDK_SOURCE)\Foundation
6556 - $(EDK_SOURCE)\Foundation\Include
6557 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6558 - $(EDK_SOURCE)\Foundation\Efi
6559 - $(EDK_SOURCE)\Foundation\Efi\Include
6560 - $(EDK_SOURCE)\Foundation\FrameWork
6561 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6562 - $(EDK_SOURCE)\Foundation\Core\Dxe
6566 + $(EDK_SOURCE)/Foundation
6567 + $(EDK_SOURCE)/Foundation/Include
6568 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6569 + $(EDK_SOURCE)/Foundation/Efi
6570 + $(EDK_SOURCE)/Foundation/Efi/Include
6571 + $(EDK_SOURCE)/Foundation/FrameWork
6572 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6573 + $(EDK_SOURCE)/Foundation/Core/Dxe
6578 Index: tzone/tzone.h
6579 ===================================================================
6580 --- tzone/tzone.h (revision 64)
6581 +++ tzone/tzone.h (working copy)
6588 ===================================================================
6589 --- vol/vol.c (revision 64)
6590 +++ vol/vol.c (working copy)
6593 #include STRING_DEFINES_FILE
6595 -EFI_HII_HANDLE HiiHandle;
6596 +STATIC EFI_HII_HANDLE HiiHandle;
6597 EFI_GUID EfiVolGuid = EFI_VOL_GUID;
6598 SHELL_VAR_CHECK_ITEM VolCheckList[] = {
6605 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6610 ===================================================================
6611 --- vol/vol.h (revision 64)
6612 +++ vol/vol.h (working copy)
6619 ===================================================================
6620 --- vol/Vol.inf (revision 64)
6621 +++ vol/Vol.inf (working copy)
6626 - ..\ShCommonStrings.uni
6627 + ../ShCommonStrings.uni
6636 - $(EDK_SOURCE)\Foundation
6637 - $(EDK_SOURCE)\Foundation\Include
6638 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6639 - $(EDK_SOURCE)\Foundation\Efi
6640 - $(EDK_SOURCE)\Foundation\Efi\Include
6641 - $(EDK_SOURCE)\Foundation\FrameWork
6642 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6643 - $(EDK_SOURCE)\Foundation\Core\Dxe
6647 + $(EDK_SOURCE)/Foundation
6648 + $(EDK_SOURCE)/Foundation/Include
6649 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6650 + $(EDK_SOURCE)/Foundation/Efi
6651 + $(EDK_SOURCE)/Foundation/Efi/Include
6652 + $(EDK_SOURCE)/Foundation/FrameWork
6653 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6654 + $(EDK_SOURCE)/Foundation/Core/Dxe
6660 ===================================================================
6661 --- cp/cp.c (revision 64)
6662 +++ cp/cp.c (working copy)
6668 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
6674 if (SrcArg->Status == EFI_SUCCESS &&
6675 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
6676 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
6677 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))
6679 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
6680 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
6682 // we need to compose a full name of dir\file for the source
6684 if (SrcArg->Status == EFI_SUCCESS &&
6685 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
6686 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) {
6688 FreePool (DstFullName);
6692 EFI_FILE_INFO *SrcInfo;
6693 EFI_FILE_INFO *DstInfo;
6694 - EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *DstVol;
6695 EFI_FILE_SYSTEM_INFO *DstFsInfo;
6696 CHAR16 InputString[10];
6706 @@ -1789,7 +1787,7 @@
6708 if (SrcArg->Status == EFI_SUCCESS &&
6709 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
6710 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
6711 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle)))
6714 FreePool (DstFullName);
6716 ===================================================================
6717 --- cp/cp.h (revision 64)
6718 +++ cp/cp.h (working copy)
6720 IN EFI_SYSTEM_TABLE *SystemTable
6724 \ No newline at end of file
6728 ===================================================================
6729 --- cp/cp.inf (revision 64)
6730 +++ cp/cp.inf (working copy)
6735 - ..\ShCommonStrings.uni
6736 + ../ShCommonStrings.uni
6744 - $(EDK_SOURCE)\Foundation
6745 - $(EDK_SOURCE)\Foundation\Include
6746 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6747 - $(EDK_SOURCE)\Foundation\Efi
6748 - $(EDK_SOURCE)\Foundation\Efi\Include
6749 - $(EDK_SOURCE)\Foundation\FrameWork
6750 - $(EDK_SOURCE)\Foundation\FrameWork\Include
6751 - $(EDK_SOURCE)\Foundation\Core\Dxe
6755 + $(EDK_SOURCE)/Foundation
6756 + $(EDK_SOURCE)/Foundation/Include
6757 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6758 + $(EDK_SOURCE)/Foundation/Efi
6759 + $(EDK_SOURCE)/Foundation/Efi/Include
6760 + $(EDK_SOURCE)/Foundation/FrameWork
6761 + $(EDK_SOURCE)/Foundation/FrameWork/Include
6762 + $(EDK_SOURCE)/Foundation/Core/Dxe
6767 Index: Library/EfiPart.h
6768 ===================================================================
6769 --- Library/EfiPart.h (revision 64)
6770 +++ Library/EfiPart.h (working copy)
6776 Index: Library/X64/efilibplat.h
6777 ===================================================================
6778 --- Library/X64/efilibplat.h (revision 64)
6779 +++ Library/X64/efilibplat.h (working copy)
6781 #define MIN_ALIGNMENT_SIZE 8
6785 Index: Library/ShellEnvInt.h
6786 ===================================================================
6787 --- Library/ShellEnvInt.h (revision 64)
6788 +++ Library/ShellEnvInt.h (working copy)
6794 \ No newline at end of file
6798 Index: Library/LinkedList.h
6799 ===================================================================
6800 --- Library/LinkedList.h (revision 64)
6801 +++ Library/LinkedList.h (working copy)
6805 #define SwapListEntries(Entry1, Entry2) { \
6806 - EFI_LIST_ENTRY *Entry1Flink, *Entry1Blink; \
6807 + EFI_LIST_ENTRY *Entry1Blink; \
6808 EFI_LIST_ENTRY *Entry2Flink, *Entry2Blink; \
6809 Entry2Flink = (Entry2)->Flink; \
6810 Entry2Blink = (Entry2)->Blink; \
6811 - Entry1Flink = (Entry1)->Flink; \
6812 Entry1Blink = (Entry1)->Blink; \
6813 Entry2Blink->Flink = Entry2Flink; \
6814 Entry2Flink->Blink = Entry2Blink; \
6821 ===================================================================
6822 --- Library/IO.c (revision 64)
6823 +++ Library/IO.c (working copy)
6828 -#include "EfiShelllib.h"
6829 +#include "EfiShellLib.h"
6831 #define PRINT_STRING_LEN 1024
6832 #define PRINT_ITEM_BUFFER_LEN 100
6844 @@ -1575,7 +1575,7 @@
6853 @@ -1769,7 +1769,7 @@
6855 // If we need to update the output do so now
6857 - if (Update != -1) {
6858 + if (Update != (UINTN) -1) {
6859 PrintAt (Column, Row, L"%s%.*s", InStr + Update, Delete, L"");
6860 Len = StrLen (InStr);
6862 @@ -1928,8 +1928,8 @@
6863 return mPrintMode.PageBreak;
6872 @@ -1937,6 +1937,7 @@
6874 return mPrintMode.OutputPause;
6880 Index: Library/FileIO.c
6881 ===================================================================
6882 --- Library/FileIO.c (revision 64)
6883 +++ Library/FileIO.c (working copy)
6888 -#include "EfiShelllib.h"
6889 +#include "EfiShellLib.h"
6891 typedef struct _PATH_COMPONENTS {
6894 IN OUT CHAR16 **Path
6897 - EFI_STATUS Status;
6905 - Status = EFI_SUCCESS;
6909 @@ -1017,13 +1015,11 @@
6910 EFI_LIST_ENTRY SrcList;
6911 EFI_LIST_ENTRY DstList;
6913 - EFI_LIST_ENTRY *Link;
6914 SHELL_FILE_ARG *SrcArg;
6915 SHELL_FILE_ARG *DstArg;
6917 ASSERT (IsSame != NULL);
6922 InitializeListHead (&SrcList);
6923 Index: Library/Aarch64/efilibplat.h
6924 ===================================================================
6925 --- Library/Aarch64/efilibplat.h (revision 0)
6926 +++ Library/Aarch64/efilibplat.h (revision 0)
6930 +Copyright (c) 2005, Intel Corporation
6931 +All rights reserved. This program and the accompanying materials
6932 +are licensed and made available under the terms and conditions of the BSD License
6933 +which accompanies this distribution. The full text of the license may be found at
6934 +http://opensource.org/licenses/bsd-license.php
6936 +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
6937 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6945 + EFI to compile bindings
6953 +#ifndef _EFI_LIB_PLAT_H
6954 +#define _EFI_LIB_PLAT_H
6957 +InitializeLibPlatform (
6958 + IN EFI_HANDLE ImageHandle,
6959 + IN EFI_SYSTEM_TABLE *SystemTable
6962 +#define MIN_ALIGNMENT_SIZE 8
6966 Index: Library/Ebc/EfiLibPlat.h
6967 ===================================================================
6968 --- Library/Ebc/EfiLibPlat.h (revision 64)
6969 +++ Library/Ebc/EfiLibPlat.h (working copy)
6973 #define MIN_ALIGNMENT_SIZE 8
6975 Index: Library/Str.c
6976 ===================================================================
6977 --- Library/Str.c (revision 64)
6978 +++ Library/Str.c (working copy)
6983 -#include "EfiShelllib.h"
6984 +#include "EfiShellLib.h"
6992 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
6993 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
7000 if (c >= '0' && c <= '9') {
7001 - if (u > m || u == m && c - '0' > (INTN) n) {
7002 + if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) {
7006 Index: Library/Data.c
7007 ===================================================================
7008 --- Library/Data.c (revision 64)
7009 +++ Library/Data.c (working copy)
7014 -#include "EfiShelllib.h"
7015 +#include "EfiShellLib.h"
7018 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
7020 ===================================================================
7021 --- Library/IO.h (revision 64)
7022 +++ Library/IO.h (working copy)
7028 \ No newline at end of file
7032 Index: Library/FileIO.h
7033 ===================================================================
7034 --- Library/FileIO.h (revision 64)
7035 +++ Library/FileIO.h (working copy)
7037 IN SIMPLE_READ_FILE SimpleReadHandle
7041 \ No newline at end of file
7045 Index: Library/Str.h
7046 ===================================================================
7047 --- Library/Str.h (revision 64)
7048 +++ Library/Str.h (working copy)
7054 Index: Library/Mem.c
7055 ===================================================================
7056 --- Library/Mem.c (revision 64)
7057 +++ Library/Mem.c (working copy)
7062 -#include "EfiShelllib.h"
7063 +#include "EfiShellLib.h"
7067 Index: Library/RtData.c
7068 ===================================================================
7069 --- Library/RtData.c (revision 64)
7070 +++ Library/RtData.c (working copy)
7075 -#include "EfiShelllib.h"
7076 +#include "EfiShellLib.h"
7079 // RT - pointer to the runtime table
7080 Index: Library/Event.c
7081 ===================================================================
7082 --- Library/Event.c (revision 64)
7083 +++ Library/Event.c (working copy)
7088 -#include "EfiShelllib.h"
7089 +#include "EfiShellLib.h"
7092 LibCreateProtocolNotifyEvent (
7093 Index: Library/Mem.h
7094 ===================================================================
7095 --- Library/Mem.h (revision 64)
7096 +++ Library/Mem.h (working copy)
7102 \ No newline at end of file
7106 Index: Library/Event.h
7107 ===================================================================
7108 --- Library/Event.h (revision 64)
7109 +++ Library/Event.h (working copy)
7111 OUT EFI_INPUT_KEY *Key
7115 \ No newline at end of file
7119 Index: Library/EfiShellLib.h
7120 ===================================================================
7121 --- Library/EfiShellLib.h (revision 64)
7122 +++ Library/EfiShellLib.h (working copy)
7124 #define _EFI_SHELL_LIB_INCLUDE_
7127 -#include "ShellEnv.h"
7128 +#include "shellenv.h"
7131 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
7133 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
7134 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
7135 #include EFI_GUID_DEFINITION (SalSystemTable)
7136 -#include EFI_GUID_DEFINITION (Smbios)
7137 +#include EFI_GUID_DEFINITION (SmBios)
7138 #include EFI_GUID_DEFINITION (StandardErrorDevice)
7139 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
7140 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
7142 #include EFI_PROTOCOL_DEFINITION (DebugPort)
7143 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
7144 #include EFI_PROTOCOL_DEFINITION (Decompress)
7145 -#include EFI_PROTOCOL_DEFINITION (DeviceIO)
7146 +#include EFI_PROTOCOL_DEFINITION (DeviceIo)
7147 #include EFI_PROTOCOL_DEFINITION (DevicePath)
7148 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
7149 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
7151 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
7152 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
7153 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
7154 -#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
7155 +#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
7156 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
7157 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
7158 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
7160 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
7162 #include "efilibplat.h"
7163 -#include "efipart.h"
7164 +#include "EfiPart.h"
7165 #include "ShellDebug.h"
7173 Index: Library/Handle.c
7174 ===================================================================
7175 --- Library/Handle.c (revision 64)
7176 +++ Library/Handle.c (working copy)
7181 -#include "EfiShelllib.h"
7182 +#include "EfiShellLib.h"
7187 EFI_HANDLE *BlockIoBuffer;
7188 EFI_DEVICE_PATH_PROTOCOL *DevicePath;
7190 - EFI_DEVICE_PATH_PROTOCOL *Start;
7191 EFI_DEVICE_PATH_PROTOCOL *Next;
7192 EFI_DEVICE_PATH_PROTOCOL *DevPath;
7193 HARDDRIVE_DEVICE_PATH *HardDriveDevicePath;
7195 PreviousNodeIsHardDriveDevicePath = FALSE;
7197 DevPath = DevicePath;
7200 // Check for end of device path type
7202 @@ -796,14 +794,12 @@
7203 UINTN OpenInfoIndex;
7205 BOOLEAN DriverBindingHandleIndexValid;
7206 - BOOLEAN ControllerHandleIndexValid;
7208 DriverBindingHandleIndexValid = FALSE;
7209 if (DriverBindingHandleIndex != NULL) {
7210 *DriverBindingHandleIndex = 0xffffffff;
7213 - ControllerHandleIndexValid = FALSE;
7214 if (ControllerHandleIndex != NULL) {
7215 *ControllerHandleIndex = 0xffffffff;
7219 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
7220 *ControllerHandleIndex = (UINT32) HandleIndex;
7221 - ControllerHandleIndexValid = TRUE;
7225 @@ -1305,7 +1300,7 @@
7226 Status = BS->HandleProtocol (
7233 if (!EFI_ERROR (Status)) {
7234 Index: Library/Misc.c
7235 ===================================================================
7236 --- Library/Misc.c (revision 64)
7237 +++ Library/Misc.c (working copy)
7242 -#include "EfiShelllib.h"
7243 +#include "EfiShellLib.h"
7245 #if (PLATFORM == NT32)
7246 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \
7248 ASSERT (Buffer != NULL);
7250 if (mShellEnv == NULL) {
7251 - Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv);
7252 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv);
7253 if (EFI_ERROR (Status)) {
7256 @@ -1171,7 +1171,7 @@
7257 Status = BS->HandleProtocol (
7258 Image->DeviceHandle,
7259 &gEfiFirmwareVolumeProtocolGuid,
7263 if (!EFI_ERROR (Status)) {
7264 Status = FV->ReadSection (
7265 @@ -1192,7 +1192,7 @@
7266 Status = BS->HandleProtocol (
7267 Image->DeviceHandle,
7268 &gEfiFirmwareVolume2ProtocolGuid,
7272 if (!EFI_ERROR (Status)) {
7273 Status = FV2->ReadSection (
7274 @@ -1339,7 +1339,7 @@
7278 - EFI_HII_HANDLE HiiHandle;
7279 + STATIC EFI_HII_HANDLE HiiHandle;
7283 @@ -1730,6 +1730,8 @@
7285 case EFI_IMAGE_MACHINE_IA64:
7287 + case EFI_IMAGE_MACHINE_AARCH64:
7288 + return L"AARCH64";
7292 @@ -2544,4 +2546,5 @@
7297 \ No newline at end of file
7300 Index: Library/Perf.c
7301 ===================================================================
7302 --- Library/Perf.c (revision 64)
7303 +++ Library/Perf.c (working copy)
7308 -#include "EfiShelllib.h"
7309 +#include "EfiShellLib.h"
7311 #include EFI_PROTOCOL_DEFINITION (Performance)
7313 Index: Library/IPF/efilibplat.h
7314 ===================================================================
7315 --- Library/IPF/efilibplat.h (revision 64)
7316 +++ Library/IPF/efilibplat.h (working copy)
7318 #define MIN_ALIGNMENT_SIZE 8
7322 Index: Library/IPF/palproc.h
7323 ===================================================================
7324 --- Library/IPF/palproc.h (revision 64)
7325 +++ Library/IPF/palproc.h (working copy)
7327 #define PAL_MC_REGISTER_MEM 0x001b
7329 #endif // _PALPROC_H
7331 Index: Library/IPF/libsalpal.h
7332 ===================================================================
7333 --- Library/IPF/libsalpal.h (revision 64)
7334 +++ Library/IPF/libsalpal.h (working copy)
7340 \ No newline at end of file
7342 Index: Library/Arm/efilibplat.h
7343 ===================================================================
7344 --- Library/Arm/efilibplat.h (revision 0)
7345 +++ Library/Arm/efilibplat.h (revision 0)
7349 +Copyright (c) 2005, Intel Corporation
7350 +All rights reserved. This program and the accompanying materials
7351 +are licensed and made available under the terms and conditions of the BSD License
7352 +which accompanies this distribution. The full text of the license may be found at
7353 +http://opensource.org/licenses/bsd-license.php
7355 +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
7356 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7364 + EFI to compile bindings
7372 +#ifndef _EFI_LIB_PLAT_H_
7373 +#define _EFI_LIB_PLAT_H_
7376 +InitializeLibPlatform (
7377 + IN EFI_HANDLE ImageHandle,
7378 + IN EFI_SYSTEM_TABLE *SystemTable
7381 +#define MIN_ALIGNMENT_SIZE 4
7386 Index: Library/ConsistMapping.c
7387 ===================================================================
7388 --- Library/ConsistMapping.c (revision 64)
7389 +++ Library/ConsistMapping.c (working copy)
7394 -#include "EfiShelllib.h"
7395 +#include "EfiShellLib.h"
7397 MTD_NAME mMTDName[] = {
7399 Index: Library/DPath.c
7400 ===================================================================
7401 --- Library/DPath.c (revision 64)
7402 +++ Library/DPath.c (working copy)
7407 -#include "EfiShelllib.h"
7408 +#include "EfiShellLib.h"
7410 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
7412 @@ -1468,7 +1468,7 @@
7414 Status = LibLocateProtocol (
7415 &gEfiDevicePathToTextProtocolGuid,
7417 + (VOID**)&DevPathToText
7419 if (!EFI_ERROR (Status)) {
7420 ToText = DevPathToText->ConvertDevicePathToText (
7421 @@ -1766,7 +1766,7 @@
7422 Status = BS->HandleProtocol (
7430 Index: Library/Handle.h
7431 ===================================================================
7432 --- Library/Handle.h (revision 64)
7433 +++ Library/Handle.h (working copy)
7439 Index: Library/Misc.h
7440 ===================================================================
7441 --- Library/Misc.h (revision 64)
7442 +++ Library/Misc.h (working copy)
7448 Index: Library/ConsistMapping.h
7449 ===================================================================
7450 --- Library/ConsistMapping.h (revision 64)
7451 +++ Library/ConsistMapping.h (working copy)
7457 \ No newline at end of file
7461 Index: Library/Init.c
7462 ===================================================================
7463 --- Library/Init.c (revision 64)
7464 +++ Library/Init.c (working copy)
7469 -#include "EfiShelllib.h"
7470 +#include "EfiShellLib.h"
7472 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
7474 Index: Library/DPath.h
7475 ===================================================================
7476 --- Library/DPath.h (revision 64)
7477 +++ Library/DPath.h (working copy)
7482 -#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
7483 +#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
7485 #include EFI_GUID_DEFINITION (PcAnsi)
7492 Index: Library/HiiSupport.c
7493 ===================================================================
7494 --- Library/HiiSupport.c (revision 64)
7495 +++ Library/HiiSupport.c (working copy)
7500 -#include "EfiShelllib.h"
7501 +#include "EfiShellLib.h"
7503 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
7509 - Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);
7510 + Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);
7511 if (EFI_ERROR (Status)) {
7514 - Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);
7515 + Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);
7516 if (EFI_ERROR (Status)) {
7519 Index: Library/CRC.c
7520 ===================================================================
7521 --- Library/CRC.c (revision 64)
7522 +++ Library/CRC.c (working copy)
7527 -#include "EfiShelllib.h"
7528 +#include "EfiShellLib.h"
7530 UINT32 CRCTable[256] = {
7532 Index: Library/HiiSupport.h
7533 ===================================================================
7534 --- Library/HiiSupport.h (revision 64)
7535 +++ Library/HiiSupport.h (working copy)
7541 Index: Library/CRC.h
7542 ===================================================================
7543 --- Library/CRC.h (revision 64)
7544 +++ Library/CRC.h (working copy)
7550 \ No newline at end of file
7554 Index: Library/EfiShellLib.inf
7555 ===================================================================
7556 --- Library/EfiShellLib.inf (revision 64)
7557 +++ Library/EfiShellLib.inf (working copy)
7601 - $(EDK_SOURCE)\Foundation
7602 - $(EDK_SOURCE)\Foundation\Include
7603 - $(EDK_SOURCE)\Foundation\Efi
7604 - $(EDK_SOURCE)\Foundation\Efi\Include
7605 - $(EDK_SOURCE)\Foundation\FrameWork
7606 - $(EDK_SOURCE)\Foundation\FrameWork\Include
7607 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7608 - $(EDK_SOURCE)\Foundation\Core\Dxe
7610 + $(EDK_SOURCE)/Foundation
7611 + $(EDK_SOURCE)/Foundation/Include
7612 + $(EDK_SOURCE)/Foundation/Efi
7613 + $(EDK_SOURCE)/Foundation/Efi/Include
7614 + $(EDK_SOURCE)/Foundation/FrameWork
7615 + $(EDK_SOURCE)/Foundation/FrameWork/Include
7616 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7617 + $(EDK_SOURCE)/Foundation/Core/Dxe
7620 EdkFrameworkProtocolLib
7626 + CompilerIntrinsicsLib
7628 +[libraries.AARCH64]
7629 + CompilerIntrinsicsLib
7633 Index: Library/IA32/efilibplat.h
7634 ===================================================================
7635 --- Library/IA32/efilibplat.h (revision 64)
7636 +++ Library/IA32/efilibplat.h (working copy)
7639 #define MIN_ALIGNMENT_SIZE 4
7642 \ No newline at end of file
7644 Index: Library/ShellDebug.c
7645 ===================================================================
7646 --- Library/ShellDebug.c (revision 64)
7647 +++ Library/ShellDebug.c (working copy)
7652 -#include "EfiShelllib.h"
7653 +#include "EfiShellLib.h"
7654 #include EFI_PROTOCOL_DEFINITION (DebugAssert)
7656 EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL;
7657 Index: Library/ShellDebug.h
7658 ===================================================================
7659 --- Library/ShellDebug.h (revision 64)
7660 +++ Library/ShellDebug.h (working copy)
7666 Index: Library/VarCheck.c
7667 ===================================================================
7668 --- Library/VarCheck.c (revision 64)
7669 +++ Library/VarCheck.c (working copy)
7674 -#include "EfiShelllib.h"
7675 +#include "EfiShellLib.h"
7678 LibCheckVarFreeVarList (
7679 Index: Library/Lock.c
7680 ===================================================================
7681 --- Library/Lock.c (revision 64)
7682 +++ Library/Lock.c (working copy)
7687 -#include "EfiShelllib.h"
7688 +#include "EfiShellLib.h"
7692 Index: Library/ShellEnvInt.c
7693 ===================================================================
7694 --- Library/ShellEnvInt.c (revision 64)
7695 +++ Library/ShellEnvInt.c (working copy)
7700 -#include "EfiShelllib.h"
7701 +#include "EfiShellLib.h"
7705 Index: Library/VarCheck.h
7706 ===================================================================
7707 --- Library/VarCheck.h (revision 64)
7708 +++ Library/VarCheck.h (working copy)
7710 ARG_PARTIALLY_QUOTED = 0x2,
7711 ARG_FIRST_HALF_QUOTED = 0x4,
7712 ARG_FIRST_CHAR_IS_ESC = 0x8
7723 Index: Library/Lock.h
7724 ===================================================================
7725 --- Library/Lock.h (revision 64)
7726 +++ Library/Lock.h (working copy)
7732 \ No newline at end of file
7736 Index: ShellFull.inf
7737 ===================================================================
7738 --- ShellFull.inf (revision 64)
7739 +++ ShellFull.inf (working copy)
7740 @@ -20,300 +20,310 @@
7745 -FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
7746 +BASE_NAME = ShellFull
7747 +FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20
7748 COMPONENT_TYPE = APPLICATION
7751 - Library\ShellDebug.c
7761 - Library\ShellEnvInt.c
7764 - Library\ConsistMapping.c
7768 - Library\VarCheck.c
7769 - Library\HiiSupport.c
7770 + Library/ShellDebug.c
7780 + Library/ShellEnvInt.c
7783 + Library/ConsistMapping.c
7787 + Library/VarCheck.c
7788 + Library/HiiSupport.c
7790 - newshell\NshellStrings.uni
7793 - newshell\fakehii.c
7794 + newshell/NshellStrings.uni
7797 + newshell/fakehii.c
7800 - shellenv\ShellenvHelpStrings.uni
7801 - shellenv\ShellenvStrings.uni
7802 - shellenv\ScriptCmdStrings.uni
7803 - shellenv\ConnectStrings.uni
7804 - shellenv\EchoStrings.uni
7805 - shellenv\HelpStrings.uni
7806 - shellenv\MapStrings.uni
7807 - shellenv\CdStrings.uni
7808 - shellenv\DhStrings.uni
7809 + shellenv/ShellenvHelpStrings.uni
7810 + shellenv/ShellenvStrings.uni
7811 + shellenv/ScriptCmdStrings.uni
7812 + shellenv/ConnectStrings.uni
7813 + shellenv/EchoStrings.uni
7814 + shellenv/HelpStrings.uni
7815 + shellenv/MapStrings.uni
7816 + shellenv/CdStrings.uni
7817 + shellenv/DhStrings.uni
7819 - shellenv\cmddisp.c
7820 - shellenv\connect.c
7827 - shellenv\consoleproxy.c
7841 - shellenv\shellenvguid.h
7842 - shellenv\parsecmd.c
7844 + shellenv/cmddisp.c
7845 + shellenv/connect.c
7852 + shellenv/consoleproxy.c
7866 + shellenv/shellenvguid.h
7867 + shellenv/parsecmd.c
7870 - unload\UnloadStrings.uni
7872 + unload/UnloadStrings.uni
7875 - attrib\AttribStrings.uni
7878 + attrib/AttribStrings.uni
7882 - cls\clsstrings.uni
7884 + cls/clsstrings.uni
7894 - date\DateStrings.uni
7897 + date/DateStrings.uni
7901 - load\LoadStrings.uni
7904 + load/LoadStrings.uni
7915 - mkdir\MkdirStrings.uni
7918 + mkdir/MkdirStrings.uni
7929 - reset\ResetStrings.uni
7932 + reset/ResetStrings.uni
7943 - type\TypeStrings.uni
7946 - time\TimeStrings.uni
7949 + type/TypeStrings.uni
7952 + time/TimeStrings.uni
7956 - touch\TouchStrings.uni
7959 + touch/TouchStrings.uni
7963 - vol\VolStrings.uni
7966 + vol/VolStrings.uni
7970 - ver\VerStrings.uni
7973 + ver/VerStrings.uni
7977 - drivers\driversStrings.uni
7980 + drivers/driversStrings.uni
7984 - drvcfg\DrvcfgStrings.uni
7987 + drvcfg/DrvcfgStrings.uni
7991 - drvdiag\DrvdiagStrings.uni
7994 + drvdiag/DrvdiagStrings.uni
7998 - comp\CompStrings.uni
8000 + comp/CompStrings.uni
8003 - dblk\dblkStrings.uni
8006 + dblk/dblkStrings.uni
8010 - devices\DevicesStrings.uni
8012 + devices/DevicesStrings.uni
8015 - devicetree\DevicetreeStrings.uni
8016 - devicetree\devicetree.c
8017 + devicetree/DevicetreeStrings.uni
8018 + devicetree/devicetree.c
8020 - dmem\MemStrings.uni
8021 - dmem\DebugStrings.uni
8023 - dmem\MemCommonPart.c
8025 + dmem/MemStrings.uni
8026 + dmem/DebugStrings.uni
8028 + dmem/MemCommonPart.c
8031 - dmpstore\DmpstoreStrings.uni
8032 - dmpstore\dmpstore.c
8033 + dmpstore/DmpstoreStrings.uni
8034 + dmpstore/dmpstore.c
8036 - edit\EditStrings.uni
8038 - edit\libFileBuffer.c
8040 - edit\libTitleBar.c
8041 - edit\libStatusBar.c
8042 - edit\libInputBar.c
8045 + edit/EditStrings.uni
8047 + edit/libFileBuffer.c
8049 + edit/libTitleBar.c
8050 + edit/libStatusBar.c
8051 + edit/libInputBar.c
8055 - eficompress\CompressStrings.uni
8056 - eficompress\compressMain.c
8057 - eficompress\compress.c
8058 + eficompress/CompressStrings.uni
8059 + eficompress/compressMain.c
8060 + eficompress/compress.c
8062 - efidecompress\DecompressStrings.uni
8063 - efidecompress\decompress.c
8064 + efidecompress/DecompressStrings.uni
8065 + efidecompress/decompress.c
8067 - err\ErrStrings.uni
8069 + err/ErrStrings.uni
8072 - guid\GuidStrings.uni
8074 + guid/GuidStrings.uni
8077 - hexedit\HexeditStrings.uni
8079 - hexedit\libBufferImage.c
8080 - hexedit\libFileImage.c
8081 - hexedit\libDiskImage.c
8082 - hexedit\libMemImage.c
8083 - hexedit\libEditor.c
8084 - hexedit\libTitleBar.c
8085 - hexedit\libStatusBar.c
8086 - hexedit\libInputBar.c
8087 - hexedit\libMenuBar.c
8088 - hexedit\libClipBoard.c
8090 + hexedit/HexeditStrings.uni
8092 + hexedit/libBufferImage.c
8093 + hexedit/libFileImage.c
8094 + hexedit/libDiskImage.c
8095 + hexedit/libMemImage.c
8096 + hexedit/libEditor.c
8097 + hexedit/libTitleBar.c
8098 + hexedit/libStatusBar.c
8099 + hexedit/libInputBar.c
8100 + hexedit/libMenuBar.c
8101 + hexedit/libClipBoard.c
8104 - IfConfig\IfConfigStrings.uni
8105 - IfConfig\IfConfig.c
8106 - IfConfig\IfConfig.h
8107 - IfConfig\ShellNetHelper.c
8108 + IfConfig/IfConfigStrings.uni
8109 + IfConfig/IfConfig.c
8110 + IfConfig/IfConfig.h
8111 + IfConfig/ShellNetHelper.c
8113 - ipconfig\IpConfigStrings.uni
8114 - ipconfig\IpConfig.c
8115 + IpConfig/IpConfigStrings.uni
8116 + IpConfig/IpConfig.c
8118 - loadpcirom\LoadPciRomStrings.uni
8119 - loadpcirom\LoadPciRom.c
8120 + loadpcirom/LoadPciRomStrings.uni
8121 + loadpcirom/LoadPciRom.c
8123 - mem\MemStrings.uni
8124 - mem\DebugStrings.uni
8126 - mem\MemCommonPart.c
8128 + mem/MemStrings.uni
8129 + mem/DebugStrings.uni
8131 + mem/MemCommonPart.c
8134 - memmap\memmapStrings.uni
8136 + memmap/memmapStrings.uni
8144 - mode\ModeStrings.uni
8146 + mode/ModeStrings.uni
8149 - mount\MountStrings.uni
8151 + mount/MountStrings.uni
8154 - openinfo\OPeninfoStrings.uni
8155 - openinfo\openinfo.c
8156 + openinfo/OPeninfoStrings.uni
8157 + openinfo/openinfo.c
8159 - Ping\PingStrings.uni
8161 + Ping/PingStrings.uni
8164 - pci\PciStrings.uni
8167 + pci/PciStrings.uni
8171 - sermode\SermodeStrings.uni
8173 + sermode/SermodeStrings.uni
8176 - smbiosview\SmBiosViewStrings.uni
8177 - smbiosview\QueryTable.c
8178 - smbiosview\EventLogInfo.c
8179 - smbiosview\PrintInfo.c
8180 - smbiosview\LibSmbiosView.c
8181 - smbiosview\smbiosview.c
8182 - smbiosview\smbios.c
8183 + smbiosview/SmBiosViewStrings.uni
8184 + smbiosview/QueryTable.c
8185 + smbiosview/EventLogInfo.c
8186 + smbiosview/PrintInfo.c
8187 + smbiosview/LibSmbiosView.c
8188 + smbiosview/smbiosview.c
8189 + smbiosview/smbios.c
8191 - stall\stallStrings.uni
8193 + stall/stallStrings.uni
8196 - telnetmgmt\TelnetMgmtStrings.uni
8197 - telnetmgmt\TelnetMgmt.c
8198 + telnetmgmt/TelnetMgmtStrings.uni
8199 + telnetmgmt/TelnetMgmt.c
8201 - tzone\TZoneStrings.uni
8203 + tzone/TZoneStrings.uni
8208 - Library\ia32\math.c
8209 - Library\ia32\initplat.c
8211 + Library/IA32/math.c
8212 + Library/IA32/initplat.c
8216 - Library\ipf\math.c
8217 - Library\ipf\initplat.c
8218 - Library\ipf\palproc.s
8219 - Library\ipf\salpal.c
8221 + Library/IPF/math.c
8222 + Library/IPF/initplat.c
8223 + Library/IPF/palproc.s
8224 + Library/IPF/salpal.c
8228 - Library\EBC\math.c
8229 - Library\EBC\initplat.c
8231 + Library/Ebc/math.c
8232 + Library/Ebc/initplat.c
8236 - Library\ipf\math.c
8237 - Library\ia32\initplat.c
8239 + Library/IPF/math.c
8240 + Library/IA32/initplat.c
8244 + Library/IPF/math.c
8245 + Library/IA32/initplat.c
8249 + Library/IPF/math.c
8250 + Library/IA32/initplat.c
8257 - $(EDK_SOURCE)\Foundation
8258 - $(EDK_SOURCE)\Foundation\Include
8259 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8260 - $(EDK_SOURCE)\Foundation\Efi
8261 - $(EDK_SOURCE)\Foundation\Efi\Include
8262 - $(EDK_SOURCE)\Foundation\FrameWork
8263 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8264 - $(EDK_SOURCE)\Foundation\Core\Dxe
8265 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
8269 + $(EDK_SOURCE)/Foundation
8270 + $(EDK_SOURCE)/Foundation/Include
8271 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8272 + $(EDK_SOURCE)/Foundation/Efi
8273 + $(EDK_SOURCE)/Foundation/Efi/Include
8274 + $(EDK_SOURCE)/Foundation/FrameWork
8275 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8276 + $(EDK_SOURCE)/Foundation/Core/Dxe
8277 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
8282 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8286 \ No newline at end of file
8288 Index: inc/shelltypes.h
8289 ===================================================================
8290 --- inc/shelltypes.h (revision 64)
8291 +++ inc/shelltypes.h (working copy)
8296 -#include "linkedlist.h"
8297 +#include "LinkedList.h"
8299 #include EFI_PROTOCOL_DEFINITION (FileInfo)
8300 #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
8306 Index: inc/shellenv.h
8307 ===================================================================
8308 --- inc/shellenv.h (revision 64)
8309 +++ inc/shellenv.h (working copy)
8313 #endif // _SHELLENV_H_
8316 ===================================================================
8317 --- mm/mm.h (revision 64)
8318 +++ mm/mm.h (working copy)
8325 ===================================================================
8326 --- mm/mm.inf (revision 64)
8327 +++ mm/mm.inf (working copy)
8332 - ..\ShCommonStrings.uni
8333 + ../ShCommonStrings.uni
8341 - $(EDK_SOURCE)\Foundation
8342 - $(EDK_SOURCE)\Foundation\Include
8343 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8344 - $(EDK_SOURCE)\Foundation\Efi
8345 - $(EDK_SOURCE)\Foundation\Efi\Include
8346 - $(EDK_SOURCE)\Foundation\FrameWork
8347 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8348 - $(EDK_SOURCE)\Foundation\Core\Dxe
8352 + $(EDK_SOURCE)/Foundation
8353 + $(EDK_SOURCE)/Foundation/Include
8354 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8355 + $(EDK_SOURCE)/Foundation/Efi
8356 + $(EDK_SOURCE)/Foundation/Efi/Include
8357 + $(EDK_SOURCE)/Foundation/FrameWork
8358 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8359 + $(EDK_SOURCE)/Foundation/Core/Dxe
8365 ===================================================================
8366 --- mm/mm.c (revision 64)
8367 +++ mm/mm.c (working copy)
8372 - IN EFI_IO_WIDTH Width,
8373 - IN UINT64 Address,
8376 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8377 + IN UINT64 Address,
8384 - IN EFI_IO_WIDTH Width,
8385 - IN UINT64 Address,
8388 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8389 + IN UINT64 Address,
8399 -EFI_HII_HANDLE HiiHandle;
8400 +STATIC EFI_HII_HANDLE HiiHandle;
8401 EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID;
8402 SHELL_VAR_CHECK_ITEM IomodCheckList[] = {
8409 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
8413 @@ -146,13 +146,13 @@
8417 - OUT EFI_IO_WIDTH *Width,
8418 - OUT EFI_ACCESS_TYPE *AccessType,
8419 - OUT UINT64 *Address,
8420 - OUT UINT64 *Value,
8422 - OUT BOOLEAN *Interactive,
8423 - OUT CHAR16 **ValueStr
8424 + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
8425 + OUT EFI_ACCESS_TYPE *AccessType,
8426 + OUT UINT64 *Address,
8427 + OUT UINT64 *Value,
8429 + OUT BOOLEAN *Interactive,
8430 + OUT CHAR16 **ValueStr
8434 @@ -207,12 +207,11 @@
8437 UINT32 SegmentNumber;
8438 - EFI_IO_WIDTH Width;
8439 + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width;
8440 EFI_ACCESS_TYPE AccessType;
8444 - CHAR16 *AddressStr;
8447 CHAR16 InputStr[80];
8450 Status = OldShellParserMM (&Width, &AccessType, &Address, &Value, &Size, &Interactive, &ValueStr);
8451 if (EFI_ERROR (Status)) {
8452 - if (-1 == Status) {
8453 + if ((EFI_STATUS)-1 == Status) {
8454 PrintToken (STRING_TOKEN (STR_HELPINFO_MM_VERBOSEHELP), HiiHandle);
8455 Status = EFI_SUCCESS;
8458 Width = EfiPciWidthUint8;
8460 AccessType = EfiMemory;
8461 - AddressStr = NULL;
8465 @@ -662,10 +660,10 @@
8469 - IN EFI_IO_WIDTH Width,
8470 - IN UINT64 Address,
8473 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8474 + IN UINT64 Address,
8480 @@ -694,10 +692,10 @@
8484 - IN EFI_IO_WIDTH Width,
8485 - IN UINT64 Address,
8488 + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8489 + IN UINT64 Address,
8498 if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
8499 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
8500 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
8504 @@ -766,13 +764,13 @@
8508 - OUT EFI_IO_WIDTH *Width,
8509 - OUT EFI_ACCESS_TYPE *AccessType,
8510 - OUT UINT64 *Address,
8511 - OUT UINT64 *Value,
8513 - OUT BOOLEAN *Interactive,
8514 - OUT CHAR16 **ValueStr
8515 + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
8516 + OUT EFI_ACCESS_TYPE *AccessType,
8517 + OUT UINT64 *Address,
8518 + OUT UINT64 *Value,
8520 + OUT BOOLEAN *Interactive,
8521 + OUT CHAR16 **ValueStr
8525 Index: drvcfg/drvcfg.h
8526 ===================================================================
8527 --- drvcfg/drvcfg.h (revision 64)
8528 +++ drvcfg/drvcfg.h (working copy)
8534 Index: drvcfg/drvcfg.inf
8535 ===================================================================
8536 --- drvcfg/drvcfg.inf (revision 64)
8537 +++ drvcfg/drvcfg.inf (working copy)
8542 - ..\ShCommonStrings.uni
8543 + ../ShCommonStrings.uni
8552 - $(EDK_SOURCE)\Foundation
8553 - $(EDK_SOURCE)\Foundation\Include
8554 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8555 - $(EDK_SOURCE)\Foundation\Efi
8556 - $(EDK_SOURCE)\Foundation\Efi\Include
8557 - $(EDK_SOURCE)\Foundation\FrameWork
8558 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8559 - $(EDK_SOURCE)\Foundation\Core\Dxe
8563 + $(EDK_SOURCE)/Foundation
8564 + $(EDK_SOURCE)/Foundation/Include
8565 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8566 + $(EDK_SOURCE)/Foundation/Efi
8567 + $(EDK_SOURCE)/Foundation/Efi/Include
8568 + $(EDK_SOURCE)/Foundation/FrameWork
8569 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8570 + $(EDK_SOURCE)/Foundation/Core/Dxe
8575 Index: drvcfg/drvcfg.c
8576 ===================================================================
8577 --- drvcfg/drvcfg.c (revision 64)
8578 +++ drvcfg/drvcfg.c (working copy)
8583 -EFI_HII_HANDLE HiiHandle;
8584 +STATIC EFI_HII_HANDLE HiiHandle;
8585 EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID;
8586 SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = {
8593 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
8597 Index: openinfo/openinfo.h
8598 ===================================================================
8599 --- openinfo/openinfo.h (revision 64)
8600 +++ openinfo/openinfo.h (working copy)
8606 Index: openinfo/openinfo.inf
8607 ===================================================================
8608 --- openinfo/openinfo.inf (revision 64)
8609 +++ openinfo/openinfo.inf (working copy)
8614 - ..\ShCommonStrings.uni
8615 + ../ShCommonStrings.uni
8624 - $(EDK_SOURCE)\Foundation
8625 - $(EDK_SOURCE)\Foundation\Include
8626 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8627 - $(EDK_SOURCE)\Foundation\Efi
8628 - $(EDK_SOURCE)\Foundation\Efi\Include
8629 - $(EDK_SOURCE)\Foundation\FrameWork
8630 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8631 - $(EDK_SOURCE)\Foundation\Core\Dxe
8635 + $(EDK_SOURCE)/Foundation
8636 + $(EDK_SOURCE)/Foundation/Include
8637 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8638 + $(EDK_SOURCE)/Foundation/Efi
8639 + $(EDK_SOURCE)/Foundation/Efi/Include
8640 + $(EDK_SOURCE)/Foundation/FrameWork
8641 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8642 + $(EDK_SOURCE)/Foundation/Core/Dxe
8647 Index: openinfo/openinfo.c
8648 ===================================================================
8649 --- openinfo/openinfo.c (revision 64)
8650 +++ openinfo/openinfo.c (working copy)
8655 -EFI_HII_HANDLE HiiHandle;
8656 +STATIC EFI_HII_HANDLE HiiHandle;
8657 EFI_GUID EfiOpeninfoGuid = EFI_OPENINFO_GUID;
8658 SHELL_VAR_CHECK_ITEM OpeninfoCheckList[] = {
8665 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
8669 Index: drivers/drivers.c
8670 ===================================================================
8671 --- drivers/drivers.c (revision 64)
8672 +++ drivers/drivers.c (working copy)
8677 -EFI_HII_HANDLE HiiHandle;
8678 +STATIC EFI_HII_HANDLE HiiHandle;
8679 EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID;
8680 SHELL_VAR_CHECK_ITEM DriversCheckList[] = {
8687 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
8692 EFI_HANDLE *ControllerHandleBuffer;
8693 UINTN ChildControllerHandleCount;
8696 SHELL_VAR_CHECK_CODE RetCode;
8698 SHELL_ARG_LIST *Item;
8701 DriverImageHandleCount = 0;
8702 DriverImageHandleBuffer = NULL;
8704 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
8706 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
8707 Index: drivers/drivers.h
8708 ===================================================================
8709 --- drivers/drivers.h (revision 64)
8710 +++ drivers/drivers.h (working copy)
8716 Index: drivers/drivers.inf
8717 ===================================================================
8718 --- drivers/drivers.inf (revision 64)
8719 +++ drivers/drivers.inf (working copy)
8724 - ..\ShCommonStrings.uni
8725 + ../ShCommonStrings.uni
8735 - $(EDK_SOURCE)\Foundation
8736 - $(EDK_SOURCE)\Foundation\Include
8737 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8738 - $(EDK_SOURCE)\Foundation\Efi
8739 - $(EDK_SOURCE)\Foundation\Efi\Include
8740 - $(EDK_SOURCE)\Foundation\FrameWork
8741 - $(EDK_SOURCE)\Foundation\FrameWork\Include
8742 - $(EDK_SOURCE)\Foundation\Core\Dxe
8746 + $(EDK_SOURCE)/Foundation
8747 + $(EDK_SOURCE)/Foundation/Include
8748 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8749 + $(EDK_SOURCE)/Foundation/Efi
8750 + $(EDK_SOURCE)/Foundation/Efi/Include
8751 + $(EDK_SOURCE)/Foundation/FrameWork
8752 + $(EDK_SOURCE)/Foundation/FrameWork/Include
8753 + $(EDK_SOURCE)/Foundation/Core/Dxe