]> git.proxmox.com Git - mirror_edk2.git/blame - EdkShellPkg/ShellR64.patch
projects / mirror_edk2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
EdkShellPkg/ShellR64.patch: Update patch to fix RVCTLINUX build
[mirror_edk2.git] / EdkShellPkg / ShellR64.patch
CommitLineData
2bba8d5a
OM		 1Index: EfiCompress/Compress.h
2===================================================================
3--- EfiCompress/Compress.h (revision 64)
4+++ EfiCompress/Compress.h (working copy)
5@@ -57,4 +57,4 @@
c0004f9c 6
2bba8d5a
OM		 7 --*/
8
9-#endif
10\ No newline at end of file
11+#endif
12Index: EfiCompress/CompressMain.c
13===================================================================
14--- EfiCompress/CompressMain.c (revision 64)
15+++ EfiCompress/CompressMain.c (working copy)
16@@ -50,7 +50,7 @@
17 NULL,
18 0,
19 0,
20- 0
21+ (SHELL_VAR_CHECK_FLAG_TYPE)0
22 }
23 };
24
25Index: EfiCompress/compress.inf
26===================================================================
27--- EfiCompress/compress.inf (revision 64)
28+++ EfiCompress/compress.inf (working copy)
29@@ -25,7 +25,7 @@
30 COMPONENT_TYPE = APPLICATION
c0004f9c 31
32 [sources.common]
2bba8d5a
OM		 33-..\ShCommonStrings.uni
34+../ShCommonStrings.uni
35 CompressStrings.uni
36 compressMain.c
37 compress.c
38@@ -34,17 +34,17 @@
39
c0004f9c 40 [includes.common]
41 .
42- ..\Inc
43- ..\Library
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
52- $(DEST_DIR)\
53+ ../Inc
54+ ../Library
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
63+ $(DEST_DIR./
64
65 [libraries.common]
66 EfiShellLib
b00c06f0
OM		 67@@ -64,11 +64,13 @@
68 # we will specify some additional DEFINEs on the compile command line.
69 #
70 [nmake.common]
71+ IMAGE_ENTRY_POINT=InitializeCompress
72+
73+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
74 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
75- IMAGE_ENTRY_POINT=InitializeCompress
76 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
77 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
78 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
79
80-
81-
82\ No newline at end of file
83+[nmake.ARM, nmake.AARCH64]
84+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 85Index: EfiCompress/compress.c
86===================================================================
87--- EfiCompress/compress.c (revision 64)
88+++ EfiCompress/compress.c (working copy)
89@@ -262,7 +262,7 @@
c0004f9c 90 STATIC UINT32 mCompSize, mOrigSize;
91
92 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
93- mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
94+ mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
95 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
96
97 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
2bba8d5a
OM		 98Index: load/load.c
99===================================================================
100--- load/load.c (revision 64)
101+++ load/load.c (working copy)
102@@ -60,7 +60,7 @@
103 NULL,
104 0,
105 0,
106- 0
107+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
108 }
109 };
110
111Index: load/load.h
112===================================================================
113--- load/load.h (revision 64)
114+++ load/load.h (working copy)
115@@ -33,3 +33,4 @@
116 }
117
118 #endif
119+
120Index: load/load.inf
121===================================================================
122--- load/load.inf (revision 64)
123+++ load/load.inf (working copy)
124@@ -39,23 +39,23 @@
c0004f9c 125 COMPONENT_TYPE = APPLICATION
126
127 [sources.common]
2bba8d5a
OM		 128- ..\ShCommonStrings.uni
129+ ../ShCommonStrings.uni
130 LoadStrings.uni
131 load.c
132
c0004f9c 133 [includes.common]
134 .
135- ..\Inc
136- ..\Library
137- $(EDK_SOURCE)\Foundation
138- $(EDK_SOURCE)\Foundation\Include
139- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
140- $(EDK_SOURCE)\Foundation\Efi
141- $(EDK_SOURCE)\Foundation\Efi\Include
142- $(EDK_SOURCE)\Foundation\FrameWork
143- $(EDK_SOURCE)\Foundation\FrameWork\Include
144- $(EDK_SOURCE)\Foundation\Core\Dxe
145- $(DEST_DIR)\
146+ ../Inc
147+ ../Library
148+ $(EDK_SOURCE)/Foundation
149+ $(EDK_SOURCE)/Foundation/Include
150+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
151+ $(EDK_SOURCE)/Foundation/Efi
152+ $(EDK_SOURCE)/Foundation/Efi/Include
153+ $(EDK_SOURCE)/Foundation/FrameWork
154+ $(EDK_SOURCE)/Foundation/FrameWork/Include
155+ $(EDK_SOURCE)/Foundation/Core/Dxe
156+ $(DEST_DIR./
157
158 [libraries.common]
159 EfiShellLib
b00c06f0
OM		 160@@ -70,6 +70,11 @@
161
162 [nmake.common]
163 IMAGE_ENTRY_POINT=InitializeLoad
164+
165+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
166 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
167 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
168 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
169+
170+[nmake.ARM, nmake.AARCH64]
171+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 172Index: drvdiag/drvdiag.c
173===================================================================
174--- drvdiag/drvdiag.c (revision 64)
175+++ drvdiag/drvdiag.c (working copy)
176@@ -41,7 +41,7 @@
c0004f9c 177 //
2bba8d5a
OM		 178 // Global Variables
179 //
180-EFI_HII_HANDLE HiiHandle;
181+STATIC EFI_HII_HANDLE HiiHandle;
182 EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID;
183 SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = {
184 {
185@@ -90,7 +90,7 @@
186 NULL,
187 0,
188 0,
189- 0
190+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
191 }
192 };
c0004f9c 193
2bba8d5a
OM		 194Index: drvdiag/drvdiag.h
195===================================================================
196--- drvdiag/drvdiag.h (revision 64)
197+++ drvdiag/drvdiag.h (working copy)
198@@ -33,3 +33,4 @@
199 }
c0004f9c 200
2bba8d5a
OM		 201 #endif
202+
203Index: drvdiag/drvdiag.inf
204===================================================================
205--- drvdiag/drvdiag.inf (revision 64)
206+++ drvdiag/drvdiag.inf (working copy)
207@@ -40,7 +40,7 @@
c0004f9c 208
c0004f9c 209
2bba8d5a
OM		 210 [sources.common]
211- ..\ShCommonStrings.uni
212+ ../ShCommonStrings.uni
213 DrvdiagStrings.uni
214 drvdiag.c
215 drvdiag.h
216@@ -48,17 +48,17 @@
217
c0004f9c 218 [includes.common]
219 .
220- ..\Inc
221- ..\Library
222- $(EDK_SOURCE)\Foundation
223- $(EDK_SOURCE)\Foundation\Include
224- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
225- $(EDK_SOURCE)\Foundation\Efi
226- $(EDK_SOURCE)\Foundation\Efi\Include
227- $(EDK_SOURCE)\Foundation\FrameWork
228- $(EDK_SOURCE)\Foundation\FrameWork\Include
229- $(EDK_SOURCE)\Foundation\Core\Dxe
230- $(DEST_DIR)\
231+ ../Inc
232+ ../Library
233+ $(EDK_SOURCE)/Foundation
234+ $(EDK_SOURCE)/Foundation/Include
235+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
236+ $(EDK_SOURCE)/Foundation/Efi
237+ $(EDK_SOURCE)/Foundation/Efi/Include
238+ $(EDK_SOURCE)/Foundation/FrameWork
239+ $(EDK_SOURCE)/Foundation/FrameWork/Include
240+ $(EDK_SOURCE)/Foundation/Core/Dxe
241+ $(DEST_DIR./
242
243 [libraries.common]
244 EfiShellLib
b00c06f0
OM		 245@@ -73,7 +73,11 @@
246
247 [nmake.common]
248 IMAGE_ENTRY_POINT=DrvdiagMain
249+
250+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
251 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
252 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
253 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
254
255+[nmake.ARM, nmake.AARCH64]
256+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 257Index: cls/cls.c
258===================================================================
259--- cls/cls.c (revision 64)
260+++ cls/cls.c (working copy)
261@@ -30,7 +30,7 @@
c0004f9c 262 //
2bba8d5a 263 #include STRING_DEFINES_FILE
c0004f9c 264
265-EFI_HII_HANDLE HiiHandle;
266+STATIC EFI_HII_HANDLE HiiHandle;
2bba8d5a
OM		 267 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
268 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
269 {
270@@ -49,7 +49,7 @@
271 NULL,
272 0,
273 0,
274- 0
275+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
276 }
277 };
c0004f9c 278
2bba8d5a
OM		 279Index: cls/cls.h
280===================================================================
281--- cls/cls.h (revision 64)
282+++ cls/cls.h (working copy)
283@@ -36,3 +36,4 @@
284 }
285
286 #endif
287+
288Index: cls/cls.inf
289===================================================================
290--- cls/cls.inf (revision 64)
291+++ cls/cls.inf (working copy)
292@@ -40,24 +40,24 @@
c0004f9c 293
c0004f9c 294
295 [sources.common]
2bba8d5a
OM		 296- ..\ShCommonStrings.uni
297+ ../ShCommonStrings.uni
298 ClsStrings.uni
299 Cls.c
300 Cls.h
301
c0004f9c 302 [includes.common]
2bba8d5a 303 .
c0004f9c 304- ..\Inc
305- ..\Library
c0004f9c 306- $(EDK_SOURCE)\Foundation
c0004f9c 307- $(EDK_SOURCE)\Foundation\Include
308- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2bba8d5a
OM		 309- $(EDK_SOURCE)\Foundation\Efi
310- $(EDK_SOURCE)\Foundation\Efi\Include
c0004f9c 311- $(EDK_SOURCE)\Foundation\FrameWork
312- $(EDK_SOURCE)\Foundation\FrameWork\Include
313- $(EDK_SOURCE)\Foundation\Core\Dxe
c0004f9c 314- $(DEST_DIR)\
315+ ../Inc
316+ ../Library
c0004f9c 317+ $(EDK_SOURCE)/Foundation
c0004f9c 318+ $(EDK_SOURCE)/Foundation/Include
319+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2bba8d5a
OM		 320+ $(EDK_SOURCE)/Foundation/Efi
321+ $(EDK_SOURCE)/Foundation/Efi/Include
c0004f9c 322+ $(EDK_SOURCE)/Foundation/FrameWork
323+ $(EDK_SOURCE)/Foundation/FrameWork/Include
324+ $(EDK_SOURCE)/Foundation/Core/Dxe
c0004f9c 325+ $(DEST_DIR./
326
2bba8d5a 327 [libraries.common]
c0004f9c 328 EfiShellLib
b00c06f0
OM		 329@@ -72,7 +72,12 @@
330
331 [nmake.common]
332 IMAGE_ENTRY_POINT=InitializeCls
333+
334+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
335 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
336 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
337 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
338
339+[nmake.ARM, nmake.AARCH64]
340+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
341+
2bba8d5a
OM		 342Index: newshell/nshell.inf
343===================================================================
344--- newshell/nshell.inf (revision 64)
345+++ newshell/nshell.inf (working copy)
346@@ -26,24 +26,24 @@
c0004f9c 347
348 [sources.common]
2bba8d5a 349 NshellStrings.uni
c0004f9c 350- ..\ShCommonStrings.uni
351+ ../ShCommonStrings.uni
2bba8d5a
OM		 352 init.c
353 nshell.h
354 fakehii.c
c0004f9c 355
356 [includes.common]
357 .
358- ..\Inc
359- ..\Library
360- $(EDK_SOURCE)\Foundation
361- $(EDK_SOURCE)\Foundation\Include
362- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
363- $(EDK_SOURCE)\Foundation\Efi
364- $(EDK_SOURCE)\Foundation\Efi\Include
365- $(EDK_SOURCE)\Foundation\FrameWork
366- $(EDK_SOURCE)\Foundation\FrameWork\Include
367- $(EDK_SOURCE)\Foundation\Core\Dxe
368- $(DEST_DIR)\
369+ ../Inc
370+ ../Library
371+ $(EDK_SOURCE)/Foundation
372+ $(EDK_SOURCE)/Foundation/Include
373+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
374+ $(EDK_SOURCE)/Foundation/Efi
375+ $(EDK_SOURCE)/Foundation/Efi/Include
376+ $(EDK_SOURCE)/Foundation/FrameWork
377+ $(EDK_SOURCE)/Foundation/FrameWork/Include
378+ $(EDK_SOURCE)/Foundation/Core/Dxe
379+ $(DEST_DIR./
380
381 [libraries.common]
382 EfiShellLib
b00c06f0
OM		 383@@ -63,11 +63,13 @@
384 # we will specify some additional DEFINEs on the compile command line.
385 #
386 [nmake.common]
387+ IMAGE_ENTRY_POINT=InitializeShell
388+
389+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
390 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
391- IMAGE_ENTRY_POINT=InitializeShell
392 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
393 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
394- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL=2
395+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
396
397-
398-
399\ No newline at end of file
400+[nmake.ARM, nmake.AARCH64]
401+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 402Index: newshell/FakeHii.c
403===================================================================
404--- newshell/FakeHii.c (revision 64)
405+++ newshell/FakeHii.c (working copy)
406@@ -196,7 +196,7 @@
407 Status = BS->HandleProtocol (
408 mFakeHiiHandle,
409 &gEfiHiiProtocolGuid,
410- &FakeHii
411+ (VOID**)&FakeHii
412 );
413 Status = BS->UninstallProtocolInterface (
414 mFakeHiiHandle,
415@@ -320,7 +320,7 @@
416 if (Language == NULL) {
417 return EFI_OUT_OF_RESOURCES;
418 }
419- strcpya (Language, (UINT8 *) PackageHdr + HeaderSize - LanguageSize);
420+ strcpya (Language, (CHAR8*) ((UINT8 *) PackageHdr + HeaderSize - LanguageSize));
421 for (Link = PackageList->StringPkgHdr.Flink; Link != &PackageList->StringPkgHdr; Link = Link->Flink) {
422 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
423 if (CompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
424@@ -770,7 +770,7 @@
425 StringPackage = NULL;
426 for (Link = DatabaseRecord->StringPkgHdr.Flink; Link != &DatabaseRecord->StringPkgHdr; Link = Link->Flink) {
427 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
428- if (CompareLanguage (StringPackage->StringPkgHdr->Language, (UINT8 *) Language)) {
429+ if (CompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) Language)) {
430 Matched = TRUE;
431 break;
432 }
433Index: newshell/init.c
434===================================================================
435--- newshell/init.c (revision 64)
436+++ newshell/init.c (working copy)
437@@ -23,7 +23,7 @@
438 #include "nshell.h"
c0004f9c 439
2bba8d5a
OM		 440 extern UINT8 STRING_ARRAY_NAME[];
441-extern BOOLEAN gHiiInitialized = FALSE;
442+BOOLEAN gHiiInitialized = FALSE;
c0004f9c 443
2bba8d5a
OM		 444 //
445 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
446@@ -99,13 +99,13 @@
447 Status = BS->HandleProtocol (
448 ImgHnd,
449 &gEfiLoadedImageProtocolGuid,
450- &img
451+ (VOID**)&img
452 );
453 if (!EFI_ERROR (Status)) {
454 Status = BS->HandleProtocol (
455 img->DeviceHandle,
456 &gEfiDevicePathProtocolGuid,
457- &dp
458+ (VOID**)&dp
459 );
460 if (!EFI_ERROR (Status)) {
461 *DevPath = DuplicateDevicePath (dp);
462@@ -220,7 +220,7 @@
463 //
c0004f9c 464 Status = LibLocateProtocol (
2bba8d5a
OM		 465 &gEfiConsoleControlProtocolGuid,
466- &ConsoleControl
467+ (VOID**)&ConsoleControl
c0004f9c 468 );
469 if (!EFI_ERROR (Status)) {
2bba8d5a
OM		 470 Status = ConsoleControl->GetMode (ConsoleControl, &mOldCurrentMode, NULL, NULL);
471@@ -342,7 +342,7 @@
472 Status = _ShellLoadEnvDriver (ImageHandle);
473 )
474 if (EFI_ERROR (Status)) {
475- Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
476+ Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
477 if (EFI_ERROR (Status)) {
478 PrintToken (STRING_TOKEN (STR_NSHELL_ENV_DRIVER), HiiNewshellHandle);
479 return Status;
480@@ -372,7 +372,7 @@
481 *IsRootInstance = TRUE;
c0004f9c 482 }
c0004f9c 483
2bba8d5a
OM		 484- Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
485+ Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
486 ASSERT (!EFI_ERROR (Status));
487 SI = SE->NewShell (ImageHandle);
c0004f9c 488
2bba8d5a
OM		 489@@ -543,7 +543,7 @@
490 //
491 ConsoleControlStatus = LibLocateProtocol (
492 &gEfiConsoleControlProtocolGuid,
493- &ConsoleControl
494+ (VOID**)&ConsoleControl
495 );
496 if (!EFI_ERROR (ConsoleControlStatus)) {
497 ConsoleControlStatus = ConsoleControl->GetMode (ConsoleControl, &CurrentMode, NULL, NULL);
498@@ -709,7 +709,7 @@
499 //
500 SE2->IncrementShellNestingLevel ();
c0004f9c 501
2bba8d5a
OM		 502- while (Status != -1) {
503+ while (Status != (EFI_STATUS) -1) {
504 Status = NShellPrompt (ImageHandle);
505 EFI_NT_EMULATOR_CODE (
506 //
507@@ -723,7 +723,7 @@
508 Status = BS->HandleProtocol (
509 ImageHandle,
510 &ShellInterfaceProtocol,
511- &SI
512+ (VOID**)&SI
513 );
514 ASSERT (!EFI_ERROR (Status));
515 }
516Index: newshell/FakeHii.h
517===================================================================
518--- newshell/FakeHii.h (revision 64)
519+++ newshell/FakeHii.h (working copy)
520@@ -479,3 +479,4 @@
521 #endif
c0004f9c 522
2bba8d5a
OM		 523 #endif
524+
525Index: newshell/nshell.h
526===================================================================
527--- newshell/nshell.h (revision 64)
528+++ newshell/nshell.h (working copy)
529@@ -58,4 +58,5 @@
530 #define EFI_NO_MONOSHELL_CODE(code) code
531 #endif
c0004f9c 532
2bba8d5a
OM		 533-#endif
534\ No newline at end of file
535+#endif
536+
537Index: type/type.c
538===================================================================
539--- type/type.c (revision 64)
540+++ type/type.c (working copy)
541@@ -59,7 +59,7 @@
542 BOOLEAN TypeUnicode;
543 BOOLEAN TypeAuto;
c0004f9c 544
2bba8d5a
OM		 545-EFI_HII_HANDLE HiiHandle;
546+STATIC EFI_HII_HANDLE HiiHandle;
547 EFI_GUID EfiTypeGuid = EFI_TYPE_GUID;
548 SHELL_VAR_CHECK_ITEM TypeCheckList[] = {
549 {
550@@ -90,7 +90,7 @@
551 NULL,
552 0,
553 0,
554- 0
555+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
556 }
557 };
c0004f9c 558
2bba8d5a
OM		 559Index: type/type.h
560===================================================================
561--- type/type.h (revision 64)
562+++ type/type.h (working copy)
563@@ -30,3 +30,4 @@
564 }
c0004f9c 565
2bba8d5a 566 #endif
c0004f9c 567+
2bba8d5a
OM		 568Index: type/type.inf
569===================================================================
570--- type/type.inf (revision 64)
571+++ type/type.inf (working copy)
572@@ -40,24 +40,24 @@
c0004f9c 573
2bba8d5a
OM		 574
575 [sources.common]
576- ..\ShCommonStrings.uni
577+ ../ShCommonStrings.uni
578 TypeStrings.uni
579 type.c
580 type.h
581
c0004f9c 582 [includes.common]
583 .
584- ..\Inc
2bba8d5a 585- ..\Library
c0004f9c 586- $(EDK_SOURCE)\Foundation
587- $(EDK_SOURCE)\Foundation\Include
2bba8d5a 588- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
c0004f9c 589- $(EDK_SOURCE)\Foundation\Efi
590- $(EDK_SOURCE)\Foundation\Efi\Include
591- $(EDK_SOURCE)\Foundation\FrameWork
592- $(EDK_SOURCE)\Foundation\FrameWork\Include
c0004f9c 593- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a 594- $(DEST_DIR)\
c0004f9c 595+ ../Inc
2bba8d5a 596+ ../Library
c0004f9c 597+ $(EDK_SOURCE)/Foundation
598+ $(EDK_SOURCE)/Foundation/Include
2bba8d5a 599+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
c0004f9c 600+ $(EDK_SOURCE)/Foundation/Efi
601+ $(EDK_SOURCE)/Foundation/Efi/Include
602+ $(EDK_SOURCE)/Foundation/FrameWork
603+ $(EDK_SOURCE)/Foundation/FrameWork/Include
c0004f9c 604+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a 605+ $(DEST_DIR./
c0004f9c 606
2bba8d5a
OM		 607 [libraries.common]
608 EfiShellLib
b00c06f0
OM		 609@@ -72,7 +72,11 @@
610
611 [nmake.common]
612 IMAGE_ENTRY_POINT=InitializeType
613+
614+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
615 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
616 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
617 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
618
619+[nmake.ARM, nmake.AARCH64]
620+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 621Index: dmem/MemCommonPart.c
622===================================================================
623--- dmem/MemCommonPart.c (revision 64)
624+++ dmem/MemCommonPart.c (working copy)
625@@ -58,7 +58,7 @@
626 NULL,
627 0,
628 0,
629- 0
630+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
631 }
632 };
c0004f9c 633
2bba8d5a
OM		 634@@ -148,7 +148,7 @@
635 return EFI_SUCCESS;
636 }
c0004f9c 637
2bba8d5a
OM		 638- Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
639+ Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
640 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
c0004f9c 641
2bba8d5a
OM		 642 //
643@@ -156,7 +156,7 @@
644 //
645 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
646 if (MMIo) {
647- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
648+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
649 if (EFI_ERROR (Status)) {
650 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
651 return Status;
652@@ -171,7 +171,7 @@
653 return Status;
654 }
655
656- PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
657+ PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
658 } else {
659 Buffer = (UINT8 *) (UINTN) Address;
660 }
661@@ -233,7 +233,7 @@
662 //
663 MMIo = FALSE;
664 AddressStr = SizeStr = NULL;
665- Address = (UINT64) SystemTable;
666+ Address = (UINT64)(UINTN) SystemTable;
667 Size = 512;
668 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
669 if (VarCheckOk != RetCode) {
670@@ -316,7 +316,7 @@
671 //
672 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
673 if (MMIo) {
674- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
675+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
676 if (EFI_ERROR (Status)) {
677 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
678 return Status;
679@@ -331,7 +331,7 @@
680 return Status;
681 }
682
683- PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
684+ PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
685 } else {
686 Buffer = (UINT8 *) (UINTN) Address;
687 }
688Index: dmem/MemCommonPart.h
689===================================================================
690--- dmem/MemCommonPart.h (revision 64)
691+++ dmem/MemCommonPart.h (working copy)
692@@ -61,4 +61,4 @@
693 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
c0004f9c 694 );
695
696-#endif
697\ No newline at end of file
698+#endif
2bba8d5a
OM		 699Index: dmem/efidump.c
700===================================================================
701--- dmem/efidump.c (revision 64)
702+++ dmem/efidump.c (working copy)
703@@ -24,7 +24,7 @@
c0004f9c 704 --*/
705
2bba8d5a
OM		 706 #include "debug.h"
707-#include "Efipart.h"
708+#include "EfiPart.h"
709 #include "EfiShellLib.h"
c0004f9c 710
2bba8d5a
OM		 711 #include STRING_DEFINES_FILE
712@@ -320,13 +320,11 @@
713 VOID *AcpiTable;
714 VOID *Acpi20Table;
715 VOID *SMBIOSTable;
716- VOID *SalSystemTable;
717 VOID *MpsTable;
718
719 AcpiTable = NULL;
720 Acpi20Table = NULL;
721 SMBIOSTable = NULL;
722- SalSystemTable = NULL;
723 MpsTable = NULL;
724
725 PrintToken (
726@@ -352,11 +350,13 @@
727 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
728 }
c0004f9c 729
2bba8d5a
OM		 730- PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
731- PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
732+ PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
733+ PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
c0004f9c 734
2bba8d5a
OM		 735 EFI64_CODE (
736- Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
737+ VOID *SalSystemTable;
738+
739+ Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
740 if (!EFI_ERROR(Status)) {
741 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable);
742 }
743@@ -364,22 +364,22 @@
c0004f9c 744
2bba8d5a
OM		 745 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
746 if (!EFI_ERROR (Status)) {
747- PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
748+ PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable);
749 }
c0004f9c 750
2bba8d5a
OM		 751 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
752 if (!EFI_ERROR (Status)) {
753- PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
754+ PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table);
755 }
c0004f9c 756
2bba8d5a
OM		 757 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
758 if (!EFI_ERROR (Status)) {
759- PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
760+ PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable);
761 }
c0004f9c 762
2bba8d5a
OM		 763 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
764 if (!EFI_ERROR (Status)) {
765- PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
766+ PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable);
767 }
768 }
c0004f9c 769
2bba8d5a
OM		 770Index: dmem/debug.h
771===================================================================
772--- dmem/debug.h (revision 64)
773+++ dmem/debug.h (working copy)
774@@ -156,3 +156,4 @@
775 extern EFI_HII_HANDLE HiiDmemHandle;
c0004f9c 776
2bba8d5a
OM		 777 #endif
778+
779Index: dmem/dmem.inf
780===================================================================
781--- dmem/dmem.inf (revision 64)
782+++ dmem/dmem.inf (working copy)
783@@ -25,7 +25,7 @@
784 COMPONENT_TYPE = APPLICATION
c0004f9c 785
2bba8d5a
OM		 786 [sources.common]
787- ..\ShCommonStrings.uni
788+ ../ShCommonStrings.uni
789 MemStrings.uni
790 DebugStrings.uni
791 mem.c
792@@ -34,17 +34,17 @@
793
794 [includes.common]
795 .
796- ..\Inc
797- ..\Library
798- $(EDK_SOURCE)\Foundation
799- $(EDK_SOURCE)\Foundation\Include
800- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
801- $(EDK_SOURCE)\Foundation\Efi
802- $(EDK_SOURCE)\Foundation\Efi\Include
803- $(EDK_SOURCE)\Foundation\FrameWork
804- $(EDK_SOURCE)\Foundation\FrameWork\Include
805- $(EDK_SOURCE)\Foundation\Core\Dxe
806- $(DEST_DIR)\
807+ ../Inc
808+ ../Library
809+ $(EDK_SOURCE)/Foundation
810+ $(EDK_SOURCE)/Foundation/Include
811+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
812+ $(EDK_SOURCE)/Foundation/Efi
813+ $(EDK_SOURCE)/Foundation/Efi/Include
814+ $(EDK_SOURCE)/Foundation/FrameWork
815+ $(EDK_SOURCE)/Foundation/FrameWork/Include
816+ $(EDK_SOURCE)/Foundation/Core/Dxe
817+ $(DEST_DIR./
c0004f9c 818
2bba8d5a
OM		 819 [libraries.common]
820 EfiShellLib
b00c06f0
OM		 821@@ -64,9 +64,13 @@
822 # we will specify some additional DEFINEs on the compile command line.
823 #
824 [nmake.common]
825+ IMAGE_ENTRY_POINT=DumpMem
826+
827+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
828 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
829- IMAGE_ENTRY_POINT=DumpMem
830 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
831 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
832 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
833
834+[nmake.ARM, nmake.AARCH64]
835+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 836Index: devices/devices.c
837===================================================================
838--- devices/devices.c (revision 64)
839+++ devices/devices.c (working copy)
840@@ -36,7 +36,7 @@
841 //
842 // Global Variables
843 //
844-EFI_HII_HANDLE HiiHandle;
845+STATIC EFI_HII_HANDLE HiiHandle;
846 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
847 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
848 {
849@@ -61,7 +61,7 @@
850 NULL,
851 0,
852 0,
853- 0
854+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
c0004f9c 855 }
2bba8d5a
OM		 856 };
857
858Index: devices/devices.h
859===================================================================
860--- devices/devices.h (revision 64)
861+++ devices/devices.h (working copy)
862@@ -32,3 +32,4 @@
863 0x6fabed98, 0x2a7, 0x46a4, 0x84, 0xd1, 0x76, 0xcd, 0x5c, 0x49, 0x78, 0x74 \
c0004f9c 864 }
2bba8d5a
OM		 865 #endif
866+
867Index: devices/devices.inf
868===================================================================
869--- devices/devices.inf (revision 64)
870+++ devices/devices.inf (working copy)
871@@ -41,23 +41,23 @@
c0004f9c 872
2bba8d5a
OM		 873 [sources.common]
874 DevicesStrings.uni
875- ..\ShCommonStrings.uni
876+ ../ShCommonStrings.uni
877 devices.c
878 devices.h
879
880 [includes.common]
881 .
882- ..\Inc
883- ..\Library
884- $(EDK_SOURCE)\Foundation
885- $(EDK_SOURCE)\Foundation\Include
886- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
887- $(EDK_SOURCE)\Foundation\Efi
888- $(EDK_SOURCE)\Foundation\Efi\Include
889- $(EDK_SOURCE)\Foundation\FrameWork
890- $(EDK_SOURCE)\Foundation\FrameWork\Include
891- $(EDK_SOURCE)\Foundation\Core\Dxe
892- $(DEST_DIR)\
893+ ../Inc
894+ ../Library
895+ $(EDK_SOURCE)/Foundation
896+ $(EDK_SOURCE)/Foundation/Include
897+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
898+ $(EDK_SOURCE)/Foundation/Efi
899+ $(EDK_SOURCE)/Foundation/Efi/Include
900+ $(EDK_SOURCE)/Foundation/FrameWork
901+ $(EDK_SOURCE)/Foundation/FrameWork/Include
902+ $(EDK_SOURCE)/Foundation/Core/Dxe
903+ $(DEST_DIR./
c0004f9c 904
2bba8d5a
OM		 905 [libraries.common]
906 EfiShellLib
b00c06f0
OM		 907@@ -72,7 +72,11 @@
908
909 [nmake.common]
910 IMAGE_ENTRY_POINT=DevicesMain
911+
912+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
913 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
914 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
915 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
916
917+[nmake.ARM, nmake.AARCH64]
918+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 919Index: mv/mv.c
920===================================================================
921--- mv/mv.c (revision 64)
922+++ mv/mv.c (working copy)
923@@ -36,7 +36,7 @@
924 //
925 // Global Variables
926 //
927-EFI_HII_HANDLE HiiHandle;
928+STATIC EFI_HII_HANDLE HiiHandle;
929 EFI_GUID EfiMvGuid = EFI_MV_GUID;
930 SHELL_VAR_CHECK_ITEM MvCheckList[] = {
931 {
932@@ -55,7 +55,7 @@
933 NULL,
934 0,
935 0,
936- 0
937+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
c0004f9c 938 }
2bba8d5a 939 };
c0004f9c 940
2bba8d5a
OM		 941Index: mv/mv.h
942===================================================================
943--- mv/mv.h (revision 64)
944+++ mv/mv.h (working copy)
945@@ -33,4 +33,4 @@
c0004f9c 946
2bba8d5a 947 #define EFI_FILE_STRING_SIZE 260
c0004f9c 948
949-#endif
950\ No newline at end of file
951+#endif
2bba8d5a
OM		 952Index: mv/mv.inf
953===================================================================
954--- mv/mv.inf (revision 64)
955+++ mv/mv.inf (working copy)
956@@ -40,24 +40,24 @@
c0004f9c 957
c0004f9c 958
2bba8d5a
OM		 959 [sources.common]
960- ..\ShCommonStrings.uni
961+ ../ShCommonStrings.uni
962 MvStrings.uni
963 mv.c
964 mv.h
965
966 [includes.common]
967 .
968- ..\Inc
969- ..\Library
970- $(EDK_SOURCE)\Foundation
971- $(EDK_SOURCE)\Foundation\Include
972- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
973- $(EDK_SOURCE)\Foundation\Efi
974- $(EDK_SOURCE)\Foundation\Efi\Include
975- $(EDK_SOURCE)\Foundation\FrameWork
976- $(EDK_SOURCE)\Foundation\FrameWork\Include
977- $(EDK_SOURCE)\Foundation\Core\Dxe
978- $(DEST_DIR)\
979+ ../Inc
980+ ../Library
981+ $(EDK_SOURCE)/Foundation
982+ $(EDK_SOURCE)/Foundation/Include
983+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
984+ $(EDK_SOURCE)/Foundation/Efi
985+ $(EDK_SOURCE)/Foundation/Efi/Include
986+ $(EDK_SOURCE)/Foundation/FrameWork
987+ $(EDK_SOURCE)/Foundation/FrameWork/Include
988+ $(EDK_SOURCE)/Foundation/Core/Dxe
989+ $(DEST_DIR./
c0004f9c 990
2bba8d5a
OM		 991 [libraries.common]
992 EfiShellLib
b00c06f0
OM		 993@@ -72,7 +72,11 @@
994
995 [nmake.common]
996 IMAGE_ENTRY_POINT=InitializeMv
997+
998+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
999 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1000 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1001 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1002
1003+[nmake.ARM, nmake.AARCH64]
1004+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 1005Index: unload/unload.c
1006===================================================================
1007--- unload/unload.c (revision 64)
1008+++ unload/unload.c (working copy)
1009@@ -66,7 +66,7 @@
1010 NULL,
1011 0,
1012 0,
1013- 0
1014+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1015 }
1016 };
c0004f9c 1017
2bba8d5a
OM		 1018@@ -110,7 +110,7 @@
1019 *DriverName = LibDevicePathToStr (Image->FilePath);
c0004f9c 1020 }
2bba8d5a
OM		 1021 } else {
1022- LibGetDriverName(DriverBindingHandle, Language, DriverName);
1023+ LibGetDriverName(DriverBindingHandle, (CHAR8*)Language, DriverName);
1024 }
c0004f9c 1025
2bba8d5a
OM		 1026 return EFI_SUCCESS;
1027@@ -184,7 +184,7 @@
c0004f9c 1028
2bba8d5a
OM		 1029 DevicePath = NULL;
1030 BestDeviceName = NULL;
1031- Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
1032+ Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
c0004f9c 1033
2bba8d5a
OM		 1034 Print (L"\n");
1035 PrintToken (STRING_TOKEN (STR_UNLOAD_CONTROLLER_NAME), HiiUnloadHandle);
1036@@ -242,14 +242,14 @@
1037 Image = FALSE;
1038 Status = _UnloadGetDriverName (
1039 DriverBindingHandleBuffer[Index],
1040- Language,
1041+ (UINT8*)Language,
1042 FALSE,
1043 &DriverName
1044 );
1045 if (DriverName == NULL) {
1046 Status = _UnloadGetDriverName (
1047 DriverBindingHandleBuffer[Index],
1048- Language,
1049+ (UINT8*)Language,
1050 TRUE,
1051 &DriverName
1052 );
1053@@ -436,7 +436,7 @@
c0004f9c 1054
2bba8d5a
OM		 1055 Status = _UnloadGetDriverName (
1056 Handle,
1057- Language,
1058+ (UINT8*)Language,
1059 FALSE,
1060 &DriverName
1061 );
1062@@ -450,7 +450,7 @@
c0004f9c 1063
2bba8d5a
OM		 1064 Status = _UnloadGetDriverName (
1065 Handle,
1066- Language,
1067+ (UINT8*)Language,
1068 TRUE,
1069 &DriverName
1070 );
1071@@ -628,7 +628,7 @@
c0004f9c 1072
2bba8d5a
OM		 1073 if (Prot->Handles[Index] == Handle) {
1074 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
1075- Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
1076+ Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
1077 if (!EFI_ERROR (Status)) {
1078 if (Verbose) {
1079 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
1080@@ -676,7 +676,7 @@
1081 goto Done;
1082 }
c0004f9c 1083
2bba8d5a
OM		 1084- Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
1085+ Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
1086 if (!EFI_ERROR (Status)) {
1087 PrintToken (STRING_TOKEN (STR_UNLOAD_TWO_VARS_HG_NEW), HiiUnloadHandle, ProtocolBuffer[Index1], Interface);
c0004f9c 1088 }
2bba8d5a
OM		 1089Index: unload/unload.h
1090===================================================================
1091--- unload/unload.h (revision 64)
1092+++ unload/unload.h (working copy)
1093@@ -36,3 +36,4 @@
1094 }
c0004f9c 1095
2bba8d5a
OM		 1096 #endif
1097+
1098Index: unload/unload.inf
1099===================================================================
1100--- unload/unload.inf (revision 64)
1101+++ unload/unload.inf (working copy)
1102@@ -39,23 +39,23 @@
1103 COMPONENT_TYPE = APPLICATION
c0004f9c 1104
1105 [sources.common]
c0004f9c 1106- ..\ShCommonStrings.uni
1107+ ../ShCommonStrings.uni
2bba8d5a
OM		 1108 UnloadStrings.uni
1109 unload.c
1110
c0004f9c 1111 [includes.common]
1112 .
1113- ..\Inc
1114- ..\Library
1115- $(EDK_SOURCE)\Foundation
1116- $(EDK_SOURCE)\Foundation\Include
1117- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1118- $(EDK_SOURCE)\Foundation\Efi
1119- $(EDK_SOURCE)\Foundation\Efi\Include
1120- $(EDK_SOURCE)\Foundation\FrameWork
1121- $(EDK_SOURCE)\Foundation\FrameWork\Include
1122- $(EDK_SOURCE)\Foundation\Core\Dxe
1123- $(DEST_DIR)\
1124+ ../Inc
1125+ ../Library
1126+ $(EDK_SOURCE)/Foundation
1127+ $(EDK_SOURCE)/Foundation/Include
1128+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1129+ $(EDK_SOURCE)/Foundation/Efi
1130+ $(EDK_SOURCE)/Foundation/Efi/Include
1131+ $(EDK_SOURCE)/Foundation/FrameWork
1132+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1133+ $(EDK_SOURCE)/Foundation/Core/Dxe
1134+ $(DEST_DIR./
1135
1136 [libraries.common]
1137 EfiShellLib
b00c06f0
OM		 1138@@ -70,6 +70,11 @@
1139
1140 [nmake.common]
1141 IMAGE_ENTRY_POINT=InitializeUnload
1142+
1143+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1144 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1145 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1146 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1147+
1148+[nmake.ARM, nmake.AARCH64]
1149+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 1150Index: mode/mode.inf
1151===================================================================
1152--- mode/mode.inf (revision 64)
1153+++ mode/mode.inf (working copy)
1154@@ -40,24 +40,24 @@
c0004f9c 1155
c0004f9c 1156
2bba8d5a
OM		 1157 [sources.common]
1158- ..\ShCommonStrings.uni
1159+ ../ShCommonStrings.uni
1160 ModeStrings.uni
1161 mode.c
1162 mode.h
1163
1164 [includes.common]
1165 .
1166- ..\Inc
1167- ..\Library
1168- $(EDK_SOURCE)\Foundation
1169- $(EDK_SOURCE)\Foundation\Include
1170- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1171- $(EDK_SOURCE)\Foundation\Efi
1172- $(EDK_SOURCE)\Foundation\Efi\Include
1173- $(EDK_SOURCE)\Foundation\FrameWork
1174- $(EDK_SOURCE)\Foundation\FrameWork\Include
1175- $(EDK_SOURCE)\Foundation\Core\Dxe
1176- $(DEST_DIR)\
1177+ ../Inc
1178+ ../Library
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
1187+ $(DEST_DIR./
1188
1189 [libraries.common]
1190 EfiShellLib
b00c06f0
OM		 1191@@ -72,7 +72,11 @@
1192
1193 [nmake.common]
1194 IMAGE_ENTRY_POINT=InitializeMode
1195+
1196+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1197 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1198 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1199 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1200
1201+[nmake.ARM, nmake.AARCH64]
1202+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 1203Index: mode/mode.c
1204===================================================================
1205--- mode/mode.c (revision 64)
1206+++ mode/mode.c (working copy)
1207@@ -53,7 +53,7 @@
1208 NULL,
1209 0,
1210 0,
1211- 0
1212+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1213 }
1214 };
1215
1216Index: mode/mode.h
1217===================================================================
1218--- mode/mode.h (revision 64)
1219+++ mode/mode.h (working copy)
1220@@ -30,3 +30,4 @@
1221 }
1222
1223 #endif
1224+
1225Index: attrib/attrib.inf
1226===================================================================
1227--- attrib/attrib.inf (revision 64)
1228+++ attrib/attrib.inf (working copy)
1229@@ -41,24 +41,24 @@
1230
1231 [sources.common]
1232 AttribStrings.uni
1233- ..\ShCommonStrings.uni
1234+ ../ShCommonStrings.uni
1235 attrib.c
1236 attrib.h
1237
1238
1239 [includes.common]
1240 .
1241- ..\Inc
1242- ..\Library
1243- $(EDK_SOURCE)\Foundation
1244- $(EDK_SOURCE)\Foundation\Include
1245- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1246- $(EDK_SOURCE)\Foundation\Efi
1247- $(EDK_SOURCE)\Foundation\Efi\Include
1248- $(EDK_SOURCE)\Foundation\FrameWork
1249- $(EDK_SOURCE)\Foundation\FrameWork\Include
1250- $(EDK_SOURCE)\Foundation\Core\Dxe
1251- $(DEST_DIR)\
1252+ ../Inc
1253+ ../Library
1254+ $(EDK_SOURCE)/Foundation
1255+ $(EDK_SOURCE)/Foundation/Include
1256+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1257+ $(EDK_SOURCE)/Foundation/Efi
1258+ $(EDK_SOURCE)/Foundation/Efi/Include
1259+ $(EDK_SOURCE)/Foundation/FrameWork
1260+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1261+ $(EDK_SOURCE)/Foundation/Core/Dxe
1262+ $(DEST_DIR./
1263
1264 [libraries.common]
1265 EfiShellLib
b00c06f0
OM		 1266@@ -73,7 +73,11 @@
1267
1268 [nmake.common]
1269 IMAGE_ENTRY_POINT=InitializeAttrib
1270+
1271+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1272 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1273 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1274 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1275
1276+[nmake.ARM, nmake.AARCH64]
1277+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 1278Index: attrib/attrib.c
1279===================================================================
1280--- attrib/attrib.c (revision 64)
1281+++ attrib/attrib.c (working copy)
1282@@ -57,7 +57,7 @@
1283 //
1284 // Global Variables
1285 //
c0004f9c 1286-EFI_HII_HANDLE HiiHandle;
1287+STATIC EFI_HII_HANDLE HiiHandle;
2bba8d5a
OM		 1288 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
1289 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
1290 {
1291@@ -124,7 +124,7 @@
1292 NULL,
1293 0,
1294 0,
1295- 0
1296+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1297 }
1298 };
c0004f9c 1299
2bba8d5a
OM		 1300@@ -438,7 +438,7 @@
1301 //
1302 Info = Arg->Info;
1303 if (Add || Remove) {
1304- Info->Attribute = Info->Attribute & (~Remove) | Add;
1305+ Info->Attribute = (Info->Attribute & (~Remove)) | Add;
1306 Status = Arg->Handle->SetInfo (
1307 Arg->Handle,
1308 &gEfiFileInfoGuid,
1309Index: attrib/attrib.h
1310===================================================================
1311--- attrib/attrib.h (revision 64)
1312+++ attrib/attrib.h (working copy)
1313@@ -29,4 +29,5 @@
1314 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \
1315 }
c0004f9c 1316
2bba8d5a
OM		 1317-#endif
1318\ No newline at end of file
1319+#endif
c0004f9c 1320+
2bba8d5a
OM		 1321Index: err/err.inf
1322===================================================================
1323--- err/err.inf (revision 64)
1324+++ err/err.inf (working copy)
1325@@ -25,7 +25,7 @@
1326 COMPONENT_TYPE = APPLICATION
c0004f9c 1327
2bba8d5a
OM		 1328 [sources.common]
1329-..\ShCommonStrings.uni
1330+../ShCommonStrings.uni
1331 ErrStrings.uni
1332 err.c
1333 err.h
1334@@ -33,17 +33,17 @@
1335
1336 [includes.common]
1337 .
1338- ..\Inc
1339- ..\Library
1340- $(EDK_SOURCE)\Foundation
1341- $(EDK_SOURCE)\Foundation\Include
1342- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1343- $(EDK_SOURCE)\Foundation\Efi
1344- $(EDK_SOURCE)\Foundation\Efi\Include
1345- $(EDK_SOURCE)\Foundation\FrameWork
1346- $(EDK_SOURCE)\Foundation\FrameWork\Include
1347- $(EDK_SOURCE)\Foundation\Core\Dxe
1348- $(DEST_DIR)\
1349+ ../Inc
1350+ ../Library
1351+ $(EDK_SOURCE)/Foundation
1352+ $(EDK_SOURCE)/Foundation/Include
1353+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1354+ $(EDK_SOURCE)/Foundation/Efi
1355+ $(EDK_SOURCE)/Foundation/Efi/Include
1356+ $(EDK_SOURCE)/Foundation/FrameWork
1357+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1358+ $(EDK_SOURCE)/Foundation/Core/Dxe
1359+ $(DEST_DIR./
1360
1361 [libraries.common]
1362 EfiShellLib
b00c06f0
OM		 1363@@ -63,11 +63,14 @@
1364 # we will specify some additional DEFINEs on the compile command line.
1365 #
1366 [nmake.common]
1367+ IMAGE_ENTRY_POINT=InitializeError
1368+
1369+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1370 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
1371- IMAGE_ENTRY_POINT=InitializeError
1372 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1373 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1374 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1375
1376-
1377+[nmake.ARM, nmake.AARCH64]
1378+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1379
1380\ No newline at end of file
2bba8d5a
OM		 1381Index: err/DebugMask.h
1382===================================================================
1383--- err/DebugMask.h (revision 64)
1384+++ err/DebugMask.h (working copy)
1385@@ -67,3 +67,4 @@
1386 extern EFI_GUID gEfiDebugMaskProtocolGuid;
1387
1388 #endif
c0004f9c 1389+
2bba8d5a
OM		 1390Index: err/err.c
1391===================================================================
1392--- err/err.c (revision 64)
1393+++ err/err.c (working copy)
1394@@ -35,7 +35,7 @@
1395 //
1396 // Global Variables
1397 //
1398-EFI_HII_HANDLE HiiHandle;
1399+STATIC EFI_HII_HANDLE HiiHandle;
1400 EFI_GUID EfiErrGuid = EFI_ERR_GUID;
1401 SHELL_VAR_CHECK_ITEM ErrCheckList[] = {
1402 {
1403@@ -60,7 +60,7 @@
1404 NULL,
1405 0,
1406 0,
1407- 0
1408+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1409 }
1410 };
c0004f9c 1411
2bba8d5a
OM		 1412@@ -149,7 +149,7 @@
1413 EFI_DEBUG_MASK_PROTOCOL *dmp;
1414 UINTN Mask;
1415
1416- Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp);
1417+ Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1418 if (!EFI_ERROR (Status)) {
1419 Status = dmp->GetDebugMask (dmp, &Mask);
1420 if (!EFI_ERROR (Status)) {
1421@@ -170,13 +170,11 @@
1422 UINTN HandleNum;
1423 UINTN Index;
1424 UINTN DrvHandle;
1425- BOOLEAN Found;
1426
1427 HandleBuf = NULL;
1428 HandleNum = 0;
1429 DrvHandle = 0;
1430 Status = EFI_SUCCESS;
1431- Found = FALSE;
1432
1433 if (NULL != Handle) {
1434 DrvHandle = (UINTN) StrToUIntegerBase (Handle, 16, &Status) - 1;
1435@@ -278,7 +276,7 @@
1436 goto Done;
1437 }
1438
1439- Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp);
1440+ Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
c0004f9c 1441 if (EFI_ERROR (Status)) {
2bba8d5a
OM		 1442 PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1);
1443 goto Done;
1444@@ -336,7 +334,7 @@
1445 }
1446
1447 for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) {
1448- Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp);
1449+ Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
1450 Status = dmp->SetDebugMask (dmp, Msk);
1451 }
1452
1453Index: err/err.h
1454===================================================================
1455--- err/err.h (revision 64)
1456+++ err/err.h (working copy)
1457@@ -29,4 +29,4 @@
1458 0xdaab229b, 0x7883, 0x4f5f, 0xac, 0x6e, 0x15, 0x20, 0xc7, 0xe7, 0x8f, 0xd4 \
c0004f9c 1459 }
2bba8d5a
OM		 1460
1461-#endif
1462\ No newline at end of file
1463+#endif
1464Index: EfiDecompress/Decompress.inf
1465===================================================================
1466--- EfiDecompress/Decompress.inf (revision 64)
1467+++ EfiDecompress/Decompress.inf (working copy)
1468@@ -25,7 +25,7 @@
c0004f9c 1469 COMPONENT_TYPE = APPLICATION
1470
1471 [sources.common]
2bba8d5a
OM		 1472-..\ShCommonStrings.uni
1473+../ShCommonStrings.uni
1474 DecompressStrings.uni
1475 decompress.c
1476 decompress.h
1477@@ -33,17 +33,17 @@
c0004f9c 1478
1479 [includes.common]
2bba8d5a 1480 .
c0004f9c 1481- ..\Inc
1482- ..\Library
c0004f9c 1483- $(EDK_SOURCE)\Foundation
c0004f9c 1484- $(EDK_SOURCE)\Foundation\Include
1485- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2bba8d5a
OM		 1486- $(EDK_SOURCE)\Foundation\Efi
1487- $(EDK_SOURCE)\Foundation\Efi\Include
c0004f9c 1488- $(EDK_SOURCE)\Foundation\FrameWork
1489- $(EDK_SOURCE)\Foundation\FrameWork\Include
1490- $(EDK_SOURCE)\Foundation\Core\Dxe
c0004f9c 1491- $(DEST_DIR)\
1492+ ../Inc
1493+ ../Library
c0004f9c 1494+ $(EDK_SOURCE)/Foundation
c0004f9c 1495+ $(EDK_SOURCE)/Foundation/Include
1496+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2bba8d5a
OM		 1497+ $(EDK_SOURCE)/Foundation/Efi
1498+ $(EDK_SOURCE)/Foundation/Efi/Include
c0004f9c 1499+ $(EDK_SOURCE)/Foundation/FrameWork
1500+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1501+ $(EDK_SOURCE)/Foundation/Core/Dxe
c0004f9c 1502+ $(DEST_DIR./
1503
1504 [libraries.common]
1505 EfiShellLib
b00c06f0
OM		 1506@@ -63,11 +63,14 @@
1507 # we will specify some additional DEFINEs on the compile command line.
1508 #
1509 [nmake.common]
1510+ IMAGE_ENTRY_POINT=InitializeDecompress
1511+
1512+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
1513 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
1514- IMAGE_ENTRY_POINT=InitializeDecompress
1515 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1516 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1517 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1518
1519-
1520-
1521+[nmake.ARM, nmake.AARCH64]
1522+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1523+
1524\ No newline at end of file
2bba8d5a
OM		 1525Index: EfiDecompress/Decompress.c
1526===================================================================
1527--- EfiDecompress/Decompress.c (revision 64)
1528+++ EfiDecompress/Decompress.c (working copy)
1529@@ -22,7 +22,7 @@
1530 --*/
c0004f9c 1531
2bba8d5a
OM		 1532 #include "EfiShellLib.h"
1533-#include "decompress.h"
1534+#include "Decompress.h"
c0004f9c 1535
2bba8d5a 1536 extern UINT8 STRING_ARRAY_NAME[];
c0004f9c 1537
2bba8d5a
OM		 1538@@ -31,7 +31,7 @@
1539 //
1540 #include STRING_DEFINES_FILE
c0004f9c 1541
2bba8d5a
OM		 1542-#include EFI_PROTOCOL_DEFINITION (decompress)
1543+#include EFI_PROTOCOL_DEFINITION (Decompress)
c0004f9c 1544
2bba8d5a
OM		 1545 EFI_HII_HANDLE HiiDecompressHandle;
1546 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
1547@@ -52,7 +52,7 @@
1548 NULL,
1549 0,
1550 0,
1551- 0
1552+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1553 }
1554 };
c0004f9c 1555
2bba8d5a
OM		 1556@@ -192,7 +192,7 @@
1557 //
1558 //
1559 //
1560- Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
1561+ Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
1562 if (EFI_ERROR (Status)) {
1563 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
1564 Status = EFI_UNSUPPORTED;
1565Index: EfiDecompress/Decompress.h
1566===================================================================
1567--- EfiDecompress/Decompress.h (revision 64)
1568+++ EfiDecompress/Decompress.h (working copy)
1569@@ -29,4 +29,4 @@
1570 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
1571 }
c0004f9c 1572
2bba8d5a
OM		 1573-#endif
1574\ No newline at end of file
1575+#endif
1576Index: hexedit/libStatusBar.c
1577===================================================================
1578--- hexedit/libStatusBar.c (revision 64)
1579+++ hexedit/libStatusBar.c (working copy)
1580@@ -173,6 +173,7 @@
1581 // back up the screen attributes
1582 //
1583 Orig = HMainEditor.ColorAttributes;
1584+ New.Data = 0;
1585 New.Colors.Foreground = Orig.Colors.Background;
1586 New.Colors.Background = Orig.Colors.Foreground;
1587
1588Index: hexedit/libtitlebar.h
1589===================================================================
1590--- hexedit/libtitlebar.h (revision 64)
1591+++ hexedit/libtitlebar.h (working copy)
1592@@ -46,3 +46,4 @@
1593 );
c0004f9c 1594
2bba8d5a
OM		 1595 #endif
1596+
1597Index: hexedit/heditor.h
1598===================================================================
1599--- hexedit/heditor.h (revision 64)
1600+++ hexedit/heditor.h (working copy)
1601@@ -39,7 +39,7 @@
1602 #include "libinputbar.h"
1603 #include "libmenubar.h"
c0004f9c 1604
2bba8d5a
OM		 1605-#include "libmisc.h"
1606+#include "libMisc.h"
1607
1608 #include "libclipboard.h"
1609
1610@@ -52,9 +52,10 @@
1611 extern BOOLEAN HEditorFirst;
1612 extern BOOLEAN HEditorExit;
1613
1614-extern EFI_HII_HANDLE HiiHandle;
1615+extern EFI_HII_HANDLE gHexEditHiiHandle;
1616 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
1617 extern EFI_HII_PROTOCOL *Hii;
1618 #endif
1619
1620 #endif // _HEDITOR_H
c0004f9c 1621+
2bba8d5a
OM		 1622Index: hexedit/libBufferImage.c
1623===================================================================
1624--- hexedit/libBufferImage.c (revision 64)
1625+++ hexedit/libBufferImage.c (working copy)
1626@@ -203,6 +203,9 @@
1627 case MEM_BUFFER:
1628 HMemImageBackup ();
1629 break;
c0004f9c 1630+
2bba8d5a
OM		 1631+ case NO_BUFFER:
1632+ break;
1633 }
1634
1635 return EFI_SUCCESS;
1636@@ -587,7 +590,7 @@
1637 UINT8 Value;
1638 BOOLEAN HighBits;
1639
1640- Line = NULL;
1641+ Line = NULL;
1642 if (HMainEditor.MouseSupported) {
1643
1644 if (HBufferImageMouseNeedRefresh) {
1645@@ -610,6 +613,7 @@
1646 // backup the old screen attributes
1647 //
1648 Orig = HMainEditor.ColorAttributes;
1649+ New.Data = 0;
1650 New.Colors.Foreground = Orig.Colors.Background;
1651 New.Colors.Background = Orig.Colors.Foreground;
1652
1653@@ -801,10 +805,10 @@
1654 UINTN StartRow;
1655 UINTN EndRow;
1656 UINTN FStartRow;
1657- UINTN FEndRow;
1658 UINTN Tmp;
1659
1660 Orig = HMainEditor.ColorAttributes;
1661+ New.Data = 0;
1662 New.Colors.Foreground = Orig.Colors.Background;
1663 New.Colors.Background = Orig.Colors.Foreground;
1664
1665@@ -870,7 +874,6 @@
1666 }
1667
1668 FStartRow = StartRow;
1669- FEndRow = EndRow;
1670
1671 StartRow = TEXT_START_ROW + StartRow - HBufferImage.LowVisibleRow;
1672 EndRow = TEXT_START_ROW + EndRow - HBufferImage.LowVisibleRow;
1673@@ -980,6 +983,10 @@
1674 case MEM_BUFFER:
1675 Status = HMemImageRead (MemOffset, MemSize, Recover);
1676 break;
c0004f9c 1677+
2bba8d5a
OM		 1678+ case NO_BUFFER:
1679+ Status = EFI_UNSUPPORTED;
1680+ break;
1681 }
c0004f9c 1682
2bba8d5a
OM		 1683 if (EFI_ERROR (Status)) {
1684@@ -1030,6 +1037,10 @@
1685 case MEM_BUFFER:
1686 Status = HMemImageSave (MemOffset, MemSize);
1687 break;
1688+
1689+ case NO_BUFFER:
1690+ Status = EFI_UNSUPPORTED;
1691+ break;
1692 }
c0004f9c 1693
2bba8d5a
OM		 1694 if (EFI_ERROR (Status)) {
1695@@ -1967,14 +1978,11 @@
c0004f9c 1696
2bba8d5a
OM		 1697 --*/
1698 {
1699- HEFI_EDITOR_LINE *Line;
1700 UINTN FRow;
1701 UINTN FCol;
1702 UINTN Gap;
1703 INTN Retreat;
c0004f9c 1704
2bba8d5a
OM		 1705- Line = HBufferImage.CurrentLine;
1706-
1707 FRow = HBufferImage.BufferPosition.Row;
1708 FCol = HBufferImage.BufferPosition.Column;
c0004f9c 1709
2bba8d5a
OM		 1710@@ -1996,7 +2004,7 @@
1711 //
1712 // get correct line
1713 //
1714- Line = HMoveLine (Retreat);
1715+ HMoveLine (Retreat);
c0004f9c 1716
2bba8d5a 1717 FRow -= Gap;
c0004f9c 1718
2bba8d5a 1719@@ -2025,13 +2033,10 @@
c0004f9c 1720
2bba8d5a
OM		 1721 --*/
1722 {
1723- HEFI_EDITOR_LINE *Line;
1724 UINTN FRow;
1725 UINTN FCol;
1726 BOOLEAN HighBits;
c0004f9c 1727
2bba8d5a
OM		 1728- Line = HBufferImage.CurrentLine;
1729-
1730 //
1731 // curosr will at the high bit
1732 //
1733@@ -2157,7 +2162,6 @@
c0004f9c 1734
2bba8d5a
OM		 1735 HEFI_EDITOR_LINE *Line;
1736 EFI_LIST_ENTRY *Link;
1737- UINTN StartRow;
c0004f9c 1738
2bba8d5a
OM		 1739 UINTN OldFCol;
1740 UINTN OldFRow;
1741@@ -2167,11 +2171,6 @@
c0004f9c 1742
2bba8d5a 1743 EFI_STATUS Status;
c0004f9c 1744
2bba8d5a
OM		 1745- //
1746- // get the line that start position is at
1747- //
1748- StartRow = Pos / 0x10;
c0004f9c 1749-
2bba8d5a 1750 Size = HBufferImageGetTotalSize ();
c0004f9c 1751
2bba8d5a
OM		 1752 if (Size < Count) {
1753@@ -2300,7 +2299,6 @@
1754 HEFI_EDITOR_LINE *Line;
c0004f9c 1755
2bba8d5a
OM		 1756 EFI_LIST_ENTRY *Link;
1757- UINTN StartRow;
c0004f9c 1758
2bba8d5a
OM		 1759 UINTN OldFCol;
1760 UINTN OldFRow;
1761@@ -2308,11 +2306,6 @@
c0004f9c 1762
2bba8d5a 1763 UINTN NewPos;
c0004f9c 1764
2bba8d5a
OM		 1765- //
1766- // get the line that start position is at
1767- //
1768- StartRow = Pos / 0x10;
1769-
1770 Size = HBufferImageGetTotalSize ();
c0004f9c 1771
2bba8d5a
OM		 1772 //
1773Index: hexedit/libstatusbar.h
1774===================================================================
1775--- hexedit/libstatusbar.h (revision 64)
1776+++ hexedit/libstatusbar.h (working copy)
1777@@ -55,3 +55,4 @@
1778 );
c0004f9c 1779
2bba8d5a
OM		 1780 #endif
1781+
1782Index: hexedit/heditortype.h
1783===================================================================
1784--- hexedit/heditortype.h (revision 64)
1785+++ hexedit/heditortype.h (working copy)
1786@@ -30,7 +30,7 @@
1787 #define EDITOR_NAME L"EFI Hex Editor\0"
1788 #define EDITOR_VERSION L"0.99\0"
1789
1790-#define EFI_EDITOR_LINE_LIST 'eell'
1791+#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
1792
1793 #define FILE_ATTRIBUTES EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE
1794 #define FILE_READ_WRITE EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE
1795@@ -147,8 +147,8 @@
1796 } HEFI_EDITOR_MENU_ITEM;
1797
1798 typedef struct {
1799- UINT32 Foreground : 4;
1800- UINT32 Background : 4;
1801+ UINT8 Foreground : 4;
1802+ UINT8 Background : 4;
1803 } HEFI_EDITOR_COLOR_ATTRIBUTES;
1804
1805 typedef union {
1806@@ -251,3 +251,4 @@
1807 } HEFI_EDITOR_GLOBAL_EDITOR;
1808
1809 #endif
1810+
1811Index: hexedit/libMemImage.c
1812===================================================================
1813--- hexedit/libMemImage.c (revision 64)
1814+++ hexedit/libMemImage.c (working copy)
1815@@ -91,7 +91,7 @@
1816 Status = BS->LocateProtocol (
1817 &gEfiPciRootBridgeIoProtocolGuid,
1818 NULL,
1819- &HMemImage.IoFncs
1820+ (VOID**)&HMemImage.IoFncs
1821 );
1822 if (Status == EFI_NOT_FOUND) {
1823 //
1824@@ -225,9 +225,6 @@
1825 CHAR16 *Str;
1826 HEFI_EDITOR_LINE *Line;
1827
1828- HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
c0004f9c 1829-
2bba8d5a
OM		 1830- BufferTypeBackup = HBufferImage.BufferType;
1831 HBufferImage.BufferType = MEM_BUFFER;
1832
1833 Buffer = AllocatePool (Size);
1834@@ -344,8 +341,6 @@
1835 EFI_STATUS Status;
1836 VOID *Buffer;
1837
1838- HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
c0004f9c 1839-
2bba8d5a
OM		 1840 //
1841 // not modified, so directly return
1842 //
1843@@ -353,7 +348,6 @@
1844 return EFI_SUCCESS;
1845 }
1846
1847- BufferTypeBackup = HBufferImage.BufferType;
1848 HBufferImage.BufferType = MEM_BUFFER;
1849
1850 Buffer = AllocatePool (Size);
1851Index: hexedit/libbufferimage.h
1852===================================================================
1853--- hexedit/libbufferimage.h (revision 64)
1854+++ hexedit/libbufferimage.h (working copy)
1855@@ -253,3 +253,4 @@
1856 );
1857
1858 #endif
1859+
1860Index: hexedit/libInputBar.c
1861===================================================================
1862--- hexedit/libInputBar.c (revision 64)
1863+++ hexedit/libInputBar.c (working copy)
1864@@ -169,8 +169,6 @@
1865 UINTN Size;
1866 EFI_STATUS Status;
1867 BOOLEAN NoDisplay;
1868- UINTN Limit;
1869- UINTN PromptLen;
1870
1871 //
1872 // variable initialization
1873@@ -190,6 +188,7 @@
1874 // back up the old screen attributes
1875 //
1876 Orig = HMainEditor.ColorAttributes;
1877+ New.Data = 0;
1878 New.Colors.Foreground = Orig.Colors.Background;
1879 New.Colors.Background = Orig.Colors.Foreground;
1880
1881@@ -201,15 +200,9 @@
1882 HEditorClearLine (INPUT_BAR_LOCATION);
1883
1884 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
1885- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
1886+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
1887
1888 //
1889- // that's the maximum input length that can be displayed on screen
1890- //
1891- PromptLen = StrLen (HMainInputBar.Prompt);
1892- Limit = HMainEditor.ScreenSize.Column - PromptLen;
c0004f9c 1893-
2bba8d5a
OM		 1894- //
1895 // this is a selection prompt, cursor will stay in edit area
1896 // actually this is for search , search/replace
1897 //
1898Index: hexedit/libmemimage.h
1899===================================================================
1900--- hexedit/libmemimage.h (revision 64)
1901+++ hexedit/libmemimage.h (working copy)
1902@@ -55,3 +55,4 @@
1903 );
1904
1905 #endif
c0004f9c 1906+
2bba8d5a
OM		 1907Index: hexedit/libEditor.c
1908===================================================================
1909--- hexedit/libEditor.c (revision 64)
1910+++ hexedit/libEditor.c (working copy)
1911@@ -20,7 +20,7 @@
1912
1913 --*/
1914
1915-#include "Heditor.h"
1916+#include "heditor.h"
1917
1918 HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
1919 INTN HOriginalMode;
1920@@ -136,7 +136,7 @@
1921 Status = BS->HandleProtocol (
1922 In,
1923 &gEfiSimplePointerProtocolGuid,
1924- &HMainEditor.MouseInterface
1925+ (VOID**)&HMainEditor.MouseInterface
1926 );
1927 if (EFI_ERROR (Status)) {
1928 //
1929@@ -159,7 +159,7 @@
1930 Status = BS->HandleProtocol (
1931 HandleBuffer[Index],
1932 &gEfiSimplePointerProtocolGuid,
1933- &HMainEditor.MouseInterface
1934+ (VOID**)&HMainEditor.MouseInterface
1935 );
1936 if (!EFI_ERROR (Status)) {
1937 break;
1938@@ -182,37 +182,37 @@
1939 //
1940 Status = HMainTitleBarInit ();
1941 if (EFI_ERROR (Status)) {
1942- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
1943+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
1944 return EFI_LOAD_ERROR;
1945 }
1946
1947 Status = HMainMenuBarInit ();
1948 if (EFI_ERROR (Status)) {
1949- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
1950+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
1951 return EFI_LOAD_ERROR;
1952 }
1953
1954 Status = HMainStatusBarInit ();
1955 if (EFI_ERROR (Status)) {
1956- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
1957+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
1958 return EFI_LOAD_ERROR;
1959 }
1960
1961 Status = HMainInputBarInit ();
1962 if (EFI_ERROR (Status)) {
1963- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
1964+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
1965 return EFI_LOAD_ERROR;
1966 }
1967
1968 Status = HBufferImageInit ();
1969 if (EFI_ERROR (Status)) {
1970- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
1971+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
1972 return EFI_LOAD_ERROR;
1973 }
1974
1975 Status = HClipBoardInit ();
1976 if (EFI_ERROR (Status)) {
1977- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
1978+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
1979 return EFI_LOAD_ERROR;
1980 }
1981 //
1982@@ -259,32 +259,32 @@
1983 //
1984 Status = HMainTitleBarCleanup ();
1985 if (EFI_ERROR (Status)) {
1986- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
1987+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
1988 }
1989
1990 Status = HMainMenuBarCleanup ();
1991 if (EFI_ERROR (Status)) {
1992- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
1993+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
1994 }
1995
1996 Status = HMainStatusBarCleanup ();
1997 if (EFI_ERROR (Status)) {
1998- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
1999+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
2000 }
2001
2002 Status = HMainInputBarCleanup ();
2003 if (EFI_ERROR (Status)) {
2004- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
2005+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
2006 }
2007
2008 Status = HBufferImageCleanup ();
2009 if (EFI_ERROR (Status)) {
2010- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
2011+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
2012 }
2013
2014 Status = HClipBoardCleanup ();
2015 if (EFI_ERROR (Status)) {
2016- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
2017+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
2018 }
2019 //
2020 // restore old mode
2021@@ -732,6 +732,9 @@
2022 case MEM_BUFFER:
2023 OldSize = HBufferImage.MemImage->Size;
2024 break;
c0004f9c 2025+
2bba8d5a
OM		 2026+ default:
2027+ break;
2028 }
2029
2030 if (LengthChange == FALSE) {
2031Index: hexedit/libfileimage.h
2032===================================================================
2033--- hexedit/libfileimage.h (revision 64)
2034+++ hexedit/libfileimage.h (working copy)
2035@@ -59,3 +59,4 @@
2036 );
2037
2038 #endif
c0004f9c 2039+
2bba8d5a
OM		 2040Index: hexedit/libinputbar.h
2041===================================================================
2042--- hexedit/libinputbar.h (revision 64)
2043+++ hexedit/libinputbar.h (working copy)
2044@@ -44,3 +44,4 @@
2045 );
2046
2047 #endif
2048+
2049Index: hexedit/libMenuBar.c
2050===================================================================
2051--- hexedit/libMenuBar.c (revision 64)
2052+++ hexedit/libMenuBar.c (working copy)
2053@@ -222,7 +222,6 @@
2054 CHAR16 *NameString;
2055 CHAR16 *FunctionKeyString;
2056 UINTN BufferSize;
2057- EFI_STATUS Status;
2058
2059 //
2060 // variable initialization
2061@@ -255,9 +254,9 @@
2062 FunctionKeyString = AllocatePool (BufferSize);
2063
2064 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2065- Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2066+ Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2067 #else
2068- Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
2069+ LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
2070 #endif
2071
2072 Width = max ((StrLen (NameString) + 6), 18);
2073@@ -267,9 +266,9 @@
2074 }
2075
2076 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2077- Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2078+ Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2079 #else
2080- Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2081+ LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2082 #endif
2083 if (Index >= 10) {
2084 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
2085@@ -1138,7 +1137,6 @@
2086 // the file won't be saved
2087 //
2088 return EFI_SUCCESS;
2089- break;
2090
2091 case L'c':
2092 case L'C':
2093@@ -1567,7 +1565,6 @@
2094 --*/
2095 {
2096 UINTN Index;
2097- HEFI_EDITOR_LINE *Line;
2098 EFI_LIST_ENTRY *Link;
2099 UINT8 *Buffer;
2100 UINTN Count;
2101@@ -1592,8 +1589,6 @@
2102 Link = Link->Flink;
2103 }
2104
2105- Line = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);
c0004f9c 2106-
2bba8d5a
OM		 2107 Count = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;
2108 Buffer = AllocatePool (Count);
2109 if (Buffer == NULL) {
2110Index: hexedit/libeditor.h
2111===================================================================
2112--- hexedit/libeditor.h (revision 64)
2113+++ hexedit/libeditor.h (working copy)
2114@@ -47,3 +47,4 @@
2115 );
2116
2117 #endif
2118+
2119Index: hexedit/hexedit.inf
2120===================================================================
2121--- hexedit/hexedit.inf (revision 64)
2122+++ hexedit/hexedit.inf (working copy)
2123@@ -25,7 +25,7 @@
2124 COMPONENT_TYPE = APPLICATION
2125
2126 [sources.common]
2127- ..\ShCommonStrings.uni
2128+ ../ShCommonStrings.uni
2129 HexeditStrings.uni
2130 heditor.h
2131 heditortype.h
2132@@ -45,17 +45,17 @@
2133
2134 [includes.common]
2135 .
2136- ..\Inc
2137- ..\Library
2138- $(EDK_SOURCE)\Foundation
2139- $(EDK_SOURCE)\Foundation\Include
2140- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2141- $(EDK_SOURCE)\Foundation\Efi
2142- $(EDK_SOURCE)\Foundation\Efi\Include
2143- $(EDK_SOURCE)\Foundation\FrameWork
2144- $(EDK_SOURCE)\Foundation\FrameWork\Include
2145- $(EDK_SOURCE)\Foundation\Core\Dxe
2146- $(DEST_DIR)\
2147+ ../Inc
2148+ ../Library
2149+ $(EDK_SOURCE)/Foundation
2150+ $(EDK_SOURCE)/Foundation/Include
2151+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2152+ $(EDK_SOURCE)/Foundation/Efi
2153+ $(EDK_SOURCE)/Foundation/Efi/Include
2154+ $(EDK_SOURCE)/Foundation/FrameWork
2155+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2156+ $(EDK_SOURCE)/Foundation/Core/Dxe
2157+ $(DEST_DIR./
2158
2159 [libraries.common]
2160 EfiShellLib
b00c06f0
OM		 2161@@ -75,11 +75,14 @@
2162 # we will specify some additional DEFINEs on the compile command line.
2163 #
2164 [nmake.common]
2165+ IMAGE_ENTRY_POINT=InitializeEFIHexEditor
2166+
2167+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2168 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2169- IMAGE_ENTRY_POINT=InitializeEFIHexEditor
2170 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2171 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2172 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2173
2174-
2175+[nmake.ARM, nmake.AARCH64]
2176+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2177
2178\ No newline at end of file
2bba8d5a
OM		 2179Index: hexedit/libdiskimage.c
2180===================================================================
2181--- hexedit/libdiskimage.c (revision 64)
2182+++ hexedit/libdiskimage.c (working copy)
2183@@ -228,11 +228,7 @@
2184 UINTN Bytes;
2185
2186 HEFI_EDITOR_LINE *Line;
2187- UINT64 ByteOffset;
2188
2189- HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
c0004f9c 2190-
2bba8d5a
OM		 2191- BufferTypeBackup = HBufferImage.BufferType;
2192 HBufferImage.BufferType = DISK_BUFFER;
2193
2194 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
2195@@ -246,7 +242,7 @@
2196 Status = LibDevicePathToInterface (
2197 &gEfiBlockIoProtocolGuid,
2198 DevicePath,
2199- &BlkIo
2200+ (VOID**)&BlkIo
2201 );
2202 if (EFI_ERROR (Status)) {
2203 HMainStatusBarSetStatusString (L"Read Disk Failed");
2204@@ -269,8 +265,6 @@
2205 return EFI_OUT_OF_RESOURCES;
2206 }
2207
2208- ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
2209-
2210 //
2211 // read from disk
2212 //
2213@@ -405,10 +399,6 @@
2214 VOID *Buffer;
2215 UINTN Bytes;
2216
2217- UINT64 ByteOffset;
2218-
2219- HEFI_EDITOR_ACTIVE_BUFFER_TYPE BufferTypeBackup;
2220-
2221 //
2222 // if not modified, directly return
2223 //
2224@@ -416,7 +406,6 @@
2225 return EFI_SUCCESS;
2226 }
2227
2228- BufferTypeBackup = HBufferImage.BufferType;
2229 HBufferImage.BufferType = DISK_BUFFER;
2230
2231 DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) ShellGetMap (DeviceName);
2232@@ -427,7 +416,7 @@
2233 Status = LibDevicePathToInterface (
2234 &gEfiBlockIoProtocolGuid,
2235 DevicePath,
2236- &BlkIo
2237+ (VOID**)&BlkIo
2238 );
2239 if (EFI_ERROR (Status)) {
2240 return Status;
2241@@ -448,8 +437,6 @@
2242 return Status;
2243 }
2244
2245- ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);
2246-
2247 //
2248 // write the buffer to disk
2249 //
2250Index: hexedit/main.c
2251===================================================================
2252--- hexedit/main.c (revision 64)
2253+++ hexedit/main.c (working copy)
2254@@ -27,7 +27,7 @@
2255 //
2256 // Global Variables
2257 //
2258-EFI_HII_HANDLE HiiHandle;
2259+EFI_HII_HANDLE gHexEditHiiHandle;
2260 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2261 EFI_HII_PROTOCOL *Hii;
2262 #endif
2263@@ -67,7 +67,7 @@
2264 NULL,
2265 0,
2266 0,
2267- 0
2268+ (SHELL_VAR_CHECK_FLAG_TYPE)0
2269 }
2270 };
2271
2272@@ -93,10 +93,10 @@
2273 VOID
2274 )
2275 {
2276- PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle);
2277- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle);
2278- PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle);
2279- PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle);
2280+ PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle);
2281+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle);
2282+ PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle);
2283+ PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle);
2284 Print (L"\n\n");
2285 }
2286
2287@@ -147,7 +147,7 @@
2288 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
2289
2290 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
2291- Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
2292+ Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
2293 if (EFI_ERROR (Status)) {
2294 return Status;
2295 }
2296@@ -158,12 +158,12 @@
2297 // Register our string package with HII and return the handle to it.
2298 // If previously registered we will simply receive the handle
2299 //
2300- EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2301+ EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
2302
2303 if (!EFI_PROPER_VERSION (1, 10)) {
2304 PrintToken (
2305 STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT),
2306- HiiHandle,
2307+ gHexEditHiiHandle,
2308 L"hexedit",
2309 EFI_VERSION_1_10
2310 );
2311@@ -187,17 +187,17 @@
2312 switch (RetCode) {
2313 case VarCheckConflict:
2314
2315- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful);
2316+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful);
2317 break;
2318
2319 case VarCheckDuplicate:
2320
2321- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful);
2322+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2323 break;
2324
2325 case VarCheckUnknown:
2326
2327- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful);
2328+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
2329 break;
2330
2331 default:
2332@@ -220,10 +220,10 @@
2333 ChkPck.FlagCount > 2 ||
2334 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
2335 ) {
2336- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2337+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2338 Status = EFI_INVALID_PARAMETER;
2339 } else {
2340- PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle);
2341+ PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle);
2342 Status = EFI_SUCCESS;
2343 }
2344
2345@@ -233,13 +233,13 @@
2346 Item = LibCheckVarGetFlag (&ChkPck, L"-d");
2347 if (Item) {
2348 if (3 < ChkPck.ValueCount) {
2349- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2350+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2351 Status = EFI_INVALID_PARAMETER;
2352 goto done;
2353 }
2354
2355 if (3 > ChkPck.ValueCount) {
2356- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2357+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2358 Status = EFI_INVALID_PARAMETER;
2359 goto done;
2360 }
2361@@ -249,7 +249,7 @@
2362 Item = Item->Next;
2363 Result = HXtoi (Item->VarStr, &Offset);
2364 if (EFI_ERROR (Result)) {
2365- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2366+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2367 Status = EFI_INVALID_PARAMETER;
2368 goto done;
2369 }
2370@@ -257,13 +257,13 @@
2371 Item = Item->Next;
2372 Result = HXtoi (Item->VarStr, &Size);
2373 if (EFI_ERROR (Result)) {
2374- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2375+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2376 Status = EFI_INVALID_PARAMETER;
2377 goto done;
2378 }
2379
2380 if (Offset < 0 || Size <= 0) {
2381- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2382+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2383 Status = EFI_INVALID_PARAMETER;
2384 goto done;
2385 }
2386@@ -274,13 +274,13 @@
2387 Item = LibCheckVarGetFlag (&ChkPck, L"-m");
2388 if (Item) {
2389 if (2 < ChkPck.ValueCount) {
2390- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2391+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2392 Status = EFI_INVALID_PARAMETER;
2393 goto done;
2394 }
2395
2396 if (2 > ChkPck.ValueCount) {
2397- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2398+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2399 Status = EFI_INVALID_PARAMETER;
2400 goto done;
2401 }
2402@@ -288,7 +288,7 @@
2403 Item = ChkPck.VarList;
2404 Result = HXtoi (Item->VarStr, &Offset);
2405 if (EFI_ERROR (Result)) {
2406- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2407+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2408 Status = EFI_INVALID_PARAMETER;
2409 goto done;
2410 }
2411@@ -296,20 +296,20 @@
2412 Item = Item->Next;
2413 Result = HXtoi (Item->VarStr, &Size);
2414 if (EFI_ERROR (Result)) {
2415- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2416+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2417 Status = EFI_INVALID_PARAMETER;
2418 goto done;
2419 }
2420
2421 if (Offset < 0 || Size <= 0) {
2422- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2423+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2424 Status = EFI_INVALID_PARAMETER;
2425 goto done;
2426 }
2427
2428 LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1;
2429 if (LastOffset > 0xffffffff) {
2430- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
2431+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
2432 goto done;
2433 }
2434
2435@@ -319,13 +319,13 @@
2436 Item = LibCheckVarGetFlag (&ChkPck, L"-f");
2437 if (Item) {
2438 if (1 < ChkPck.ValueCount) {
2439- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2440+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2441 Status = EFI_INVALID_PARAMETER;
2442 goto done;
2443 }
2444
2445 if (1 > ChkPck.ValueCount) {
2446- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
2447+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
2448 Status = EFI_INVALID_PARAMETER;
2449 goto done;
2450 }
2451@@ -333,7 +333,7 @@
2452 Item = ChkPck.VarList;
2453 Name = Item->VarStr;
2454 if (!HIsValidFileName (Name)) {
2455- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2456+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2457 Status = EFI_INVALID_PARAMETER;
2458 goto done;
2459 }
2460@@ -345,20 +345,20 @@
2461 if (Name != NULL) {
2462 FreeName = TRUE;
2463 } else {
2464- PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), HiiHandle, L"hexedit");
2465+ PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), gHexEditHiiHandle, L"hexedit");
2466 Status = EFI_INVALID_PARAMETER;
2467 goto done ;
2468 }
2469 } else if (1 == ChkPck.ValueCount) {
2470 Name = ChkPck.VarList->VarStr;
2471 } else {
2472- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
2473+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
2474 Status = EFI_INVALID_PARAMETER;
2475 goto done;
2476 }
2477
2478 if (!HIsValidFileName (Name)) {
2479- PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
2480+ PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
2481 Status = EFI_INVALID_PARAMETER;
2482 goto done;
2483 }
2484@@ -367,7 +367,7 @@
2485 }
2486
2487 if (SI->RedirArgc != 0) {
2488- PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle);
2489+ PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle);
2490 Status = EFI_INVALID_PARAMETER;
2491 goto done;
2492 }
2493@@ -376,7 +376,7 @@
2494 if (EFI_ERROR (Status)) {
2495 Out->ClearScreen (Out);
2496 Out->EnableCursor (Out, TRUE);
2497- PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle);
2498+ PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle);
2499 goto done;
2500 }
2501
2502@@ -421,7 +421,9 @@
2503 FALSE
2504 );
2505 break;
2506-
2507+ case NEW_FILE:
2508+ Status = EFI_UNSUPPORTED;
2509+ break;
2510 }
2511
2512 if (!EFI_ERROR (Status)) {
2513@@ -453,19 +455,19 @@
2514 //
2515 if (Status == EFI_SUCCESS) {
2516 } else if (Status == EFI_OUT_OF_RESOURCES) {
2517- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit");
2518+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit");
2519 } else {
2520 if (Buffer != NULL) {
2521 if (StrCmp (Buffer, L"") != 0) {
2522 //
2523 // print out the status string
2524 //
2525- PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer);
2526+ PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer);
2527 } else {
2528- PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2529+ PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2530 }
2531 } else {
2532- PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
2533+ PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
2534 }
2535 }
2536
2537Index: hexedit/libmenubar.h
2538===================================================================
2539--- hexedit/libmenubar.h (revision 64)
2540+++ hexedit/libmenubar.h (working copy)
2541@@ -20,7 +20,7 @@
2542 #ifndef _LIB_MENU_BAR_H_
2543 #define _LIB_MENU_BAR_H_
2544
2545-#include "Heditortype.h"
2546+#include "heditortype.h"
2547
2548 EFI_STATUS
2549 HMainMenuBarInit (
2550@@ -94,3 +94,4 @@
2551 );
2552
2553 #endif
2554+
2555Index: hexedit/libMisc.h
2556===================================================================
2557--- hexedit/libMisc.h (revision 64)
2558+++ hexedit/libMisc.h (working copy)
2559@@ -20,7 +20,7 @@
2560 #ifndef _LIB_MISC_H_
2561 #define _LIB_MISC_H_
2562
2563-#include "Heditortype.h"
2564+#include "heditortype.h"
2565
2566 VOID
2567 HEditorClearLine (
2568@@ -108,3 +108,4 @@
2569 );
2570
2571 #endif
2572+
2573Index: hexedit/libdiskimage.h
2574===================================================================
2575--- hexedit/libdiskimage.h (revision 64)
2576+++ hexedit/libdiskimage.h (working copy)
2577@@ -58,3 +58,4 @@
2578 );
2579
2580 #endif
2581+
2582Index: hexedit/libclipboard.h
2583===================================================================
2584--- hexedit/libclipboard.h (revision 64)
2585+++ hexedit/libclipboard.h (working copy)
2586@@ -43,3 +43,4 @@
2587 );
2588
2589 #endif
2590+
2591Index: hexedit/libTitleBar.c
2592===================================================================
2593--- hexedit/libTitleBar.c (revision 64)
2594+++ hexedit/libTitleBar.c (working copy)
2595@@ -166,6 +166,7 @@
2596 // backup the old screen attributes
2597 //
2598 Orig = HMainEditor.ColorAttributes;
2599+ New.Data = 0;
2600 New.Colors.Foreground = Orig.Colors.Background;
2601 New.Colors.Background = Orig.Colors.Foreground;
2602
2603@@ -212,7 +213,7 @@
2604 // the space for file name is 35 characters
2605 //
2606 if (StrLen (FileNameTmp) <= 35) {
2607- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp);
2608+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp);
2609
2610 for (Index = StrLen (FileNameTmp); Index < 35; Index++) {
2611 Print (L" ");
2612@@ -220,7 +221,7 @@
2613
2614 } else {
2615 for (Index = 0; Index < 32; Index++) {
2616- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]);
2617+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]);
2618 }
2619 //
2620 // print "..."
2621@@ -234,14 +235,14 @@
2622 if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) {
2623 PrintToken (
2624 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR),
2625- HiiHandle,
2626+ gHexEditHiiHandle,
2627 HMainEditor.BufferImage->DiskImage->Name
2628 );
2629 } else {
2630 for (Index = 0; Index < 6; Index++) {
2631 PrintToken (
2632 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C),
2633- HiiHandle,
2634+ gHexEditHiiHandle,
2635 HMainEditor.BufferImage->DiskImage->Name[Index]
2636 );
2637 }
2638@@ -253,7 +254,7 @@
2639
2640 PrintToken (
2641 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2642- HiiHandle,
2643+ gHexEditHiiHandle,
2644 HMainEditor.BufferImage->DiskImage->Offset,
2645 HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1
2646 );
2647@@ -269,7 +270,7 @@
2648 case MEM_BUFFER:
2649 PrintToken (
2650 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
2651- HiiHandle,
2652+ gHexEditHiiHandle,
2653 HMainEditor.BufferImage->MemImage->Offset,
2654 HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1
2655 );
2656@@ -280,22 +281,27 @@
2657
2658 break;
2659
2660+ default:
2661+ break;
2662 }
2663 //
2664 // 9 characters
2665 //
2666 switch (HMainEditor.BufferImage->BufferType) {
2667 case FILE_BUFFER:
2668- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle);
2669+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle);
2670 break;
2671
2672 case DISK_BUFFER:
2673- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle);
2674+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle);
2675 break;
2676
2677 case MEM_BUFFER:
2678- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle);
2679+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle);
2680 break;
2681+
2682+ default:
2683+ break;
2684 }
2685 //
2686 // print modified field
2687Index: Ping/Ping.h
2688===================================================================
2689--- Ping/Ping.h (revision 64)
2690+++ Ping/Ping.h (working copy)
2691@@ -78,3 +78,4 @@
2692 } ICMP_TX_INFO;
2693
2694 #endif
2695+
2696Index: Ping/Ping.inf
2697===================================================================
2698--- Ping/Ping.inf (revision 64)
2699+++ Ping/Ping.inf (working copy)
2700@@ -25,24 +25,24 @@
2701 COMPONENT_TYPE = APPLICATION
2702
2703 [sources.common]
2704- ..\ShCommonStrings.uni
2705+ ../ShCommonStrings.uni
2706 PingStrings.uni
2707 Ping.h
2708 Ping.c
2709
2710 [includes.common]
2711- ..\Inc
2712- ..\Library
2713- $(EDK_SOURCE)\Foundation\Efi
2714- $(EDK_SOURCE)\Foundation
2715- $(EDK_SOURCE)\Foundation\Efi\Include
2716- $(EDK_SOURCE)\Foundation\Include
2717- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2718- $(EDK_SOURCE)\Foundation\FrameWork
2719- $(EDK_SOURCE)\Foundation\FrameWork\Include
2720- $(EDK_SOURCE)\Foundation\Core\Dxe
2721- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2722- $(DEST_DIR)\
2723+ ../Inc
2724+ ../Library
2725+ $(EDK_SOURCE)/Foundation/Efi
2726+ $(EDK_SOURCE)/Foundation
2727+ $(EDK_SOURCE)/Foundation/Efi/Include
2728+ $(EDK_SOURCE)/Foundation/Include
2729+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2730+ $(EDK_SOURCE)/Foundation/FrameWork
2731+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2732+ $(EDK_SOURCE)/Foundation/Core/Dxe
2733+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2734+ $(DEST_DIR./
2735
2736 [libraries.common]
2737 EfiShellLib
2738@@ -52,7 +52,6 @@
2739 ArchProtocolLib
2740 EdkGuidLib
2741 EdkFrameworkGuidLib
2742- EfiDriverLib
2743
2744 [libraries.Ia32]
2745 CpuIA32Lib
b00c06f0
OM		 2746@@ -64,9 +63,12 @@
2747 CpuIA32Lib
2748
2749 [nmake.common]
2750- C_PROJ_FLAGS = $(C_PROJ_FLAGS)
2751 IMAGE_ENTRY_POINT=Ping
2752- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2753+
2754+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2755 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2756 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2757+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2758
2759+[nmake.ARM, nmake.AARCH64]
2760+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 2761Index: Ping/Ping.c
2762===================================================================
2763--- Ping/Ping.c (revision 64)
2764+++ Ping/Ping.c (working copy)
2765@@ -20,14 +20,14 @@
2766 --*/
2767
2768 #include "EfiShellLib.h"
2769-#include "CpuFuncs.h"
2770+//#include "CpuFuncs.h"
2771 #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu)
2772 #include EFI_PROTOCOL_DEFINITION (Ip4)
2773 #include "Ping.h"
2774 #include STRING_DEFINES_FILE
2775 extern UINT8 STRING_ARRAY_NAME[];
2776
2777-EFI_HII_HANDLE HiiHandle;
2778+STATIC EFI_HII_HANDLE HiiHandle;
2779
2780 EFI_GUID EfiPingGuid = EFI_PING_GUID;
2781 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
2782@@ -59,7 +59,7 @@
2783 NULL,
2784 0,
2785 0,
2786- 0
2787+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
2788 }
2789 };
2790
2791@@ -114,6 +114,8 @@
2792 UINT32 RttMin;
2793 UINT32 RttMax;
2794
2795+EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
2796+
2797 STATIC
2798 UINT64
2799 GetTimerValue (
2800@@ -135,7 +137,22 @@
2801
2802 --*/
2803 {
2804- return EfiReadTsc ();
2805+ static UINT64 CurrentTick = 0;
2806+ UINT64 TimerPeriod;
2807+ EFI_STATUS Status;
2808+
2809+ ASSERT (gCpu != NULL);
2810+
2811+ Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);
2812+ if (EFI_ERROR (Status)) {
2813+ //
2814+ // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the
2815+ // TimerPeriod by ourselves.
2816+ //
2817+ CurrentTick += 1000000;
2818+ }
2819+
2820+ return CurrentTick;
2821 }
2822
2823 STATIC
2824@@ -168,7 +185,7 @@
2825 //
2826 // Locate the Cpu Arch Protocol.
2827 //
2828- Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
2829+ Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu);
2830 if (EFI_ERROR (Status)) {
2831 return Status;
2832 }
2833Index: time/time.c
2834===================================================================
2835--- time/time.c (revision 64)
2836+++ time/time.c (working copy)
2837@@ -49,7 +49,7 @@
2838 NULL,
2839 0,
2840 0,
2841- 0
2842+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
2843 }
2844 };
2845
2846@@ -64,8 +64,8 @@
2847 BOOLEAN
2848 GetNumber (
2849 IN CHAR16 *Str,
2850- IN OUT INTN *Offset,
2851- IN OUT INTN *number,
2852+ IN OUT UINTN *Offset,
2853+ IN OUT UINTN *number,
2854 IN BOOLEAN GetSecond
2855 );
2856
2857@@ -296,8 +296,8 @@
2858 BOOLEAN
2859 GetNumber (
2860 IN CHAR16 *Str,
2861- IN OUT INTN *Offset,
2862- IN OUT INTN *Number,
2863+ IN OUT UINTN *Offset,
2864+ IN OUT UINTN *Number,
2865 IN BOOLEAN GetSecond
2866 )
2867 {
2868Index: time/time.h
2869===================================================================
2870--- time/time.h (revision 64)
2871+++ time/time.h (working copy)
2872@@ -32,3 +32,4 @@
2873 }
2874
2875 #endif
2876+
2877Index: time/time.inf
2878===================================================================
2879--- time/time.inf (revision 64)
2880+++ time/time.inf (working copy)
2881@@ -40,24 +40,24 @@
2882
2883
2884 [sources.common]
2885- ..\ShCommonStrings.uni
2886+ ../ShCommonStrings.uni
2887 TimeStrings.uni
2888 Time.c
2889 Time.h
2890
2891 [includes.common]
2892 .
2893- ..\Inc
2894- ..\Library
2895- $(EDK_SOURCE)\Foundation
2896- $(EDK_SOURCE)\Foundation\Include
2897- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2898- $(EDK_SOURCE)\Foundation\Efi
2899- $(EDK_SOURCE)\Foundation\Efi\Include
2900- $(EDK_SOURCE)\Foundation\FrameWork
2901- $(EDK_SOURCE)\Foundation\FrameWork\Include
2902- $(EDK_SOURCE)\Foundation\Core\Dxe
2903- $(DEST_DIR)\
2904+ ../Inc
2905+ ../Library
2906+ $(EDK_SOURCE)/Foundation
2907+ $(EDK_SOURCE)/Foundation/Include
2908+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2909+ $(EDK_SOURCE)/Foundation/Efi
2910+ $(EDK_SOURCE)/Foundation/Efi/Include
2911+ $(EDK_SOURCE)/Foundation/FrameWork
2912+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2913+ $(EDK_SOURCE)/Foundation/Core/Dxe
2914+ $(DEST_DIR./
2915
2916 [libraries.common]
2917 EfiShellLib
b00c06f0
OM		 2918@@ -72,7 +72,11 @@
2919
2920 [nmake.common]
2921 IMAGE_ENTRY_POINT=InitializeTime
2922+
2923+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2924 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2925 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2926 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2927
2928+[nmake.ARM, nmake.AARCH64]
2929+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 2930Index: mount/mount.c
2931===================================================================
2932--- mount/mount.c (revision 64)
2933+++ mount/mount.c (working copy)
2934@@ -36,7 +36,7 @@
2935 //
2936 // Global Variables
2937 //
2938-EFI_HII_HANDLE HiiHandle;
2939+STATIC EFI_HII_HANDLE HiiHandle;
2940 EFI_GUID EfiMountGuid = EFI_MOUNT_GUID;
2941 SHELL_VAR_CHECK_ITEM MountCheckList[] = {
2942 {
2943@@ -55,7 +55,7 @@
2944 NULL,
2945 0,
2946 0,
2947- 0
2948+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
2949 }
2950 };
2951
2952Index: mount/mount.h
2953===================================================================
2954--- mount/mount.h (revision 64)
2955+++ mount/mount.h (working copy)
2956@@ -33,3 +33,4 @@
2957 }
2958
2959 #endif
2960+
2961Index: mount/mount.inf
2962===================================================================
2963--- mount/mount.inf (revision 64)
2964+++ mount/mount.inf (working copy)
2965@@ -40,24 +40,24 @@
2966
2967
2968 [sources.common]
2969- ..\ShCommonStrings.uni
2970+ ../ShCommonStrings.uni
2971 MountStrings.uni
2972 mount.c
2973 mount.h
2974
2975 [includes.common]
2976 .
2977- ..\Inc
2978- ..\Library
2979- $(EDK_SOURCE)\Foundation
2980- $(EDK_SOURCE)\Foundation\Include
2981- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2982- $(EDK_SOURCE)\Foundation\Efi
2983- $(EDK_SOURCE)\Foundation\Efi\Include
2984- $(EDK_SOURCE)\Foundation\FrameWork
2985- $(EDK_SOURCE)\Foundation\FrameWork\Include
2986- $(EDK_SOURCE)\Foundation\Core\Dxe
2987- $(DEST_DIR)\
2988+ ../Inc
2989+ ../Library
2990+ $(EDK_SOURCE)/Foundation
2991+ $(EDK_SOURCE)/Foundation/Include
2992+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2993+ $(EDK_SOURCE)/Foundation/Efi
2994+ $(EDK_SOURCE)/Foundation/Efi/Include
2995+ $(EDK_SOURCE)/Foundation/FrameWork
2996+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2997+ $(EDK_SOURCE)/Foundation/Core/Dxe
2998+ $(DEST_DIR./
2999
3000 [libraries.common]
3001 EfiShellLib
b00c06f0
OM		 3002@@ -72,7 +72,11 @@
3003
3004 [nmake.common]
3005 IMAGE_ENTRY_POINT=MountMain
3006+
3007+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3008 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3009 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3010 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3011
3012+[nmake.ARM, nmake.AARCH64]
3013+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3014Index: mkdir/mkdir.inf
3015===================================================================
3016--- mkdir/mkdir.inf (revision 64)
3017+++ mkdir/mkdir.inf (working copy)
3018@@ -41,23 +41,23 @@
3019
3020 [sources.common]
3021 MkdirStrings.uni
3022- ..\ShCommonStrings.uni
3023+ ../ShCommonStrings.uni
3024 mkdir.c
3025 mkdir.h
3026
3027 [includes.common]
3028 .
3029- ..\Inc
3030- ..\Library
3031- $(EDK_SOURCE)\Foundation
3032- $(EDK_SOURCE)\Foundation\Include
3033- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3034- $(EDK_SOURCE)\Foundation\Efi
3035- $(EDK_SOURCE)\Foundation\Efi\Include
3036- $(EDK_SOURCE)\Foundation\FrameWork
3037- $(EDK_SOURCE)\Foundation\FrameWork\Include
3038- $(EDK_SOURCE)\Foundation\Core\Dxe
3039- $(DEST_DIR)\
3040+ ../Inc
3041+ ../Library
3042+ $(EDK_SOURCE)/Foundation
3043+ $(EDK_SOURCE)/Foundation/Include
3044+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3045+ $(EDK_SOURCE)/Foundation/Efi
3046+ $(EDK_SOURCE)/Foundation/Efi/Include
3047+ $(EDK_SOURCE)/Foundation/FrameWork
3048+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3049+ $(EDK_SOURCE)/Foundation/Core/Dxe
3050+ $(DEST_DIR./
3051
3052 [libraries.common]
3053 EfiShellLib
b00c06f0
OM		 3054@@ -72,7 +72,11 @@
3055
3056 [nmake.common]
3057 IMAGE_ENTRY_POINT=InitializeMkDir
3058+
3059+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3060 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3061 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3062 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3063
3064+[nmake.ARM, nmake.AARCH64]
3065+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3066Index: mkdir/mkdir.c
3067===================================================================
3068--- mkdir/mkdir.c (revision 64)
3069+++ mkdir/mkdir.c (working copy)
3070@@ -49,7 +49,7 @@
3071 //
3072 // Global Variables
3073 //
3074-EFI_HII_HANDLE HiiHandle;
3075+STATIC EFI_HII_HANDLE HiiHandle;
3076 EFI_GUID EfiMkdirGuid = EFI_MKDIR_GUID;
3077 SHELL_VAR_CHECK_ITEM MkdirCheckList[] = {
3078 {
3079@@ -68,7 +68,7 @@
3080 NULL,
3081 0,
3082 0,
3083- 0
3084+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3085 }
3086 };
3087
3088Index: mkdir/mkdir.h
3089===================================================================
3090--- mkdir/mkdir.h (revision 64)
3091+++ mkdir/mkdir.h (working copy)
3092@@ -29,4 +29,5 @@
3093 0x75ecb57f, 0x4264, 0x49d2, 0x98, 0xe6, 0x39, 0x1a, 0x32, 0x17, 0x9d, 0xf2 \
3094 }
3095
3096-#endif
3097\ No newline at end of file
3098+#endif
3099+
3100Index: pci/pci.h
3101===================================================================
3102--- pci/pci.h (revision 64)
3103+++ pci/pci.h (working copy)
3104@@ -30,7 +30,7 @@
3105 0x388da6c3, 0x3447, 0x4b1f, 0xa0, 0xba, 0xa9, 0xe8, 0xa2, 0x87, 0xf1, 0x76 \
3106 }
3107
3108-#include "TIANO.h"
3109+#include "Tiano.h"
3110
3111 typedef enum {
3112 PciDevice,
3113@@ -477,3 +477,4 @@
3114 #pragma pack()
3115
3116 #endif // _PCI_H_
3117+
3118Index: pci/pci_class.c
3119===================================================================
3120--- pci/pci_class.c (revision 64)
3121+++ pci/pci_class.c (working copy)
3122@@ -30,7 +30,7 @@
3123 //
3124 // Global Variables
3125 //
3126-EFI_HII_HANDLE HiiHandle;
3127+STATIC EFI_HII_HANDLE HiiHandle;
3128
3129 PCI_CLASS_ENTRY gClassStringList[];
3130
3131Index: pci/pci.inf
3132===================================================================
3133--- pci/pci.inf (revision 64)
3134+++ pci/pci.inf (working copy)
3135@@ -41,7 +41,7 @@
3136
3137 [sources.common]
3138 PciStrings.uni
3139- ..\ShCommonStrings.uni
3140+ ../ShCommonStrings.uni
3141 pci.c
3142 pci.h
3143 pci_class.h
3144@@ -49,17 +49,17 @@
3145
3146 [includes.common]
3147 .
3148- ..\Inc
3149- ..\Library
3150- $(EDK_SOURCE)\Foundation
3151- $(EDK_SOURCE)\Foundation\Include
3152- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3153- $(EDK_SOURCE)\Foundation\Efi
3154- $(EDK_SOURCE)\Foundation\Efi\Include
3155- $(EDK_SOURCE)\Foundation\FrameWork
3156- $(EDK_SOURCE)\Foundation\FrameWork\Include
3157- $(EDK_SOURCE)\Foundation\Core\Dxe
3158- $(DEST_DIR)\
3159+ ../Inc
3160+ ../Library
3161+ $(EDK_SOURCE)/Foundation
3162+ $(EDK_SOURCE)/Foundation/Include
3163+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3164+ $(EDK_SOURCE)/Foundation/Efi
3165+ $(EDK_SOURCE)/Foundation/Efi/Include
3166+ $(EDK_SOURCE)/Foundation/FrameWork
3167+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3168+ $(EDK_SOURCE)/Foundation/Core/Dxe
3169+ $(DEST_DIR./
3170
3171 [libraries.common]
3172 EfiShellLib
b00c06f0
OM		 3173@@ -74,7 +74,11 @@
3174
3175 [nmake.common]
3176 IMAGE_ENTRY_POINT=PciDump
3177+
3178+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3179 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3180 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3181 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3182
3183+[nmake.ARM, nmake.AARCH64]
3184+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3185Index: pci/pci_class.h
3186===================================================================
3187--- pci/pci_class.h (revision 64)
3188+++ pci/pci_class.h (working copy)
3189@@ -24,7 +24,7 @@
3190 #ifndef _PCI_CLASS_H_
3191 #define _PCI_CLASS_H_
3192
3193-#include "TIANO.h" // for UINT32 etc.
3194+#include "Tiano.h" // for UINT32 etc.
3195 #define PCI_CLASS_STRING_LIMIT 54
3196 //
3197 // Printable strings for Pci class code
3198@@ -58,3 +58,4 @@
3199 );
3200
3201 #endif // _PCI_CLASS_H_
3202+
3203Index: pci/pci.c
3204===================================================================
3205--- pci/pci.c (revision 64)
3206+++ pci/pci.c (working copy)
3207@@ -334,7 +334,7 @@
3208 {
3209 0,
3210 0,
3211- 0,
3212+ (PCIE_CAPREG_FIELD_WIDTH)0,
3213 NULL,
3214 PcieExplainTypeMax
3215 }
3216@@ -344,7 +344,7 @@
3217 // Global Variables
3218 //
3219 PCI_CONFIG_SPACE *mConfigSpace;
3220-EFI_HII_HANDLE HiiHandle;
3221+STATIC EFI_HII_HANDLE HiiHandle;
3222 EFI_GUID EfiPciGuid = EFI_PCI_GUID;
3223 SHELL_VAR_CHECK_ITEM PciCheckList[] = {
3224 {
3225@@ -375,7 +375,7 @@
3226 NULL,
3227 0,
3228 0,
3229- 0
3230+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3231 }
3232 };
3233
3234@@ -1034,7 +1034,7 @@
3235 Status = BS->HandleProtocol (
3236 Handle,
3237 &gEfiPciRootBridgeIoProtocolGuid,
3238- IoDev
3239+ (VOID**)IoDev
3240 );
3241
3242 if (EFI_ERROR (Status)) {
3243@@ -1043,7 +1043,7 @@
3244 //
3245 // Call Configuration() to get address space descriptors
3246 //
3247- Status = (*IoDev)->Configuration (*IoDev, Descriptors);
3248+ Status = (*IoDev)->Configuration (*IoDev, (VOID**)Descriptors);
3249 if (Status == EFI_UNSUPPORTED) {
3250 *Descriptors = NULL;
3251 return EFI_SUCCESS;
3252@@ -1237,7 +1237,7 @@
3253 PrintToken (STRING_TOKEN (STR_PCI2_SINGLE_FUNCTION), HiiHandle);
3254 }
3255
3256- HeaderType = (UINT8) (Common->HeaderType & 0x7f);
3257+ HeaderType = (PCI_HEADER_TYPE) (Common->HeaderType & 0x7f);
3258 switch (HeaderType) {
3259 case PciDevice:
3260 PrintToken (STRING_TOKEN (STR_PCI2_PCI_DEVICE), HiiHandle);
3261@@ -1300,6 +1300,9 @@
3262 );
3263 CapPtr = ConfigSpace->NonCommon.CardBus.CapabilitiesPtr;
3264 break;
3265+
3266+ default:
3267+ Status = EFI_UNSUPPORTED;
3268 }
3269 //
3270 // If Status bit4 is 1, dump or explain capability structure
3271@@ -1956,7 +1959,7 @@
3272 INDEX_OF (&(CardBus->IoBase0)),
3273 Io32Bit ? L" 32 bit" : L" 16 bit",
3274 CardBus->IoBase0 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
3275- CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
3276+ (CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3277 );
3278
3279 Io32Bit = (BOOLEAN) (CardBus->IoBase1 & PCI_BIT_0);
3280@@ -1966,7 +1969,7 @@
3281 INDEX_OF (&(CardBus->IoBase1)),
3282 Io32Bit ? L" 32 bit" : L" 16 bit",
3283 CardBus->IoBase1 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
3284- CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
3285+ (CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
3286 );
3287
3288 //
3289Index: memmap/memmap.h
3290===================================================================
3291--- memmap/memmap.h (revision 64)
3292+++ memmap/memmap.h (working copy)
3293@@ -33,3 +33,4 @@
3294 }
3295
3296 #endif
3297+
3298Index: memmap/memmap.inf
3299===================================================================
3300--- memmap/memmap.inf (revision 64)
3301+++ memmap/memmap.inf (working copy)
3302@@ -40,7 +40,7 @@
3303
3304
3305 [sources.common]
3306- ..\ShCommonStrings.uni
3307+ ../ShCommonStrings.uni
3308 memmapStrings.uni
3309 memmap.c
3310 memmap.h
3311@@ -48,17 +48,17 @@
3312
3313 [includes.common]
3314 .
3315- ..\Inc
3316- ..\Library
3317- $(EDK_SOURCE)\Foundation
3318- $(EDK_SOURCE)\Foundation\Include
3319- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3320- $(EDK_SOURCE)\Foundation\Efi
3321- $(EDK_SOURCE)\Foundation\Efi\Include
3322- $(EDK_SOURCE)\Foundation\FrameWork
3323- $(EDK_SOURCE)\Foundation\FrameWork\Include
3324- $(EDK_SOURCE)\Foundation\Core\Dxe
3325- $(DEST_DIR)\
3326+ ../Inc
3327+ ../Library
3328+ $(EDK_SOURCE)/Foundation
3329+ $(EDK_SOURCE)/Foundation/Include
3330+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3331+ $(EDK_SOURCE)/Foundation/Efi
3332+ $(EDK_SOURCE)/Foundation/Efi/Include
3333+ $(EDK_SOURCE)/Foundation/FrameWork
3334+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3335+ $(EDK_SOURCE)/Foundation/Core/Dxe
3336+ $(DEST_DIR./
3337
3338 [libraries.common]
3339 EfiShellLib
b00c06f0
OM		 3340@@ -73,7 +73,11 @@
3341
3342 [nmake.common]
3343 IMAGE_ENTRY_POINT=InitializeMemmap
3344+
3345+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3346 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3347 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3348 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3349
3350+[nmake.ARM, nmake.AARCH64]
3351+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3352Index: memmap/memmap.c
3353===================================================================
3354--- memmap/memmap.c (revision 64)
3355+++ memmap/memmap.c (working copy)
3356@@ -35,7 +35,7 @@
3357 //
3358 // Global Variables
3359 //
3360-EFI_HII_HANDLE HiiHandle;
3361+STATIC EFI_HII_HANDLE HiiHandle;
3362 EFI_GUID EfiMemmapGuid = EFI_MEMMAP_GUID;
3363 SHELL_VAR_CHECK_ITEM MemmapCheckList[] = {
3364 {
3365@@ -54,7 +54,7 @@
3366 NULL,
3367 0,
3368 0,
3369- 0
3370+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3371 }
3372 };
3373
3374@@ -216,7 +216,7 @@
3375 }
3376
3377 Bytes = LShiftU64 (Desc->NumberOfPages, 12);
3378- Ptr = MemoryTypeStr (Desc->Type);
3379+ Ptr = MemoryTypeStr ((EFI_MEMORY_TYPE)Desc->Type);
3380 PrintToken (
3381 STRING_TOKEN (STR_MEMMAP_FIVE_ARGS),
3382 HiiHandle,
3383Index: dblk/dblk.h
3384===================================================================
3385--- dblk/dblk.h (revision 64)
3386+++ dblk/dblk.h (working copy)
3387@@ -168,3 +168,4 @@
3388 extern EFI_HII_HANDLE HiiDblkHandle;
3389
3390 #endif
3391+
3392Index: dblk/dblk.inf
3393===================================================================
3394--- dblk/dblk.inf (revision 64)
3395+++ dblk/dblk.inf (working copy)
3396@@ -26,23 +26,23 @@
3397
3398 [sources.common]
3399 DblkStrings.uni
3400- ..\ShCommonStrings.uni
3401+ ../ShCommonStrings.uni
3402 dblk.c
3403 efidump.c
3404
3405 [includes.common]
3406 .
3407- ..\Inc
3408- ..\Library
3409- $(EDK_SOURCE)\Foundation
3410- $(EDK_SOURCE)\Foundation\Include
3411- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3412- $(EDK_SOURCE)\Foundation\Efi
3413- $(EDK_SOURCE)\Foundation\Efi\Include
3414- $(EDK_SOURCE)\Foundation\FrameWork
3415- $(EDK_SOURCE)\Foundation\FrameWork\Include
3416- $(EDK_SOURCE)\Foundation\Core\Dxe
3417- $(DEST_DIR)\
3418+ ../Inc
3419+ ../Library
3420+ $(EDK_SOURCE)/Foundation
3421+ $(EDK_SOURCE)/Foundation/Include
3422+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3423+ $(EDK_SOURCE)/Foundation/Efi
3424+ $(EDK_SOURCE)/Foundation/Efi/Include
3425+ $(EDK_SOURCE)/Foundation/FrameWork
3426+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3427+ $(EDK_SOURCE)/Foundation/Core/Dxe
3428+ $(DEST_DIR./
3429
3430 [libraries.common]
3431 EfiShellLib
b00c06f0
OM		 3432@@ -61,11 +61,16 @@
3433 # we will specify some additional DEFINEs on the compile command line.
3434 #
3435 [nmake.common]
3436+ IMAGE_ENTRY_POINT=DumpBlockDev
3437+
3438+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3439 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3440- IMAGE_ENTRY_POINT=DumpBlockDev
3441 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3442 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3443 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3444
3445+[nmake.ARM, nmake.AARCH64]
3446+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3447
3448+
3449
3450\ No newline at end of file
2bba8d5a
OM		 3451Index: dblk/efidump.c
3452===================================================================
3453--- dblk/efidump.c (revision 64)
3454+++ dblk/efidump.c (working copy)
3455@@ -24,7 +24,7 @@
3456 --*/
3457
3458 #include "dblk.h"
3459-#include "Efipart.h"
3460+#include "EfiPart.h"
3461 #include "EfiShellLib.h"
3462
3463 #include STRING_DEFINES_FILE
3464@@ -320,13 +320,11 @@
3465 VOID *AcpiTable;
3466 VOID *Acpi20Table;
3467 VOID *SMBIOSTable;
3468- VOID *SalSystemTable;
3469 VOID *MpsTable;
3470
3471 AcpiTable = NULL;
3472 Acpi20Table = NULL;
3473 SMBIOSTable = NULL;
3474- SalSystemTable = NULL;
3475 MpsTable = NULL;
3476
3477 PrintToken (
3478@@ -352,10 +350,12 @@
3479 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
3480 }
3481
3482- PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
3483- PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
3484+ PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3485+ PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3486
3487 EFI64_CODE (
3488+ VOID *SalSystemTable;
c0004f9c 3489+
2bba8d5a
OM		 3490 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3491 if (!EFI_ERROR(Status)) {
3492 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable);
3493@@ -364,22 +364,22 @@
3494
3495 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3496 if (!EFI_ERROR (Status)) {
3497- PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
3498+ PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable);
3499 }
3500
3501 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3502 if (!EFI_ERROR (Status)) {
3503- PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
3504+ PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table);
3505 }
3506
3507 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3508 if (!EFI_ERROR (Status)) {
3509- PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
3510+ PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable);
3511 }
3512
3513 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3514 if (!EFI_ERROR (Status)) {
3515- PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
3516+ PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable);
3517 }
3518 }
3519
3520Index: dblk/dblk.c
3521===================================================================
3522--- dblk/dblk.c (revision 64)
3523+++ dblk/dblk.c (working copy)
3524@@ -52,7 +52,7 @@
3525 NULL,
3526 0,
3527 0,
3528- 0
3529+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3530 }
3531 };
3532
3533Index: date/date.h
3534===================================================================
3535--- date/date.h (revision 64)
3536+++ date/date.h (working copy)
3537@@ -32,3 +32,4 @@
3538 }
3539
3540 #endif
c0004f9c 3541+
2bba8d5a
OM		 3542Index: date/date.inf
3543===================================================================
3544--- date/date.inf (revision 64)
3545+++ date/date.inf (working copy)
3546@@ -40,24 +40,24 @@
c0004f9c 3547
c0004f9c 3548
2bba8d5a
OM		 3549 [sources.common]
3550- ..\ShCommonStrings.uni
3551+ ../ShCommonStrings.uni
3552 DateStrings.uni
3553 Date.c
3554 Date.h
3555
3556 [includes.common]
3557 .
3558- ..\Inc
3559- ..\Library
3560- $(EDK_SOURCE)\Foundation
3561- $(EDK_SOURCE)\Foundation\Include
3562- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3563- $(EDK_SOURCE)\Foundation\Efi
3564- $(EDK_SOURCE)\Foundation\Efi\Include
3565- $(EDK_SOURCE)\Foundation\FrameWork
3566- $(EDK_SOURCE)\Foundation\FrameWork\Include
3567- $(EDK_SOURCE)\Foundation\Core\Dxe
3568- $(DEST_DIR)\
3569+ ../Inc
3570+ ../Library
3571+ $(EDK_SOURCE)/Foundation
3572+ $(EDK_SOURCE)/Foundation/Include
3573+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3574+ $(EDK_SOURCE)/Foundation/Efi
3575+ $(EDK_SOURCE)/Foundation/Efi/Include
3576+ $(EDK_SOURCE)/Foundation/FrameWork
3577+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3578+ $(EDK_SOURCE)/Foundation/Core/Dxe
3579+ $(DEST_DIR./
c0004f9c 3580
2bba8d5a
OM		 3581 [libraries.common]
3582 EfiShellLib
b00c06f0
OM		 3583@@ -71,7 +71,12 @@
3584
3585 [nmake.common]
3586 IMAGE_ENTRY_POINT=InitializeDate
3587+
3588+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3589 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3590 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3591 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3592
3593+[nmake.ARM, nmake.AARCH64]
3594+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3595+
2bba8d5a
OM		 3596Index: date/date.c
3597===================================================================
3598--- date/date.c (revision 64)
3599+++ date/date.c (working copy)
3600@@ -53,8 +53,8 @@
3601 BOOLEAN
3602 GetNumber (
3603 IN CHAR16 *Str,
3604- IN OUT INTN *Position,
3605- IN OUT INTN *Number,
3606+ IN OUT UINTN *Position,
3607+ IN OUT UINTN *Number,
3608 IN BOOLEAN EndNum
3609 );
c0004f9c 3610
2bba8d5a
OM		 3611@@ -92,7 +92,7 @@
3612 NULL,
3613 0,
3614 0,
3615- 0
3616+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3617 }
3618 };
c0004f9c 3619
2bba8d5a
OM		 3620@@ -330,8 +330,8 @@
3621 BOOLEAN
3622 GetNumber (
3623 IN CHAR16 *Str,
3624- IN OUT INTN *Position,
3625- IN OUT INTN *Number,
3626+ IN OUT UINTN *Position,
3627+ IN OUT UINTN *Number,
3628 IN BOOLEAN EndNum
3629 )
3630 {
3631Index: rm/rm.c
3632===================================================================
3633--- rm/rm.c (revision 64)
3634+++ rm/rm.c (working copy)
3635@@ -54,7 +54,7 @@
3636 NULL,
3637 0,
3638 0,
3639- FALSE
3640+ (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
3641 }
3642 };
3643
3644Index: rm/rm.h
3645===================================================================
3646--- rm/rm.h (revision 64)
3647+++ rm/rm.h (working copy)
3648@@ -59,3 +59,4 @@
3649 );
c0004f9c 3650
2bba8d5a 3651 #endif
c0004f9c 3652+
2bba8d5a
OM		 3653Index: rm/rm.inf
3654===================================================================
3655--- rm/rm.inf (revision 64)
3656+++ rm/rm.inf (working copy)
3657@@ -41,23 +41,23 @@
3658
3659 [sources.common]
3660 RmStrings.uni
3661- ..\ShCommonStrings.uni
3662+ ../ShCommonStrings.uni
3663 rm.h
3664 rm.c
c0004f9c 3665
3666 [includes.common]
3667 .
2bba8d5a
OM		 3668- ..\Inc
3669- ..\Library
c0004f9c 3670- $(EDK_SOURCE)\Foundation
3671- $(EDK_SOURCE)\Foundation\Include
3672- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3673- $(EDK_SOURCE)\Foundation\Efi
3674- $(EDK_SOURCE)\Foundation\Efi\Include
3675- $(EDK_SOURCE)\Foundation\FrameWork
3676- $(EDK_SOURCE)\Foundation\FrameWork\Include
3677- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a
OM		 3678- $(DEST_DIR)\
3679+ ../Inc
3680+ ../Library
c0004f9c 3681+ $(EDK_SOURCE)/Foundation
3682+ $(EDK_SOURCE)/Foundation/Include
3683+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3684+ $(EDK_SOURCE)/Foundation/Efi
3685+ $(EDK_SOURCE)/Foundation/Efi/Include
3686+ $(EDK_SOURCE)/Foundation/FrameWork
3687+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3688+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a 3689+ $(DEST_DIR./
c0004f9c 3690
2bba8d5a
OM		 3691 [libraries.common]
3692 EfiShellLib
b00c06f0
OM		 3693@@ -72,7 +72,11 @@
3694
3695 [nmake.common]
3696 IMAGE_ENTRY_POINT=InitializeRM
3697+
3698+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3699 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3700 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3701 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3702
3703+[nmake.ARM, nmake.AARCH64]
3704+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3705Index: mem/MemCommonPart.c
3706===================================================================
3707--- mem/MemCommonPart.c (revision 64)
3708+++ mem/MemCommonPart.c (working copy)
3709@@ -58,7 +58,7 @@
3710 NULL,
3711 0,
3712 0,
3713- 0
3714+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3715 }
3716 };
3717
3718@@ -149,7 +149,7 @@
3719 return EFI_SUCCESS;
3720 }
c0004f9c 3721
2bba8d5a
OM		 3722- Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
3723+ Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
3724 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
c0004f9c 3725
2bba8d5a
OM		 3726 //
3727@@ -157,7 +157,7 @@
3728 //
3729 PrintToken (STRING_TOKEN (STR_MEM_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3730 if (MMIo) {
3731- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3732+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3733 if (EFI_ERROR (Status)) {
3734 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3735 return Status;
3736@@ -172,7 +172,7 @@
3737 return Status;
3738 }
3739
3740- PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3741+ PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3742 } else {
3743 Buffer = (UINT8 *) (UINTN) Address;
3744 }
3745@@ -233,7 +233,7 @@
3746 MMIo = FALSE;
3747 AddressStr = NULL;
3748 SizeStr = NULL;
3749- Address = (UINT64) SystemTable;
3750+ Address = (UINT64)(UINTN) SystemTable;
3751 Size = 512;
3752 RetCode = LibCheckVariables (SI, MemCheckList, &ChkPck, &Useful);
3753 if (VarCheckOk != RetCode) {
3754@@ -312,7 +312,7 @@
3755 //
3756 PrintToken (STRING_TOKEN (STR_MEM_NEW_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
3757 if (MMIo) {
3758- Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3759+ Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3760 if (EFI_ERROR (Status)) {
3761 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
3762 return Status;
3763@@ -327,7 +327,7 @@
3764 return Status;
3765 }
3766
3767- PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
3768+ PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
3769 } else {
3770 Buffer = (UINT8 *) (UINTN) Address;
3771 }
3772Index: mem/MemCommonPart.h
3773===================================================================
3774--- mem/MemCommonPart.h (revision 64)
3775+++ mem/MemCommonPart.h (working copy)
3776@@ -62,4 +62,4 @@
3777 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
3778 );
3779
3780-#endif
c0004f9c 3781\ No newline at end of file
2bba8d5a
OM		 3782+#endif
3783Index: mem/mem.inf
3784===================================================================
3785--- mem/mem.inf (revision 64)
3786+++ mem/mem.inf (working copy)
3787@@ -25,7 +25,7 @@
3788 COMPONENT_TYPE = APPLICATION
c0004f9c 3789
2bba8d5a
OM		 3790 [sources.common]
3791- ..\ShCommonStrings.uni
3792+ ../ShCommonStrings.uni
3793 MemStrings.uni
3794 DebugStrings.uni
3795 mm.c
3796@@ -34,17 +34,17 @@
3797
3798 [includes.common]
3799 .
3800- ..\Inc
3801- ..\Library
3802- $(EDK_SOURCE)\Foundation
3803- $(EDK_SOURCE)\Foundation\Include
3804- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3805- $(EDK_SOURCE)\Foundation\Efi
3806- $(EDK_SOURCE)\Foundation\Efi\Include
3807- $(EDK_SOURCE)\Foundation\FrameWork
3808- $(EDK_SOURCE)\Foundation\FrameWork\Include
3809- $(EDK_SOURCE)\Foundation\Core\Dxe
3810- $(DEST_DIR)\
3811+ ../Inc
3812+ ../Library
3813+ $(EDK_SOURCE)/Foundation
3814+ $(EDK_SOURCE)/Foundation/Include
3815+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3816+ $(EDK_SOURCE)/Foundation/Efi
3817+ $(EDK_SOURCE)/Foundation/Efi/Include
3818+ $(EDK_SOURCE)/Foundation/FrameWork
3819+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3820+ $(EDK_SOURCE)/Foundation/Core/Dxe
3821+ $(DEST_DIR./
3822
3823 [libraries.common]
3824 EfiShellLib
b00c06f0
OM		 3825@@ -63,9 +63,13 @@
3826 # we will specify some additional DEFINEs on the compile command line.
3827 #
3828 [nmake.common]
3829+ IMAGE_ENTRY_POINT=DumpMm
3830+
3831+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3832 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3833- IMAGE_ENTRY_POINT=DumpMm
3834 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3835 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3836 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3837
3838+[nmake.ARM, nmake.AARCH64]
3839+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 3840Index: mem/efidump.c
3841===================================================================
3842--- mem/efidump.c (revision 64)
3843+++ mem/efidump.c (working copy)
3844@@ -24,7 +24,7 @@
c0004f9c 3845 --*/
3846
2bba8d5a
OM		 3847 #include "debug.h"
3848-#include "Efipart.h"
3849+#include "EfiPart.h"
c0004f9c 3850 #include "EfiShellLib.h"
2bba8d5a 3851
c0004f9c 3852 #include STRING_DEFINES_FILE
2bba8d5a
OM		 3853@@ -320,13 +320,11 @@
3854 VOID *AcpiTable;
3855 VOID *Acpi20Table;
3856 VOID *SMBIOSTable;
3857- VOID *SalSystemTable;
3858 VOID *MpsTable;
3859
3860 AcpiTable = NULL;
3861 Acpi20Table = NULL;
3862 SMBIOSTable = NULL;
3863- SalSystemTable = NULL;
3864 MpsTable = NULL;
3865
3866 PrintToken (
3867@@ -352,11 +350,13 @@
3868 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiMemHandle, LibDevicePathToStr (DevicePath));
3869 }
c0004f9c 3870
2bba8d5a
OM		 3871- PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->RuntimeServices);
3872- PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->BootServices);
3873+ PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3874+ PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
c0004f9c 3875
2bba8d5a
OM		 3876 EFI64_CODE (
3877- Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3878+ VOID *SalSystemTable;
3879+
3880+ Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3881 if (!EFI_ERROR(Status)) {
3882 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiMemHandle, (UINT64)SalSystemTable);
3883 }
3884@@ -364,22 +364,22 @@
3885
3886 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3887 if (!EFI_ERROR (Status)) {
3888- PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64) AcpiTable);
3889+ PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64)(UINTN) AcpiTable);
3890 }
3891
3892 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3893 if (!EFI_ERROR (Status)) {
3894- PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64) Acpi20Table);
3895+ PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64)(UINTN) Acpi20Table);
3896 }
3897
3898 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3899 if (!EFI_ERROR (Status)) {
3900- PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64) MpsTable);
3901+ PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64)(UINTN) MpsTable);
3902 }
3903
3904 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3905 if (!EFI_ERROR (Status)) {
3906- PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64) SMBIOSTable);
3907+ PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64)(UINTN) SMBIOSTable);
3908 }
3909 }
3910
3911Index: mem/debug.h
3912===================================================================
3913--- mem/debug.h (revision 64)
3914+++ mem/debug.h (working copy)
3915@@ -156,3 +156,4 @@
3916 extern EFI_HII_HANDLE HiiMemHandle;
3917
3918 #endif
3919+
3920Index: ls/ls.c
3921===================================================================
3922--- ls/ls.c (revision 64)
3923+++ ls/ls.c (working copy)
3924@@ -59,7 +59,7 @@
3925 NULL,
3926 0,
3927 0,
3928- 0
3929+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3930 }
3931 };
3932
3933@@ -199,7 +199,6 @@
3934 CHAR16 *PtrTwo;
3935 CHAR16 *Path;
3936 EFI_LIST_ENTRY DirList;
3937- EFI_LIST_ENTRY *Link;
3938 SHELL_FILE_ARG *Arg;
3939 BOOLEAN WildcardsEncountered;
3940 CHAR16 *Pattern;
3941@@ -210,7 +209,6 @@
3942 Argv = SI->Argv;
3943 PtrTwo = NULL;
3944 InitializeListHead (&DirList);
3945- Link = NULL;
3946 Arg = NULL;
3947 Pattern = NULL;
3948 Status = EFI_SUCCESS;
3949@@ -815,8 +813,6 @@
3950 CHAR16 *Path
3951 )
3952 {
3953-
3954- EFI_STATUS Status;
3955 CHAR16 *PtrOne;
3956 CHAR16 *PtrTwo;
3957 UINTN Index1;
3958@@ -825,7 +821,6 @@
3959 BOOLEAN LeadingBlanks;
3960
3961 LeadingBlanks = TRUE;
3962- Status = EFI_SUCCESS;
3963
3964 for (PtrOne = PtrTwo = Path; PtrOne < Path + StrLen (Path); PtrOne++) {
3965 if ((*PtrOne) == ' ' && LeadingBlanks) {
3966@@ -917,14 +912,14 @@
3967
3968 if ((IsMatch && mIgnoreAttribute) ||
3969 (IsMatch && !mAttributes && !(Info->Attribute & EFI_FILE_HIDDEN) && !(Info->Attribute & EFI_FILE_SYSTEM)) ||
3970- IsMatch &&
3971+ (IsMatch &&
3972 mAttributes &&
3973 (
3974 (mAttribA ? (Info->Attribute & EFI_FILE_ARCHIVE ? TRUE : FALSE) : TRUE) &&
3975 (mAttribH ? (Info->Attribute & EFI_FILE_HIDDEN ? TRUE : FALSE) : TRUE) &&
3976 (mAttribR ? (Info->Attribute & EFI_FILE_READ_ONLY ? TRUE : FALSE) : TRUE) &&
3977 (mAttribS ? (Info->Attribute & EFI_FILE_SYSTEM ? TRUE : FALSE) : TRUE) &&
3978- (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE)
3979+ (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE))
3980 )
3981 ) {
3982 IsMatch = TRUE;
3983Index: ls/ls.h
3984===================================================================
3985--- ls/ls.h (revision 64)
3986+++ ls/ls.h (working copy)
3987@@ -91,4 +91,5 @@
3988 IN UINT16 VHlpToken
3989 );
3990
3991-#endif
3992\ No newline at end of file
3993+#endif
3994+
3995Index: ls/ls.inf
3996===================================================================
3997--- ls/ls.inf (revision 64)
3998+++ ls/ls.inf (working copy)
3999@@ -40,24 +40,24 @@
4000
4001
4002 [sources.common]
4003- ..\ShCommonStrings.uni
4004+ ../ShCommonStrings.uni
4005 LsStrings.uni
4006 ls.c
4007 ls.h
4008
4009 [includes.common]
4010 .
4011- ..\Inc
4012- ..\Library
4013- $(EDK_SOURCE)\Foundation
4014- $(EDK_SOURCE)\Foundation\Include
4015- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4016- $(EDK_SOURCE)\Foundation\Efi
4017- $(EDK_SOURCE)\Foundation\Efi\Include
4018- $(EDK_SOURCE)\Foundation\FrameWork
4019- $(EDK_SOURCE)\Foundation\FrameWork\Include
4020- $(EDK_SOURCE)\Foundation\Core\Dxe
4021- $(DEST_DIR)\
4022+ ../Inc
4023+ ../Library
4024+ $(EDK_SOURCE)/Foundation
4025+ $(EDK_SOURCE)/Foundation/Include
4026+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4027+ $(EDK_SOURCE)/Foundation/Efi
4028+ $(EDK_SOURCE)/Foundation/Efi/Include
4029+ $(EDK_SOURCE)/Foundation/FrameWork
4030+ $(EDK_SOURCE)/Foundation/FrameWork/Include
4031+ $(EDK_SOURCE)/Foundation/Core/Dxe
4032+ $(DEST_DIR./
4033
4034 [libraries.common]
4035 EfiShellLib
b00c06f0
OM		 4036@@ -72,7 +72,11 @@
4037
4038 [nmake.common]
4039 IMAGE_ENTRY_POINT=InitializeLS
4040+
4041+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4042 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4043 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4044 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4045
4046+[nmake.ARM, nmake.AARCH64]
4047+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 4048Index: stall/stall.c
4049===================================================================
4050--- stall/stall.c (revision 64)
4051+++ stall/stall.c (working copy)
4052@@ -50,7 +50,7 @@
4053 NULL,
4054 0,
4055 0,
4056- 0
4057+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4058 }
4059 };
c0004f9c 4060
2bba8d5a
OM		 4061Index: stall/stall.h
4062===================================================================
4063--- stall/stall.h (revision 64)
4064+++ stall/stall.h (working copy)
4065@@ -30,3 +30,4 @@
4066 }
c0004f9c 4067
2bba8d5a
OM		 4068 #endif
4069+
4070Index: stall/stall.inf
4071===================================================================
4072--- stall/stall.inf (revision 64)
4073+++ stall/stall.inf (working copy)
4074@@ -40,24 +40,24 @@
c0004f9c 4075
c0004f9c 4076
4077 [sources.common]
4078- ..\ShCommonStrings.uni
4079+ ../ShCommonStrings.uni
2bba8d5a
OM		 4080 stallStrings.uni
4081 stall.c
4082 stall.h
c0004f9c 4083
4084 [includes.common]
4085 .
4086- ..\Inc
4087- ..\Library
4088- $(EDK_SOURCE)\Foundation
4089- $(EDK_SOURCE)\Foundation\Include
4090- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4091- $(EDK_SOURCE)\Foundation\Efi
4092- $(EDK_SOURCE)\Foundation\Efi\Include
4093- $(EDK_SOURCE)\Foundation\FrameWork
4094- $(EDK_SOURCE)\Foundation\FrameWork\Include
4095- $(EDK_SOURCE)\Foundation\Core\Dxe
4096- $(DEST_DIR)\
c0004f9c 4097+ ../Inc
4098+ ../Library
4099+ $(EDK_SOURCE)/Foundation
4100+ $(EDK_SOURCE)/Foundation/Include
4101+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4102+ $(EDK_SOURCE)/Foundation/Efi
4103+ $(EDK_SOURCE)/Foundation/Efi/Include
4104+ $(EDK_SOURCE)/Foundation/FrameWork
4105+ $(EDK_SOURCE)/Foundation/FrameWork/Include
4106+ $(EDK_SOURCE)/Foundation/Core/Dxe
4107+ $(DEST_DIR./
c0004f9c 4108
4109 [libraries.common]
4110 EfiShellLib
b00c06f0
OM		 4111@@ -72,7 +72,11 @@
4112
4113 [nmake.common]
4114 IMAGE_ENTRY_POINT=InitializeStall
4115+
4116+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4117 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4118 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4119 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4120
4121+[nmake.ARM, nmake.AARCH64]
4122+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 4123Index: DeviceTree/devicetree.c
4124===================================================================
4125--- DeviceTree/devicetree.c (revision 64)
4126+++ DeviceTree/devicetree.c (working copy)
4127@@ -36,7 +36,7 @@
4128 //
4129 // Global Variables
4130 //
4131-EFI_HII_HANDLE HiiHandle;
4132+STATIC EFI_HII_HANDLE HiiHandle;
4133 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
4134 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
4135 {
4136@@ -67,7 +67,7 @@
4137 NULL,
4138 0,
4139 0,
4140- 0
4141+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4142 }
4143 };
4144
4145Index: DeviceTree/devicetree.h
4146===================================================================
4147--- DeviceTree/devicetree.h (revision 64)
4148+++ DeviceTree/devicetree.h (working copy)
4149@@ -32,3 +32,4 @@
4150 0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
4151 }
4152 #endif
4153+
4154Index: DeviceTree/devicetree.inf
4155===================================================================
4156--- DeviceTree/devicetree.inf (revision 64)
4157+++ DeviceTree/devicetree.inf (working copy)
4158@@ -40,24 +40,24 @@
c0004f9c 4159
c0004f9c 4160
2bba8d5a
OM		 4161 [sources.common]
4162- ..\ShCommonStrings.uni
4163+ ../ShCommonStrings.uni
4164 DevicetreeStrings.uni
4165 devicetree.c
4166 devicetree.h
4167
4168 [includes.common]
4169 .
4170- ..\Inc
4171- ..\Library
4172- $(EDK_SOURCE)\Foundation
4173- $(EDK_SOURCE)\Foundation\Include
4174- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4175- $(EDK_SOURCE)\Foundation\Efi
4176- $(EDK_SOURCE)\Foundation\Efi\Include
4177- $(EDK_SOURCE)\Foundation\FrameWork
4178- $(EDK_SOURCE)\Foundation\FrameWork\Include
4179- $(EDK_SOURCE)\Foundation\Core\Dxe
4180- $(DEST_DIR)\
4181+ ../Inc
4182+ ../Library
4183+ $(EDK_SOURCE)/Foundation
4184+ $(EDK_SOURCE)/Foundation/Include
4185+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4186+ $(EDK_SOURCE)/Foundation/Efi
4187+ $(EDK_SOURCE)/Foundation/Efi/Include
4188+ $(EDK_SOURCE)/Foundation/FrameWork
4189+ $(EDK_SOURCE)/Foundation/FrameWork/Include
4190+ $(EDK_SOURCE)/Foundation/Core/Dxe
4191+ $(DEST_DIR./
4192
4193 [libraries.common]
4194 EfiShellLib
b00c06f0
OM		 4195@@ -72,7 +72,11 @@
4196
4197 [nmake.common]
4198 IMAGE_ENTRY_POINT=DevicetreeMain
4199+
4200+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4201 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4202 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4203 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4204
4205+[nmake.ARM, nmake.AARCH64]
4206+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 4207Index: TelnetMgmt/TelnetMgmt.c
4208===================================================================
4209--- TelnetMgmt/TelnetMgmt.c (revision 64)
4210+++ TelnetMgmt/TelnetMgmt.c (working copy)
4211@@ -32,7 +32,7 @@
c0004f9c 4212 //
4213 #include STRING_DEFINES_FILE
4214
4215-EFI_HII_HANDLE HiiHandle;
4216+STATIC EFI_HII_HANDLE HiiHandle;
4217 EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID;
4218 EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID;
4219 SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
2bba8d5a
OM		 4220@@ -58,7 +58,7 @@
4221 NULL,
4222 0,
4223 0,
4224- 0
4225+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4226 }
4227 };
4228
4229Index: TelnetMgmt/TelnetMgmt.h
4230===================================================================
4231--- TelnetMgmt/TelnetMgmt.h (revision 64)
4232+++ TelnetMgmt/TelnetMgmt.h (working copy)
4233@@ -29,4 +29,4 @@
4234 0x55d41b9a, 0x954d, 0x4fbb, 0x8d, 0x6d, 0x24, 0x75, 0xf5, 0x30, 0x9d, 0x37 \
4235 }
4236
4237-#endif
4238\ No newline at end of file
4239+#endif
4240Index: TelnetMgmt/TelnetServer.h
4241===================================================================
4242--- TelnetMgmt/TelnetServer.h (revision 64)
4243+++ TelnetMgmt/TelnetServer.h (working copy)
4244@@ -81,3 +81,4 @@
4245 extern EFI_GUID gEfiTelnetServerGuid;
4246
4247 #endif
4248+
4249Index: TelnetMgmt/TelnetMgmt.inf
4250===================================================================
4251--- TelnetMgmt/TelnetMgmt.inf (revision 64)
4252+++ TelnetMgmt/TelnetMgmt.inf (working copy)
4253@@ -25,23 +25,23 @@
c0004f9c 4254 COMPONENT_TYPE = APPLICATION
4255
4256 [sources.common]
4257- ..\ShCommonStrings.uni
4258+ ../ShCommonStrings.uni
4259 TelnetMgmtStrings.uni
4260 TelnetMgmt.c
4261
4262 [includes.common]
4263 .
4264- ..\Inc
4265- ..\Library
4266- $(EDK_SOURCE)\Foundation
4267- $(EDK_SOURCE)\Foundation\Include
4268- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4269- $(EDK_SOURCE)\Foundation\Efi
4270- $(EDK_SOURCE)\Foundation\Efi\Include
4271- $(EDK_SOURCE)\Foundation\FrameWork
4272- $(EDK_SOURCE)\Foundation\FrameWork\Include
4273- $(EDK_SOURCE)\Foundation\Core\Dxe
4274- $(DEST_DIR)\
4275+ ../Inc
4276+ ../Library
4277+ $(EDK_SOURCE)/Foundation
4278+ $(EDK_SOURCE)/Foundation/Include
4279+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4280+ $(EDK_SOURCE)/Foundation/Efi
4281+ $(EDK_SOURCE)/Foundation/Efi/Include
4282+ $(EDK_SOURCE)/Foundation/FrameWork
4283+ $(EDK_SOURCE)/Foundation/FrameWork/Include
4284+ $(EDK_SOURCE)/Foundation/Core/Dxe
4285+ $(DEST_DIR./
4286
4287 [libraries.common]
4288 EfiShellLib
b00c06f0
OM		 4289@@ -55,6 +55,11 @@
4290
4291 [nmake.common]
4292 IMAGE_ENTRY_POINT=InitializeTelnetMgmt
4293+
4294+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4295 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4296 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4297 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4298+
4299+[nmake.ARM, nmake.AARCH64]
4300+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 4301Index: shellenv/if.c
4302===================================================================
4303--- shellenv/if.c (revision 64)
4304+++ shellenv/if.c (working copy)
4305@@ -59,7 +59,6 @@
4306 BOOLEAN ExistNot;
4307 UINTN NotPos;
4308 BOOLEAN ExistI;
4309- UINTN IPos;
4310 EFI_STATUS Status;
4311 CHAR16 *FileName;
4312 BOOLEAN FileExists;
4313@@ -122,10 +121,8 @@
c0004f9c 4314 //
2bba8d5a
OM		 4315 if ((StriCmp (SI->Argv[1], L"/i") == 0)) {
4316 ExistI = TRUE;
4317- IPos = 1;
4318 } else {
4319 ExistI = FALSE;
4320- IPos = 0;
4321 }
c0004f9c 4322
2bba8d5a
OM		 4323 NotPos = ExistI ? 2 : 1;
4324Index: shellenv/init.c
4325===================================================================
4326--- shellenv/init.c (revision 64)
4327+++ shellenv/init.c (working copy)
4328@@ -143,7 +143,7 @@
4329 Status = BS->HandleProtocol (
4330 mOldSEnv->Handle,
4331 &ShellEnvProtocol,
4332- &(mOldSEnv->Interface)
4333+ (VOID**)&(mOldSEnv->Interface)
4334 );
4335 ASSERT (!EFI_ERROR (Status));
4336 Status = BS->ReinstallProtocolInterface (
4337Index: shellenv/echo.c
4338===================================================================
4339--- shellenv/echo.c (revision 64)
4340+++ shellenv/echo.c (working copy)
4341@@ -52,7 +52,7 @@
4342 NULL,
4343 0,
4344 0,
4345- 0
4346+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4347 }
4348 };
4349
4350Index: shellenv/shelle.h
4351===================================================================
4352--- shellenv/shelle.h (revision 64)
4353+++ shellenv/shelle.h (working copy)
4354@@ -2074,3 +2074,4 @@
4355 );
4356
4357 #endif // _SHELLE_H_
4358+
4359Index: shellenv/batch.c
4360===================================================================
4361--- shellenv/batch.c (revision 64)
4362+++ shellenv/batch.c (working copy)
4363@@ -2388,7 +2388,6 @@
4364
4365 --*/
4366 {
4367- BOOLEAN EndOfFile;
4368 EFI_STATUS Status;
4369 UINTN BufSize;
4370 CHAR16 *CommandLine;
4371@@ -2396,7 +2395,6 @@
4372 EFI_BATCH_STATEMENT *Stmt;
4373 ENV_SHELL_INTERFACE NewShell;
4374 UINTN GotoTargetStatus;
4375- UINTN SkippedIfCount;
4376 BOOLEAN EchoStateValid;
4377 BOOLEAN EchoState;
4378 EFI_STATUS ExecuteResult;
4379@@ -2409,7 +2407,6 @@
4380 // Initialize
4381 //
4382 Status = EFI_SUCCESS;
4383- EndOfFile = FALSE;
4384 BufSize = 0;
4385 EchoStateValid = FALSE;
4386 EchoState = FALSE;
4387@@ -2468,14 +2465,6 @@
4388 EFI_BATCH_SCRIPT_SIGNATURE
4389 );
4390
4391- //
4392- // Iterate through the file, reading a line at a time and executing each
4393- // line as a shell command. Nested shell scripts will come through
4394- // this code path recursively.
4395- //
4396- EndOfFile = FALSE;
4397- SkippedIfCount = 0;
4398-
4399 while (1) {
4400 //
4401 // Read a command line from the file
4402@@ -2681,7 +2670,7 @@
4403 LastError = ExecuteResult;
4404 }
4405
4406- if (ExecuteResult == -1) {
4407+ if (ExecuteResult == (EFI_STATUS) -1) {
4408 SE2->DecrementShellNestingLevel ();
4409 if (SE2->IsRootShell ()) {
4410 goto Done;
4411@@ -2774,7 +2763,7 @@
4412 Status = _ResumePreviousMode ();
4413 }
4414
4415- if (LastError == -1) {
4416+ if (LastError == (UINTN) -1) {
4417 return LastError;
4418 } else {
4419 return Status;
4420Index: shellenv/dprot.c
4421===================================================================
4422--- shellenv/dprot.c (revision 64)
4423+++ shellenv/dprot.c (working copy)
4424@@ -23,7 +23,7 @@
4425
4426 #include "shelle.h"
4427 #include "shellenvguid.h"
4428-#include "acpi.h"
4429+#include "Acpi.h"
4430
4431 STATIC CHAR16 *SEnvDP_IlleagalStr[] = { L"Illegal" };
4432
4433@@ -328,7 +328,6 @@
4434 I2O_DEVICE_PATH *I2ODevicePath;
4435 MAC_ADDR_DEVICE_PATH *MacAddrDevicePath;
4436 IPv4_DEVICE_PATH *IPv4DevicePath;
4437- IPv6_DEVICE_PATH *IPv6DevicePath;
4438 INFINIBAND_DEVICE_PATH *InfinibandDevicePath;
4439 UART_DEVICE_PATH *UartDevicePath;
4440 VENDOR_DEVICE_PATH *VendorDevicePath;
4441@@ -464,7 +463,6 @@
4442 break;
4443
4444 case MSG_IPv6_DP:
4445- IPv6DevicePath = (IPv6_DEVICE_PATH *) DevicePath;
4446 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_NOT_AVAIL), HiiEnvHandle);
4447 break;
4448
4449@@ -1054,6 +1052,8 @@
4450 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4451 } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) {
4452 Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4453+ } else if (NtHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_AARCH64) {
4454+ Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
4455 } else {
4456 Magic = NtHdr->OptionalHeader.Magic;
4457 }
4458@@ -1294,6 +1294,8 @@
4459 case EfiIsaAcpiResourceInterrupt:
4460 PrintToken (STRING_TOKEN (STR_SHELLENV_DPROT_INT), HiiEnvHandle);
4461 break;
4462+ case EfiIsaAcpiResourceEndOfList:
4463+ return;
4464 }
4465
4466 if (IsaIo->ResourceList->ResourceItem[Index].StartRange == IsaIo->ResourceList->ResourceItem[Index].EndRange) {
4467Index: shellenv/Connect.c
4468===================================================================
4469--- shellenv/Connect.c (revision 64)
4470+++ shellenv/Connect.c (working copy)
4471@@ -51,7 +51,7 @@
4472 NULL,
4473 0,
4474 0,
4475- 0
4476+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4477 }
4478 };
4479
4480@@ -78,7 +78,7 @@
4481 NULL,
4482 0,
4483 0,
4484- 0
4485+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4486 }
4487 };
4488
4489@@ -105,7 +105,7 @@
4490 NULL,
4491 0,
4492 0,
4493- 0
4494+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4495 }
4496 };
4497
4498@@ -333,7 +333,7 @@
4499 Status = BS->HandleProtocol (
4500 HandleBuffer[0],
4501 &gEfiDevicePathProtocolGuid,
4502- &Instance
4503+ (VOID**)&Instance
4504 );
4505 if (EFI_ERROR (Status)) {
4506 DriverBindingHandleCount = 1;
4507@@ -349,7 +349,7 @@
4508 Status = BS->HandleProtocol (
4509 HandleBuffer[0],
4510 &gEfiDevicePathProtocolGuid,
4511- &Instance
4512+ (VOID**)&Instance
4513 );
4514 if (EFI_ERROR (Status)) {
4515 PrintToken (
4516@@ -368,7 +368,7 @@
4517 Status = BS->HandleProtocol (
4518 HandleBuffer[1],
4519 &gEfiDriverBindingProtocolGuid,
4520- &Instance
4521+ (VOID**)&Instance
4522 );
4523 if (EFI_ERROR (Status)) {
4524 PrintToken (
4525@@ -407,7 +407,7 @@
4526 Status = BS->HandleProtocol (
4527 AllHandleBuffer[Index],
4528 &gEfiDriverBindingProtocolGuid,
4529- &Instance
4530+ (VOID**)&Instance
4531 );
4532 if (EFI_ERROR (Status)) {
4533 DeviceHandleBuffer[DeviceHandleCount++] = AllHandleBuffer[Index];
4534@@ -1052,7 +1052,7 @@
4535 Status = BS->HandleProtocol (
4536 *ConsoleHandle,
4537 ConsoleGuid,
4538- &Interface
4539+ (VOID**)&Interface
4540 );
4541 }
4542
4543@@ -1079,7 +1079,7 @@
4544 Status = BS->HandleProtocol (
4545 AllHandleBuffer[Index],
4546 &gEfiDevicePathProtocolGuid,
4547- &Interface
4548+ (VOID**)&Interface
4549 );
4550 if (!EFI_ERROR (Status)) {
4551 ConsoleIndex = Index;
4552@@ -1095,7 +1095,7 @@
4553 BS->HandleProtocol (
4554 *ConsoleHandle,
4555 ConsoleGuid,
4556- ConsoleInterface
4557+ (VOID**)ConsoleInterface
4558 );
4559 }
4560
4561Index: shellenv/shellenvguid.h
4562===================================================================
4563--- shellenv/shellenvguid.h (revision 64)
4564+++ shellenv/shellenvguid.h (working copy)
4565@@ -37,3 +37,4 @@
4566 extern EFI_HII_HANDLE HiiEnvHandle;
4567
4568 #endif
4569+
4570Index: shellenv/protid.c
4571===================================================================
4572--- shellenv/protid.c (revision 64)
4573+++ shellenv/protid.c (working copy)
4574@@ -628,7 +628,7 @@
4575 NULL,
4576 0,
4577 0,
4578- FALSE
4579+ (SHELL_VAR_CHECK_FLAG_TYPE) FALSE
4580 }
4581 };
4582
4583@@ -1183,7 +1183,7 @@
4584 *DriverName = LibDevicePathToStr (Image->FilePath);
4585 }
4586 } else {
4587- LibGetDriverName (DriverBindingHandle, Language, DriverName);
4588+ LibGetDriverName (DriverBindingHandle, (CHAR8*)Language, DriverName);
4589 }
4590
4591 return EFI_SUCCESS;
4592@@ -1539,7 +1539,7 @@
4593
4594 DevicePath = NULL;
4595 BestDeviceName = NULL;
4596- Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
4597+ Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
4598
4599 Print (L"\n");
4600 PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_CONTROLLER_NAME), HiiEnvHandle);
4601@@ -1598,14 +1598,14 @@
4602 Image = FALSE;
4603 Status = GetDriverName (
4604 DriverBindingHandleBuffer[Index],
4605- Language,
4606+ (UINT8*)Language,
4607 FALSE,
4608 &DriverName
4609 );
4610 if (DriverName == NULL) {
4611 Status = GetDriverName (
4612 DriverBindingHandleBuffer[Index],
4613- Language,
4614+ (UINT8*)Language,
4615 TRUE,
4616 &DriverName
4617 );
4618@@ -1792,7 +1792,7 @@
4619
4620 Status = GetDriverName (
4621 Handle,
4622- Language,
4623+ (UINT8*)Language,
4624 FALSE,
4625 &DriverName
4626 );
4627@@ -1806,7 +1806,7 @@
4628
4629 Status = GetDriverName (
4630 Handle,
4631- Language,
4632+ (UINT8*)Language,
4633 TRUE,
4634 &DriverName
4635 );
4636@@ -1979,7 +1979,7 @@
c0004f9c 4637
2bba8d5a
OM		 4638 if (Prot->Handles[Index] == Handle) {
4639 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
4640- Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
4641+ Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
4642 if (!EFI_ERROR (Status)) {
4643 if (Verbose) {
4644 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
4645@@ -2027,7 +2027,7 @@
4646 goto Done;
4647 }
c0004f9c 4648
2bba8d5a
OM		 4649- Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
4650+ Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
4651 if (!EFI_ERROR (Status)) {
4652 PrintToken (
4653 STRING_TOKEN (STR_SHELLENV_PROTID_TWO_VARS_HG_NEW),
4654@@ -2660,8 +2660,6 @@
c0004f9c 4655
2bba8d5a
OM		 4656 --*/
4657 {
4658- EFI_STATUS Status;
4659-
4660 DEVICEPATH_INFO *DevicePathInfo;
c0004f9c 4661
2bba8d5a
OM		 4662 UINTN Index;
4663@@ -2688,7 +2686,7 @@
4664 //
4665 // Establish current device path info list
4666 //
4667- Status = LibLocateHandle (
4668+ LibLocateHandle (
4669 ByProtocol,
4670 Protocol,
4671 NULL,
4672Index: shellenv/parsecmd.h
4673===================================================================
4674--- shellenv/parsecmd.h (revision 64)
4675+++ shellenv/parsecmd.h (working copy)
4676@@ -103,4 +103,5 @@
4677 IN OUT SHELL_PARSED_ARGS *args
4678 );
c0004f9c 4679
2bba8d5a
OM		 4680-#endif
4681\ No newline at end of file
4682+#endif
4683+
4684Index: shellenv/ConsoleProxy.c
4685===================================================================
4686--- shellenv/ConsoleProxy.c (revision 64)
4687+++ shellenv/ConsoleProxy.c (working copy)
4688@@ -1483,7 +1483,7 @@
4689
4690 if (!EFI_ERROR (TimerStatus)) {
4691 mConInProxy.InputState = INPUT_STATE_DEFAULT;
4692- BS->SetTimer (
4693+ Status = BS->SetTimer (
4694 mConInProxy.TwoSecondTimeOut,
4695 TimerCancel,
4696 0
4697@@ -1496,9 +1496,11 @@
4698 (UINT64) 20000000
4699 );
4700 mConInProxy.InputState = INPUT_STATE_ESC;
4701+ } else {
4702+ Status = EFI_UNSUPPORTED;
4703 }
c0004f9c 4704
2bba8d5a
OM		 4705- return EFI_SUCCESS;
4706+ return Status;
4707 }
c0004f9c 4708
2bba8d5a
OM		 4709 EFI_STATUS
4710Index: shellenv/conio.c
4711===================================================================
4712--- shellenv/conio.c (revision 64)
4713+++ shellenv/conio.c (working copy)
4714@@ -889,7 +889,7 @@
c0004f9c 4715 //
2bba8d5a 4716 // If we need to update the output do so now
c0004f9c 4717 //
2bba8d5a
OM		 4718- if (Update != -1) {
4719+ if (Update != (UINTN) -1) {
4720 if ((ConOut->Mode->CursorColumn != (INT32) Column) || (ConOut->Mode->CursorRow != (INT32) Row)) {
4721 PrintAt (Column, Row, L"%s%.*s", Str + Update, Delete, L"");
4722 } else {
4723Index: shellenv/map.c
4724===================================================================
4725--- shellenv/map.c (revision 64)
4726+++ shellenv/map.c (working copy)
4727@@ -185,7 +185,7 @@
4728 NULL,
4729 0,
4730 0,
4731- 0
4732+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4733 }
4734 };
4735
4736@@ -206,7 +206,7 @@
4737 NULL,
4738 0,
4739 0,
4740- 0
4741+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4742 }
4743 };
4744
4745@@ -2038,13 +2038,13 @@
4746 goto Done;
4747 }
4748
4749- Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, &BlockIo);
4750+ Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID**)&BlockIo);
4751 //
4752 // This is just for NT32, because fsntx has no block io protocol installed
4753 // but fsntx has installed simple file system protocol
4754 //
4755 if (EFI_ERROR (Status)) {
4756- Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, &BlockIo);
4757+ Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&BlockIo);
4758 }
4759
4760 if (EFI_ERROR (Status)) {
4761@@ -2630,7 +2630,6 @@
4762 UINTN Index;
4763 UINTN HandleNo;
4764 BOOLEAN EchoStatus;
4765- BOOLEAN Same;
4766 CHAR16 MapStr[8];
4767 EFI_LIST_ENTRY *Link;
4768 EFI_LIST_ENTRY *Head;
4769@@ -2729,11 +2728,6 @@
c0004f9c 4770 }
2bba8d5a
OM		 4771 }
4772 }
4773- //
4774- // New code, try to make mapping list sequence unchanged if current device
4775- // paths and original device paths are the same
4776- //
4777- Same = FALSE;
4778
4779 //
4780 // Load handle table and handle protocol info so that we can get
4781@@ -3410,4 +3404,4 @@
4782 FreePool (HistoryNode->DevicePath);
4783 FreePool (HistoryNode);
4784 }
4785-}
4786\ No newline at end of file
4787+}
4788Index: shellenv/pause.c
4789===================================================================
4790--- shellenv/pause.c (revision 64)
4791+++ shellenv/pause.c (working copy)
4792@@ -47,7 +47,7 @@
4793 NULL,
4794 0,
4795 0,
4796- 0
4797+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4798 }
4799 };
4800
4801Index: shellenv/exec.c
4802===================================================================
4803--- shellenv/exec.c (revision 64)
4804+++ shellenv/exec.c (working copy)
4805@@ -105,7 +105,7 @@
4806 NULL,
4807 0,
4808 0,
4809- 0
4810+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4811 }
4812 };
4813
4814@@ -126,7 +126,7 @@
4815 NULL,
4816 0,
4817 0,
4818- 0
4819+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4820 }
4821 };
4822
4823@@ -1270,7 +1270,6 @@
4824 SHELLENV_INTERNAL_COMMAND InternalCommand;
4825 EFI_HANDLE NewImage;
4826 EFI_FILE_HANDLE Script;
4827- BOOLEAN ShowHelp;
4828 BOOLEAN ConsoleContextSaved;
4829 EFI_HANDLE SavedConsoleInHandle;
4830 EFI_HANDLE SavedConsoleOutHandle;
4831@@ -1292,7 +1291,6 @@
4832 //
4833 Status = EFI_SUCCESS;
4834 ParentShell = NULL;
4835- ShowHelp = FALSE;
4836 ConsoleContextSaved = FALSE;
4837 SavedConIn = NULL;
4838 SavedConOut = NULL;
4839@@ -1557,7 +1555,7 @@
4840 );
4841
4842 EFI_SHELL_APP_INIT (ParentImageHandle, ParentSystemTable);
4843- if (-2 == Status) {
4844+ if ((EFI_STATUS) -2 == Status) {
4845 //
4846 // if status = -2 we assume that a nested shell has just exited.
4847 //
4848@@ -1613,7 +1611,9 @@
4849 Done:
4850 DEBUG_CODE (
4851 if (EFI_ERROR (Status) && Output) {
4852- if ((Status == -1) || (Status == -2) || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4853+ if ((Status == (EFI_STATUS) -1)
4854+ || (Status == (EFI_STATUS) -2)
4855+ || (Status == EFI_REDIRECTION_NOT_ALLOWED)
4856 || (Status == EFI_REDIRECTION_SAME)) {
4857 } else {
4858 PrintToken (STRING_TOKEN (STR_SHELLENV_EXEC_EXIT_STATUS_CODE), HiiEnvHandle, Status);
4859@@ -1674,7 +1674,7 @@
4860 PrintToken (STRING_TOKEN (STR_SHELLENV_REDIR_NOT_ALLOWED), HiiEnvHandle);
4861 }
4862
4863- if (Status != -1) {
4864+ if (Status != (EFI_STATUS) -1) {
c0004f9c 4865 //
2bba8d5a
OM		 4866 // Don't Print on a "Disconnect All" exit. The ConOut device may not exist
4867 //
4868@@ -1872,7 +1872,7 @@
4869 return Status;
4870 }
4871 //
4872- // Processing foo: or foo:\
4873+ // Processing foo:\ or foo:
4874 //
4875 if (PathPos != -1 && Ptr1 == NULL) {
4876 return Status;
4877@@ -2638,7 +2638,6 @@
4878 EFI_STATUS Status;
4879 CHAR16 *Alias;
4880 CHAR16 *SubstituteStr;
4881- CHAR16 *OldSubstituteStr;
4882 BOOLEAN Literal;
4883 BOOLEAN Comment;
4884 BOOLEAN IsVariable;
4885@@ -2735,7 +2734,6 @@
4886 // Try to find a shell enviroment variable
4887 //
4888 QuoteCount = 0;
4889- OldSubstituteStr = SubstituteStr;
4890 SubstituteStr = Str + 1;
4891 while (*SubstituteStr != '%' && *SubstituteStr != 0 && (!IsWhiteSpace (*SubstituteStr) || ParseState->Quote)) {
4892 if (*SubstituteStr == '"') {
4893Index: shellenv/for.c
4894===================================================================
4895--- shellenv/for.c (revision 64)
4896+++ shellenv/for.c (working copy)
4897@@ -24,7 +24,7 @@
4898 #include "shelle.h"
4899 #include "shellenvguid.h"
c0004f9c 4900
2bba8d5a
OM		 4901-/*
4902+#if 0
4903 BOOLEAN
4904 CheckInterValue (
4905 IN CHAR16 *wszValueStr,
4906@@ -190,7 +190,7 @@
4907 Returns:
4908 EFI_SUCCESS The function finished sucessfully
4909
4910---
4911+--*/
4912 {
4913 EFI_BATCH_STATEMENT *Stmt;
4914 EFI_LIST_ENTRY FileList;
4915@@ -326,7 +326,8 @@
4916
4917 return Status;
4918 }
4919-*/
4920+#endif
4921+
4922 EFI_STATUS
4923 SEnvCmdForRun (
4924 IN EFI_HANDLE hImageHandle,
4925Index: shellenv/help.c
4926===================================================================
4927--- shellenv/help.c (revision 64)
4928+++ shellenv/help.c (working copy)
4929@@ -52,7 +52,7 @@
4930 NULL,
4931 0,
4932 0,
4933- 0
4934+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4935 }
4936 };
4937
4938Index: shellenv/var.c
4939===================================================================
4940--- shellenv/var.c (revision 64)
4941+++ shellenv/var.c (working copy)
4942@@ -110,7 +110,7 @@
4943 NULL,
4944 0,
4945 0,
4946- 0
4947+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4948 }
4949 };
c0004f9c 4950
2bba8d5a
OM		 4951@@ -144,7 +144,6 @@
4952 EFI_LIST_ENTRY *ListHead;
4953 VARIABLE_ID *Var;
4954 EFI_STATUS Status;
4955- BOOLEAN IsString;
4956 UINT32 Attributes;
c0004f9c 4957
2bba8d5a
OM		 4958 //
4959@@ -175,15 +174,12 @@
4960 // See if it's a shellenv variable
4961 //
4962 ListHead = NULL;
4963- IsString = FALSE;
4964 if (CompareGuid (&Id, &SEnvEnvId) == 0) {
4965 ListHead = &SEnvEnv;
4966- IsString = TRUE;
4967 }
4968
4969 if (CompareGuid (&Id, &SEnvAliasId) == 0) {
4970 ListHead = &SEnvAlias;
4971- IsString = TRUE;
4972 }
4973
4974 if (ListHead) {
4975Index: reset/reset.c
4976===================================================================
4977--- reset/reset.c (revision 64)
4978+++ reset/reset.c (working copy)
4979@@ -61,7 +61,7 @@
4980 NULL,
4981 0,
4982 0,
4983- 0
4984+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
4985 }
4986 };
4987
4988Index: reset/reset.h
4989===================================================================
4990--- reset/reset.h (revision 64)
4991+++ reset/reset.h (working copy)
4992@@ -32,3 +32,4 @@
4993 }
4994
4995 #endif
4996+
4997Index: reset/reset.inf
4998===================================================================
4999--- reset/reset.inf (revision 64)
5000+++ reset/reset.inf (working copy)
5001@@ -40,24 +40,24 @@
c0004f9c 5002
5003
5004 [sources.common]
5005- ..\ShCommonStrings.uni
5006+ ../ShCommonStrings.uni
2bba8d5a
OM		 5007 ResetStrings.uni
5008 Reset.c
5009 Reset.h
c0004f9c 5010
5011 [includes.common]
5012 .
5013- ..\Inc
5014- ..\Library
5015- $(EDK_SOURCE)\Foundation
5016- $(EDK_SOURCE)\Foundation\Include
5017- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5018- $(EDK_SOURCE)\Foundation\Efi
5019- $(EDK_SOURCE)\Foundation\Efi\Include
5020- $(EDK_SOURCE)\Foundation\FrameWork
5021- $(EDK_SOURCE)\Foundation\FrameWork\Include
5022- $(EDK_SOURCE)\Foundation\Core\Dxe
5023- $(DEST_DIR)\
5024+ ../Inc
5025+ ../Library
5026+ $(EDK_SOURCE)/Foundation
5027+ $(EDK_SOURCE)/Foundation/Include
5028+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5029+ $(EDK_SOURCE)/Foundation/Efi
5030+ $(EDK_SOURCE)/Foundation/Efi/Include
5031+ $(EDK_SOURCE)/Foundation/FrameWork
5032+ $(EDK_SOURCE)/Foundation/FrameWork/Include
5033+ $(EDK_SOURCE)/Foundation/Core/Dxe
5034+ $(DEST_DIR./
5035
5036 [libraries.common]
5037 EfiShellLib
b00c06f0
OM		 5038@@ -72,7 +72,11 @@
5039
5040 [nmake.common]
5041 IMAGE_ENTRY_POINT=InitializeReset
5042+
5043+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5044 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5045 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5046 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5047
5048+[nmake.ARM, nmake.AARCH64]
5049+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 5050Index: touch/touch.c
5051===================================================================
5052--- touch/touch.c (revision 64)
5053+++ touch/touch.c (working copy)
5054@@ -64,7 +64,7 @@
c0004f9c 5055 //
5056 // Global Variables
5057 //
5058-EFI_HII_HANDLE HiiHandle;
5059+STATIC EFI_HII_HANDLE HiiHandle;
2bba8d5a
OM		 5060 EFI_GUID EfiTouchGuid = EFI_TOUCH_GUID;
5061 SHELL_VAR_CHECK_ITEM TouchCheckList[] = {
c0004f9c 5062 {
2bba8d5a
OM		 5063Index: touch/touch.h
5064===================================================================
5065--- touch/touch.h (revision 64)
5066+++ touch/touch.h (working copy)
5067@@ -29,4 +29,4 @@
5068 0xa16a4695, 0x5815, 0x4d4f, 0xb8, 0xe, 0x6a, 0xf, 0x88, 0xac, 0xdb, 0x6c \
5069 }
5070
5071-#endif
5072\ No newline at end of file
5073+#endif
5074Index: touch/touch.inf
5075===================================================================
5076--- touch/touch.inf (revision 64)
5077+++ touch/touch.inf (working copy)
5078@@ -39,23 +39,23 @@
5079 COMPONENT_TYPE = APPLICATION
c0004f9c 5080
5081 [sources.common]
c0004f9c 5082- ..\ShCommonStrings.uni
5083+ ../ShCommonStrings.uni
2bba8d5a
OM		 5084 TouchStrings.uni
5085 touch.c
c0004f9c 5086
5087 [includes.common]
5088 .
5089- ..\Inc
5090- ..\Library
5091- $(EDK_SOURCE)\Foundation
5092- $(EDK_SOURCE)\Foundation\Include
5093- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5094- $(EDK_SOURCE)\Foundation\Efi
5095- $(EDK_SOURCE)\Foundation\Efi\Include
5096- $(EDK_SOURCE)\Foundation\FrameWork
5097- $(EDK_SOURCE)\Foundation\FrameWork\Include
5098- $(EDK_SOURCE)\Foundation\Core\Dxe
5099- $(DEST_DIR)\
5100+ ../Inc
5101+ ../Library
5102+ $(EDK_SOURCE)/Foundation
5103+ $(EDK_SOURCE)/Foundation/Include
5104+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5105+ $(EDK_SOURCE)/Foundation/Efi
5106+ $(EDK_SOURCE)/Foundation/Efi/Include
5107+ $(EDK_SOURCE)/Foundation/FrameWork
5108+ $(EDK_SOURCE)/Foundation/FrameWork/Include
5109+ $(EDK_SOURCE)/Foundation/Core/Dxe
5110+ $(DEST_DIR./
5111
2bba8d5a
OM		 5112 [libraries.common]
5113 EfiShellLib
b00c06f0
OM		 5114@@ -70,6 +70,11 @@
5115
5116 [nmake.common]
5117 IMAGE_ENTRY_POINT=InitializeTouch
5118+
5119+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5120 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5121 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5122 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5123+
5124+[nmake.ARM, nmake.AARCH64]
5125+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 5126Index: Shell.inf
5127===================================================================
5128--- Shell.inf (revision 64)
5129+++ Shell.inf (working copy)
5130@@ -25,179 +25,189 @@
5131 COMPONENT_TYPE = APPLICATION
5132
5133 [sources.common]
5134- Library\ShellDebug.c
5135- Library\DPath.c
5136- Library\Init.c
5137- Library\Lock.c
5138- Library\Str.c
5139- Library\IO.c
5140- Library\Mem.c
5141- Library\Misc.c
5142- Library\Data.c
5143- Library\RtData.c
5144- Library\ShellEnvInt.c
5145- Library\Handle.c
5146- Library\FileIO.c
5147- Library\ConsistMapping.c
5148- Library\CRC.c
5149- Library\Event.c
5150- Library\Perf.c
5151- Library\VarCheck.c
5152- Library\HiiSupport.c
5153+ Library/ShellDebug.c
5154+ Library/DPath.c
5155+ Library/Init.c
5156+ Library/Lock.c
5157+ Library/Str.c
5158+ Library/IO.c
5159+ Library/Mem.c
5160+ Library/Misc.c
5161+ Library/Data.c
5162+ Library/RtData.c
5163+ Library/ShellEnvInt.c
5164+ Library/Handle.c
5165+ Library/FileIO.c
5166+ Library/ConsistMapping.c
5167+ Library/CRC.c
5168+ Library/Event.c
5169+ Library/Perf.c
5170+ Library/VarCheck.c
5171+ Library/HiiSupport.c
5172
5173- newshell\NshellStrings.uni
5174- newshell\init.c
5175- newshell\nshell.h
5176- newshell\fakehii.c
5177+ newshell/NshellStrings.uni
5178+ newshell/init.c
5179+ newshell/nshell.h
5180+ newshell/fakehii.c
5181
5182 ShCommonStrings.uni
5183- shellenv\ShellenvHelpStrings.uni
5184- shellenv\ShellenvStrings.uni
5185- shellenv\ScriptCmdStrings.uni
5186- shellenv\ConnectStrings.uni
5187- shellenv\EchoStrings.uni
5188- shellenv\HelpStrings.uni
5189- shellenv\MapStrings.uni
5190- shellenv\CdStrings.uni
5191- shellenv\DhStrings.uni
5192+ shellenv/ShellenvHelpStrings.uni
5193+ shellenv/ShellenvStrings.uni
5194+ shellenv/ScriptCmdStrings.uni
5195+ shellenv/ConnectStrings.uni
5196+ shellenv/EchoStrings.uni
5197+ shellenv/HelpStrings.uni
5198+ shellenv/MapStrings.uni
5199+ shellenv/CdStrings.uni
5200+ shellenv/DhStrings.uni
5201
5202- shellenv\cmddisp.c
5203- shellenv\connect.c
5204- shellenv\data.c
5205- shellenv\exec.c
5206- shellenv\init.c
5207- shellenv\protid.c
5208- shellenv\var.c
5209- shellenv\conio.c
5210- shellenv\consoleproxy.c
5211- shellenv\handle.c
5212- shellenv\dprot.c
5213- shellenv\map.c
5214- shellenv\marg.c
5215- shellenv\batch.c
5216- shellenv\if.c
5217- shellenv\goto.c
5218- shellenv\echo.c
5219- shellenv\pause.c
5220- shellenv\for.c
5221- shellenv\wait.c
5222- shellenv\help.c
5223- shellenv\shelle.h
5224- shellenv\shellenvguid.h
5225- shellenv\parsecmd.c
5226- shellenv\shift.c
5227+ shellenv/cmddisp.c
5228+ shellenv/connect.c
5229+ shellenv/data.c
5230+ shellenv/exec.c
5231+ shellenv/init.c
5232+ shellenv/protid.c
5233+ shellenv/var.c
5234+ shellenv/conio.c
5235+ shellenv/consoleproxy.c
5236+ shellenv/handle.c
5237+ shellenv/dprot.c
5238+ shellenv/map.c
5239+ shellenv/marg.c
5240+ shellenv/batch.c
5241+ shellenv/if.c
5242+ shellenv/goto.c
5243+ shellenv/echo.c
5244+ shellenv/pause.c
5245+ shellenv/for.c
5246+ shellenv/wait.c
5247+ shellenv/help.c
5248+ shellenv/shelle.h
5249+ shellenv/shellenvguid.h
5250+ shellenv/parsecmd.c
5251+ shellenv/shift.c
5252
5253- unload\UnloadStrings.uni
5254- unload\unload.c
5255+ unload/UnloadStrings.uni
5256+ unload/unload.c
5257
5258- attrib\AttribStrings.uni
5259- attrib\attrib.c
5260- attrib\attrib.h
5261+ attrib/AttribStrings.uni
5262+ attrib/attrib.c
5263+ attrib/attrib.h
5264
5265- cls\clsstrings.uni
5266- cls\cls.c
5267+ cls/clsstrings.uni
5268+ cls/cls.c
c0004f9c 5269
2bba8d5a
OM		 5270- cp\CpStrings.uni
5271- cp\cp.h
5272- cp\cp.c
5273+ cp/CpStrings.uni
5274+ cp/cp.h
5275+ cp/cp.c
5276
5277- date\DateStrings.uni
5278- date\date.c
5279- date\date.h
5280+ date/DateStrings.uni
5281+ date/date.c
5282+ date/date.h
c0004f9c 5283
2bba8d5a
OM		 5284- load\LoadStrings.uni
5285- load\load.c
5286- load\load.h
5287+ load/LoadStrings.uni
5288+ load/load.c
5289+ load/load.h
c0004f9c 5290
2bba8d5a
OM		 5291- ls\LsStrings.uni
5292- ls\ls.h
5293- ls\ls.c
5294+ ls/LsStrings.uni
5295+ ls/ls.h
5296+ ls/ls.c
c0004f9c 5297
2bba8d5a
OM		 5298- mkdir\MkdirStrings.uni
5299- mkdir\mkdir.c
5300- mkdir\mkdir.h
5301+ mkdir/MkdirStrings.uni
5302+ mkdir/mkdir.c
5303+ mkdir/mkdir.h
c0004f9c 5304
2bba8d5a
OM		 5305- mv\MvStrings.uni
5306- mv\mv.c
5307- mv\mv.h
5308+ mv/MvStrings.uni
5309+ mv/mv.c
5310+ mv/mv.h
5311
5312- reset\ResetStrings.uni
5313- reset\reset.c
5314- reset\reset.h
5315+ reset/ResetStrings.uni
5316+ reset/reset.c
5317+ reset/reset.h
5318
5319- rm\RmStrings.uni
5320- rm\rm.h
5321- rm\rm.c
5322+ rm/RmStrings.uni
5323+ rm/rm.h
5324+ rm/rm.c
5325
5326- type\TypeStrings.uni
5327- type\type.c
5328- type\type.h
5329- time\TimeStrings.uni
5330- time\time.c
5331- time\time.h
5332+ type/TypeStrings.uni
5333+ type/type.c
5334+ type/type.h
5335+ time/TimeStrings.uni
5336+ time/time.c
5337+ time/time.h
c0004f9c 5338
2bba8d5a
OM		 5339- touch\TouchStrings.uni
5340- touch\touch.c
5341- touch\touch.h
5342+ touch/TouchStrings.uni
5343+ touch/touch.c
5344+ touch/touch.h
c0004f9c 5345
2bba8d5a
OM		 5346- vol\VolStrings.uni
5347- vol\vol.c
5348- vol\vol.h
5349+ vol/VolStrings.uni
5350+ vol/vol.c
5351+ vol/vol.h
c0004f9c 5352
2bba8d5a
OM		 5353- ver\VerStrings.uni
5354- ver\ver.c
5355- ver\ver.h
5356+ ver/VerStrings.uni
5357+ ver/ver.c
5358+ ver/ver.h
c0004f9c 5359
2bba8d5a
OM		 5360- drivers\driversStrings.uni
5361- drivers\drivers.c
5362- drivers\drivers.h
5363+ drivers/driversStrings.uni
5364+ drivers/drivers.c
5365+ drivers/drivers.h
5366
5367- drvcfg\DrvcfgStrings.uni
5368- drvcfg\drvcfg.c
5369- drvcfg\drvcfg.h
5370+ drvcfg/DrvcfgStrings.uni
5371+ drvcfg/drvcfg.c
5372+ drvcfg/drvcfg.h
5373
5374- drvdiag\DrvdiagStrings.uni
5375- drvdiag\drvdiag.c
5376- drvdiag\drvdiag.h
5377+ drvdiag/DrvdiagStrings.uni
5378+ drvdiag/drvdiag.c
5379+ drvdiag/drvdiag.h
5380
c0004f9c 5381
c0004f9c 5382
2bba8d5a
OM		 5383 [sources.ia32]
5384- ver\ia32\ver32.c
5385- Library\ia32\math.c
5386- Library\ia32\initplat.c
5387+ ver/IA32/ver32.c
5388+ Library/IA32/math.c
5389+ Library/IA32/initplat.c
c0004f9c 5390
c0004f9c 5391
2bba8d5a
OM		 5392 [sources.ipf]
5393- ver\ipf\ver64.c
5394- Library\ipf\math.c
5395- Library\ipf\initplat.c
5396- Library\ipf\palproc.s
5397- Library\ipf\salpal.c
5398+ ver/IPF/ver64.c
5399+ Library/IPF/math.c
5400+ Library/IPF/initplat.c
5401+ Library/IPF/palproc.s
5402+ Library/IPF/salpal.c
5403
5404 [sources.EBC]
5405- ver\ebc\verEbc.c
5406- Library\EBC\math.c
5407- Library\EBC\initplat.c
5408+ ver/ebc/verEbc.c
5409+ Library/Ebc/math.c
5410+ Library/Ebc/initplat.c
c0004f9c 5411
2bba8d5a
OM		 5412 [sources.x64]
5413- ver\ia32\ver32.c
5414- Library\ipf\math.c
5415- Library\ia32\initplat.c
5416+ ver/IA32/ver32.c
5417+ Library/IPF/math.c
5418+ Library/IA32/initplat.c
5419
5420+[sources.ARM]
5421+ ver/ia32/ver32.c
5422+ Library/IPF/math.c
5423+ Library/IA32/initplat.c
5424+
5425+[sources.AARCH64]
5426+ ver/ia32/ver32.c
5427+ Library/IPF/math.c
5428+ Library/IA32/initplat.c
5429+
c0004f9c 5430 [includes.common]
5431 .
2bba8d5a
OM		 5432- .\Inc
5433- .\ver
5434- .\Library
c0004f9c 5435- $(EDK_SOURCE)\Foundation
5436- $(EDK_SOURCE)\Foundation\Include
5437- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5438- $(EDK_SOURCE)\Foundation\Efi
5439- $(EDK_SOURCE)\Foundation\Efi\Include
5440- $(EDK_SOURCE)\Foundation\FrameWork
5441- $(EDK_SOURCE)\Foundation\FrameWork\Include
5442- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a
OM		 5443+ ./Inc
5444+ ./ver
5445+ ./Library
c0004f9c 5446+ $(EDK_SOURCE)/Foundation
5447+ $(EDK_SOURCE)/Foundation/Include
5448+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5449+ $(EDK_SOURCE)/Foundation/Efi
5450+ $(EDK_SOURCE)/Foundation/Efi/Include
5451+ $(EDK_SOURCE)/Foundation/FrameWork
5452+ $(EDK_SOURCE)/Foundation/FrameWork/Include
5453+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a
OM		 5454 $(DEST_DIR)
5455
5456 [libraries.common]
b00c06f0
OM		 5457@@ -216,17 +226,18 @@
5458 # we will specify some additional DEFINEs on the compile command line.
5459 #
5460 [nmake.common]
5461+ IMAGE_ENTRY_POINT=InitializeShell
5462+
5463+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5464 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
5465- IMAGE_ENTRY_POINT=InitializeShell
5466- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
5467 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5468 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5469+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
5470
5471+[nmake.ARM, nmake.AARCH64]
5472+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL
5473+
5474 [nmake.ebc]
5475 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL
5476 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5477 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5478-
5479-
5480-
2bba8d5a
OM		 5481-
5482\ No newline at end of file
2bba8d5a
OM		 5483Index: IfConfig/IfConfig.inf
5484===================================================================
5485--- IfConfig/IfConfig.inf (revision 64)
5486+++ IfConfig/IfConfig.inf (working copy)
5487@@ -25,7 +25,7 @@
5488 COMPONENT_TYPE = APPLICATION
c0004f9c 5489
5490 [sources.common]
5491- ..\ShCommonStrings.uni
5492+ ../ShCommonStrings.uni
2bba8d5a
OM		 5493 IfConfigStrings.uni
5494 IfConfig.c
5495 IfConfig.h
b00c06f0 5496@@ -33,30 +33,32 @@
2bba8d5a 5497 ShellNetHelper.h
c0004f9c 5498
5499 [includes.common]
c0004f9c 5500- ..\Inc
5501- ..\Library
2bba8d5a 5502- $(EDK_SOURCE)\Foundation\Efi
c0004f9c 5503- $(EDK_SOURCE)\Foundation
2bba8d5a 5504- $(EDK_SOURCE)\Foundation\Efi\Include
c0004f9c 5505- $(EDK_SOURCE)\Foundation\Include
5506- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
c0004f9c 5507- $(EDK_SOURCE)\Foundation\FrameWork
5508- $(EDK_SOURCE)\Foundation\FrameWork\Include
5509- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a 5510- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
c0004f9c 5511- $(DEST_DIR)\
5512+ ../Inc
5513+ ../Library
2bba8d5a 5514+ $(EDK_SOURCE)/Foundation/Efi
c0004f9c 5515+ $(EDK_SOURCE)/Foundation
2bba8d5a 5516+ $(EDK_SOURCE)/Foundation/Efi/Include
c0004f9c 5517+ $(EDK_SOURCE)/Foundation/Include
5518+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
c0004f9c 5519+ $(EDK_SOURCE)/Foundation/FrameWork
5520+ $(EDK_SOURCE)/Foundation/FrameWork/Include
5521+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a 5522+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
c0004f9c 5523+ $(DEST_DIR./
5524
2bba8d5a 5525 [libraries.common]
c0004f9c 5526 EfiShellLib
2bba8d5a
OM		 5527 EdkProtocolLib
5528 EfiProtocolLib
5529 EdkGuidLib
5530- EfiDriverLib
5531
5532 [nmake.common]
b00c06f0
OM		 5533- C_PROJ_FLAGS = $(C_PROJ_FLAGS)
5534 IMAGE_ENTRY_POINT=IfConfig
5535- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5536+
5537+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5538 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5539 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5540+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5541
5542+[nmake.ARM, nmake.AARCH64]
5543+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 5544Index: IfConfig/ShellNetHelper.h
5545===================================================================
5546--- IfConfig/ShellNetHelper.h (revision 64)
5547+++ IfConfig/ShellNetHelper.h (working copy)
5548@@ -87,3 +87,4 @@
5549 IN EFI_HANDLE ChildHandle
5550 );
5551 #endif
5552+
5553Index: IfConfig/IfConfig.c
5554===================================================================
5555--- IfConfig/IfConfig.c (revision 64)
5556+++ IfConfig/IfConfig.c (working copy)
5557@@ -29,7 +29,7 @@
c0004f9c 5558 //
2bba8d5a
OM		 5559 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
5560
c0004f9c 5561-EFI_HII_HANDLE HiiHandle;
5562+STATIC EFI_HII_HANDLE HiiHandle;
c0004f9c 5563
2bba8d5a 5564 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
c0004f9c 5565
2bba8d5a
OM		 5566@@ -75,7 +75,7 @@
5567 NULL,
5568 0,
5569 0,
5570- 0
5571+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
5572 }
5573 };
c0004f9c 5574
2bba8d5a
OM		 5575@@ -669,7 +669,7 @@
5576 Status = BS->LocateProtocol (
5577 &gEfiHiiConfigRoutingProtocolGuid,
5578 NULL,
5579- &mHiiConfigRouting
5580+ (VOID**)&mHiiConfigRouting
5581 );
5582 if (EFI_ERROR (Status)) {
5583 return EFI_NOT_FOUND;
5584Index: IfConfig/IfConfig.h
5585===================================================================
5586--- IfConfig/IfConfig.h (revision 64)
5587+++ IfConfig/IfConfig.h (working copy)
5588@@ -60,3 +60,4 @@
5589 } ARP_REQUEST;
c0004f9c 5590
2bba8d5a
OM		 5591 #endif
5592+
5593Index: edit/libStatusBar.c
5594===================================================================
5595--- edit/libStatusBar.c (revision 64)
5596+++ edit/libStatusBar.c (working copy)
5597@@ -157,11 +157,15 @@
5598 // back up the screen attributes
5599 //
5600 Orig = MainEditor.ColorAttributes;
5601+ New.Data = 0;
5602 New.Colors.Foreground = Orig.Colors.Background;
5603 New.Colors.Background = Orig.Colors.Foreground;
5604
5605 Out->EnableCursor (Out, FALSE);
5606- Out->SetAttribute (Out, New.Data);
5607+ Out->SetAttribute (
5608+ Out,
5609+ EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5610+ );
c0004f9c 5611
2bba8d5a
OM		 5612 //
5613 // clear status bar
5614@@ -191,7 +195,10 @@
5615 //
5616 // restore the old screen attributes
5617 //
5618- Out->SetAttribute (Out, Orig.Data);
5619+ Out->SetAttribute (
5620+ Out,
5621+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5622+ );
c0004f9c 5623
2bba8d5a
OM		 5624 //
5625 // restore position in edit area
5626Index: edit/libFileBuffer.c
5627===================================================================
5628--- edit/libFileBuffer.c (revision 64)
5629+++ edit/libFileBuffer.c (working copy)
5630@@ -196,8 +196,9 @@
5631 // backup the old screen attributes
5632 //
5633 Orig = MainEditor.ColorAttributes;
5634- New.Colors.Foreground = Orig.Colors.Background;
5635- New.Colors.Background = Orig.Colors.Foreground;
5636+ New.Data = 0;
5637+ New.Colors.Foreground = Orig.Colors.Foreground;
5638+ New.Colors.Background = Orig.Colors.Background;
c0004f9c 5639
2bba8d5a
OM		 5640 //
5641 // clear the old mouse position
5642@@ -235,10 +236,14 @@
5643 Value
5644 );
5645 }
5646+
5647 //
5648 // set the new mouse position
5649 //
5650- Out->SetAttribute (Out, New.Data);
5651+ Out->SetAttribute (
5652+ Out,
5653+ EFI_TEXT_ATTR (New.Colors.Background, New.Colors.Foreground)
5654+ );
c0004f9c 5655
2bba8d5a
OM		 5656 //
5657 // clear the old mouse position
5658@@ -278,7 +283,10 @@
5659 //
5660 // end of HasCharacter
5661 //
5662- Out->SetAttribute (Out, Orig.Data);
5663+ Out->SetAttribute (
5664+ Out,
5665+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5666+ );
5667 }
5668 //
5669 // end of MouseNeedRefresh
5670@@ -768,7 +776,7 @@
5671 Handle = NULL;
5672 FileSize = 0;
5673 UnicodeBuffer = NULL;
5674- Type = 0;
5675+ Type = DEFAULT_TYPE;
c0004f9c 5676
2bba8d5a
OM		 5677 //
5678 // in this function, when you return error ( except EFI_OUT_OF_RESOURCES )
5679@@ -2624,15 +2632,9 @@
5680 VOID
5681 )
5682 {
5683- EFI_EDITOR_LINE *Line;
5684 UINTN FRow;
5685 UINTN FCol;
5686
5687- //
5688- // go to the first column of the line
5689- //
5690- Line = FileBuffer.CurrentLine;
5691-
5692 FRow = FileBuffer.FilePosition.Row;
5693 FCol = 1;
5694
5695Index: edit/libtitlebar.h
5696===================================================================
5697--- edit/libtitlebar.h (revision 64)
5698+++ edit/libtitlebar.h (working copy)
5699@@ -46,3 +46,4 @@
5700 );
5701
5702 #endif
5703+
5704Index: edit/libstatusbar.h
5705===================================================================
5706--- edit/libstatusbar.h (revision 64)
5707+++ edit/libstatusbar.h (working copy)
5708@@ -53,3 +53,4 @@
5709 );
5710
5711 #endif
5712+
5713Index: edit/libfilebuffer.h
5714===================================================================
5715--- edit/libfilebuffer.h (revision 64)
5716+++ edit/libfilebuffer.h (working copy)
5717@@ -209,3 +209,4 @@
5718 );
c0004f9c 5719
c0004f9c 5720 #endif
2bba8d5a
OM		 5721+
5722Index: edit/libInputBar.c
5723===================================================================
5724--- edit/libInputBar.c (revision 64)
5725+++ edit/libInputBar.c (working copy)
5726@@ -141,8 +141,6 @@
5727 UINTN Size;
5728 EFI_STATUS Status;
5729 BOOLEAN NoDisplay;
5730- UINTN Limit;
5731- UINTN PromptLen;
c0004f9c 5732
2bba8d5a
OM		 5733 //
5734 // variable initialization
5735@@ -162,10 +160,14 @@
5736 // back up the old screen attributes
5737 //
5738 Orig = MainEditor.ColorAttributes;
5739+ New.Data = 0;
5740 New.Colors.Foreground = Orig.Colors.Background;
5741 New.Colors.Background = Orig.Colors.Foreground;
c0004f9c 5742
2bba8d5a
OM		 5743- Out->SetAttribute (Out, New.Data);
5744+ Out->SetAttribute (
5745+ Out,
5746+ EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
5747+ );
5748
5749 //
5750 // clear input bar
5751@@ -173,22 +175,19 @@
5752 EditorClearLine (INPUT_BAR_LOCATION);
5753
5754 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
5755- PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt);
5756+ PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt);
5757
5758 //
5759- // that's the maximum input length that can be displayed on screen
5760- //
5761- PromptLen = StrLen (MainInputBar.Prompt);
5762- Limit = MainEditor.ScreenSize.Column - PromptLen;
5763-
5764- //
5765 // this is a selection prompt, cursor will stay in edit area
5766 // actually this is for search , search/replace
5767 //
5768 if (StrStr (MainInputBar.Prompt, L"Yes/No")) {
5769 NoDisplay = TRUE;
5770 FileBufferRestorePosition ();
5771- Out->SetAttribute (Out, Orig.Data);
5772+ Out->SetAttribute (
5773+ Out,
5774+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5775+ );
5776 } else {
5777 NoDisplay = FALSE;
5778 }
5779@@ -265,7 +264,10 @@
5780 //
5781 // restore screen attributes
5782 //
5783- Out->SetAttribute (Out, Orig.Data);
5784+ Out->SetAttribute (
5785+ Out,
5786+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
5787+ );
5788
5789 StatusBarNeedRefresh = TRUE;
5790
5791Index: edit/libEditor.c
5792===================================================================
5793--- edit/libEditor.c (revision 64)
5794+++ edit/libEditor.c (working copy)
5795@@ -123,7 +123,7 @@
c0004f9c 5796 Status = BS->HandleProtocol (
5797 In,
5798 &gEfiSimplePointerProtocolGuid,
5799- &MainEditor.MouseInterface
5800+ (VOID**)&MainEditor.MouseInterface
5801 );
5802 if (EFI_ERROR (Status)) {
5803 //
2bba8d5a 5804@@ -146,7 +146,7 @@
c0004f9c 5805 Status = BS->HandleProtocol (
5806 HandleBuffer[Index],
5807 &gEfiSimplePointerProtocolGuid,
5808- &MainEditor.MouseInterface
5809+ (VOID**)&MainEditor.MouseInterface
5810 );
5811 if (!EFI_ERROR (Status)) {
5812 break;
2bba8d5a 5813@@ -169,31 +169,31 @@
c0004f9c 5814 //
5815 Status = MainTitleBarInit ();
5816 if (EFI_ERROR (Status)) {
5817- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle);
5818+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle);
5819 return EFI_LOAD_ERROR;
5820 }
5821
5822 Status = MainMenuBarInit ();
5823 if (EFI_ERROR (Status)) {
5824- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle);
5825+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle);
5826 return EFI_LOAD_ERROR;
5827 }
5828
5829 Status = MainStatusBarInit ();
5830 if (EFI_ERROR (Status)) {
5831- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle);
5832+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle);
5833 return EFI_LOAD_ERROR;
5834 }
5835
5836 Status = MainInputBarInit ();
5837 if (EFI_ERROR (Status)) {
5838- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle);
5839+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle);
5840 return EFI_LOAD_ERROR;
5841 }
5842
5843 Status = FileBufferInit ();
5844 if (EFI_ERROR (Status)) {
5845- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle);
5846+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle);
5847 return EFI_LOAD_ERROR;
5848 }
5849 //
2bba8d5a 5850@@ -234,27 +234,27 @@
c0004f9c 5851 //
5852 Status = MainTitleBarCleanup ();
5853 if (EFI_ERROR (Status)) {
5854- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle);
5855+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle);
5856 }
5857
5858 Status = MainMenuBarCleanup ();
5859 if (EFI_ERROR (Status)) {
5860- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle);
5861+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle);
5862 }
5863
5864 Status = MainStatusBarCleanup ();
5865 if (EFI_ERROR (Status)) {
5866- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle);
5867+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle);
5868 }
5869
5870 Status = MainInputBarCleanup ();
5871 if (EFI_ERROR (Status)) {
5872- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle);
5873+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle);
5874 }
5875
5876 Status = FileBufferCleanup ();
5877 if (EFI_ERROR (Status)) {
5878- PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle);
5879+ PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle);
5880 }
5881 //
5882 // restore old mode
2bba8d5a
OM		 5883Index: edit/edit.inf
5884===================================================================
5885--- edit/edit.inf (revision 64)
5886+++ edit/edit.inf (working copy)
5887@@ -25,7 +25,7 @@
5888 COMPONENT_TYPE = APPLICATION
c0004f9c 5889
2bba8d5a
OM		 5890 [sources.common]
5891- ..\ShCommonStrings.uni
5892+ ../ShCommonStrings.uni
5893 EditStrings.uni
5894 editor.h
5895 editortype.h
5896@@ -41,17 +41,17 @@
5897
5898 [includes.common]
5899 .
5900- ..\Inc
5901- ..\Library
5902- $(EDK_SOURCE)\Foundation
5903- $(EDK_SOURCE)\Foundation\Include
5904- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5905- $(EDK_SOURCE)\Foundation\Efi
5906- $(EDK_SOURCE)\Foundation\Efi\Include
5907- $(EDK_SOURCE)\Foundation\FrameWork
5908- $(EDK_SOURCE)\Foundation\FrameWork\Include
5909- $(EDK_SOURCE)\Foundation\Core\Dxe
5910- $(DEST_DIR)\
5911+ ../Inc
5912+ ../Library
5913+ $(EDK_SOURCE)/Foundation
5914+ $(EDK_SOURCE)/Foundation/Include
5915+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5916+ $(EDK_SOURCE)/Foundation/Efi
5917+ $(EDK_SOURCE)/Foundation/Efi/Include
5918+ $(EDK_SOURCE)/Foundation/FrameWork
5919+ $(EDK_SOURCE)/Foundation/FrameWork/Include
5920+ $(EDK_SOURCE)/Foundation/Core/Dxe
5921+ $(DEST_DIR./
5922
5923 [libraries.common]
5924 EfiShellLib
b00c06f0
OM		 5925@@ -70,11 +70,13 @@
5926 # we will specify some additional DEFINEs on the compile command line.
5927 #
5928 [nmake.common]
5929+ IMAGE_ENTRY_POINT=InitializeEFIEditor
5930+
5931+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
5932 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
5933- IMAGE_ENTRY_POINT=InitializeEFIEditor
5934 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
5935 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
5936 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
5937
5938-
5939-
5940\ No newline at end of file
5941+[nmake.ARM, nmake.AARCH64]
5942+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 5943Index: edit/libMenuBar.c
5944===================================================================
5945--- edit/libMenuBar.c (revision 64)
5946+++ edit/libMenuBar.c (working copy)
5947@@ -189,7 +189,6 @@
5948 CHAR16 *NameString;
5949 CHAR16 *FunctionKeyString;
5950 UINTN BufferSize;
5951- EFI_STATUS Status;
c0004f9c 5952
5953 //
2bba8d5a
OM		 5954 // variable initialization
5955@@ -220,9 +219,9 @@
c0004f9c 5956 FunctionKeyString = AllocatePool (BufferSize);
5957
5958 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5959- Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
2bba8d5a 5960+ Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
c0004f9c 5961 #else
5962- Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
2bba8d5a 5963+ LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize);
c0004f9c 5964 #endif
5965
5966 Width = max ((StrLen (NameString) + 6), 20);
2bba8d5a 5967@@ -232,9 +231,9 @@
c0004f9c 5968 }
5969
5970 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
5971- Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
2bba8d5a 5972+ Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
c0004f9c 5973 #else
5974- Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
2bba8d5a 5975+ LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
c0004f9c 5976 #endif
5977 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
5978
2bba8d5a
OM		 5979Index: edit/libinputbar.h
5980===================================================================
5981--- edit/libinputbar.h (revision 64)
5982+++ edit/libinputbar.h (working copy)
5983@@ -44,3 +44,4 @@
5984 );
5985
5986 #endif
5987+
5988Index: edit/libeditor.h
5989===================================================================
5990--- edit/libeditor.h (revision 64)
5991+++ edit/libeditor.h (working copy)
5992@@ -52,3 +52,4 @@
5993 );
5994
5995 #endif
5996+
5997Index: edit/main.c
5998===================================================================
5999--- edit/main.c (revision 64)
6000+++ edit/main.c (working copy)
6001@@ -34,7 +34,7 @@
c0004f9c 6002 //
6003 // Global Variables
6004 //
6005-EFI_HII_HANDLE HiiHandle;
6006+EFI_HII_HANDLE gEditHiiHandle;
6007 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
6008 EFI_HII_PROTOCOL *Hii;
6009 #endif
2bba8d5a
OM		 6010@@ -56,7 +56,7 @@
6011 NULL,
6012 0,
6013 0,
6014- 0
6015+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6016 }
6017 };
6018
6019@@ -121,13 +121,13 @@
6020 //
6021 // There should only be one HII protocol
6022 //
6023- Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
6024+ Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
6025 if (EFI_ERROR (Status) || NULL == Hii) {
6026 return EFI_ABORTED;
6027 }
6028 #endif
6029
6030- Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
6031+ Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
6032
6033 if (EFI_ERROR (Status)) {
6034 return Status;
6035@@ -137,7 +137,7 @@
6036 if (VarCheckOk != RetCode) {
6037 switch (RetCode) {
6038 case VarCheckUnknown:
6039- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful);
6040+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful);
6041 break;
6042
6043 default:
6044@@ -161,10 +161,10 @@
6045 ChkPck.FlagCount > 2 ||
6046 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
6047 ) {
6048- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
6049+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
6050 Status = EFI_INVALID_PARAMETER;
6051 } else {
6052- PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle);
6053+ PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle);
6054 Status = EFI_SUCCESS;
6055 }
6056
6057@@ -172,21 +172,21 @@
6058 }
6059
6060 if (ChkPck.ValueCount > 1) {
6061- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
6062+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
6063 Status = EFI_INVALID_PARAMETER;
6064 goto done;
6065 }
6066
6067 if (ChkPck.ValueCount == 1) {
6068 if (!IsValidFileName (ChkPck.VarList->VarStr)) {
6069- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle);
6070+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle);
6071 Status = EFI_INVALID_PARAMETER;
6072 goto done;
6073 }
6074 }
6075
6076 if (SI->RedirArgc != 0) {
6077- PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle);
6078+ PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle);
6079 Status = EFI_INVALID_PARAMETER;
6080 goto done;
6081 }
6082@@ -195,7 +195,7 @@
6083 if (EFI_ERROR (Status)) {
6084 Out->ClearScreen (Out);
6085 Out->EnableCursor (Out, TRUE);
6086- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle);
6087+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle);
6088 goto done;
6089 }
6090
6091@@ -240,19 +240,19 @@
6092 //
6093 if (Status == EFI_SUCCESS) {
6094 } else if (Status == EFI_OUT_OF_RESOURCES) {
6095- PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit");
6096+ PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit");
6097 } else {
6098 if (Buffer != NULL) {
6099 if (StrCmp (Buffer, L"") != 0) {
6100 //
6101 // print out the status string
6102 //
6103- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer);
6104+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer);
6105 } else {
6106- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
6107+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
6108 }
6109 } else {
6110- PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
6111+ PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
6112 }
6113 }
6114
6115Index: edit/libmenubar.h
6116===================================================================
6117--- edit/libmenubar.h (revision 64)
6118+++ edit/libmenubar.h (working copy)
6119@@ -85,3 +85,4 @@
6120 );
6121
6122 #endif
6123+
6124Index: edit/libMisc.h
6125===================================================================
6126--- edit/libMisc.h (revision 64)
6127+++ edit/libMisc.h (working copy)
6128@@ -96,3 +96,4 @@
6129 ) ;
6130
6131 #endif
6132+
6133Index: edit/editor.h
6134===================================================================
6135--- edit/editor.h (revision 64)
6136+++ edit/editor.h (working copy)
6137@@ -33,7 +33,7 @@
6138 #include "libstatusbar.h"
6139 #include "libinputbar.h"
6140 #include "libmenubar.h"
6141-#include "libmisc.h"
6142+#include "libMisc.h"
6143 //
6144 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
6145 //
6146@@ -43,9 +43,10 @@
6147 extern BOOLEAN EditorFirst;
6148 extern BOOLEAN EditorExit;
6149
6150-extern EFI_HII_HANDLE HiiHandle;
6151+extern EFI_HII_HANDLE gEditHiiHandle;
6152 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
6153 extern EFI_HII_PROTOCOL *Hii;
6154 #endif
6155
6156 #endif // _EFI_EDITOR_H_
6157+
6158Index: edit/libTitleBar.c
6159===================================================================
6160--- edit/libTitleBar.c (revision 64)
6161+++ edit/libTitleBar.c (working copy)
6162@@ -120,10 +120,15 @@
6163 // backup the old screen attributes
6164 //
6165 Orig = MainEditor.ColorAttributes;
6166+
6167+ New.Data = 0;
6168 New.Colors.Foreground = Orig.Colors.Background;
6169 New.Colors.Background = Orig.Colors.Foreground;
6170
6171- Out->SetAttribute (Out, New.Data);
6172+ Out->SetAttribute (
6173+ Out,
6174+ EFI_TEXT_ATTR (New.Colors.Foreground, New.Colors.Background)
6175+ );
6176
6177 //
6178 // clear the old title bar
6179@@ -142,7 +147,10 @@
6180 );
6181
6182 if (MainEditor.FileBuffer->FileName == NULL) {
6183- Out->SetAttribute (Out, Orig.Data);
6184+ Out->SetAttribute (
6185+ Out,
6186+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
6187+ );
6188 FileBufferRestorePosition ();
6189 return EFI_SUCCESS;
6190 }
6191@@ -204,7 +212,10 @@
6192 //
6193 // restore the old attribute
6194 //
6195- Out->SetAttribute (Out, Orig.Data);
6196+ Out->SetAttribute (
6197+ Out,
6198+ EFI_TEXT_ATTR (Orig.Colors.Foreground, Orig.Colors.Background)
6199+ );
6200
6201 //
6202 // restore edit area cursor position
6203Index: edit/editortype.h
6204===================================================================
6205--- edit/editortype.h (revision 64)
6206+++ edit/editortype.h (working copy)
6207@@ -28,7 +28,7 @@
6208 #define EDITOR_NAME L"EFI Editor\0"
6209 #define EDITOR_VERSION L"0.99\0"
6210
6211-#define EFI_EDITOR_LINE_LIST 'eell'
6212+#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
6213
6214 #define INSERT_MODE_STR L"INS"
6215 #define OVERWR_MODE_STR L"OVR"
6216@@ -149,8 +149,8 @@
6217 } EFI_EDITOR_MENU_ITEM;
6218
6219 typedef struct {
6220- UINT32 Foreground : 4;
6221- UINT32 Background : 4;
6222+ UINT8 Foreground : 4;
6223+ UINT8 Background : 4;
6224 } EFI_EDITOR_COLOR_ATTRIBUTES;
6225
6226 typedef union {
6227@@ -223,3 +223,4 @@
6228 } EFI_EDITOR_GLOBAL_EDITOR;
6229
6230 #endif
6231+
6232Index: SmbiosView/EventLogInfo.c
6233===================================================================
6234--- SmbiosView/EventLogInfo.c (revision 64)
6235+++ SmbiosView/EventLogInfo.c (working copy)
6236@@ -25,7 +25,7 @@
6237 #include "PrintInfo.h"
6238 #include "QueryTable.h"
6239 #include "EventLogInfo.h"
6240-#include "smbios.h"
6241+#include "Smbios.h"
6242 #include STRING_DEFINES_FILE
6243
6244 VOID
6245Index: SmbiosView/Smbios.h
6246===================================================================
6247--- SmbiosView/Smbios.h (revision 64)
6248+++ SmbiosView/Smbios.h (working copy)
6249@@ -37,3 +37,4 @@
6250
6251
6252 #endif
6253+
6254Index: SmbiosView/EventLogInfo.h
6255===================================================================
6256--- SmbiosView/EventLogInfo.h (revision 64)
6257+++ SmbiosView/EventLogInfo.h (working copy)
6258@@ -85,3 +85,4 @@
6259 );
6260
6261 #endif
6262+
6263Index: SmbiosView/PrintInfo.c
6264===================================================================
6265--- SmbiosView/PrintInfo.c (revision 64)
6266+++ SmbiosView/PrintInfo.c (working copy)
6267@@ -26,7 +26,7 @@
6268 #include "LibSmbiosView.h"
6269 #include "QueryTable.h"
6270 #include "EventLogInfo.h"
6271-#include "smbios.h"
6272+#include "Smbios.h"
6273 #include STRING_DEFINES_FILE
6274
6275 //
6276Index: SmbiosView/PrintInfo.h
6277===================================================================
6278--- SmbiosView/PrintInfo.h (revision 64)
6279+++ SmbiosView/PrintInfo.h (working copy)
6280@@ -199,3 +199,4 @@
6281 );
6282
6283 #endif
6284+
6285Index: SmbiosView/QueryTable.c
6286===================================================================
6287--- SmbiosView/QueryTable.c (revision 64)
6288+++ SmbiosView/QueryTable.c (working copy)
6289@@ -23,7 +23,7 @@
6290 #include "EfiShellLib.h"
6291 #include "QueryTable.h"
6292 #include "PrintInfo.h"
6293-#include "smbios.h"
6294+#include "Smbios.h"
6295
6296 #include STRING_DEFINES_FILE
6297
6298Index: SmbiosView/LibSmbiosView.c
6299===================================================================
6300--- SmbiosView/LibSmbiosView.c (revision 64)
6301+++ SmbiosView/LibSmbiosView.c (working copy)
6302@@ -22,10 +22,10 @@
6303 --*/
6304
6305 #include "EfiShellLib.h"
6306-#include "LIbSmbios.h"
6307+#include "LibSmbios.h"
6308 #include "LibSmbiosView.h"
6309 #include "smbiosview.h"
6310-#include "smbios.h"
6311+#include "Smbios.h"
6312 #include STRING_DEFINES_FILE
6313
6314 STATIC UINT8 mInit = 0;
6315@@ -62,7 +62,7 @@
c0004f9c 6316 //
2bba8d5a 6317 // Get SMBIOS table from System Configure table
c0004f9c 6318 //
2bba8d5a
OM		 6319- Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
6320+ Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
c0004f9c 6321
2bba8d5a
OM		 6322 if (mSmbiosTable == NULL) {
6323 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
b00c06f0
OM		 6324@@ -110,13 +110,13 @@
6325
6326 VOID
6327 LibSmbiosGetStructHead (
6328- SMBIOS_STRUCTURE_POINTER *pHead
6329+ SMBIOS_STRUCTURE_POINTER **pHead
6330 )
6331 {
6332 //
6333 // return SMBIOS structure table address
6334 //
6335- pHead = mSmbiosStruct;
6336+ *pHead = mSmbiosStruct;
6337 }
6338
6339 EFI_STATUS
2bba8d5a
OM		 6340Index: SmbiosView/Smbiosview.inf
6341===================================================================
6342--- SmbiosView/Smbiosview.inf (revision 64)
6343+++ SmbiosView/Smbiosview.inf (working copy)
6344@@ -25,7 +25,7 @@
6345 COMPONENT_TYPE = APPLICATION
c0004f9c 6346
2bba8d5a
OM		 6347 [sources.common]
6348- ..\ShCommonStrings.uni
6349+ ../ShCommonStrings.uni
6350 SmBiosViewStrings.uni
6351 QueryTable.c
6352 QueryTable.h
6353@@ -43,19 +43,19 @@
c0004f9c 6354
2bba8d5a
OM		 6355 [includes.common]
6356 .
6357- ..\Inc
6358- ..\Library
6359- $(EDK_SOURCE)\Foundation
6360- $(EDK_SOURCE)\Foundation\Include
6361- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6362- $(EDK_SOURCE)\Foundation\Efi
6363- $(EDK_SOURCE)\Foundation\Efi\Include
6364- $(EDK_SOURCE)\Foundation\FrameWork
6365- $(EDK_SOURCE)\Foundation\FrameWork\Include
6366- $(EDK_SOURCE)\Foundation\Core\Dxe
6367- $(DEST_DIR)\
6368- $(EFI_SOURCE)\Application\Shell\Inc
6369- $(EFI_SOURCE)\Application\Shell\Library
6370+ ../Inc
6371+ ../Library
6372+ $(EDK_SOURCE)/Foundation
6373+ $(EDK_SOURCE)/Foundation/Include
6374+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6375+ $(EDK_SOURCE)/Foundation/Efi
6376+ $(EDK_SOURCE)/Foundation/Efi/Include
6377+ $(EDK_SOURCE)/Foundation/FrameWork
6378+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6379+ $(EDK_SOURCE)/Foundation/Core/Dxe
6380+ $(DEST_DIR./
6381+ $(EFI_SOURCE)/Applicatio./Shels/Inc
6382+ $(EFI_SOURCE)/Applicatio./Shels/Library
c0004f9c 6383
2bba8d5a
OM		 6384 [libraries.common]
6385 EfiShellLib
b00c06f0
OM		 6386@@ -70,7 +70,12 @@
6387
6388 [nmake.common]
6389 IMAGE_ENTRY_POINT=InitializeSmbiosViewApplication
6390+
6391+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6392 L_PROJ_FLAGS=/align:4096
6393 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6394 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6395 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6396+
6397+[nmake.ARM, nmake.AARCH64]
6398+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 6399Index: SmbiosView/QueryTable.h
6400===================================================================
6401--- SmbiosView/QueryTable.h (revision 64)
6402+++ SmbiosView/QueryTable.h (working copy)
6403@@ -437,3 +437,4 @@
6404 );
c0004f9c 6405
2bba8d5a
OM		 6406 #endif
6407+
6408Index: SmbiosView/LibSmbiosView.h
6409===================================================================
6410--- SmbiosView/LibSmbiosView.h (revision 64)
6411+++ SmbiosView/LibSmbiosView.h (working copy)
b00c06f0
OM		 6412@@ -66,7 +66,7 @@
6413
6414 VOID
6415 LibSmbiosGetStructHead (
6416- SMBIOS_STRUCTURE_POINTER *pHead
6417+ SMBIOS_STRUCTURE_POINTER **pHead
6418 );
6419
6420 EFI_STATUS
2bba8d5a
OM		 6421@@ -128,3 +128,4 @@
6422 );
c0004f9c 6423
2bba8d5a
OM		 6424 #endif
6425+
6426Index: SmbiosView/smbiosview.c
6427===================================================================
6428--- SmbiosView/smbiosview.c (revision 64)
6429+++ SmbiosView/smbiosview.c (working copy)
6430@@ -26,7 +26,7 @@
6431 #include "smbiosview.h"
6432 #include "PrintInfo.h"
6433 #include "QueryTable.h"
6434-#include "smbios.h"
6435+#include "Smbios.h"
c0004f9c 6436
2bba8d5a 6437 extern UINT8 STRING_ARRAY_NAME[];
c0004f9c 6438
2bba8d5a
OM		 6439@@ -88,7 +88,7 @@
6440 NULL,
6441 0,
6442 0,
6443- 0
6444+ (SHELL_VAR_CHECK_FLAG_TYPE)0
c0004f9c 6445 }
2bba8d5a 6446 };
c0004f9c 6447
2bba8d5a
OM		 6448Index: SmbiosView/LibSmbios.h
6449===================================================================
6450--- SmbiosView/LibSmbios.h (revision 64)
6451+++ SmbiosView/LibSmbios.h (working copy)
6452@@ -642,3 +642,4 @@
c0004f9c 6453
c0004f9c 6454
2bba8d5a
OM		 6455 #endif
6456+
6457Index: SmbiosView/smbiosview.h
6458===================================================================
6459--- SmbiosView/smbiosview.h (revision 64)
6460+++ SmbiosView/smbiosview.h (working copy)
6461@@ -84,3 +84,4 @@
6462 extern UINT8 gShowType;
c0004f9c 6463
2bba8d5a
OM		 6464 #endif
6465+
6466Index: guid/guid.inf
6467===================================================================
6468--- guid/guid.inf (revision 64)
6469+++ guid/guid.inf (working copy)
6470@@ -37,23 +37,23 @@
6471 FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405
6472 COMPONENT_TYPE = APPLICATION
c0004f9c 6473 [sources.common]
2bba8d5a
OM		 6474- ..\ShCommonStrings.uni
6475+ ../ShCommonStrings.uni
6476 GuidStrings.uni
6477 guid.c
6478 guid.h
c0004f9c 6479 [includes.common]
6480 .
6481- ..\Inc
6482- ..\Library
6483- $(EDK_SOURCE)\Foundation
6484- $(EDK_SOURCE)\Foundation\Include
6485- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6486- $(EDK_SOURCE)\Foundation\Efi
6487- $(EDK_SOURCE)\Foundation\Efi\Include
6488- $(EDK_SOURCE)\Foundation\FrameWork
6489- $(EDK_SOURCE)\Foundation\FrameWork\Include
6490- $(EDK_SOURCE)\Foundation\Core\Dxe
6491- $(DEST_DIR)\
6492+ ../Inc
6493+ ../Library
6494+ $(EDK_SOURCE)/Foundation
6495+ $(EDK_SOURCE)/Foundation/Include
6496+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6497+ $(EDK_SOURCE)/Foundation/Efi
6498+ $(EDK_SOURCE)/Foundation/Efi/Include
6499+ $(EDK_SOURCE)/Foundation/FrameWork
6500+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6501+ $(EDK_SOURCE)/Foundation/Core/Dxe
6502+ $(DEST_DIR./
2bba8d5a 6503 [libraries.common]
c0004f9c 6504 EfiShellLib
2bba8d5a 6505 EdkProtocolLib
b00c06f0
OM		 6506@@ -63,8 +63,15 @@
6507 EdkGuidLib
6508 EdkFrameworkGuidLib
6509 EfiGuidLib
6510+
6511 [nmake.common]
6512 IMAGE_ENTRY_POINT=GuidMain
6513- C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6514+
6515+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6516+ C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6517 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6518 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6519+
6520+[nmake.ARM, nmake.AARCH64]
6521+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6522+
6523\ No newline at end of file
2bba8d5a
OM		 6524Index: guid/guid.c
6525===================================================================
6526--- guid/guid.c (revision 64)
6527+++ guid/guid.c (working copy)
6528@@ -36,7 +36,7 @@
c0004f9c 6529 //
6530 // Global Variables
6531 //
6532-EFI_HII_HANDLE HiiHandle;
6533+STATIC EFI_HII_HANDLE HiiHandle;
6534 EFI_GUID EfiGuidGuid = EFI_GUID_GUID;
6535 SHELL_VAR_CHECK_ITEM GuidCheckList[] = {
6536 {
2bba8d5a
OM		 6537@@ -55,7 +55,7 @@
6538 NULL,
6539 0,
6540 0,
6541- 0
6542+ (SHELL_VAR_CHECK_FLAG_TYPE)0
6543 }
6544 };
6545
6546Index: guid/guid.h
6547===================================================================
6548--- guid/guid.h (revision 64)
6549+++ guid/guid.h (working copy)
6550@@ -31,4 +31,4 @@
6551 0x425bff44, 0x1cae, 0x4c27, 0x98, 0x2c, 0x25, 0xc8, 0x74, 0x59, 0xdf, 0xd6 \
6552 }
6553
6554-#endif
6555\ No newline at end of file
6556+#endif
6557Index: LoadPciRom/LoadPciRom.h
6558===================================================================
6559--- LoadPciRom/LoadPciRom.h (revision 64)
6560+++ LoadPciRom/LoadPciRom.h (working copy)
6561@@ -30,3 +30,4 @@
6562 }
6563
6564 #endif
6565+
6566Index: LoadPciRom/LoadPciRom.inf
6567===================================================================
6568--- LoadPciRom/LoadPciRom.inf (revision 64)
6569+++ LoadPciRom/LoadPciRom.inf (working copy)
6570@@ -41,23 +41,23 @@
6571
c0004f9c 6572 [sources.common]
2bba8d5a 6573 LoadPciRomStrings.uni
c0004f9c 6574- ..\ShCommonStrings.uni
6575+ ../ShCommonStrings.uni
2bba8d5a
OM		 6576 LoadPciRom.c
6577 LoadPciRom.h
6578
c0004f9c 6579 [includes.common]
6580 .
6581- ..\Inc
6582- ..\Library
6583- $(EDK_SOURCE)\Foundation
6584- $(EDK_SOURCE)\Foundation\Include
6585- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6586- $(EDK_SOURCE)\Foundation\Efi
6587- $(EDK_SOURCE)\Foundation\Efi\Include
6588- $(EDK_SOURCE)\Foundation\FrameWork
6589- $(EDK_SOURCE)\Foundation\FrameWork\Include
6590- $(EDK_SOURCE)\Foundation\Core\Dxe
6591- $(DEST_DIR)\
6592+ ../Inc
6593+ ../Library
6594+ $(EDK_SOURCE)/Foundation
6595+ $(EDK_SOURCE)/Foundation/Include
6596+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6597+ $(EDK_SOURCE)/Foundation/Efi
6598+ $(EDK_SOURCE)/Foundation/Efi/Include
6599+ $(EDK_SOURCE)/Foundation/FrameWork
6600+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6601+ $(EDK_SOURCE)/Foundation/Core/Dxe
6602+ $(DEST_DIR./
2bba8d5a
OM		 6603
6604 [libraries.common]
c0004f9c 6605 EfiShellLib
b00c06f0
OM		 6606@@ -72,7 +72,11 @@
6607
6608 [nmake.common]
6609 IMAGE_ENTRY_POINT=InitializeLoadPciRom
6610+
6611+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6612 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6613 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6614 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6615
6616+[nmake.ARM, nmake.AARCH64]
6617+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 6618Index: LoadPciRom/LoadPciRom.c
6619===================================================================
6620--- LoadPciRom/LoadPciRom.c (revision 64)
6621+++ LoadPciRom/LoadPciRom.c (working copy)
6622@@ -24,7 +24,7 @@
c0004f9c 6623
2bba8d5a
OM		 6624 #include "EfiShellLib.h"
6625 #include "LoadPciRom.h"
6626-#include "Pci22.h"
6627+#include "pci22.h"
c0004f9c 6628
2bba8d5a 6629 extern UINT8 STRING_ARRAY_NAME[];
c0004f9c 6630
2bba8d5a
OM		 6631@@ -56,7 +56,7 @@
6632 );
c0004f9c 6633
2bba8d5a
OM		 6634 EFI_HANDLE gMyImageHandle;
6635-EFI_HII_HANDLE HiiHandle;
6636+STATIC EFI_HII_HANDLE HiiHandle;
6637 EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID;
6638 SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
6639 {
6640@@ -81,7 +81,7 @@
6641 NULL,
6642 0,
6643 0,
6644- 0
6645+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6646 }
6647 };
c0004f9c 6648
2bba8d5a
OM		 6649@@ -377,7 +377,7 @@
6650 }
6651
6652 if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {
6653- Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress);
6654+ Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);
6655 if (EFI_ERROR (Status)) {
6656 PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle);
6657 SkipImage = TRUE;
6658Index: ver/ver.h
6659===================================================================
6660--- ver/ver.h (revision 64)
6661+++ ver/ver.h (working copy)
6662@@ -37,3 +37,4 @@
6663 IN EFI_SYSTEM_TABLE *SystemTable
6664 );
6665 #endif
6666+
6667Index: ver/Ver.inf
6668===================================================================
6669--- ver/Ver.inf (revision 64)
6670+++ ver/Ver.inf (working copy)
6671@@ -40,33 +40,33 @@
c0004f9c 6672
c0004f9c 6673
6674 [sources.common]
2bba8d5a
OM		 6675- ..\ShCommonStrings.uni
6676+ ../ShCommonStrings.uni
6677 VerStrings.uni
6678 Ver.c
6679 Ver.h
6680
6681-[sources.ia32,sources.x64]
6682- ia32\ver32.c
6683+[sources.ia32,sources.x64,sources.ARM,sources.AARCH64]
6684+ ia32/ver32.c
6685
6686 [sources.ipf]
6687- ipf\ver64.c
6688+ IPF/ver64.c
c0004f9c 6689
2bba8d5a
OM		 6690 [sources.ebc]
6691- ebc\verEbc.c
6692+ eb./verEbc.c
6693
c0004f9c 6694 [includes.common]
6695 .
6696- ..\Inc
6697- ..\Library
6698- $(EDK_SOURCE)\Foundation
6699- $(EDK_SOURCE)\Foundation\Include
6700- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6701- $(EDK_SOURCE)\Foundation\Efi
6702- $(EDK_SOURCE)\Foundation\Efi\Include
6703- $(EDK_SOURCE)\Foundation\FrameWork
6704- $(EDK_SOURCE)\Foundation\FrameWork\Include
6705- $(EDK_SOURCE)\Foundation\Core\Dxe
6706- $(DEST_DIR)\
6707+ ../Inc
6708+ ../Library
6709+ $(EDK_SOURCE)/Foundation
6710+ $(EDK_SOURCE)/Foundation/Include
6711+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6712+ $(EDK_SOURCE)/Foundation/Efi
6713+ $(EDK_SOURCE)/Foundation/Efi/Include
6714+ $(EDK_SOURCE)/Foundation/FrameWork
6715+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6716+ $(EDK_SOURCE)/Foundation/Core/Dxe
6717+ $(DEST_DIR./
6718
6719 [libraries.common]
6720 EfiShellLib
b00c06f0
OM		 6721@@ -82,7 +82,11 @@
6722
6723 [nmake.common]
6724 IMAGE_ENTRY_POINT=InitializeVer
6725+
6726+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6727 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6728 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6729 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6730
6731+[nmake.ARM, nmake.AARCH64]
6732+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 6733Index: ver/Ebc/verEbc.c
6734===================================================================
6735--- ver/Ebc/verEbc.c (revision 64)
6736+++ ver/Ebc/verEbc.c (working copy)
6737@@ -45,7 +45,7 @@
6738 Status = BS->LocateProtocol (\r
6739 &gEfiEbcProtocolGuid,\r
6740 NULL,\r
6741- &Ebc\r
6742+ (VOID**)&Ebc\r
6743 );\r
6744 if (EFI_ERROR (Status)) {\r
6745 return ;\r
6746Index: ver/ver.c
6747===================================================================
6748--- ver/ver.c (revision 64)
6749+++ ver/ver.c (working copy)
6750@@ -57,7 +57,7 @@
6751 NULL,
6752 0,
6753 0,
6754- 0
6755+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6756 }
6757 };
c0004f9c 6758
2bba8d5a
OM		 6759Index: dmpstore/dmpstore.h
6760===================================================================
6761--- dmpstore/dmpstore.h (revision 64)
6762+++ dmpstore/dmpstore.h (working copy)
6763@@ -40,3 +40,4 @@
6764 } DMPSTORE_VARIABLE;
c0004f9c 6765
c0004f9c 6766 #endif
2bba8d5a
OM		 6767+
6768Index: dmpstore/dmpstore.inf
6769===================================================================
6770--- dmpstore/dmpstore.inf (revision 64)
6771+++ dmpstore/dmpstore.inf (working copy)
6772@@ -25,24 +25,24 @@
6773 COMPONENT_TYPE = APPLICATION
c0004f9c 6774
2bba8d5a
OM		 6775 [sources.common]
6776- ..\ShCommonStrings.uni
6777+ ../ShCommonStrings.uni
6778 DmpstoreStrings.uni
6779 dmpstore.c
6780 dmpstore.h
6781
6782 [includes.common]
6783 .
6784- ..\Inc
6785- ..\Library
6786- $(EDK_SOURCE)\Foundation
6787- $(EDK_SOURCE)\Foundation\Include
6788- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6789- $(EDK_SOURCE)\Foundation\Efi
6790- $(EDK_SOURCE)\Foundation\Efi\Include
6791- $(EDK_SOURCE)\Foundation\FrameWork
6792- $(EDK_SOURCE)\Foundation\FrameWork\Include
6793- $(EDK_SOURCE)\Foundation\Core\Dxe
6794- $(DEST_DIR)\
6795+ ../Inc
6796+ ../Library
6797+ $(EDK_SOURCE)/Foundation
6798+ $(EDK_SOURCE)/Foundation/Include
6799+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6800+ $(EDK_SOURCE)/Foundation/Efi
6801+ $(EDK_SOURCE)/Foundation/Efi/Include
6802+ $(EDK_SOURCE)/Foundation/FrameWork
6803+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6804+ $(EDK_SOURCE)/Foundation/Core/Dxe
6805+ $(DEST_DIR./
c0004f9c 6806
2bba8d5a
OM		 6807 [libraries.common]
6808 EfiShellLib
b00c06f0
OM		 6809@@ -61,11 +61,14 @@
6810 # we will specify some additional DEFINEs on the compile command line.
6811 #
6812 [nmake.common]
6813+ IMAGE_ENTRY_POINT=InitializeDumpStore
6814+
6815+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6816 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
6817- IMAGE_ENTRY_POINT=InitializeDumpStore
6818 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6819 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6820 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6821
6822-
6823+[nmake.ARM, nmake.AARCH64]
6824+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6825
6826\ No newline at end of file
2bba8d5a
OM		 6827Index: dmpstore/dmpstore.c
6828===================================================================
6829--- dmpstore/dmpstore.c (revision 64)
6830+++ dmpstore/dmpstore.c (working copy)
6831@@ -95,7 +95,7 @@
6832 //
6833 // Global Variables
6834 //
6835-EFI_HII_HANDLE HiiHandle;
6836+STATIC EFI_HII_HANDLE HiiHandle;
6837 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
6838 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
6839 {
6840@@ -132,7 +132,7 @@
6841 NULL,
6842 0,
6843 0,
6844- 0
6845+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6846 }
6847 };
6848
6849Index: comp/comp.c
6850===================================================================
6851--- comp/comp.c (revision 64)
6852+++ comp/comp.c (working copy)
6853@@ -50,7 +50,7 @@
6854 NULL,
6855 0,
6856 0,
6857- 0
6858+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6859 }
6860 };
6861
6862Index: comp/comp.h
6863===================================================================
6864--- comp/comp.h (revision 64)
6865+++ comp/comp.h (working copy)
6866@@ -29,4 +29,4 @@
6867 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \
c0004f9c 6868 }
c0004f9c 6869
2bba8d5a
OM		 6870-#endif
6871\ No newline at end of file
6872+#endif
6873Index: comp/comp.inf
6874===================================================================
6875--- comp/comp.inf (revision 64)
6876+++ comp/comp.inf (working copy)
6877@@ -28,21 +28,21 @@
6878 CompStrings.uni
6879 comp.c
6880 comp.h
6881-..\ShCommonStrings.uni
6882+../ShCommonStrings.uni
6883
6884 [includes.common]
6885 .
6886- ..\Inc
6887- ..\Library
6888- $(EDK_SOURCE)\Foundation
6889- $(EDK_SOURCE)\Foundation\Include
6890- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6891- $(EDK_SOURCE)\Foundation\Efi
6892- $(EDK_SOURCE)\Foundation\Efi\Include
6893- $(EDK_SOURCE)\Foundation\FrameWork
6894- $(EDK_SOURCE)\Foundation\FrameWork\Include
6895- $(EDK_SOURCE)\Foundation\Core\Dxe
6896- $(DEST_DIR)\
6897+ ../Inc
6898+ ../Library
6899+ $(EDK_SOURCE)/Foundation
6900+ $(EDK_SOURCE)/Foundation/Include
6901+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6902+ $(EDK_SOURCE)/Foundation/Efi
6903+ $(EDK_SOURCE)/Foundation/Efi/Include
6904+ $(EDK_SOURCE)/Foundation/FrameWork
6905+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6906+ $(EDK_SOURCE)/Foundation/Core/Dxe
6907+ $(DEST_DIR./
c0004f9c 6908
2bba8d5a
OM		 6909 [libraries.common]
6910 EfiShellLib
b00c06f0
OM		 6911@@ -61,11 +61,16 @@
6912 # we will specify some additional DEFINEs on the compile command line.
6913 #
6914 [nmake.common]
6915+ IMAGE_ENTRY_POINT=InitializeComp
6916+
6917+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
6918 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
6919- IMAGE_ENTRY_POINT=InitializeComp
6920 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
6921 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
6922 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
6923
6924+[nmake.ARM, nmake.AARCH64]
6925+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
6926
6927+
6928
6929\ No newline at end of file
2bba8d5a
OM		 6930Index: IpConfig/IpConfig.c
6931===================================================================
6932--- IpConfig/IpConfig.c (revision 64)
6933+++ IpConfig/IpConfig.c (working copy)
6934@@ -39,7 +39,7 @@
6935 //
6936 // Global Variables
6937 //
6938-EFI_HII_HANDLE HiiHandle;
6939+STATIC EFI_HII_HANDLE HiiHandle;
6940 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
6941 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
6942 {
6943@@ -76,7 +76,7 @@
6944 NULL,
6945 0,
6946 0,
6947- 0
6948+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
6949 }
6950 };
6951
6952Index: IpConfig/IpConfig.h
6953===================================================================
6954--- IpConfig/IpConfig.h (revision 64)
6955+++ IpConfig/IpConfig.h (working copy)
6956@@ -29,4 +29,4 @@
6957 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
6958 }
c0004f9c 6959
2bba8d5a
OM		 6960-#endif
6961\ No newline at end of file
6962+#endif
6963Index: IpConfig/IpConfig.inf
6964===================================================================
6965--- IpConfig/IpConfig.inf (revision 64)
6966+++ IpConfig/IpConfig.inf (working copy)
6967@@ -25,24 +25,24 @@
6968 COMPONENT_TYPE = APPLICATION
c0004f9c 6969
2bba8d5a
OM		 6970 [sources.common]
6971- ..\ShCommonStrings.uni
6972+ ../ShCommonStrings.uni
6973 IpConfigStrings.uni
6974 IpConfig.c
6975 IpConfig.h
c0004f9c 6976
2bba8d5a
OM		 6977 [includes.common]
6978 .
6979- ..\Inc
6980- ..\Library
6981- $(EDK_SOURCE)\Foundation
6982- $(EDK_SOURCE)\Foundation\Include
6983- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
6984- $(EDK_SOURCE)\Foundation\Efi
6985- $(EDK_SOURCE)\Foundation\Efi\Include
6986- $(EDK_SOURCE)\Foundation\FrameWork
6987- $(EDK_SOURCE)\Foundation\FrameWork\Include
6988- $(EDK_SOURCE)\Foundation\Core\Dxe
6989- $(DEST_DIR)\
6990+ ../Inc
6991+ ../Library
6992+ $(EDK_SOURCE)/Foundation
6993+ $(EDK_SOURCE)/Foundation/Include
6994+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
6995+ $(EDK_SOURCE)/Foundation/Efi
6996+ $(EDK_SOURCE)/Foundation/Efi/Include
6997+ $(EDK_SOURCE)/Foundation/FrameWork
6998+ $(EDK_SOURCE)/Foundation/FrameWork/Include
6999+ $(EDK_SOURCE)/Foundation/Core/Dxe
7000+ $(DEST_DIR./
c0004f9c 7001
2bba8d5a
OM		 7002 [libraries.common]
7003 EfiShellLib
b00c06f0
OM		 7004@@ -56,9 +56,12 @@
7005
7006
7007 [nmake.common]
7008- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
7009 IMAGE_ENTRY_POINT=InitializeIpConfig
7010+
7011+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7012 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7013 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7014 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7015
7016+[nmake.ARM, nmake.AARCH64]
7017+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 7018Index: sermode/sermode.c
7019===================================================================
7020--- sermode/sermode.c (revision 64)
7021+++ sermode/sermode.c (working copy)
7022@@ -35,7 +35,7 @@
c0004f9c 7023
2bba8d5a 7024 #include EFI_PROTOCOL_DEFINITION (SerialIo)
c0004f9c 7025
2bba8d5a
OM		 7026-EFI_HII_HANDLE HiiHandle;
7027+STATIC EFI_HII_HANDLE HiiHandle;
7028 EFI_GUID EfiSermodeGuid = EFI_SERMODEB_GUID;
7029 SHELL_VAR_CHECK_ITEM SermodeCheckList[] = {
7030 {
7031@@ -54,7 +54,7 @@
7032 NULL,
7033 0,
7034 0,
7035- 0
7036+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
7037 }
7038 };
c0004f9c 7039
2bba8d5a 7040@@ -104,7 +104,7 @@
c0004f9c 7041
c0004f9c 7042 }
7043
2bba8d5a
OM		 7044- Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
7045+ Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
7046 if (!EFI_ERROR (Status)) {
7047 switch (SerialIo->Mode->Parity) {
7048 case DefaultParity:
7049@@ -454,7 +454,7 @@
7050 continue;
c0004f9c 7051 }
7052
2bba8d5a
OM		 7053- Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
7054+ Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
7055 if (!EFI_ERROR (Status)) {
7056 Status = SerialIo->SetAttributes (
7057 SerialIo,
7058Index: sermode/sermode.h
7059===================================================================
7060--- sermode/sermode.h (revision 64)
7061+++ sermode/sermode.h (working copy)
7062@@ -32,3 +32,4 @@
7063 }
c0004f9c 7064
2bba8d5a
OM		 7065 #endif
7066+
7067Index: sermode/sermode.inf
7068===================================================================
7069--- sermode/sermode.inf (revision 64)
7070+++ sermode/sermode.inf (working copy)
7071@@ -40,24 +40,24 @@
c0004f9c 7072
2bba8d5a
OM		 7073
7074 [sources.common]
7075- ..\ShCommonStrings.uni
7076+ ../ShCommonStrings.uni
7077 SermodeStrings.uni
7078 sermode.c
7079 sermode.h
7080
7081 [includes.common]
7082 .
7083- ..\Inc
7084- ..\Library
7085- $(EDK_SOURCE)\Foundation
7086- $(EDK_SOURCE)\Foundation\Include
7087- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7088- $(EDK_SOURCE)\Foundation\Efi
7089- $(EDK_SOURCE)\Foundation\Efi\Include
7090- $(EDK_SOURCE)\Foundation\FrameWork
7091- $(EDK_SOURCE)\Foundation\FrameWork\Include
7092- $(EDK_SOURCE)\Foundation\Core\Dxe
7093- $(DEST_DIR)\
7094+ ../Inc
7095+ ../Library
7096+ $(EDK_SOURCE)/Foundation
7097+ $(EDK_SOURCE)/Foundation/Include
7098+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7099+ $(EDK_SOURCE)/Foundation/Efi
7100+ $(EDK_SOURCE)/Foundation/Efi/Include
7101+ $(EDK_SOURCE)/Foundation/FrameWork
7102+ $(EDK_SOURCE)/Foundation/FrameWork/Include
7103+ $(EDK_SOURCE)/Foundation/Core/Dxe
7104+ $(DEST_DIR./
7105
7106 [libraries.common]
7107 EfiShellLib
b00c06f0
OM		 7108@@ -72,7 +72,11 @@
7109
7110 [nmake.common]
7111 IMAGE_ENTRY_POINT=InitializeSerialMode
7112+
7113+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7114 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7115 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7116 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7117
7118+[nmake.ARM, nmake.AARCH64]
7119+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 7120Index: tzone/tzone.c
7121===================================================================
7122--- tzone/tzone.c (revision 64)
7123+++ tzone/tzone.c (working copy)
7124@@ -65,7 +65,7 @@
7125 NULL,
7126 0,
7127 0,
7128- 0
7129+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
c0004f9c 7130 }
2bba8d5a
OM		 7131 };
7132
7133@@ -258,7 +258,6 @@
7134 BOOLEAN bList;
7135 BOOLEAN bSet;
7136 INT16 nValue;
7137- UINTN uValueSize;
7138 SHELL_VAR_CHECK_CODE RetCode;
7139 CHAR16 *Useful;
7140 SHELL_VAR_CHECK_PACKAGE ChkPck;
7141@@ -269,7 +268,6 @@
7142 bList = FALSE;
7143 bSet = FALSE;
7144 nValue = 0;
7145- uValueSize = sizeof (INTN);
7146 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
7147 ZeroMem (&Time, sizeof (EFI_TIME));
7148 //
7149Index: tzone/timezone.inf
7150===================================================================
7151--- tzone/timezone.inf (revision 64)
7152+++ tzone/timezone.inf (working copy)
7153@@ -25,24 +25,24 @@
7154 COMPONENT_TYPE = APPLICATION
c0004f9c 7155
2bba8d5a
OM		 7156 [sources.common]
7157- ..\ShCommonStrings.uni
7158+ ../ShCommonStrings.uni
7159 TZoneStrings.uni
7160 tzone.c
7161 tzone.h
7162
7163 [includes.common]
7164 .
7165- ..\Inc
7166- ..\Library
7167- $(EDK_SOURCE)\Foundation
7168- $(EDK_SOURCE)\Foundation\Include
7169- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7170- $(EDK_SOURCE)\Foundation\Efi
7171- $(EDK_SOURCE)\Foundation\Efi\Include
7172- $(EDK_SOURCE)\Foundation\FrameWork
7173- $(EDK_SOURCE)\Foundation\FrameWork\Include
7174- $(EDK_SOURCE)\Foundation\Core\Dxe
7175- $(DEST_DIR)\
7176+ ../Inc
7177+ ../Library
7178+ $(EDK_SOURCE)/Foundation
7179+ $(EDK_SOURCE)/Foundation/Include
7180+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7181+ $(EDK_SOURCE)/Foundation/Efi
7182+ $(EDK_SOURCE)/Foundation/Efi/Include
7183+ $(EDK_SOURCE)/Foundation/FrameWork
7184+ $(EDK_SOURCE)/Foundation/FrameWork/Include
7185+ $(EDK_SOURCE)/Foundation/Core/Dxe
7186+ $(DEST_DIR./
7187
7188 [libraries.common]
7189 EfiShellLib
b00c06f0
OM		 7190@@ -62,11 +62,13 @@
7191 # we will specify some additional DEFINEs on the compile command line.
7192 #
7193 [nmake.common]
7194+ IMAGE_ENTRY_POINT=InitializeTZone
7195+
7196+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7197 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
7198- IMAGE_ENTRY_POINT=InitializeTZone
7199 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7200 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7201 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7202
7203-
7204-
7205\ No newline at end of file
7206+[nmake.ARM, nmake.AARCH64]
7207+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 7208Index: tzone/tzone.h
7209===================================================================
7210--- tzone/tzone.h (revision 64)
7211+++ tzone/tzone.h (working copy)
7212@@ -35,3 +35,4 @@
c0004f9c 7213 }
2bba8d5a
OM		 7214
7215 #endif
7216+
7217Index: vol/vol.c
7218===================================================================
7219--- vol/vol.c (revision 64)
7220+++ vol/vol.c (working copy)
7221@@ -32,7 +32,7 @@
7222 //
7223 #include STRING_DEFINES_FILE
7224
7225-EFI_HII_HANDLE HiiHandle;
7226+STATIC EFI_HII_HANDLE HiiHandle;
7227 EFI_GUID EfiVolGuid = EFI_VOL_GUID;
7228 SHELL_VAR_CHECK_ITEM VolCheckList[] = {
7229 {
7230@@ -63,7 +63,7 @@
7231 NULL,
7232 0,
7233 0,
7234- 0
7235+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
c0004f9c 7236 }
2bba8d5a 7237 };
c0004f9c 7238
2bba8d5a
OM		 7239Index: vol/vol.h
7240===================================================================
7241--- vol/vol.h (revision 64)
7242+++ vol/vol.h (working copy)
7243@@ -32,3 +32,4 @@
c0004f9c 7244 }
7245
c0004f9c 7246 #endif
2bba8d5a
OM		 7247+
7248Index: vol/Vol.inf
7249===================================================================
7250--- vol/Vol.inf (revision 64)
7251+++ vol/Vol.inf (working copy)
7252@@ -40,24 +40,24 @@
c0004f9c 7253
c0004f9c 7254
7255 [sources.common]
2bba8d5a
OM		 7256- ..\ShCommonStrings.uni
7257+ ../ShCommonStrings.uni
7258 VolStrings.uni
7259 Vol.c
7260 Vol.h
7261
c0004f9c 7262 [includes.common]
7263 .
7264- ..\Inc
7265- ..\Library
7266- $(EDK_SOURCE)\Foundation
7267- $(EDK_SOURCE)\Foundation\Include
7268- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7269- $(EDK_SOURCE)\Foundation\Efi
7270- $(EDK_SOURCE)\Foundation\Efi\Include
7271- $(EDK_SOURCE)\Foundation\FrameWork
7272- $(EDK_SOURCE)\Foundation\FrameWork\Include
7273- $(EDK_SOURCE)\Foundation\Core\Dxe
7274- $(DEST_DIR)\
7275+ ../Inc
7276+ ../Library
7277+ $(EDK_SOURCE)/Foundation
7278+ $(EDK_SOURCE)/Foundation/Include
7279+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7280+ $(EDK_SOURCE)/Foundation/Efi
7281+ $(EDK_SOURCE)/Foundation/Efi/Include
7282+ $(EDK_SOURCE)/Foundation/FrameWork
7283+ $(EDK_SOURCE)/Foundation/FrameWork/Include
7284+ $(EDK_SOURCE)/Foundation/Core/Dxe
7285+ $(DEST_DIR./
7286
7287 [libraries.common]
7288 EfiShellLib
b00c06f0
OM		 7289@@ -72,7 +72,11 @@
7290
7291 [nmake.common]
7292 IMAGE_ENTRY_POINT=InitializeVol
7293+
7294+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7295 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7296 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7297 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7298
7299+[nmake.ARM, nmake.AARCH64]
7300+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 7301Index: cp/cp.c
7302===================================================================
7303--- cp/cp.c (revision 64)
7304+++ cp/cp.c (working copy)
7305@@ -66,7 +66,7 @@
7306 NULL,
7307 0,
7308 0,
7309- 0
7310+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
7311 }
7312 };
c0004f9c 7313
2bba8d5a
OM		 7314@@ -578,7 +578,7 @@
7315 //
7316 if (SrcArg->Status == EFI_SUCCESS &&
7317 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
7318- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
7319+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))
7320 ) {
7321 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
7322 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
7323@@ -592,7 +592,7 @@
7324 // we need to compose a full name of dir\file for the source
7325 //
7326 if (SrcArg->Status == EFI_SUCCESS &&
7327- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
7328+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) {
7329 if (DstFullName) {
7330 FreePool (DstFullName);
7331 }
7332@@ -869,7 +869,6 @@
7333 EFI_STATUS Status;
7334 EFI_FILE_INFO *SrcInfo;
7335 EFI_FILE_INFO *DstInfo;
7336- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *DstVol;
7337 EFI_FILE_SYSTEM_INFO *DstFsInfo;
7338 CHAR16 InputString[10];
7339 UINTN BufSize;
7340@@ -894,7 +893,6 @@
7341 SrcInfo = NULL;
7342 DstInfo = NULL;
7343 FileInfo = NULL;
7344- DstVol = NULL;
7345 DstFsInfo = NULL;
7346 InputString[0] = 0;
7347 BufSize = 0;
7348@@ -1789,7 +1787,7 @@
7349 //
7350 if (SrcArg->Status == EFI_SUCCESS &&
7351 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
7352- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
7353+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle)))
7354 ) {
7355 if (DstFullName) {
7356 FreePool (DstFullName);
7357Index: cp/cp.h
7358===================================================================
7359--- cp/cp.h (revision 64)
7360+++ cp/cp.h (working copy)
7361@@ -67,4 +67,5 @@
7362 IN EFI_SYSTEM_TABLE *SystemTable
7363 );
c0004f9c 7364
2bba8d5a
OM		 7365-#endif
7366\ No newline at end of file
7367+#endif
7368+
7369Index: cp/cp.inf
7370===================================================================
7371--- cp/cp.inf (revision 64)
7372+++ cp/cp.inf (working copy)
7373@@ -41,23 +41,23 @@
c0004f9c 7374
7375 [sources.common]
2bba8d5a
OM		 7376 CpStrings.uni
7377- ..\ShCommonStrings.uni
7378+ ../ShCommonStrings.uni
7379 cp.h
7380 cp.c
7381
c0004f9c 7382 [includes.common]
7383 .
7384- ..\Inc
7385- ..\Library
7386- $(EDK_SOURCE)\Foundation
7387- $(EDK_SOURCE)\Foundation\Include
7388- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
7389- $(EDK_SOURCE)\Foundation\Efi
7390- $(EDK_SOURCE)\Foundation\Efi\Include
7391- $(EDK_SOURCE)\Foundation\FrameWork
7392- $(EDK_SOURCE)\Foundation\FrameWork\Include
7393- $(EDK_SOURCE)\Foundation\Core\Dxe
7394- $(DEST_DIR)\
7395+ ../Inc
7396+ ../Library
7397+ $(EDK_SOURCE)/Foundation
7398+ $(EDK_SOURCE)/Foundation/Include
7399+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
7400+ $(EDK_SOURCE)/Foundation/Efi
7401+ $(EDK_SOURCE)/Foundation/Efi/Include
7402+ $(EDK_SOURCE)/Foundation/FrameWork
7403+ $(EDK_SOURCE)/Foundation/FrameWork/Include
7404+ $(EDK_SOURCE)/Foundation/Core/Dxe
7405+ $(DEST_DIR./
7406
7407 [libraries.common]
7408 EfiShellLib
b00c06f0
OM		 7409@@ -72,7 +72,12 @@
7410
7411 [nmake.common]
7412 IMAGE_ENTRY_POINT=InitializeCP
7413+
7414+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
7415 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
7416 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
7417 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
7418
7419+[nmake.ARM, nmake.AARCH64]
7420+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
7421+
2bba8d5a
OM		 7422Index: Library/EfiPart.h
7423===================================================================
7424--- Library/EfiPart.h (revision 64)
7425+++ Library/EfiPart.h (working copy)
7426@@ -56,3 +56,4 @@
7427 #pragma pack()
7428
7429 #endif
7430+
7431Index: Library/X64/efilibplat.h
7432===================================================================
7433--- Library/X64/efilibplat.h (revision 64)
7434+++ Library/X64/efilibplat.h (working copy)
7435@@ -35,3 +35,4 @@
7436 #define MIN_ALIGNMENT_SIZE 8
7437
7438 #endif
7439+
7440Index: Library/ShellEnvInt.h
7441===================================================================
7442--- Library/ShellEnvInt.h (revision 64)
7443+++ Library/ShellEnvInt.h (working copy)
7444@@ -196,4 +196,6 @@
7445 VOID
7446 );
7447
7448-#endif
7449\ No newline at end of file
7450+#endif
7451+
7452+
7453Index: Library/LinkedList.h
7454===================================================================
7455--- Library/LinkedList.h (revision 64)
7456+++ Library/LinkedList.h (working copy)
7457@@ -77,11 +77,10 @@
c0004f9c 7458 }
7459
2bba8d5a
OM		 7460 #define SwapListEntries(Entry1, Entry2) { \
7461- EFI_LIST_ENTRY *Entry1Flink, *Entry1Blink; \
7462+ EFI_LIST_ENTRY *Entry1Blink; \
7463 EFI_LIST_ENTRY *Entry2Flink, *Entry2Blink; \
7464 Entry2Flink = (Entry2)->Flink; \
7465 Entry2Blink = (Entry2)->Blink; \
7466- Entry1Flink = (Entry1)->Flink; \
7467 Entry1Blink = (Entry1)->Blink; \
7468 Entry2Blink->Flink = Entry2Flink; \
7469 Entry2Flink->Blink = Entry2Blink; \
7470@@ -100,3 +99,4 @@
7471 // A lock structure
7472 //
7473 #endif
7474+
7475Index: Library/IO.c
7476===================================================================
7477--- Library/IO.c (revision 64)
7478+++ Library/IO.c (working copy)
7479@@ -21,7 +21,7 @@
c0004f9c 7480
c0004f9c 7481 --*/
7482
2bba8d5a
OM		 7483-#include "EfiShelllib.h"
7484+#include "EfiShellLib.h"
c0004f9c 7485
2bba8d5a
OM		 7486 #define PRINT_STRING_LEN 1024
7487 #define PRINT_ITEM_BUFFER_LEN 100
7488@@ -86,8 +86,8 @@
7489 typedef struct {
7490 BOOLEAN PageBreak;
7491 BOOLEAN AutoWrap;
7492- INTN MaxRow;
7493- INTN MaxColumn;
7494+ UINTN MaxRow;
7495+ UINTN MaxColumn;
7496 INTN InitRow;
7497 INTN Row;
7498 INTN Column;
7499@@ -1575,7 +1575,7 @@
7500 {
7501 BOOLEAN Done;
7502 UINTN Column;
7503- INTN Row;
7504+ UINTN Row;
7505 UINTN StartColumn;
7506 UINTN Update;
7507 UINTN Delete;
7508@@ -1769,7 +1769,7 @@
7509 //
7510 // If we need to update the output do so now
7511 //
7512- if (Update != -1) {
7513+ if (Update != (UINTN) -1) {
7514 PrintAt (Column, Row, L"%s%.*s", InStr + Update, Delete, L"");
7515 Len = StrLen (InStr);
c0004f9c 7516
2bba8d5a
OM		 7517@@ -1928,8 +1928,8 @@
7518 return mPrintMode.PageBreak;
7519 }
c0004f9c 7520
2bba8d5a
OM		 7521+#if 0
7522 STATIC
7523-
7524 BOOLEAN
7525 GetOutputPause (
7526 VOID
7527@@ -1937,6 +1937,7 @@
7528 {
7529 return mPrintMode.OutputPause;
7530 }
7531+#endif
7532
7533 INTN
7534 DbgPrint (
7535Index: Library/FileIO.c
7536===================================================================
7537--- Library/FileIO.c (revision 64)
7538+++ Library/FileIO.c (working copy)
7539@@ -21,7 +21,7 @@
7540
7541 --*/
7542
7543-#include "EfiShelllib.h"
7544+#include "EfiShellLib.h"
7545
7546 typedef struct _PATH_COMPONENTS {
7547 CHAR16 *Name;
7548@@ -719,7 +719,6 @@
7549 IN OUT CHAR16 **Path
7550 )
7551 {
7552- EFI_STATUS Status;
7553 CHAR16 *p;
7554 UINTN Size;
7555
7556@@ -728,7 +727,6 @@
7557
7558 *Fs = NULL;
7559 *Path = NULL;
7560- Status = EFI_SUCCESS;
7561
7562 p = AbPath;
7563 while (*p) {
7564@@ -1017,13 +1015,11 @@
7565 EFI_LIST_ENTRY SrcList;
7566 EFI_LIST_ENTRY DstList;
7567 EFI_STATUS Status;
7568- EFI_LIST_ENTRY *Link;
7569 SHELL_FILE_ARG *SrcArg;
7570 SHELL_FILE_ARG *DstArg;
c0004f9c 7571
2bba8d5a
OM		 7572 ASSERT (IsSame != NULL);
7573
7574- Link = NULL;
7575 SrcArg = NULL;
7576 DstArg = NULL;
7577 InitializeListHead (&SrcList);
2bba8d5a
OM		 7578Index: Library/Ebc/EfiLibPlat.h
7579===================================================================
7580--- Library/Ebc/EfiLibPlat.h (revision 64)
7581+++ Library/Ebc/EfiLibPlat.h (working copy)
7582@@ -44,3 +44,4 @@
7583 ;
7584
7585 #define MIN_ALIGNMENT_SIZE 8
7586+
7587Index: Library/Str.c
7588===================================================================
7589--- Library/Str.c (revision 64)
7590+++ Library/Str.c (working copy)
7591@@ -22,7 +22,7 @@
7592
7593 --*/
7594
7595-#include "EfiShelllib.h"
7596+#include "EfiShellLib.h"
7597
7598 INTN
7599 StrCmp (
7600@@ -421,7 +421,7 @@
7601 return (UINTN) -1;
7602 }
7603
7604- u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
7605+ u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
7606 } else {
7607 break;
7608 }
7609@@ -472,7 +472,7 @@
7610 c = *(str++);
7611 while (c) {
7612 if (c >= '0' && c <= '9') {
7613- if (u > m || u == m && c - '0' > (INTN) n) {
7614+ if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) {
7615 return (UINTN) -1;
7616 }
7617
7618Index: Library/Data.c
7619===================================================================
7620--- Library/Data.c (revision 64)
7621+++ Library/Data.c (working copy)
7622@@ -21,7 +21,7 @@
7623
7624 --*/
7625
7626-#include "EfiShelllib.h"
7627+#include "EfiShellLib.h"
7628
7629 //
7630 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
7631Index: Library/IO.h
7632===================================================================
7633--- Library/IO.h (revision 64)
7634+++ Library/IO.h (working copy)
7635@@ -157,4 +157,6 @@
7636 );
7637
7638
7639-#endif
7640\ No newline at end of file
7641+#endif
7642+
7643+
7644Index: Library/FileIO.h
7645===================================================================
7646--- Library/FileIO.h (revision 64)
7647+++ Library/FileIO.h (working copy)
7648@@ -208,4 +208,6 @@
7649 IN SIMPLE_READ_FILE SimpleReadHandle
7650 );
7651
7652-#endif
7653\ No newline at end of file
7654+#endif
7655+
7656+
7657Index: Library/Str.h
7658===================================================================
7659--- Library/Str.h (revision 64)
7660+++ Library/Str.h (working copy)
7661@@ -248,3 +248,4 @@
7662 );
7663
7664 #endif
7665+
7666Index: Library/Mem.c
7667===================================================================
7668--- Library/Mem.c (revision 64)
7669+++ Library/Mem.c (working copy)
7670@@ -21,7 +21,7 @@
7671
7672 --*/
7673
7674-#include "EfiShelllib.h"
7675+#include "EfiShellLib.h"
7676
7677 VOID
7678 SetMem (
7679Index: Library/RtData.c
7680===================================================================
7681--- Library/RtData.c (revision 64)
7682+++ Library/RtData.c (working copy)
7683@@ -21,7 +21,7 @@
7684
7685 --*/
7686
7687-#include "EfiShelllib.h"
7688+#include "EfiShellLib.h"
c0004f9c 7689
2bba8d5a
OM		 7690 //
7691 // RT - pointer to the runtime table
7692Index: Library/Event.c
7693===================================================================
7694--- Library/Event.c (revision 64)
7695+++ Library/Event.c (working copy)
7696@@ -21,7 +21,7 @@
c0004f9c 7697
2bba8d5a 7698 --*/
c0004f9c 7699
2bba8d5a
OM		 7700-#include "EfiShelllib.h"
7701+#include "EfiShellLib.h"
c0004f9c 7702
2bba8d5a
OM		 7703 EFI_EVENT
7704 LibCreateProtocolNotifyEvent (
7705Index: Library/Mem.h
7706===================================================================
7707--- Library/Mem.h (revision 64)
7708+++ Library/Mem.h (working copy)
7709@@ -73,4 +73,6 @@
7710 IN UINTN Size
7711 );
c0004f9c 7712
2bba8d5a
OM		 7713-#endif
7714\ No newline at end of file
7715+#endif
7716+
7717+
7718Index: Library/Event.h
7719===================================================================
7720--- Library/Event.h (revision 64)
7721+++ Library/Event.h (working copy)
7722@@ -50,4 +50,6 @@
7723 OUT EFI_INPUT_KEY *Key
7724 );
c0004f9c 7725
2bba8d5a
OM		 7726-#endif
7727\ No newline at end of file
7728+#endif
7729+
7730+
7731Index: Library/EfiShellLib.h
7732===================================================================
7733--- Library/EfiShellLib.h (revision 64)
7734+++ Library/EfiShellLib.h (working copy)
7735@@ -25,7 +25,7 @@
7736 #define _EFI_SHELL_LIB_INCLUDE_
c0004f9c 7737
2bba8d5a
OM		 7738 #include "Tiano.h"
7739-#include "ShellEnv.h"
7740+#include "shellenv.h"
7741 #include "pci22.h"
c0004f9c 7742
2bba8d5a
OM		 7743 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
7744@@ -51,7 +51,7 @@
7745 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
7746 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
7747 #include EFI_GUID_DEFINITION (SalSystemTable)
7748-#include EFI_GUID_DEFINITION (Smbios)
7749+#include EFI_GUID_DEFINITION (SmBios)
7750 #include EFI_GUID_DEFINITION (StandardErrorDevice)
7751 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
7752 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
7753@@ -67,7 +67,7 @@
7754 #include EFI_PROTOCOL_DEFINITION (DebugPort)
7755 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
7756 #include EFI_PROTOCOL_DEFINITION (Decompress)
7757-#include EFI_PROTOCOL_DEFINITION (DeviceIO)
7758+#include EFI_PROTOCOL_DEFINITION (DeviceIo)
7759 #include EFI_PROTOCOL_DEFINITION (DevicePath)
7760 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
7761 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
7762@@ -111,7 +111,7 @@
7763 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
7764 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
7765 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
7766-#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
7767+#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
7768 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
7769 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
7770 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
7771@@ -152,7 +152,7 @@
7772 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
c0004f9c 7773
2bba8d5a
OM		 7774 #include "efilibplat.h"
7775-#include "efipart.h"
7776+#include "EfiPart.h"
7777 #include "ShellDebug.h"
7778 #include "CRC.h"
7779 #include "DPath.h"
7780@@ -358,3 +358,4 @@
7781 );
c0004f9c 7782
2bba8d5a
OM		 7783 #endif
7784+
7785Index: Library/Handle.c
7786===================================================================
7787--- Library/Handle.c (revision 64)
7788+++ Library/Handle.c (working copy)
7789@@ -21,7 +21,7 @@
c0004f9c 7790
2bba8d5a 7791 --*/
c0004f9c 7792
2bba8d5a
OM		 7793-#include "EfiShelllib.h"
7794+#include "EfiShellLib.h"
c0004f9c 7795
2bba8d5a
OM		 7796 EFI_STATUS
7797 LibLocateHandle (
7798@@ -131,7 +131,6 @@
7799 EFI_HANDLE *BlockIoBuffer;
7800 EFI_DEVICE_PATH_PROTOCOL *DevicePath;
7801 UINTN Index;
7802- EFI_DEVICE_PATH_PROTOCOL *Start;
7803 EFI_DEVICE_PATH_PROTOCOL *Next;
7804 EFI_DEVICE_PATH_PROTOCOL *DevPath;
7805 HARDDRIVE_DEVICE_PATH *HardDriveDevicePath;
7806@@ -204,7 +203,6 @@
7807 PreviousNodeIsHardDriveDevicePath = FALSE;
c0004f9c 7808
2bba8d5a
OM		 7809 DevPath = DevicePath;
7810- Start = DevPath;
7811 //
7812 // Check for end of device path type
7813 //
7814@@ -796,14 +794,12 @@
7815 UINTN OpenInfoIndex;
7816 UINTN ChildIndex;
7817 BOOLEAN DriverBindingHandleIndexValid;
7818- BOOLEAN ControllerHandleIndexValid;
c0004f9c 7819
2bba8d5a
OM		 7820 DriverBindingHandleIndexValid = FALSE;
7821 if (DriverBindingHandleIndex != NULL) {
7822 *DriverBindingHandleIndex = 0xffffffff;
7823 }
c0004f9c 7824
2bba8d5a
OM		 7825- ControllerHandleIndexValid = FALSE;
7826 if (ControllerHandleIndex != NULL) {
7827 *ControllerHandleIndex = 0xffffffff;
7828 }
7829@@ -847,7 +843,6 @@
c0004f9c 7830
2bba8d5a
OM		 7831 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
7832 *ControllerHandleIndex = (UINT32) HandleIndex;
7833- ControllerHandleIndexValid = TRUE;
7834 }
c0004f9c 7835
2bba8d5a
OM		 7836 }
7837@@ -1305,7 +1300,7 @@
7838 Status = BS->HandleProtocol (
7839 Handles[Index],
7840 ProtocolGuid,
7841- Interface
7842+ (VOID**)Interface
7843 );
c0004f9c 7844
2bba8d5a
OM		 7845 if (!EFI_ERROR (Status)) {
7846Index: Library/Misc.c
7847===================================================================
7848--- Library/Misc.c (revision 64)
7849+++ Library/Misc.c (working copy)
7850@@ -21,7 +21,7 @@
c0004f9c 7851
2bba8d5a 7852 --*/
c0004f9c 7853
2bba8d5a
OM		 7854-#include "EfiShelllib.h"
7855+#include "EfiShellLib.h"
c0004f9c 7856
2bba8d5a
OM		 7857 #if (PLATFORM == NT32)
7858 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \
7859@@ -348,7 +348,7 @@
7860 ASSERT (Buffer != NULL);
c0004f9c 7861
2bba8d5a
OM		 7862 if (mShellEnv == NULL) {
7863- Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv);
7864+ Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv);
7865 if (EFI_ERROR (Status)) {
7866 mShellEnv = NULL;
7867 }
7868@@ -1171,7 +1171,7 @@
7869 Status = BS->HandleProtocol (
7870 Image->DeviceHandle,
7871 &gEfiFirmwareVolumeProtocolGuid,
7872- &FV
7873+ (VOID**)&FV
7874 );
7875 if (!EFI_ERROR (Status)) {
7876 Status = FV->ReadSection (
7877@@ -1192,7 +1192,7 @@
7878 Status = BS->HandleProtocol (
7879 Image->DeviceHandle,
7880 &gEfiFirmwareVolume2ProtocolGuid,
7881- &FV2
7882+ (VOID**)&FV2
7883 );
7884 if (!EFI_ERROR (Status)) {
7885 Status = FV2->ReadSection (
7886@@ -1339,7 +1339,7 @@
7887 {
7888 EFI_STATUS Status;
7889 CHAR16 *String;
7890- EFI_HII_HANDLE HiiHandle;
7891+ STATIC EFI_HII_HANDLE HiiHandle;
c0004f9c 7892
2bba8d5a
OM		 7893 ASSERT (Str);
7894
7895@@ -1730,6 +1730,8 @@
7896 return L"X64";
7897 case EFI_IMAGE_MACHINE_IA64:
7898 return L"IA64";
7899+ case EFI_IMAGE_MACHINE_AARCH64:
7900+ return L"AARCH64";
7901 default:
7902 return L"UNKNOWN";
c0004f9c 7903 }
2bba8d5a
OM		 7904@@ -2544,4 +2546,5 @@
7905 }
7906
7907 return Status;
7908-}
7909\ No newline at end of file
7910+}
7911+
7912Index: Library/Perf.c
7913===================================================================
7914--- Library/Perf.c (revision 64)
7915+++ Library/Perf.c (working copy)
7916@@ -19,7 +19,7 @@
7917
7918 --*/
7919
7920-#include "EfiShelllib.h"
7921+#include "EfiShellLib.h"
7922
7923 #include EFI_PROTOCOL_DEFINITION (Performance)
7924
7925Index: Library/IPF/efilibplat.h
7926===================================================================
7927--- Library/IPF/efilibplat.h (revision 64)
7928+++ Library/IPF/efilibplat.h (working copy)
7929@@ -35,3 +35,4 @@
7930 #define MIN_ALIGNMENT_SIZE 8
7931
7932 #endif
7933+
7934Index: Library/IPF/palproc.h
7935===================================================================
7936--- Library/IPF/palproc.h (revision 64)
7937+++ Library/IPF/palproc.h (working copy)
7938@@ -58,3 +58,4 @@
7939 #define PAL_MC_REGISTER_MEM 0x001b
7940
7941 #endif // _PALPROC_H
7942+
7943Index: Library/IPF/libsalpal.h
7944===================================================================
7945--- Library/IPF/libsalpal.h (revision 64)
7946+++ Library/IPF/libsalpal.h (working copy)
7947@@ -74,4 +74,4 @@
7948 IN UINT64 Arg8
7949 );
7950
7951-#endif
7952\ No newline at end of file
7953+#endif
2bba8d5a
OM		 7954Index: Library/ConsistMapping.c
7955===================================================================
7956--- Library/ConsistMapping.c (revision 64)
7957+++ Library/ConsistMapping.c (working copy)
7958@@ -21,7 +21,7 @@
c0004f9c 7959
2bba8d5a 7960 --*/
c0004f9c 7961
2bba8d5a
OM		 7962-#include "EfiShelllib.h"
7963+#include "EfiShellLib.h"
7964
7965 MTD_NAME mMTDName[] = {
7966 {
7967Index: Library/DPath.c
7968===================================================================
7969--- Library/DPath.c (revision 64)
7970+++ Library/DPath.c (working copy)
7971@@ -20,7 +20,7 @@
7972
7973 --*/
7974
7975-#include "EfiShelllib.h"
7976+#include "EfiShellLib.h"
7977
7978 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
7979
7980@@ -1468,7 +1468,7 @@
7981
c0004f9c 7982 Status = LibLocateProtocol (
2bba8d5a
OM		 7983 &gEfiDevicePathToTextProtocolGuid,
7984- &DevPathToText
7985+ (VOID**)&DevPathToText
c0004f9c 7986 );
7987 if (!EFI_ERROR (Status)) {
2bba8d5a
OM		 7988 ToText = DevPathToText->ConvertDevicePathToText (
7989@@ -1766,7 +1766,7 @@
7990 Status = BS->HandleProtocol (
7991 Device,
7992 Protocol,
7993- Interface
7994+ (VOID**)Interface
7995 );
7996 }
c0004f9c 7997 }
2bba8d5a
OM		 7998Index: Library/Handle.h
7999===================================================================
8000--- Library/Handle.h (revision 64)
8001+++ Library/Handle.h (working copy)
8002@@ -161,3 +161,4 @@
8003 );
c0004f9c 8004
2bba8d5a
OM		 8005 #endif
8006+
8007Index: Library/Misc.h
8008===================================================================
8009--- Library/Misc.h (revision 64)
8010+++ Library/Misc.h (working copy)
8011@@ -258,3 +258,4 @@
8012 );
c0004f9c 8013
2bba8d5a
OM		 8014 #endif
8015+
8016Index: Library/ConsistMapping.h
8017===================================================================
8018--- Library/ConsistMapping.h (revision 64)
8019+++ Library/ConsistMapping.h (working copy)
8020@@ -79,4 +79,6 @@
8021 IN VOID *Buffer2
8022 );
c0004f9c 8023
2bba8d5a
OM		 8024-#endif
8025\ No newline at end of file
8026+#endif
8027+
8028+
8029Index: Library/Init.c
8030===================================================================
8031--- Library/Init.c (revision 64)
8032+++ Library/Init.c (working copy)
8033@@ -20,7 +20,7 @@
c0004f9c 8034
2bba8d5a 8035 --*/
c0004f9c 8036
2bba8d5a
OM		 8037-#include "EfiShelllib.h"
8038+#include "EfiShellLib.h"
c0004f9c 8039
2bba8d5a 8040 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
c0004f9c 8041
2bba8d5a
OM		 8042Index: Library/DPath.h
8043===================================================================
8044--- Library/DPath.h (revision 64)
8045+++ Library/DPath.h (working copy)
8046@@ -24,7 +24,7 @@
8047 #ifndef _D_PATH_H
8048 #define _D_PATH_H
c0004f9c 8049
2bba8d5a
OM		 8050-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
8051+#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
c0004f9c 8052
2bba8d5a 8053 #include EFI_GUID_DEFINITION (PcAnsi)
c0004f9c 8054
2bba8d5a
OM		 8055@@ -153,3 +153,4 @@
8056 );
c0004f9c 8057
2bba8d5a
OM		 8058 #endif
8059+
8060Index: Library/HiiSupport.c
8061===================================================================
8062--- Library/HiiSupport.c (revision 64)
8063+++ Library/HiiSupport.c (working copy)
8064@@ -21,7 +21,7 @@
8065 \r
8066 --*/\r
8067 \r
8068-#include "EfiShelllib.h"\r
8069+#include "EfiShellLib.h"\r
8070 \r
8071 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
8072 \r
8073@@ -56,11 +56,11 @@
8074 return EFI_SUCCESS;\r
8075 }\r
8076 \r
8077- Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);\r
8078+ Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);\r
8079 if (EFI_ERROR (Status)) {\r
8080 return Status;\r
8081 }\r
8082- Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);\r
8083+ Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);\r
8084 if (EFI_ERROR (Status)) {\r
8085 return Status;\r
8086 } \r
8087Index: Library/CRC.c
8088===================================================================
8089--- Library/CRC.c (revision 64)
8090+++ Library/CRC.c (working copy)
8091@@ -21,7 +21,7 @@
c0004f9c 8092
2bba8d5a 8093 --*/
c0004f9c 8094
2bba8d5a
OM		 8095-#include "EfiShelllib.h"
8096+#include "EfiShellLib.h"
c0004f9c 8097
2bba8d5a
OM		 8098 UINT32 CRCTable[256] = {
8099 0x00000000,
8100Index: Library/HiiSupport.h
8101===================================================================
8102--- Library/HiiSupport.h (revision 64)
8103+++ Library/HiiSupport.h (working copy)
8104@@ -142,3 +142,4 @@
8105 ;\r
8106 \r
8107 #endif\r
8108+
8109Index: Library/CRC.h
8110===================================================================
8111--- Library/CRC.h (revision 64)
8112+++ Library/CRC.h (working copy)
8113@@ -53,4 +53,6 @@
8114 UINTN Size
8115 );
c0004f9c 8116
2bba8d5a
OM		 8117-#endif
8118\ No newline at end of file
8119+#endif
8120+
8121+
8122Index: Library/EfiShellLib.inf
8123===================================================================
8124--- Library/EfiShellLib.inf (revision 64)
8125+++ Library/EfiShellLib.inf (working copy)
8126@@ -45,34 +45,42 @@
8127 HiiSupport.c
c0004f9c 8128
2bba8d5a
OM		 8129 [sources.ia32]
8130- ia32\math.c
8131- ia32\initplat.c
8132+ IA32/math.c
8133+ IA32/initplat.c
8134
8135 [sources.ipf]
8136- ipf\math.c
8137- ipf\initplat.c
8138- ipf\palproc.s
8139- ipf\salpal.c
8140+ IPF/math.c
8141+ IPF/initplat.c
8142+ IPF/palproc.s
8143+ IPF/salpal.c
c0004f9c 8144
2bba8d5a
OM		 8145 [sources.EBC]
8146- EBC\math.c
8147- EBC\initplat.c
8148-
8149+ Ebc/math.c
8150+ Ebc/initplat.c
8151+
8152 [sources.x64]
8153- ipf\math.c
8154- ia32\initplat.c
8155+ IPF/math.c
8156+ IA32/initplat.c
c0004f9c 8157
2bba8d5a
OM		 8158+[sources.ARM]
8159+ IPF/math.c
8160+ IA32/initplat.c
8161+
8162+[sources.AARCH64]
8163+ IPF/math.c
8164+ IA32/initplat.c
8165+
c0004f9c 8166 [includes.common]
8167 .
8168- ..\Inc
c0004f9c 8169- $(EDK_SOURCE)\Foundation
8170- $(EDK_SOURCE)\Foundation\Include
c0004f9c 8171- $(EDK_SOURCE)\Foundation\Efi
8172- $(EDK_SOURCE)\Foundation\Efi\Include
8173- $(EDK_SOURCE)\Foundation\FrameWork
8174- $(EDK_SOURCE)\Foundation\FrameWork\Include
2bba8d5a 8175- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
c0004f9c 8176- $(EDK_SOURCE)\Foundation\Core\Dxe
c0004f9c 8177+ ../Inc
c0004f9c 8178+ $(EDK_SOURCE)/Foundation
8179+ $(EDK_SOURCE)/Foundation/Include
c0004f9c 8180+ $(EDK_SOURCE)/Foundation/Efi
8181+ $(EDK_SOURCE)/Foundation/Efi/Include
8182+ $(EDK_SOURCE)/Foundation/FrameWork
8183+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2bba8d5a 8184+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
c0004f9c 8185+ $(EDK_SOURCE)/Foundation/Core/Dxe
c0004f9c 8186
2bba8d5a
OM		 8187 [libraries.common]
8188 EdkFrameworkProtocolLib
b00c06f0 8189@@ -81,4 +89,7 @@
2bba8d5a
OM		 8190 EfiGuidLib
8191 EdkGuidLib
c0004f9c 8192
2bba8d5a 8193+[libraries.ARM]
b00c06f0 8194+ CompilerIntrinsicsLib, CompilerIntrinsicsLib
2bba8d5a
OM		 8195+
8196 [nmake.common]
8197Index: Library/IA32/efilibplat.h
8198===================================================================
8199--- Library/IA32/efilibplat.h (revision 64)
8200+++ Library/IA32/efilibplat.h (working copy)
8201@@ -34,4 +34,4 @@
c0004f9c 8202
2bba8d5a 8203 #define MIN_ALIGNMENT_SIZE 4
c0004f9c 8204
2bba8d5a
OM		 8205-#endif
8206\ No newline at end of file
8207+#endif
8208Index: Library/ShellDebug.c
8209===================================================================
8210--- Library/ShellDebug.c (revision 64)
8211+++ Library/ShellDebug.c (working copy)
8212@@ -19,7 +19,7 @@
c0004f9c 8213
2bba8d5a 8214 --*/
c0004f9c 8215
2bba8d5a
OM		 8216-#include "EfiShelllib.h"
8217+#include "EfiShellLib.h"
8218 #include EFI_PROTOCOL_DEFINITION (DebugAssert)
c0004f9c 8219
2bba8d5a
OM		 8220 EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL;
8221Index: Library/ShellDebug.h
8222===================================================================
8223--- Library/ShellDebug.h (revision 64)
8224+++ Library/ShellDebug.h (working copy)
8225@@ -99,3 +99,4 @@
8226 );
8227 #endif
8228
8229+
8230Index: Library/VarCheck.c
8231===================================================================
8232--- Library/VarCheck.c (revision 64)
8233+++ Library/VarCheck.c (working copy)
8234@@ -21,7 +21,7 @@
c0004f9c 8235
2bba8d5a 8236 --*/
c0004f9c 8237
2bba8d5a
OM		 8238-#include "EfiShelllib.h"
8239+#include "EfiShellLib.h"
c0004f9c 8240
2bba8d5a
OM		 8241 VOID
8242 LibCheckVarFreeVarList (
8243Index: Library/Lock.c
8244===================================================================
8245--- Library/Lock.c (revision 64)
8246+++ Library/Lock.c (working copy)
8247@@ -21,7 +21,7 @@
c0004f9c 8248
2bba8d5a 8249 --*/
c0004f9c 8250
2bba8d5a
OM		 8251-#include "EfiShelllib.h"
8252+#include "EfiShellLib.h"
c0004f9c 8253
2bba8d5a
OM		 8254 VOID
8255 InitializeLock (
8256Index: Library/ShellEnvInt.c
8257===================================================================
8258--- Library/ShellEnvInt.c (revision 64)
8259+++ Library/ShellEnvInt.c (working copy)
8260@@ -21,7 +21,7 @@
c0004f9c 8261
2bba8d5a 8262 --*/
c0004f9c 8263
2bba8d5a
OM		 8264-#include "EfiShelllib.h"
8265+#include "EfiShellLib.h"
c0004f9c 8266
2bba8d5a
OM		 8267 EFI_STATUS
8268 ShellExecute (
8269Index: Library/VarCheck.h
8270===================================================================
8271--- Library/VarCheck.h (revision 64)
8272+++ Library/VarCheck.h (working copy)
8273@@ -41,7 +41,7 @@
8274 ARG_PARTIALLY_QUOTED = 0x2,
8275 ARG_FIRST_HALF_QUOTED = 0x4,
8276 ARG_FIRST_CHAR_IS_ESC = 0x8
8277-};
8278+} SHELL_ARG_EXPR;
c0004f9c 8279
2bba8d5a
OM		 8280 typedef struct {
8281 CHAR16 *FlagStr;
8282@@ -116,3 +116,4 @@
8283 );
c0004f9c 8284
2bba8d5a
OM		 8285 #endif
8286+
8287Index: Library/Lock.h
8288===================================================================
8289--- Library/Lock.h (revision 64)
8290+++ Library/Lock.h (working copy)
8291@@ -45,4 +45,6 @@
8292 IN FLOCK *Lock
8293 );
c0004f9c 8294
2bba8d5a
OM		 8295-#endif
8296\ No newline at end of file
c0004f9c 8297+#endif
8298+
2bba8d5a
OM		 8299+
8300Index: ShellFull.inf
8301===================================================================
8302--- ShellFull.inf (revision 64)
8303+++ ShellFull.inf (working copy)
8304@@ -20,300 +20,310 @@
8305 #--*/
c0004f9c 8306
2bba8d5a
OM		 8307 [defines]
8308-BASE_NAME = Shell
8309-FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
8310+BASE_NAME = ShellFull
8311+FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20
8312 COMPONENT_TYPE = APPLICATION
c0004f9c 8313
2bba8d5a
OM		 8314 [sources.common]
8315- Library\ShellDebug.c
8316- Library\DPath.c
8317- Library\Init.c
8318- Library\Lock.c
8319- Library\Str.c
8320- Library\IO.c
8321- Library\Mem.c
8322- Library\Misc.c
8323- Library\Data.c
8324- Library\RtData.c
8325- Library\ShellEnvInt.c
8326- Library\Handle.c
8327- Library\FileIO.c
8328- Library\ConsistMapping.c
8329- Library\CRC.c
8330- Library\Event.c
8331- Library\Perf.c
8332- Library\VarCheck.c
8333- Library\HiiSupport.c
8334+ Library/ShellDebug.c
8335+ Library/DPath.c
8336+ Library/Init.c
8337+ Library/Lock.c
8338+ Library/Str.c
8339+ Library/IO.c
8340+ Library/Mem.c
8341+ Library/Misc.c
8342+ Library/Data.c
8343+ Library/RtData.c
8344+ Library/ShellEnvInt.c
8345+ Library/Handle.c
8346+ Library/FileIO.c
8347+ Library/ConsistMapping.c
8348+ Library/CRC.c
8349+ Library/Event.c
8350+ Library/Perf.c
8351+ Library/VarCheck.c
8352+ Library/HiiSupport.c
c0004f9c 8353
2bba8d5a
OM		 8354- newshell\NshellStrings.uni
8355- newshell\init.c
8356- newshell\nshell.h
8357- newshell\fakehii.c
8358+ newshell/NshellStrings.uni
8359+ newshell/init.c
8360+ newshell/nshell.h
8361+ newshell/fakehii.c
c0004f9c 8362
2bba8d5a
OM		 8363 ShCommonStrings.uni
8364- shellenv\ShellenvHelpStrings.uni
8365- shellenv\ShellenvStrings.uni
8366- shellenv\ScriptCmdStrings.uni
8367- shellenv\ConnectStrings.uni
8368- shellenv\EchoStrings.uni
8369- shellenv\HelpStrings.uni
8370- shellenv\MapStrings.uni
8371- shellenv\CdStrings.uni
8372- shellenv\DhStrings.uni
8373+ shellenv/ShellenvHelpStrings.uni
8374+ shellenv/ShellenvStrings.uni
8375+ shellenv/ScriptCmdStrings.uni
8376+ shellenv/ConnectStrings.uni
8377+ shellenv/EchoStrings.uni
8378+ shellenv/HelpStrings.uni
8379+ shellenv/MapStrings.uni
8380+ shellenv/CdStrings.uni
8381+ shellenv/DhStrings.uni
8382
8383- shellenv\cmddisp.c
8384- shellenv\connect.c
8385- shellenv\data.c
8386- shellenv\exec.c
8387- shellenv\init.c
8388- shellenv\protid.c
8389- shellenv\var.c
8390- shellenv\conio.c
8391- shellenv\consoleproxy.c
8392- shellenv\handle.c
8393- shellenv\dprot.c
8394- shellenv\map.c
8395- shellenv\marg.c
8396- shellenv\batch.c
8397- shellenv\if.c
8398- shellenv\goto.c
8399- shellenv\echo.c
8400- shellenv\pause.c
8401- shellenv\for.c
8402- shellenv\wait.c
8403- shellenv\help.c
8404- shellenv\shelle.h
8405- shellenv\shellenvguid.h
8406- shellenv\parsecmd.c
8407- shellenv\shift.c
8408+ shellenv/cmddisp.c
8409+ shellenv/connect.c
8410+ shellenv/data.c
8411+ shellenv/exec.c
8412+ shellenv/init.c
8413+ shellenv/protid.c
8414+ shellenv/var.c
8415+ shellenv/conio.c
8416+ shellenv/consoleproxy.c
8417+ shellenv/handle.c
8418+ shellenv/dprot.c
8419+ shellenv/map.c
8420+ shellenv/marg.c
8421+ shellenv/batch.c
8422+ shellenv/if.c
8423+ shellenv/goto.c
8424+ shellenv/echo.c
8425+ shellenv/pause.c
8426+ shellenv/for.c
8427+ shellenv/wait.c
8428+ shellenv/help.c
8429+ shellenv/shelle.h
8430+ shellenv/shellenvguid.h
8431+ shellenv/parsecmd.c
8432+ shellenv/shift.c
8433
8434- unload\UnloadStrings.uni
8435- unload\unload.c
8436+ unload/UnloadStrings.uni
8437+ unload/unload.c
8438
8439- attrib\AttribStrings.uni
8440- attrib\attrib.c
8441- attrib\attrib.h
8442+ attrib/AttribStrings.uni
8443+ attrib/attrib.c
8444+ attrib/attrib.h
c0004f9c 8445
2bba8d5a
OM		 8446- cls\clsstrings.uni
8447- cls\cls.c
8448+ cls/clsstrings.uni
8449+ cls/cls.c
c0004f9c 8450
2bba8d5a
OM		 8451- cp\CpStrings.uni
8452- cp\cp.h
8453- cp\cp.c
8454+ cp/CpStrings.uni
8455+ cp/cp.h
8456+ cp/cp.c
8457
8458- date\DateStrings.uni
8459- date\date.c
8460- date\date.h
8461+ date/DateStrings.uni
8462+ date/date.c
8463+ date/date.h
c0004f9c 8464
2bba8d5a
OM		 8465- load\LoadStrings.uni
8466- load\load.c
8467- load\load.h
8468+ load/LoadStrings.uni
8469+ load/load.c
8470+ load/load.h
c0004f9c 8471
2bba8d5a
OM		 8472- ls\LsStrings.uni
8473- ls\ls.h
8474- ls\ls.c
8475+ ls/LsStrings.uni
8476+ ls/ls.h
8477+ ls/ls.c
c0004f9c 8478
2bba8d5a
OM		 8479- mkdir\MkdirStrings.uni
8480- mkdir\mkdir.c
8481- mkdir\mkdir.h
8482+ mkdir/MkdirStrings.uni
8483+ mkdir/mkdir.c
8484+ mkdir/mkdir.h
c0004f9c 8485
2bba8d5a
OM		 8486- mv\MvStrings.uni
8487- mv\mv.c
8488- mv\mv.h
8489+ mv/MvStrings.uni
8490+ mv/mv.c
8491+ mv/mv.h
8492
8493- reset\ResetStrings.uni
8494- reset\reset.c
8495- reset\reset.h
8496+ reset/ResetStrings.uni
8497+ reset/reset.c
8498+ reset/reset.h
8499
8500- rm\RmStrings.uni
8501- rm\rm.h
8502- rm\rm.c
8503+ rm/RmStrings.uni
8504+ rm/rm.h
8505+ rm/rm.c
8506
8507- type\TypeStrings.uni
8508- type\type.c
8509- type\type.h
8510- time\TimeStrings.uni
8511- time\time.c
8512- time\time.h
8513+ type/TypeStrings.uni
8514+ type/type.c
8515+ type/type.h
8516+ time/TimeStrings.uni
8517+ time/time.c
8518+ time/time.h
c0004f9c 8519
2bba8d5a
OM		 8520- touch\TouchStrings.uni
8521- touch\touch.c
8522- touch\touch.h
8523+ touch/TouchStrings.uni
8524+ touch/touch.c
8525+ touch/touch.h
c0004f9c 8526
2bba8d5a
OM		 8527- vol\VolStrings.uni
8528- vol\vol.c
8529- vol\vol.h
8530+ vol/VolStrings.uni
8531+ vol/vol.c
8532+ vol/vol.h
c0004f9c 8533
2bba8d5a
OM		 8534- ver\VerStrings.uni
8535- ver\ver.c
8536- ver\ver.h
8537+ ver/VerStrings.uni
8538+ ver/ver.c
8539+ ver/ver.h
8540
8541- drivers\driversStrings.uni
8542- drivers\drivers.c
8543- drivers\drivers.h
8544+ drivers/driversStrings.uni
8545+ drivers/drivers.c
8546+ drivers/drivers.h
8547
8548- drvcfg\DrvcfgStrings.uni
8549- drvcfg\drvcfg.c
8550- drvcfg\drvcfg.h
8551+ drvcfg/DrvcfgStrings.uni
8552+ drvcfg/drvcfg.c
8553+ drvcfg/drvcfg.h
8554
8555- drvdiag\DrvdiagStrings.uni
8556- drvdiag\drvdiag.c
8557- drvdiag\drvdiag.h
8558+ drvdiag/DrvdiagStrings.uni
8559+ drvdiag/drvdiag.c
8560+ drvdiag/drvdiag.h
8561
8562- comp\CompStrings.uni
8563- comp\comp.c
8564+ comp/CompStrings.uni
8565+ comp/comp.c
8566
8567- dblk\dblkStrings.uni
8568- dblk\dblk.c
8569- dblk\efidump.c
8570+ dblk/dblkStrings.uni
8571+ dblk/dblk.c
8572+ dblk/efidump.c
8573
8574- devices\DevicesStrings.uni
8575- devices\devices.c
8576+ devices/DevicesStrings.uni
8577+ devices/devices.c
8578
8579- devicetree\DevicetreeStrings.uni
8580- devicetree\devicetree.c
8581+ devicetree/DevicetreeStrings.uni
8582+ devicetree/devicetree.c
8583
8584- dmem\MemStrings.uni
8585- dmem\DebugStrings.uni
8586- dmem\mem.c
8587- dmem\MemCommonPart.c
8588- dmem\efidump.c
8589+ dmem/MemStrings.uni
8590+ dmem/DebugStrings.uni
8591+ dmem/mem.c
8592+ dmem/MemCommonPart.c
8593+ dmem/efidump.c
8594
8595- dmpstore\DmpstoreStrings.uni
8596- dmpstore\dmpstore.c
8597+ dmpstore/DmpstoreStrings.uni
8598+ dmpstore/dmpstore.c
8599
8600- edit\EditStrings.uni
8601- edit\main.c
8602- edit\libFileBuffer.c
8603- edit\libEditor.c
8604- edit\libTitleBar.c
8605- edit\libStatusBar.c
8606- edit\libInputBar.c
8607- edit\libMenuBar.c
8608- edit\libMisc.c
8609+ edit/EditStrings.uni
8610+ edit/main.c
8611+ edit/libFileBuffer.c
8612+ edit/libEditor.c
8613+ edit/libTitleBar.c
8614+ edit/libStatusBar.c
8615+ edit/libInputBar.c
8616+ edit/libMenuBar.c
8617+ edit/libMisc.c
8618
8619- eficompress\CompressStrings.uni
8620- eficompress\compressMain.c
8621- eficompress\compress.c
8622+ eficompress/CompressStrings.uni
8623+ eficompress/compressMain.c
8624+ eficompress/compress.c
8625
8626- efidecompress\DecompressStrings.uni
8627- efidecompress\decompress.c
8628+ efidecompress/DecompressStrings.uni
8629+ efidecompress/decompress.c
8630
8631- err\ErrStrings.uni
8632- err\err.c
8633+ err/ErrStrings.uni
8634+ err/err.c
8635
8636- guid\GuidStrings.uni
8637- guid\guid.c
8638+ guid/GuidStrings.uni
8639+ guid/guid.c
8640
8641- hexedit\HexeditStrings.uni
8642- hexedit\main.c
8643- hexedit\libBufferImage.c
8644- hexedit\libFileImage.c
8645- hexedit\libDiskImage.c
8646- hexedit\libMemImage.c
8647- hexedit\libEditor.c
8648- hexedit\libTitleBar.c
8649- hexedit\libStatusBar.c
8650- hexedit\libInputBar.c
8651- hexedit\libMenuBar.c
8652- hexedit\libClipBoard.c
8653- hexedit\libMisc.c
8654+ hexedit/HexeditStrings.uni
8655+ hexedit/main.c
8656+ hexedit/libBufferImage.c
8657+ hexedit/libFileImage.c
8658+ hexedit/libDiskImage.c
8659+ hexedit/libMemImage.c
8660+ hexedit/libEditor.c
8661+ hexedit/libTitleBar.c
8662+ hexedit/libStatusBar.c
8663+ hexedit/libInputBar.c
8664+ hexedit/libMenuBar.c
8665+ hexedit/libClipBoard.c
8666+ hexedit/libMisc.c
c0004f9c 8667
2bba8d5a
OM		 8668- IfConfig\IfConfigStrings.uni
8669- IfConfig\IfConfig.c
8670- IfConfig\IfConfig.h
8671- IfConfig\ShellNetHelper.c
8672+ IfConfig/IfConfigStrings.uni
8673+ IfConfig/IfConfig.c
8674+ IfConfig/IfConfig.h
8675+ IfConfig/ShellNetHelper.c
c0004f9c 8676
2bba8d5a
OM		 8677- ipconfig\IpConfigStrings.uni
8678- ipconfig\IpConfig.c
8679+ IpConfig/IpConfigStrings.uni
8680+ IpConfig/IpConfig.c
8681
8682- loadpcirom\LoadPciRomStrings.uni
8683- loadpcirom\LoadPciRom.c
8684+ loadpcirom/LoadPciRomStrings.uni
8685+ loadpcirom/LoadPciRom.c
8686
8687- mem\MemStrings.uni
8688- mem\DebugStrings.uni
8689- mem\mm.c
8690- mem\MemCommonPart.c
8691- mem\efidump.c
8692+ mem/MemStrings.uni
8693+ mem/DebugStrings.uni
8694+ mem/mm.c
8695+ mem/MemCommonPart.c
8696+ mem/efidump.c
8697
8698- memmap\memmapStrings.uni
8699- memmap\memmap.c
8700+ memmap/memmapStrings.uni
8701+ memmap/memmap.c
8702
8703- mm\MmStrings.uni
8704- mm\mm.c
8705+ mm/MmStrings.uni
8706+ mm/mm.c
8707
8708- mode\ModeStrings.uni
8709- mode\mode.c
8710+ mode/ModeStrings.uni
8711+ mode/mode.c
8712
8713- mount\MountStrings.uni
8714- mount\mount.c
8715+ mount/MountStrings.uni
8716+ mount/mount.c
8717
8718- openinfo\OPeninfoStrings.uni
8719- openinfo\openinfo.c
8720+ openinfo/OPeninfoStrings.uni
8721+ openinfo/openinfo.c
c0004f9c 8722
2bba8d5a
OM		 8723- Ping\PingStrings.uni
8724- Ping\Ping.c
8725+ Ping/PingStrings.uni
8726+ Ping/Ping.c
c0004f9c 8727
2bba8d5a
OM		 8728- pci\PciStrings.uni
8729- pci\pci.c
8730- pci\pci_class.c
8731+ pci/PciStrings.uni
8732+ pci/pci.c
8733+ pci/pci_class.c
8734
8735- sermode\SermodeStrings.uni
8736- sermode\sermode.c
8737+ sermode/SermodeStrings.uni
8738+ sermode/sermode.c
8739
8740- smbiosview\SmBiosViewStrings.uni
8741- smbiosview\QueryTable.c
8742- smbiosview\EventLogInfo.c
8743- smbiosview\PrintInfo.c
8744- smbiosview\LibSmbiosView.c
8745- smbiosview\smbiosview.c
8746- smbiosview\smbios.c
8747+ smbiosview/SmBiosViewStrings.uni
8748+ smbiosview/QueryTable.c
8749+ smbiosview/EventLogInfo.c
8750+ smbiosview/PrintInfo.c
8751+ smbiosview/LibSmbiosView.c
8752+ smbiosview/smbiosview.c
8753+ smbiosview/smbios.c
8754
8755- stall\stallStrings.uni
8756- stall\stall.c
8757+ stall/stallStrings.uni
8758+ stall/stall.c
8759
8760- telnetmgmt\TelnetMgmtStrings.uni
8761- telnetmgmt\TelnetMgmt.c
8762+ telnetmgmt/TelnetMgmtStrings.uni
8763+ telnetmgmt/TelnetMgmt.c
8764
8765- tzone\TZoneStrings.uni
8766- tzone\tzone.c
8767+ tzone/TZoneStrings.uni
8768+ tzone/tzone.c
c0004f9c 8769
2bba8d5a
OM		 8770 [sources.ia32]
8771- ver\ia32\ver32.c
8772- Library\ia32\math.c
8773- Library\ia32\initplat.c
8774+ ver/IA32/ver32.c
8775+ Library/IA32/math.c
8776+ Library/IA32/initplat.c
c0004f9c 8777
2bba8d5a
OM		 8778 [sources.ipf]
8779- ver\ipf\ver64.c
8780- Library\ipf\math.c
8781- Library\ipf\initplat.c
8782- Library\ipf\palproc.s
8783- Library\ipf\salpal.c
8784+ ver/IPF/ver64.c
8785+ Library/IPF/math.c
8786+ Library/IPF/initplat.c
8787+ Library/IPF/palproc.s
8788+ Library/IPF/salpal.c
c0004f9c 8789
2bba8d5a
OM		 8790 [sources.EBC]
8791- ver\ebc\verEbc.c
8792- Library\EBC\math.c
8793- Library\EBC\initplat.c
8794+ ver/ebc/verEbc.c
8795+ Library/Ebc/math.c
8796+ Library/Ebc/initplat.c
c0004f9c 8797
2bba8d5a
OM		 8798 [sources.x64]
8799- ver\ia32\ver32.c
8800- Library\ipf\math.c
8801- Library\ia32\initplat.c
8802+ ver/IA32/ver32.c
8803+ Library/IPF/math.c
8804+ Library/IA32/initplat.c
8805
8806+[sources.ARM]
8807+ ver/ia32/ver32.c
8808+ Library/IPF/math.c
8809+ Library/IA32/initplat.c
8810+
8811+[sources.AARCH64]
8812+ ver/ia32/ver32.c
8813+ Library/IPF/math.c
8814+ Library/IA32/initplat.c
8815+
c0004f9c 8816 [includes.common]
8817 .
2bba8d5a
OM		 8818- .\Inc
8819- .\ver
8820- .\Library
c0004f9c 8821- $(EDK_SOURCE)\Foundation
8822- $(EDK_SOURCE)\Foundation\Include
8823- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8824- $(EDK_SOURCE)\Foundation\Efi
8825- $(EDK_SOURCE)\Foundation\Efi\Include
8826- $(EDK_SOURCE)\Foundation\FrameWork
8827- $(EDK_SOURCE)\Foundation\FrameWork\Include
8828- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a
OM		 8829- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
8830+ ./Inc
8831+ ./ver
8832+ ./Library
c0004f9c 8833+ $(EDK_SOURCE)/Foundation
8834+ $(EDK_SOURCE)/Foundation/Include
8835+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8836+ $(EDK_SOURCE)/Foundation/Efi
8837+ $(EDK_SOURCE)/Foundation/Efi/Include
8838+ $(EDK_SOURCE)/Foundation/FrameWork
8839+ $(EDK_SOURCE)/Foundation/FrameWork/Include
8840+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a
OM		 8841+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
8842 $(DEST_DIR)
c0004f9c 8843
2bba8d5a 8844 [libraries.common]
b00c06f0
OM		 8845@@ -341,16 +351,18 @@
8846 # we will specify some additional DEFINEs on the compile command line.
8847 #
8848 [nmake.common]
8849+ IMAGE_ENTRY_POINT=InitializeShell
8850+
8851+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
8852 C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
8853- IMAGE_ENTRY_POINT=InitializeShell
8854- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8855 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
8856 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8857+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8858
8859+[nmake.ARM, nmake.AARCH64]
8860+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL -DEFI_FULLSHELL
8861+
8862 [nmake.ebc]
8863 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
8864 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2bba8d5a 8865 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
b00c06f0
OM		 8866-
8867-
2bba8d5a
OM		 8868-
8869\ No newline at end of file
2bba8d5a
OM		 8870Index: inc/shelltypes.h
8871===================================================================
8872--- inc/shelltypes.h (revision 64)
8873+++ inc/shelltypes.h (working copy)
8874@@ -36,7 +36,7 @@
8875 #endif
8876
8877 #include "Tiano.h"
8878-#include "linkedlist.h"
8879+#include "LinkedList.h"
8880
8881 #include EFI_PROTOCOL_DEFINITION (FileInfo)
8882 #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
8883@@ -183,3 +183,4 @@
8884 #endif
8885
8886 #endif
8887+
8888Index: inc/shellenv.h
8889===================================================================
8890--- inc/shellenv.h (revision 64)
8891+++ inc/shellenv.h (working copy)
8892@@ -492,3 +492,4 @@
8893 #endif
8894
8895 #endif // _SHELLENV_H_
8896+
8897Index: mm/mm.h
8898===================================================================
8899--- mm/mm.h (revision 64)
8900+++ mm/mm.h (working copy)
8901@@ -33,3 +33,4 @@
8902 }
8903
8904 #endif
8905+
8906Index: mm/mm.inf
8907===================================================================
8908--- mm/mm.inf (revision 64)
8909+++ mm/mm.inf (working copy)
8910@@ -41,23 +41,23 @@
c0004f9c 8911
8912 [sources.common]
2bba8d5a 8913 MmStrings.uni
c0004f9c 8914- ..\ShCommonStrings.uni
8915+ ../ShCommonStrings.uni
2bba8d5a
OM		 8916 mm.c
8917 mm.h
8918
c0004f9c 8919 [includes.common]
8920 .
8921- ..\Inc
8922- ..\Library
8923- $(EDK_SOURCE)\Foundation
8924- $(EDK_SOURCE)\Foundation\Include
8925- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
8926- $(EDK_SOURCE)\Foundation\Efi
8927- $(EDK_SOURCE)\Foundation\Efi\Include
8928- $(EDK_SOURCE)\Foundation\FrameWork
8929- $(EDK_SOURCE)\Foundation\FrameWork\Include
8930- $(EDK_SOURCE)\Foundation\Core\Dxe
8931- $(DEST_DIR)\
8932+ ../Inc
8933+ ../Library
8934+ $(EDK_SOURCE)/Foundation
8935+ $(EDK_SOURCE)/Foundation/Include
8936+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
8937+ $(EDK_SOURCE)/Foundation/Efi
8938+ $(EDK_SOURCE)/Foundation/Efi/Include
8939+ $(EDK_SOURCE)/Foundation/FrameWork
8940+ $(EDK_SOURCE)/Foundation/FrameWork/Include
8941+ $(EDK_SOURCE)/Foundation/Core/Dxe
8942+ $(DEST_DIR./
8943
8944 [libraries.common]
8945 EfiShellLib
b00c06f0
OM		 8946@@ -72,7 +72,11 @@
8947
8948 [nmake.common]
8949 IMAGE_ENTRY_POINT=DumpIoModify
8950+
8951+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
8952 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
8953 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
8954 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
8955
8956+[nmake.ARM, nmake.AARCH64]
8957+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 8958Index: mm/mm.c
8959===================================================================
8960--- mm/mm.c (revision 64)
8961+++ mm/mm.c (working copy)
8962@@ -49,18 +49,18 @@
8963
8964 VOID
8965 ReadMem (
8966- IN EFI_IO_WIDTH Width,
8967- IN UINT64 Address,
8968- IN UINTN Size,
8969- IN VOID *Buffer
8970+ IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8971+ IN UINT64 Address,
8972+ IN UINTN Size,
8973+ IN VOID *Buffer
8974 );
8975
8976 VOID
8977 WriteMem (
8978- IN EFI_IO_WIDTH Width,
8979- IN UINT64 Address,
8980- IN UINTN Size,
8981- IN VOID *Buffer
8982+ IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
8983+ IN UINT64 Address,
8984+ IN UINTN Size,
8985+ IN VOID *Buffer
8986 );
8987
8988 STATIC
8989@@ -73,7 +73,7 @@
8990 //
8991 // Global Variables
8992 //
8993-EFI_HII_HANDLE HiiHandle;
8994+STATIC EFI_HII_HANDLE HiiHandle;
8995 EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID;
8996 SHELL_VAR_CHECK_ITEM IomodCheckList[] = {
8997 {
8998@@ -134,7 +134,7 @@
8999 NULL,
9000 0,
9001 0,
9002- 0
9003+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
c0004f9c 9004 }
2bba8d5a 9005 };
c0004f9c 9006
2bba8d5a 9007@@ -146,13 +146,13 @@
c0004f9c 9008
2bba8d5a
OM		 9009 EFI_STATUS
9010 OldShellParserMM (
9011- OUT EFI_IO_WIDTH *Width,
9012- OUT EFI_ACCESS_TYPE *AccessType,
9013- OUT UINT64 *Address,
9014- OUT UINT64 *Value,
9015- OUT UINTN *Size,
9016- OUT BOOLEAN *Interactive,
9017- OUT CHAR16 **ValueStr
9018+ OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
9019+ OUT EFI_ACCESS_TYPE *AccessType,
9020+ OUT UINT64 *Address,
9021+ OUT UINT64 *Value,
9022+ OUT UINTN *Size,
9023+ OUT BOOLEAN *Interactive,
9024+ OUT CHAR16 **ValueStr
9025 );
c0004f9c 9026
2bba8d5a
OM		 9027 EFI_STATUS
9028@@ -207,12 +207,11 @@
9029 UINT64 PciEAddress;
9030 UINT64 Value;
9031 UINT32 SegmentNumber;
9032- EFI_IO_WIDTH Width;
9033+ EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width;
9034 EFI_ACCESS_TYPE AccessType;
9035 UINT64 Buffer;
9036 UINTN Index;
9037 UINTN Size;
9038- CHAR16 *AddressStr;
9039 CHAR16 *ValueStr;
9040 BOOLEAN Complete;
9041 CHAR16 InputStr[80];
9042@@ -261,7 +260,7 @@
9043 if (IS_OLD_SHELL) {
9044 Status = OldShellParserMM (&Width, &AccessType, &Address, &Value, &Size, &Interactive, &ValueStr);
9045 if (EFI_ERROR (Status)) {
9046- if (-1 == Status) {
9047+ if ((EFI_STATUS)-1 == Status) {
9048 PrintToken (STRING_TOKEN (STR_HELPINFO_MM_VERBOSEHELP), HiiHandle);
9049 Status = EFI_SUCCESS;
9050 }
9051@@ -274,7 +273,6 @@
9052 Width = EfiPciWidthUint8;
9053 Size = 1;
9054 AccessType = EfiMemory;
9055- AddressStr = NULL;
9056 ValueStr = NULL;
9057 Interactive = TRUE;
c0004f9c 9058
2bba8d5a 9059@@ -662,10 +660,10 @@
c0004f9c 9060
2bba8d5a
OM		 9061 VOID
9062 ReadMem (
9063- IN EFI_IO_WIDTH Width,
9064- IN UINT64 Address,
9065- IN UINTN Size,
9066- IN VOID *Buffer
9067+ IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
9068+ IN UINT64 Address,
9069+ IN UINTN Size,
9070+ IN VOID *Buffer
9071 )
9072 {
9073 do {
9074@@ -694,10 +692,10 @@
c0004f9c 9075
2bba8d5a
OM		 9076 VOID
9077 WriteMem (
9078- IN EFI_IO_WIDTH Width,
9079- IN UINT64 Address,
9080- IN UINTN Size,
9081- IN VOID *Buffer
9082+ IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width,
9083+ IN UINT64 Address,
9084+ IN UINTN Size,
9085+ IN VOID *Buffer
9086 )
9087 {
9088 do {
9089@@ -750,7 +748,7 @@
9090 }
9091
9092 if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
9093- u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
9094+ u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
9095
9096 Find = TRUE;
9097 } else {
9098@@ -766,13 +764,13 @@
9099
9100 EFI_STATUS
9101 OldShellParserMM (
9102- OUT EFI_IO_WIDTH *Width,
9103- OUT EFI_ACCESS_TYPE *AccessType,
9104- OUT UINT64 *Address,
9105- OUT UINT64 *Value,
9106- OUT UINTN *Size,
9107- OUT BOOLEAN *Interactive,
9108- OUT CHAR16 **ValueStr
9109+ OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH *Width,
9110+ OUT EFI_ACCESS_TYPE *AccessType,
9111+ OUT UINT64 *Address,
9112+ OUT UINT64 *Value,
9113+ OUT UINTN *Size,
9114+ OUT BOOLEAN *Interactive,
9115+ OUT CHAR16 **ValueStr
9116 )
9117 /*++
9118
9119Index: drvcfg/drvcfg.h
9120===================================================================
9121--- drvcfg/drvcfg.h (revision 64)
9122+++ drvcfg/drvcfg.h (working copy)
9123@@ -33,3 +33,4 @@
9124 }
9125
9126 #endif
9127+
9128Index: drvcfg/drvcfg.inf
9129===================================================================
9130--- drvcfg/drvcfg.inf (revision 64)
9131+++ drvcfg/drvcfg.inf (working copy)
9132@@ -40,24 +40,24 @@
c0004f9c 9133
c0004f9c 9134
9135 [sources.common]
9136- ..\ShCommonStrings.uni
9137+ ../ShCommonStrings.uni
2bba8d5a
OM		 9138 DrvcfgStrings.uni
9139 drvcfg.c
9140 drvcfg.h
c0004f9c 9141
9142 [includes.common]
9143 .
9144- ..\Inc
9145- ..\Library
9146- $(EDK_SOURCE)\Foundation
9147- $(EDK_SOURCE)\Foundation\Include
9148- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9149- $(EDK_SOURCE)\Foundation\Efi
9150- $(EDK_SOURCE)\Foundation\Efi\Include
9151- $(EDK_SOURCE)\Foundation\FrameWork
9152- $(EDK_SOURCE)\Foundation\FrameWork\Include
9153- $(EDK_SOURCE)\Foundation\Core\Dxe
9154- $(DEST_DIR)\
9155+ ../Inc
9156+ ../Library
9157+ $(EDK_SOURCE)/Foundation
9158+ $(EDK_SOURCE)/Foundation/Include
9159+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9160+ $(EDK_SOURCE)/Foundation/Efi
9161+ $(EDK_SOURCE)/Foundation/Efi/Include
9162+ $(EDK_SOURCE)/Foundation/FrameWork
9163+ $(EDK_SOURCE)/Foundation/FrameWork/Include
9164+ $(EDK_SOURCE)/Foundation/Core/Dxe
9165+ $(DEST_DIR./
9166
9167 [libraries.common]
9168 EfiShellLib
b00c06f0
OM		 9169@@ -72,7 +72,11 @@
9170
9171 [nmake.common]
9172 IMAGE_ENTRY_POINT=DrvcfgMain
9173+
9174+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9175 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9176 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9177 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9178
9179+[nmake.ARM, nmake.AARCH64]
9180+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 9181Index: drvcfg/drvcfg.c
9182===================================================================
9183--- drvcfg/drvcfg.c (revision 64)
9184+++ drvcfg/drvcfg.c (working copy)
9185@@ -38,7 +38,7 @@
9186 //
9187 // Global Variables
9188 //
9189-EFI_HII_HANDLE HiiHandle;
9190+STATIC EFI_HII_HANDLE HiiHandle;
9191 EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID;
9192 SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = {
9193 {
9194@@ -87,7 +87,7 @@
9195 NULL,
9196 0,
9197 0,
9198- 0
9199+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
9200 }
9201 };
c0004f9c 9202
2bba8d5a
OM		 9203Index: openinfo/openinfo.h
9204===================================================================
9205--- openinfo/openinfo.h (revision 64)
9206+++ openinfo/openinfo.h (working copy)
9207@@ -33,3 +33,4 @@
9208 }
c0004f9c 9209
2bba8d5a
OM		 9210 #endif
9211+
9212Index: openinfo/openinfo.inf
9213===================================================================
9214--- openinfo/openinfo.inf (revision 64)
9215+++ openinfo/openinfo.inf (working copy)
9216@@ -41,24 +41,24 @@
c0004f9c 9217
2bba8d5a
OM		 9218 [sources.common]
9219 OPeninfoStrings.uni
9220- ..\ShCommonStrings.uni
9221+ ../ShCommonStrings.uni
9222 openinfo.c
9223 openinfo.h
c0004f9c 9224
2bba8d5a 9225
c0004f9c 9226 [includes.common]
9227 .
9228- ..\Inc
9229- ..\Library
9230- $(EDK_SOURCE)\Foundation
9231- $(EDK_SOURCE)\Foundation\Include
9232- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9233- $(EDK_SOURCE)\Foundation\Efi
9234- $(EDK_SOURCE)\Foundation\Efi\Include
9235- $(EDK_SOURCE)\Foundation\FrameWork
9236- $(EDK_SOURCE)\Foundation\FrameWork\Include
9237- $(EDK_SOURCE)\Foundation\Core\Dxe
9238- $(DEST_DIR)\
9239+ ../Inc
9240+ ../Library
9241+ $(EDK_SOURCE)/Foundation
9242+ $(EDK_SOURCE)/Foundation/Include
9243+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9244+ $(EDK_SOURCE)/Foundation/Efi
9245+ $(EDK_SOURCE)/Foundation/Efi/Include
9246+ $(EDK_SOURCE)/Foundation/FrameWork
9247+ $(EDK_SOURCE)/Foundation/FrameWork/Include
9248+ $(EDK_SOURCE)/Foundation/Core/Dxe
9249+ $(DEST_DIR./
9250
9251 [libraries.common]
9252 EfiShellLib
b00c06f0
OM		 9253@@ -73,7 +73,11 @@
9254
9255 [nmake.common]
9256 IMAGE_ENTRY_POINT=OpeninfoMain
9257+
9258+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9259 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9260 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9261 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9262
9263+[nmake.ARM, nmake.AARCH64]
9264+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2bba8d5a
OM		 9265Index: openinfo/openinfo.c
9266===================================================================
9267--- openinfo/openinfo.c (revision 64)
9268+++ openinfo/openinfo.c (working copy)
9269@@ -36,7 +36,7 @@
9270 //
9271 // Global Variables
9272 //
9273-EFI_HII_HANDLE HiiHandle;
9274+STATIC EFI_HII_HANDLE HiiHandle;
9275 EFI_GUID EfiOpeninfoGuid = EFI_OPENINFO_GUID;
9276 SHELL_VAR_CHECK_ITEM OpeninfoCheckList[] = {
9277 {
9278@@ -55,7 +55,7 @@
9279 NULL,
9280 0,
9281 0,
9282- 0
9283+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
9284 }
9285 };
9286
9287Index: drivers/drivers.c
9288===================================================================
9289--- drivers/drivers.c (revision 64)
9290+++ drivers/drivers.c (working copy)
9291@@ -43,7 +43,7 @@
9292 //
9293 // Global Variables
9294 //
9295-EFI_HII_HANDLE HiiHandle;
9296+STATIC EFI_HII_HANDLE HiiHandle;
9297 EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID;
9298 SHELL_VAR_CHECK_ITEM DriversCheckList[] = {
9299 {
9300@@ -68,7 +68,7 @@
9301 NULL,
9302 0,
9303 0,
9304- 0
9305+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
9306 }
9307 };
9308
9309@@ -133,7 +133,6 @@
9310 EFI_HANDLE *ControllerHandleBuffer;
9311 UINTN ChildControllerHandleCount;
9312 CHAR16 *ImageName;
9313- BOOLEAN IsHelp;
9314 SHELL_VAR_CHECK_CODE RetCode;
9315 CHAR16 *Useful;
9316 SHELL_ARG_LIST *Item;
9317@@ -143,7 +142,6 @@
9318 Language = NULL;
9319 DriverImageHandleCount = 0;
9320 DriverImageHandleBuffer = NULL;
9321- IsHelp = FALSE;
9322 ZeroMem (&ChkPck, sizeof (SHELL_VAR_CHECK_PACKAGE));
9323
9324 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
9325Index: drivers/drivers.h
9326===================================================================
9327--- drivers/drivers.h (revision 64)
9328+++ drivers/drivers.h (working copy)
9329@@ -33,3 +33,4 @@
9330 }
9331
9332 #endif
9333+
9334Index: drivers/drivers.inf
9335===================================================================
9336--- drivers/drivers.inf (revision 64)
9337+++ drivers/drivers.inf (working copy)
9338@@ -40,7 +40,7 @@
c0004f9c 9339
9340
9341 [sources.common]
2bba8d5a
OM		 9342- ..\ShCommonStrings.uni
9343+ ../ShCommonStrings.uni
9344 DriversStrings.uni
9345 drivers.c
9346 drivers.h
9347@@ -48,17 +48,17 @@
9348
c0004f9c 9349 [includes.common]
9350 .
9351- ..\Inc
9352- ..\Library
9353- $(EDK_SOURCE)\Foundation
9354- $(EDK_SOURCE)\Foundation\Include
9355- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
9356- $(EDK_SOURCE)\Foundation\Efi
9357- $(EDK_SOURCE)\Foundation\Efi\Include
9358- $(EDK_SOURCE)\Foundation\FrameWork
9359- $(EDK_SOURCE)\Foundation\FrameWork\Include
9360- $(EDK_SOURCE)\Foundation\Core\Dxe
9361- $(DEST_DIR)\
9362+ ../Inc
9363+ ../Library
9364+ $(EDK_SOURCE)/Foundation
9365+ $(EDK_SOURCE)/Foundation/Include
9366+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
9367+ $(EDK_SOURCE)/Foundation/Efi
9368+ $(EDK_SOURCE)/Foundation/Efi/Include
9369+ $(EDK_SOURCE)/Foundation/FrameWork
9370+ $(EDK_SOURCE)/Foundation/FrameWork/Include
9371+ $(EDK_SOURCE)/Foundation/Core/Dxe
9372+ $(DEST_DIR./
9373
9374 [libraries.common]
9375 EfiShellLib
b00c06f0
OM		 9376@@ -73,7 +73,11 @@
9377
9378 [nmake.common]
9379 IMAGE_ENTRY_POINT=DriversMain
9380+
9381+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
9382 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
9383 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
9384 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
9385
9386+[nmake.ARM, nmake.AARCH64]
9387+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
EFI Development Kit II mirror for PVE