BaseTools/Capsule: Do not support -o with --dump-info
[mirror_edk2.git] / EdkShellPkg / ShellR64.patch
CommitLineData
2405af19
OM
1From 6451e0daf7f733a27e1afb3c7ac662a620d8b93b Mon Sep 17 00:00:00 2001
2From: Olivier Martin <olivier.martin@arm.com>
3Date: Tue, 14 Jan 2014 14:43:50 +0000
4Subject: [PATCH] EDK Shell patch to support GCC
5
6---
7 DeviceTree/devicetree.c | 4 +-
8 DeviceTree/devicetree.h | 1 +
9 DeviceTree/devicetree.inf | 28 +--
10 EfiCompress/Compress.h | 2 +-
11 EfiCompress/CompressMain.c | 2 +-
12 EfiCompress/compress.c | 2 +-
13 EfiCompress/compress.inf | 32 +--
14 EfiDecompress/Decompress.c | 8 +-
15 EfiDecompress/Decompress.h | 2 +-
16 EfiDecompress/Decompress.inf | 33 +--
17 IfConfig/IfConfig.c | 6 +-
18 IfConfig/IfConfig.h | 1 +
19 IfConfig/IfConfig.inf | 34 +--
20 IfConfig/ShellNetHelper.h | 1 +
21 IpConfig/IpConfig.c | 4 +-
22 IpConfig/IpConfig.h | 2 +-
23 IpConfig/IpConfig.inf | 29 +--
24 Library/Aarch64/efilibplat.h | 38 ++++
25 Library/Arm/efilibplat.h | 39 ++++
26 Library/CRC.c | 2 +-
27 Library/CRC.h | 4 +-
28 Library/ConsistMapping.c | 2 +-
29 Library/ConsistMapping.h | 4 +-
30 Library/DPath.c | 6 +-
31 Library/DPath.h | 3 +-
32 Library/Data.c | 2 +-
33 Library/Ebc/EfiLibPlat.h | 1 +
34 Library/EfiPart.h | 1 +
35 Library/EfiShellLib.h | 11 +-
36 Library/EfiShellLib.inf | 51 +++--
37 Library/Event.c | 2 +-
38 Library/Event.h | 4 +-
39 Library/FileIO.c | 6 +-
40 Library/FileIO.h | 4 +-
41 Library/Handle.c | 9 +-
42 Library/Handle.h | 1 +
43 Library/HiiSupport.c | 6 +-
44 Library/HiiSupport.h | 1 +
45 Library/IA32/efilibplat.h | 2 +-
46 Library/IO.c | 13 +-
47 Library/IO.h | 4 +-
48 Library/IPF/efilibplat.h | 1 +
49 Library/IPF/libsalpal.h | 2 +-
50 Library/IPF/palproc.h | 1 +
51 Library/Init.c | 2 +-
52 Library/LinkedList.h | 4 +-
53 Library/Lock.c | 2 +-
54 Library/Lock.h | 4 +-
55 Library/Mem.c | 2 +-
56 Library/Mem.h | 4 +-
57 Library/Misc.c | 15 +-
58 Library/Misc.h | 1 +
59 Library/Perf.c | 2 +-
60 Library/RtData.c | 2 +-
61 Library/ShellDebug.c | 2 +-
62 Library/ShellDebug.h | 1 +
63 Library/ShellEnvInt.c | 2 +-
64 Library/ShellEnvInt.h | 4 +-
65 Library/Str.c | 6 +-
66 Library/Str.h | 1 +
67 Library/VarCheck.c | 2 +-
68 Library/VarCheck.h | 3 +-
69 Library/X64/efilibplat.h | 1 +
70 LoadPciRom/LoadPciRom.c | 8 +-
71 LoadPciRom/LoadPciRom.h | 1 +
72 LoadPciRom/LoadPciRom.inf | 28 +--
73 Ping/Ping.c | 27 ++-
74 Ping/Ping.h | 1 +
75 Ping/Ping.inf | 34 +--
76 Shell.inf | 305 +++++++++++++-------------
77 ShellFull.inf | 494 ++++++++++++++++++++++---------------------
78 SmbiosView/EventLogInfo.c | 2 +-
79 SmbiosView/EventLogInfo.h | 1 +
80 SmbiosView/LibSmbios.h | 1 +
81 SmbiosView/LibSmbiosView.c | 10 +-
82 SmbiosView/LibSmbiosView.h | 3 +-
83 SmbiosView/PrintInfo.c | 2 +-
84 SmbiosView/PrintInfo.h | 1 +
85 SmbiosView/QueryTable.c | 2 +-
86 SmbiosView/QueryTable.h | 1 +
87 SmbiosView/Smbios.h | 1 +
88 SmbiosView/Smbiosview.inf | 33 +--
89 SmbiosView/smbiosview.c | 4 +-
90 SmbiosView/smbiosview.h | 1 +
91 TelnetMgmt/TelnetMgmt.c | 4 +-
92 TelnetMgmt/TelnetMgmt.h | 2 +-
93 TelnetMgmt/TelnetMgmt.inf | 29 +--
94 TelnetMgmt/TelnetServer.h | 1 +
95 attrib/attrib.c | 6 +-
96 attrib/attrib.h | 3 +-
97 attrib/attrib.inf | 28 +--
98 cls/cls.c | 4 +-
99 cls/cls.h | 1 +
100 cls/cls.inf | 29 +--
101 comp/comp.c | 2 +-
102 comp/comp.h | 2 +-
103 comp/comp.inf | 31 +--
104 cp/cp.c | 10 +-
105 cp/cp.h | 3 +-
106 cp/cp.inf | 29 +--
107 date/date.c | 10 +-
108 date/date.h | 1 +
109 date/date.inf | 29 +--
110 dblk/dblk.c | 2 +-
111 dblk/dblk.h | 1 +
112 dblk/dblk.inf | 31 +--
113 dblk/efidump.c | 18 +-
114 devices/devices.c | 4 +-
115 devices/devices.h | 1 +
116 devices/devices.inf | 28 +--
117 dmem/MemCommonPart.c | 14 +-
118 dmem/MemCommonPart.h | 2 +-
119 dmem/debug.h | 1 +
120 dmem/dmem.inf | 30 +--
121 dmem/efidump.c | 20 +-
122 dmpstore/dmpstore.c | 4 +-
123 dmpstore/dmpstore.h | 1 +
124 dmpstore/dmpstore.inf | 31 +--
125 drivers/drivers.c | 6 +-
126 drivers/drivers.h | 1 +
127 drivers/drivers.inf | 28 +--
128 drvcfg/drvcfg.c | 4 +-
129 drvcfg/drvcfg.h | 1 +
130 drvcfg/drvcfg.inf | 28 +--
131 drvdiag/drvdiag.c | 4 +-
132 drvdiag/drvdiag.h | 1 +
133 drvdiag/drvdiag.inf | 28 +--
134 edit/edit.inf | 32 +--
135 edit/editor.h | 5 +-
136 edit/editortype.h | 7 +-
137 edit/libEditor.c | 24 +--
138 edit/libFileBuffer.c | 24 ++-
139 edit/libInputBar.c | 26 +--
140 edit/libMenuBar.c | 9 +-
141 edit/libMisc.h | 1 +
142 edit/libStatusBar.c | 11 +-
143 edit/libTitleBar.c | 17 +-
144 edit/libeditor.h | 1 +
145 edit/libfilebuffer.h | 1 +
146 edit/libinputbar.h | 1 +
147 edit/libmenubar.h | 1 +
148 edit/libstatusbar.h | 1 +
149 edit/libtitlebar.h | 1 +
150 edit/main.c | 30 +--
151 err/DebugMask.h | 1 +
152 err/err.c | 12 +-
153 err/err.h | 2 +-
154 err/err.inf | 31 +--
155 guid/guid.c | 4 +-
156 guid/guid.h | 2 +-
157 guid/guid.inf | 33 +--
158 hexedit/heditor.h | 5 +-
159 hexedit/heditortype.h | 7 +-
160 hexedit/hexedit.inf | 31 +--
161 hexedit/libBufferImage.c | 37 ++--
162 hexedit/libEditor.c | 33 +--
163 hexedit/libInputBar.c | 11 +-
164 hexedit/libMemImage.c | 8 +-
165 hexedit/libMenuBar.c | 13 +-
166 hexedit/libMisc.h | 3 +-
167 hexedit/libStatusBar.c | 1 +
168 hexedit/libTitleBar.c | 24 ++-
169 hexedit/libbufferimage.h | 1 +
170 hexedit/libclipboard.h | 1 +
171 hexedit/libdiskimage.c | 17 +-
172 hexedit/libdiskimage.h | 1 +
173 hexedit/libeditor.h | 1 +
174 hexedit/libfileimage.h | 1 +
175 hexedit/libinputbar.h | 1 +
176 hexedit/libmemimage.h | 1 +
177 hexedit/libmenubar.h | 3 +-
178 hexedit/libstatusbar.h | 1 +
179 hexedit/libtitlebar.h | 1 +
180 hexedit/main.c | 78 +++----
181 inc/shellenv.h | 1 +
182 inc/shelltypes.h | 3 +-
183 load/load.c | 2 +-
184 load/load.h | 1 +
185 load/load.inf | 29 +--
186 ls/ls.c | 11 +-
187 ls/ls.h | 3 +-
188 ls/ls.inf | 28 +--
189 mem/MemCommonPart.c | 14 +-
190 mem/MemCommonPart.h | 2 +-
191 mem/debug.h | 1 +
192 mem/efidump.c | 20 +-
193 mem/mem.inf | 30 +--
194 memmap/memmap.c | 6 +-
195 memmap/memmap.h | 1 +
196 memmap/memmap.inf | 28 +--
197 mkdir/mkdir.c | 4 +-
198 mkdir/mkdir.h | 3 +-
199 mkdir/mkdir.inf | 28 +--
200 mm/mm.c | 72 +++----
201 mm/mm.h | 1 +
202 mm/mm.inf | 28 +--
203 mode/mode.c | 2 +-
204 mode/mode.h | 1 +
205 mode/mode.inf | 28 +--
206 mount/mount.c | 4 +-
207 mount/mount.h | 1 +
208 mount/mount.inf | 28 +--
209 mv/mv.c | 4 +-
210 mv/mv.h | 2 +-
211 mv/mv.inf | 28 +--
212 newshell/FakeHii.c | 6 +-
213 newshell/FakeHii.h | 1 +
214 newshell/init.c | 18 +-
215 newshell/nshell.h | 3 +-
216 newshell/nshell.inf | 34 +--
217 openinfo/openinfo.c | 4 +-
218 openinfo/openinfo.h | 1 +
219 openinfo/openinfo.inf | 28 +--
220 pci/pci.c | 19 +-
221 pci/pci.h | 3 +-
222 pci/pci.inf | 28 +--
223 pci/pci_class.c | 2 +-
224 pci/pci_class.h | 3 +-
225 reset/reset.c | 2 +-
226 reset/reset.h | 1 +
227 reset/reset.inf | 28 +--
228 rm/rm.c | 2 +-
229 rm/rm.h | 1 +
230 rm/rm.inf | 28 +--
231 sermode/sermode.c | 8 +-
232 sermode/sermode.h | 1 +
233 sermode/sermode.inf | 28 +--
234 shellenv/Connect.c | 20 +-
235 shellenv/ConsoleProxy.c | 6 +-
236 shellenv/batch.c | 15 +-
237 shellenv/conio.c | 2 +-
238 shellenv/dprot.c | 8 +-
239 shellenv/echo.c | 2 +-
240 shellenv/exec.c | 18 +-
241 shellenv/for.c | 7 +-
242 shellenv/help.c | 2 +-
243 shellenv/if.c | 3 -
244 shellenv/init.c | 2 +-
245 shellenv/map.c | 16 +-
246 shellenv/parsecmd.h | 3 +-
247 shellenv/pause.c | 2 +-
248 shellenv/protid.c | 22 +-
249 shellenv/shelle.h | 1 +
250 shellenv/shellenvguid.h | 1 +
251 shellenv/var.c | 6 +-
252 stall/stall.c | 2 +-
253 stall/stall.h | 1 +
254 stall/stall.inf | 28 +--
255 time/time.c | 10 +-
256 time/time.h | 1 +
257 time/time.inf | 28 +--
258 touch/touch.c | 2 +-
259 touch/touch.h | 2 +-
260 touch/touch.inf | 29 +--
261 type/type.c | 4 +-
262 type/type.h | 1 +
263 type/type.inf | 28 +--
264 tzone/timezone.inf | 32 +--
265 tzone/tzone.c | 4 +-
266 tzone/tzone.h | 1 +
267 unload/unload.c | 18 +-
268 unload/unload.h | 1 +
269 unload/unload.inf | 29 +--
270 ver/Ebc/verEbc.c | 2 +-
271 ver/Ver.inf | 36 ++--
272 ver/ver.c | 2 +-
273 ver/ver.h | 1 +
274 vol/Vol.inf | 28 +--
275 vol/vol.c | 4 +-
276 vol/vol.h | 1 +
277 270 files changed, 1985 insertions(+), 1610 deletions(-)
278 create mode 100644 Library/Aarch64/efilibplat.h
279 create mode 100644 Library/Arm/efilibplat.h
280
281diff --git a/DeviceTree/devicetree.c b/DeviceTree/devicetree.c
282index 147e2cb..77e3cf4 100644
283--- a/DeviceTree/devicetree.c
284+++ b/DeviceTree/devicetree.c
285@@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
286 //
287 // Global Variables
288 //
289-EFI_HII_HANDLE HiiHandle;
290+STATIC EFI_HII_HANDLE HiiHandle;
291 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
292 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
293 {
294@@ -67,7 +67,7 @@ SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
2bba8d5a
OM
295 NULL,
296 0,
297 0,
298- 0
2405af19 299+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
2bba8d5a
OM
300 }
301 };
302
2405af19
OM
303diff --git a/DeviceTree/devicetree.h b/DeviceTree/devicetree.h
304index c452fc7..07bb939 100644
305--- a/DeviceTree/devicetree.h
306+++ b/DeviceTree/devicetree.h
307@@ -32,3 +32,4 @@ Revision History
308 0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
309 }
310 #endif
311+
312diff --git a/DeviceTree/devicetree.inf b/DeviceTree/devicetree.inf
313index a86a1a0..7adc097 100644
314--- a/DeviceTree/devicetree.inf
315+++ b/DeviceTree/devicetree.inf
316@@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
c0004f9c 317
2bba8d5a 318
2405af19
OM
319 [sources.common]
320- ..\ShCommonStrings.uni
321+ ../ShCommonStrings.uni
322 DevicetreeStrings.uni
323 devicetree.c
324 devicetree.h
325
c0004f9c 326 [includes.common]
327 .
328- ..\Inc
329- ..\Library
330- $(EDK_SOURCE)\Foundation
331- $(EDK_SOURCE)\Foundation\Include
332- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
333- $(EDK_SOURCE)\Foundation\Efi
334- $(EDK_SOURCE)\Foundation\Efi\Include
335- $(EDK_SOURCE)\Foundation\FrameWork
336- $(EDK_SOURCE)\Foundation\FrameWork\Include
337- $(EDK_SOURCE)\Foundation\Core\Dxe
338- $(DEST_DIR)\
339+ ../Inc
340+ ../Library
341+ $(EDK_SOURCE)/Foundation
342+ $(EDK_SOURCE)/Foundation/Include
343+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
344+ $(EDK_SOURCE)/Foundation/Efi
345+ $(EDK_SOURCE)/Foundation/Efi/Include
346+ $(EDK_SOURCE)/Foundation/FrameWork
347+ $(EDK_SOURCE)/Foundation/FrameWork/Include
348+ $(EDK_SOURCE)/Foundation/Core/Dxe
349+ $(DEST_DIR./
350
351 [libraries.common]
352 EfiShellLib
2405af19
OM
353@@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
354
b00c06f0 355 [nmake.common]
2405af19 356 IMAGE_ENTRY_POINT=DevicetreeMain
b00c06f0
OM
357+
358+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
b00c06f0
OM
359 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
360 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
361 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
362
b00c06f0
OM
363+[nmake.ARM, nmake.AARCH64]
364+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
365diff --git a/EfiCompress/Compress.h b/EfiCompress/Compress.h
366index 6ce2bfc..4e8313f 100644
367--- a/EfiCompress/Compress.h
368+++ b/EfiCompress/Compress.h
369@@ -57,4 +57,4 @@ Returns:
c0004f9c 370
2405af19 371 --*/
c0004f9c 372
2405af19
OM
373-#endif
374\ No newline at end of file
375+#endif
376diff --git a/EfiCompress/CompressMain.c b/EfiCompress/CompressMain.c
377index 3edb17e..082046e 100644
378--- a/EfiCompress/CompressMain.c
379+++ b/EfiCompress/CompressMain.c
380@@ -50,7 +50,7 @@ SHELL_VAR_CHECK_ITEM CompressCheckList[] = {
2bba8d5a
OM
381 NULL,
382 0,
383 0,
384- 0
2405af19 385+ (SHELL_VAR_CHECK_FLAG_TYPE)0
2bba8d5a
OM
386 }
387 };
388
2405af19
OM
389diff --git a/EfiCompress/compress.c b/EfiCompress/compress.c
390index e21c1f6..012bbef 100644
391--- a/EfiCompress/compress.c
392+++ b/EfiCompress/compress.c
393@@ -262,7 +262,7 @@ STATIC UINT32 mBufSiz = 0, mOutputPos, mOutputMask, mSubBitBuf, mCrc;
394 STATIC UINT32 mCompSize, mOrigSize;
2bba8d5a 395
2405af19
OM
396 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
397- mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
398+ mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
399 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
400
401 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
402diff --git a/EfiCompress/compress.inf b/EfiCompress/compress.inf
403index 2e62fbf..f3194b5 100644
404--- a/EfiCompress/compress.inf
405+++ b/EfiCompress/compress.inf
406@@ -25,7 +25,7 @@ FILE_GUID = A6A236DB-F3FB-4f7f-93BC-0AF7DAA583B9
c0004f9c 407 COMPONENT_TYPE = APPLICATION
408
409 [sources.common]
2405af19
OM
410-..\ShCommonStrings.uni
411+../ShCommonStrings.uni
412 CompressStrings.uni
413 compressMain.c
414 compress.c
415@@ -34,17 +34,17 @@ compress.h
416
c0004f9c 417 [includes.common]
418 .
419- ..\Inc
420- ..\Library
421- $(EDK_SOURCE)\Foundation
422- $(EDK_SOURCE)\Foundation\Include
423- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
424- $(EDK_SOURCE)\Foundation\Efi
425- $(EDK_SOURCE)\Foundation\Efi\Include
426- $(EDK_SOURCE)\Foundation\FrameWork
427- $(EDK_SOURCE)\Foundation\FrameWork\Include
428- $(EDK_SOURCE)\Foundation\Core\Dxe
429- $(DEST_DIR)\
430+ ../Inc
431+ ../Library
432+ $(EDK_SOURCE)/Foundation
433+ $(EDK_SOURCE)/Foundation/Include
434+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
435+ $(EDK_SOURCE)/Foundation/Efi
436+ $(EDK_SOURCE)/Foundation/Efi/Include
437+ $(EDK_SOURCE)/Foundation/FrameWork
438+ $(EDK_SOURCE)/Foundation/FrameWork/Include
439+ $(EDK_SOURCE)/Foundation/Core/Dxe
440+ $(DEST_DIR./
441
442 [libraries.common]
443 EfiShellLib
2405af19
OM
444@@ -64,11 +64,13 @@ compress.h
445 # we will specify some additional DEFINEs on the compile command line.
446 #
b00c06f0 447 [nmake.common]
2405af19
OM
448- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
449 IMAGE_ENTRY_POINT=InitializeCompress
b00c06f0
OM
450+
451+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2405af19 452+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
b00c06f0
OM
453 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
454 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
455 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
2405af19
OM
456
457-
458-
459\ No newline at end of file
b00c06f0
OM
460+[nmake.ARM, nmake.AARCH64]
461+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
462diff --git a/EfiDecompress/Decompress.c b/EfiDecompress/Decompress.c
463index 918f673..2ee0404 100644
464--- a/EfiDecompress/Decompress.c
465+++ b/EfiDecompress/Decompress.c
466@@ -22,7 +22,7 @@ Revision History
467 --*/
468
469 #include "EfiShellLib.h"
470-#include "decompress.h"
471+#include "Decompress.h"
472
473 extern UINT8 STRING_ARRAY_NAME[];
474
475@@ -31,7 +31,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2bba8d5a 476 //
2405af19
OM
477 #include STRING_DEFINES_FILE
478
479-#include EFI_PROTOCOL_DEFINITION (decompress)
480+#include EFI_PROTOCOL_DEFINITION (Decompress)
481
482 EFI_HII_HANDLE HiiDecompressHandle;
483 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
484@@ -52,7 +52,7 @@ SHELL_VAR_CHECK_ITEM DecompressCheckList[] = {
2bba8d5a
OM
485 NULL,
486 0,
487 0,
488- 0
489+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
490 }
491 };
c0004f9c 492
2405af19
OM
493@@ -192,7 +192,7 @@ Returns:
494 //
495 //
496 //
497- Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
498+ Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
499 if (EFI_ERROR (Status)) {
500 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
501 Status = EFI_UNSUPPORTED;
502diff --git a/EfiDecompress/Decompress.h b/EfiDecompress/Decompress.h
503index abfae65..3d4520c 100644
504--- a/EfiDecompress/Decompress.h
505+++ b/EfiDecompress/Decompress.h
506@@ -29,4 +29,4 @@ Revision History
507 0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
2bba8d5a 508 }
c0004f9c 509
2405af19
OM
510-#endif
511\ No newline at end of file
512+#endif
513diff --git a/EfiDecompress/Decompress.inf b/EfiDecompress/Decompress.inf
514index f955220..7b2ff3d 100644
515--- a/EfiDecompress/Decompress.inf
516+++ b/EfiDecompress/Decompress.inf
517@@ -25,7 +25,7 @@ FILE_GUID = D9D42564-071C-4d73-8DB0-43C55C62DC4C
518 COMPONENT_TYPE = APPLICATION
c0004f9c 519
2bba8d5a 520 [sources.common]
2405af19
OM
521-..\ShCommonStrings.uni
522+../ShCommonStrings.uni
523 DecompressStrings.uni
524 decompress.c
525 decompress.h
526@@ -33,17 +33,17 @@ decompress.h
527
c0004f9c 528 [includes.common]
529 .
530- ..\Inc
531- ..\Library
532- $(EDK_SOURCE)\Foundation
533- $(EDK_SOURCE)\Foundation\Include
534- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
535- $(EDK_SOURCE)\Foundation\Efi
536- $(EDK_SOURCE)\Foundation\Efi\Include
537- $(EDK_SOURCE)\Foundation\FrameWork
538- $(EDK_SOURCE)\Foundation\FrameWork\Include
539- $(EDK_SOURCE)\Foundation\Core\Dxe
540- $(DEST_DIR)\
541+ ../Inc
542+ ../Library
543+ $(EDK_SOURCE)/Foundation
544+ $(EDK_SOURCE)/Foundation/Include
545+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
546+ $(EDK_SOURCE)/Foundation/Efi
547+ $(EDK_SOURCE)/Foundation/Efi/Include
548+ $(EDK_SOURCE)/Foundation/FrameWork
549+ $(EDK_SOURCE)/Foundation/FrameWork/Include
550+ $(EDK_SOURCE)/Foundation/Core/Dxe
551+ $(DEST_DIR./
552
553 [libraries.common]
554 EfiShellLib
2405af19
OM
555@@ -63,11 +63,14 @@ decompress.h
556 # we will specify some additional DEFINEs on the compile command line.
557 #
b00c06f0 558 [nmake.common]
2405af19
OM
559- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
560 IMAGE_ENTRY_POINT=InitializeDecompress
b00c06f0
OM
561+
562+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2405af19 563+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
b00c06f0
OM
564 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
565 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
566 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
567
2405af19
OM
568-
569-
b00c06f0
OM
570+[nmake.ARM, nmake.AARCH64]
571+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
572+
573\ No newline at end of file
574diff --git a/IfConfig/IfConfig.c b/IfConfig/IfConfig.c
575index 07cedc2..52e1add 100644
576--- a/IfConfig/IfConfig.c
577+++ b/IfConfig/IfConfig.c
578@@ -29,7 +29,7 @@ extern UINT8 STRING_ARRAY_NAME[];
c0004f9c 579 //
2405af19 580 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
c0004f9c 581
582-EFI_HII_HANDLE HiiHandle;
583+STATIC EFI_HII_HANDLE HiiHandle;
2405af19
OM
584
585 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
586
587@@ -75,7 +75,7 @@ SHELL_VAR_CHECK_ITEM IfConfigCheckList[] = {
2bba8d5a
OM
588 NULL,
589 0,
590 0,
591- 0
592+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
593 }
594 };
c0004f9c 595
2405af19
OM
596@@ -669,7 +669,7 @@ Returns:
597 Status = BS->LocateProtocol (
598 &gEfiHiiConfigRoutingProtocolGuid,
599 NULL,
600- &mHiiConfigRouting
601+ (VOID**)&mHiiConfigRouting
602 );
603 if (EFI_ERROR (Status)) {
604 return EFI_NOT_FOUND;
605diff --git a/IfConfig/IfConfig.h b/IfConfig/IfConfig.h
606index 4a9d3c5..b8f044e 100644
607--- a/IfConfig/IfConfig.h
608+++ b/IfConfig/IfConfig.h
609@@ -60,3 +60,4 @@ typedef struct {
610 } ARP_REQUEST;
2bba8d5a
OM
611
612 #endif
613+
2405af19
OM
614diff --git a/IfConfig/IfConfig.inf b/IfConfig/IfConfig.inf
615index b2e4964..d8c5c23 100644
616--- a/IfConfig/IfConfig.inf
617+++ b/IfConfig/IfConfig.inf
618@@ -25,7 +25,7 @@ FILE_GUID = 6394CF3D-D3DC-4f69-926D-AF9FFE59F922
619 COMPONENT_TYPE = APPLICATION
c0004f9c 620
621 [sources.common]
2405af19
OM
622- ..\ShCommonStrings.uni
623+ ../ShCommonStrings.uni
624 IfConfigStrings.uni
625 IfConfig.c
626 IfConfig.h
627@@ -33,30 +33,32 @@ COMPONENT_TYPE = APPLICATION
628 ShellNetHelper.h
629
c0004f9c 630 [includes.common]
631- ..\Inc
632- ..\Library
2405af19 633- $(EDK_SOURCE)\Foundation\Efi
c0004f9c 634- $(EDK_SOURCE)\Foundation
2405af19 635- $(EDK_SOURCE)\Foundation\Efi\Include
c0004f9c 636- $(EDK_SOURCE)\Foundation\Include
637- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
638- $(EDK_SOURCE)\Foundation\FrameWork
639- $(EDK_SOURCE)\Foundation\FrameWork\Include
640- $(EDK_SOURCE)\Foundation\Core\Dxe
2405af19 641- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
c0004f9c 642- $(DEST_DIR)\
643+ ../Inc
644+ ../Library
2405af19 645+ $(EDK_SOURCE)/Foundation/Efi
c0004f9c 646+ $(EDK_SOURCE)/Foundation
2405af19 647+ $(EDK_SOURCE)/Foundation/Efi/Include
c0004f9c 648+ $(EDK_SOURCE)/Foundation/Include
649+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
650+ $(EDK_SOURCE)/Foundation/FrameWork
651+ $(EDK_SOURCE)/Foundation/FrameWork/Include
652+ $(EDK_SOURCE)/Foundation/Core/Dxe
2405af19 653+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
c0004f9c 654+ $(DEST_DIR./
655
2405af19 656 [libraries.common]
c0004f9c 657 EfiShellLib
2405af19
OM
658 EdkProtocolLib
659 EfiProtocolLib
660 EdkGuidLib
661- EfiDriverLib
b00c06f0
OM
662
663 [nmake.common]
2405af19
OM
664- C_PROJ_FLAGS = $(C_PROJ_FLAGS)
665 IMAGE_ENTRY_POINT=IfConfig
666- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
b00c06f0
OM
667+
668+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
669 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
670 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2405af19 671+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
b00c06f0
OM
672
673+[nmake.ARM, nmake.AARCH64]
674+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
675diff --git a/IfConfig/ShellNetHelper.h b/IfConfig/ShellNetHelper.h
676index 9a33d3f..87e6886 100644
677--- a/IfConfig/ShellNetHelper.h
678+++ b/IfConfig/ShellNetHelper.h
679@@ -87,3 +87,4 @@ ShellDestroyServiceChild (
680 IN EFI_HANDLE ChildHandle
681 );
682 #endif
b00c06f0 683+
2405af19
OM
684diff --git a/IpConfig/IpConfig.c b/IpConfig/IpConfig.c
685index 0c3e4c3..474e5f1 100644
686--- a/IpConfig/IpConfig.c
687+++ b/IpConfig/IpConfig.c
688@@ -39,7 +39,7 @@ extern UINT8 STRING_ARRAY_NAME[];
689 //
690 // Global Variables
691 //
692-EFI_HII_HANDLE HiiHandle;
693+STATIC EFI_HII_HANDLE HiiHandle;
694 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
695 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
696 {
697@@ -76,7 +76,7 @@ SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
698 NULL,
699 0,
700 0,
701- 0
702+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
703 }
704 };
705
706diff --git a/IpConfig/IpConfig.h b/IpConfig/IpConfig.h
707index 1806435..5c975a9 100644
708--- a/IpConfig/IpConfig.h
709+++ b/IpConfig/IpConfig.h
710@@ -29,4 +29,4 @@ Revision History
711 0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
712 }
713
714-#endif
715\ No newline at end of file
716+#endif
717diff --git a/IpConfig/IpConfig.inf b/IpConfig/IpConfig.inf
718index bc8271c..8cb1e0f 100644
719--- a/IpConfig/IpConfig.inf
720+++ b/IpConfig/IpConfig.inf
721@@ -25,24 +25,24 @@ FILE_GUID = 1D73AC03-AF05-44b3-B21E-93A174893FA6
722 COMPONENT_TYPE = APPLICATION
c0004f9c 723
724 [sources.common]
725- ..\ShCommonStrings.uni
726+ ../ShCommonStrings.uni
2405af19
OM
727 IpConfigStrings.uni
728 IpConfig.c
729 IpConfig.h
c0004f9c 730
731 [includes.common]
732 .
733- ..\Inc
734- ..\Library
735- $(EDK_SOURCE)\Foundation
736- $(EDK_SOURCE)\Foundation\Include
737- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
738- $(EDK_SOURCE)\Foundation\Efi
739- $(EDK_SOURCE)\Foundation\Efi\Include
740- $(EDK_SOURCE)\Foundation\FrameWork
741- $(EDK_SOURCE)\Foundation\FrameWork\Include
742- $(EDK_SOURCE)\Foundation\Core\Dxe
743- $(DEST_DIR)\
744+ ../Inc
745+ ../Library
746+ $(EDK_SOURCE)/Foundation
747+ $(EDK_SOURCE)/Foundation/Include
748+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
749+ $(EDK_SOURCE)/Foundation/Efi
750+ $(EDK_SOURCE)/Foundation/Efi/Include
751+ $(EDK_SOURCE)/Foundation/FrameWork
752+ $(EDK_SOURCE)/Foundation/FrameWork/Include
753+ $(EDK_SOURCE)/Foundation/Core/Dxe
754+ $(DEST_DIR./
755
756 [libraries.common]
757 EfiShellLib
2405af19
OM
758@@ -56,9 +56,12 @@ COMPONENT_TYPE = APPLICATION
759
760
b00c06f0 761 [nmake.common]
2405af19
OM
762- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
763 IMAGE_ENTRY_POINT=InitializeIpConfig
b00c06f0
OM
764+
765+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
b00c06f0
OM
766 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
767 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2405af19 768 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
b00c06f0 769
b00c06f0
OM
770+[nmake.ARM, nmake.AARCH64]
771+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
772diff --git a/Library/Aarch64/efilibplat.h b/Library/Aarch64/efilibplat.h
773new file mode 100644
774index 0000000..185c8b7
775--- /dev/null
776+++ b/Library/Aarch64/efilibplat.h
777@@ -0,0 +1,38 @@
778+/*++
779+
780+Copyright (c) 2005, Intel Corporation
781+All rights reserved. This program and the accompanying materials
782+are licensed and made available under the terms and conditions of the BSD License
783+which accompanies this distribution. The full text of the license may be found at
784+http://opensource.org/licenses/bsd-license.php
785+
786+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
787+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
788+
789+Module Name:
790+
791+ efilibplat.h
792+
793+Abstract:
794+
795+ EFI to compile bindings
796+
797+
798+
799+Revision History
800+
801+--*/
802+
803+#ifndef _EFI_LIB_PLAT_H
804+#define _EFI_LIB_PLAT_H
805+
806+VOID
807+InitializeLibPlatform (
808+ IN EFI_HANDLE ImageHandle,
809+ IN EFI_SYSTEM_TABLE *SystemTable
810+ );
811+
812+#define MIN_ALIGNMENT_SIZE 8
813+
814+#endif
815+
816diff --git a/Library/Arm/efilibplat.h b/Library/Arm/efilibplat.h
817new file mode 100644
818index 0000000..791018d
819--- /dev/null
820+++ b/Library/Arm/efilibplat.h
821@@ -0,0 +1,39 @@
822+/*++
823+
824+Copyright (c) 2005, Intel Corporation
825+All rights reserved. This program and the accompanying materials
826+are licensed and made available under the terms and conditions of the BSD License
827+which accompanies this distribution. The full text of the license may be found at
828+http://opensource.org/licenses/bsd-license.php
829+
830+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
831+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
832+
833+Module Name:
834+
835+ efilibplat.h
836+
837+Abstract:
838+
839+ EFI to compile bindings
840+
841+
842+
843+
844+Revision History
845+
846+--*/
847+#ifndef _EFI_LIB_PLAT_H_
848+#define _EFI_LIB_PLAT_H_
849+
850+VOID
851+InitializeLibPlatform (
852+ IN EFI_HANDLE ImageHandle,
853+ IN EFI_SYSTEM_TABLE *SystemTable
854+ );
855+
856+#define MIN_ALIGNMENT_SIZE 4
857+
858+#endif
859+
860+
861diff --git a/Library/CRC.c b/Library/CRC.c
862index ce5387b..ebbdf70 100644
863--- a/Library/CRC.c
864+++ b/Library/CRC.c
865@@ -21,7 +21,7 @@ Revision History
c0004f9c 866
2405af19 867 --*/
c0004f9c 868
2405af19
OM
869-#include "EfiShelllib.h"
870+#include "EfiShellLib.h"
c0004f9c 871
2405af19
OM
872 UINT32 CRCTable[256] = {
873 0x00000000,
874diff --git a/Library/CRC.h b/Library/CRC.h
875index 326a5e1..db1f765 100644
876--- a/Library/CRC.h
877+++ b/Library/CRC.h
878@@ -53,4 +53,6 @@ CalculateCrc (
879 UINTN Size
880 );
c0004f9c 881
2405af19
OM
882-#endif
883\ No newline at end of file
884+#endif
885+
886+
887diff --git a/Library/ConsistMapping.c b/Library/ConsistMapping.c
888index b70fa06..61eda8b 100644
889--- a/Library/ConsistMapping.c
890+++ b/Library/ConsistMapping.c
891@@ -21,7 +21,7 @@ Revision History
c0004f9c 892
2405af19 893 --*/
c0004f9c 894
2405af19
OM
895-#include "EfiShelllib.h"
896+#include "EfiShellLib.h"
897
898 MTD_NAME mMTDName[] = {
899 {
900diff --git a/Library/ConsistMapping.h b/Library/ConsistMapping.h
901index bc8d6f0..d520f31 100644
902--- a/Library/ConsistMapping.h
903+++ b/Library/ConsistMapping.h
904@@ -79,4 +79,6 @@ DevicePathConsistMappingCompare (
905 IN VOID *Buffer2
906 );
c0004f9c 907
2bba8d5a
OM
908-#endif
909\ No newline at end of file
910+#endif
911+
2405af19
OM
912+
913diff --git a/Library/DPath.c b/Library/DPath.c
914index f0974ac..73086d7 100644
915--- a/Library/DPath.c
916+++ b/Library/DPath.c
917@@ -20,7 +20,7 @@ Revision History
c0004f9c 918
2405af19
OM
919 --*/
920
921-#include "EfiShelllib.h"
922+#include "EfiShellLib.h"
923
924 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
c0004f9c 925
2405af19
OM
926@@ -1468,7 +1468,7 @@ Returns:
927
928 Status = LibLocateProtocol (
929 &gEfiDevicePathToTextProtocolGuid,
930- &DevPathToText
931+ (VOID**)&DevPathToText
932 );
933 if (!EFI_ERROR (Status)) {
934 ToText = DevPathToText->ConvertDevicePathToText (
935@@ -1766,7 +1766,7 @@ Returns:
936 Status = BS->HandleProtocol (
937 Device,
938 Protocol,
939- Interface
940+ (VOID**)Interface
941 );
942 }
2bba8d5a 943 }
2405af19
OM
944diff --git a/Library/DPath.h b/Library/DPath.h
945index 68da82b..0f2a33f 100644
946--- a/Library/DPath.h
947+++ b/Library/DPath.h
948@@ -24,7 +24,7 @@ Revision History
949 #ifndef _D_PATH_H
950 #define _D_PATH_H
951
952-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
953+#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
954
955 #include EFI_GUID_DEFINITION (PcAnsi)
956
957@@ -153,3 +153,4 @@ GetNameGuidFromFwVolDevicePathNode (
958 );
c0004f9c 959
2bba8d5a 960 #endif
c0004f9c 961+
2405af19
OM
962diff --git a/Library/Data.c b/Library/Data.c
963index d2ffe4a..979b3dd 100644
964--- a/Library/Data.c
965+++ b/Library/Data.c
966@@ -21,7 +21,7 @@ Revision History
c0004f9c 967
2405af19 968 --*/
2bba8d5a 969
2405af19
OM
970-#include "EfiShelllib.h"
971+#include "EfiShellLib.h"
c0004f9c 972
2405af19
OM
973 //
974 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
975diff --git a/Library/Ebc/EfiLibPlat.h b/Library/Ebc/EfiLibPlat.h
976index 922c881..e4a8771 100644
977--- a/Library/Ebc/EfiLibPlat.h
978+++ b/Library/Ebc/EfiLibPlat.h
979@@ -44,3 +44,4 @@ Returns:
980 ;
b00c06f0 981
2405af19 982 #define MIN_ALIGNMENT_SIZE 8
b00c06f0 983+
2405af19
OM
984diff --git a/Library/EfiPart.h b/Library/EfiPart.h
985index a62cd15..e59ae77 100644
986--- a/Library/EfiPart.h
987+++ b/Library/EfiPart.h
988@@ -56,3 +56,4 @@ typedef struct {
989 #pragma pack()
c0004f9c 990
2405af19
OM
991 #endif
992+
993diff --git a/Library/EfiShellLib.h b/Library/EfiShellLib.h
994index 6243d1d..e0ffe43 100644
995--- a/Library/EfiShellLib.h
996+++ b/Library/EfiShellLib.h
997@@ -25,7 +25,7 @@ Revision History
998 #define _EFI_SHELL_LIB_INCLUDE_
c0004f9c 999
2405af19
OM
1000 #include "Tiano.h"
1001-#include "ShellEnv.h"
1002+#include "shellenv.h"
1003 #include "pci22.h"
c0004f9c 1004
2405af19
OM
1005 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
1006@@ -51,7 +51,7 @@ Revision History
1007 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
1008 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
1009 #include EFI_GUID_DEFINITION (SalSystemTable)
1010-#include EFI_GUID_DEFINITION (Smbios)
1011+#include EFI_GUID_DEFINITION (SmBios)
1012 #include EFI_GUID_DEFINITION (StandardErrorDevice)
1013 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
1014 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
1015@@ -67,7 +67,7 @@ Revision History
1016 #include EFI_PROTOCOL_DEFINITION (DebugPort)
1017 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
1018 #include EFI_PROTOCOL_DEFINITION (Decompress)
1019-#include EFI_PROTOCOL_DEFINITION (DeviceIO)
1020+#include EFI_PROTOCOL_DEFINITION (DeviceIo)
1021 #include EFI_PROTOCOL_DEFINITION (DevicePath)
1022 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
1023 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
1024@@ -111,7 +111,7 @@ Revision History
1025 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
1026 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
1027 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
1028-#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
1029+#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
1030 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
1031 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
1032 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
1033@@ -152,7 +152,7 @@ Revision History
1034 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
c0004f9c 1035
2405af19
OM
1036 #include "efilibplat.h"
1037-#include "efipart.h"
2bba8d5a 1038+#include "EfiPart.h"
2405af19
OM
1039 #include "ShellDebug.h"
1040 #include "CRC.h"
1041 #include "DPath.h"
1042@@ -358,3 +358,4 @@ LibGetControllerName (
1043 );
c0004f9c 1044
2405af19 1045 #endif
2bba8d5a 1046+
2405af19
OM
1047diff --git a/Library/EfiShellLib.inf b/Library/EfiShellLib.inf
1048index d450f9d..a63406c 100644
1049--- a/Library/EfiShellLib.inf
1050+++ b/Library/EfiShellLib.inf
1051@@ -45,34 +45,42 @@ COMPONENT_TYPE = LIBRARY
1052 HiiSupport.c
c0004f9c 1053
2405af19
OM
1054 [sources.ia32]
1055- ia32\math.c
1056- ia32\initplat.c
1057+ IA32/math.c
1058+ IA32/initplat.c
c0004f9c 1059
2405af19
OM
1060 [sources.ipf]
1061- ipf\math.c
1062- ipf\initplat.c
1063- ipf\palproc.s
1064- ipf\salpal.c
1065+ IPF/math.c
1066+ IPF/initplat.c
1067+ IPF/palproc.s
1068+ IPF/salpal.c
c0004f9c 1069
2405af19
OM
1070 [sources.EBC]
1071- EBC\math.c
1072- EBC\initplat.c
1073-
1074+ Ebc/math.c
1075+ Ebc/initplat.c
2bba8d5a 1076+
2405af19
OM
1077 [sources.x64]
1078- ipf\math.c
1079- ia32\initplat.c
1080+ IPF/math.c
1081+ IA32/initplat.c
1082+
1083+[sources.ARM]
1084+ IPF/math.c
1085+ IA32/initplat.c
1086+
1087+[sources.AARCH64]
1088+ IPF/math.c
1089+ IA32/initplat.c
c0004f9c 1090
2bba8d5a
OM
1091 [includes.common]
1092 .
1093- ..\Inc
2bba8d5a
OM
1094- $(EDK_SOURCE)\Foundation
1095- $(EDK_SOURCE)\Foundation\Include
2bba8d5a
OM
1096- $(EDK_SOURCE)\Foundation\Efi
1097- $(EDK_SOURCE)\Foundation\Efi\Include
1098- $(EDK_SOURCE)\Foundation\FrameWork
1099- $(EDK_SOURCE)\Foundation\FrameWork\Include
2405af19 1100- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2bba8d5a 1101- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a 1102+ ../Inc
2bba8d5a
OM
1103+ $(EDK_SOURCE)/Foundation
1104+ $(EDK_SOURCE)/Foundation/Include
2bba8d5a
OM
1105+ $(EDK_SOURCE)/Foundation/Efi
1106+ $(EDK_SOURCE)/Foundation/Efi/Include
1107+ $(EDK_SOURCE)/Foundation/FrameWork
1108+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2405af19 1109+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2bba8d5a 1110+ $(EDK_SOURCE)/Foundation/Core/Dxe
c0004f9c 1111
2405af19
OM
1112 [libraries.common]
1113 EdkFrameworkProtocolLib
1114@@ -81,4 +89,7 @@ COMPONENT_TYPE = LIBRARY
1115 EfiGuidLib
1116 EdkGuidLib
1117
1118+[libraries.ARM]
1119+ CompilerIntrinsicsLib, CompilerIntrinsicsLib
b00c06f0 1120+
2405af19
OM
1121 [nmake.common]
1122diff --git a/Library/Event.c b/Library/Event.c
1123index 4929e4b..a0cbdc2 100644
1124--- a/Library/Event.c
1125+++ b/Library/Event.c
1126@@ -21,7 +21,7 @@ Revision History
b00c06f0 1127
2405af19 1128 --*/
2bba8d5a 1129
2405af19
OM
1130-#include "EfiShelllib.h"
1131+#include "EfiShellLib.h"
1132
1133 EFI_EVENT
1134 LibCreateProtocolNotifyEvent (
1135diff --git a/Library/Event.h b/Library/Event.h
1136index b8df801..8e0e718 100644
1137--- a/Library/Event.h
1138+++ b/Library/Event.h
1139@@ -50,4 +50,6 @@ WaitForEventWithTimeout (
1140 OUT EFI_INPUT_KEY *Key
1141 );
1142
1143-#endif
1144\ No newline at end of file
1145+#endif
2bba8d5a 1146+
2405af19
OM
1147+
1148diff --git a/Library/FileIO.c b/Library/FileIO.c
1149index 40c67d1..8820c52 100644
1150--- a/Library/FileIO.c
1151+++ b/Library/FileIO.c
1152@@ -21,7 +21,7 @@ Revision History
c0004f9c 1153
2405af19 1154 --*/
c0004f9c 1155
2405af19
OM
1156-#include "EfiShelllib.h"
1157+#include "EfiShellLib.h"
b00c06f0 1158
2405af19
OM
1159 typedef struct _PATH_COMPONENTS {
1160 CHAR16 *Name;
1161@@ -719,7 +719,6 @@ LibSplitFsAndPath (
1162 IN OUT CHAR16 **Path
1163 )
1164 {
1165- EFI_STATUS Status;
1166 CHAR16 *p;
1167 UINTN Size;
b00c06f0 1168
2405af19
OM
1169@@ -728,7 +727,6 @@ LibSplitFsAndPath (
1170
1171 *Fs = NULL;
1172 *Path = NULL;
1173- Status = EFI_SUCCESS;
c0004f9c 1174
2405af19
OM
1175 p = AbPath;
1176 while (*p) {
1177@@ -1017,13 +1015,11 @@ Return:
1178 EFI_LIST_ENTRY SrcList;
1179 EFI_LIST_ENTRY DstList;
1180 EFI_STATUS Status;
1181- EFI_LIST_ENTRY *Link;
1182 SHELL_FILE_ARG *SrcArg;
1183 SHELL_FILE_ARG *DstArg;
1184
1185 ASSERT (IsSame != NULL);
c0004f9c 1186
2405af19
OM
1187- Link = NULL;
1188 SrcArg = NULL;
1189 DstArg = NULL;
1190 InitializeListHead (&SrcList);
1191diff --git a/Library/FileIO.h b/Library/FileIO.h
1192index bb07d91..e568e17 100644
1193--- a/Library/FileIO.h
1194+++ b/Library/FileIO.h
1195@@ -208,4 +208,6 @@ CloseSimpleReadFile (
1196 IN SIMPLE_READ_FILE SimpleReadHandle
1197 );
c0004f9c 1198
1199-#endif
1200\ No newline at end of file
1201+#endif
2405af19
OM
1202+
1203+
1204diff --git a/Library/Handle.c b/Library/Handle.c
1205index 25da2a1..45e623c 100644
1206--- a/Library/Handle.c
1207+++ b/Library/Handle.c
1208@@ -21,7 +21,7 @@ Revision History
c0004f9c 1209
2405af19 1210 --*/
c0004f9c 1211
2405af19
OM
1212-#include "EfiShelllib.h"
1213+#include "EfiShellLib.h"
c0004f9c 1214
2405af19
OM
1215 EFI_STATUS
1216 LibLocateHandle (
1217@@ -131,7 +131,6 @@ Returns:
1218 EFI_HANDLE *BlockIoBuffer;
1219 EFI_DEVICE_PATH_PROTOCOL *DevicePath;
1220 UINTN Index;
1221- EFI_DEVICE_PATH_PROTOCOL *Start;
1222 EFI_DEVICE_PATH_PROTOCOL *Next;
1223 EFI_DEVICE_PATH_PROTOCOL *DevPath;
1224 HARDDRIVE_DEVICE_PATH *HardDriveDevicePath;
1225@@ -204,7 +203,6 @@ Returns:
1226 PreviousNodeIsHardDriveDevicePath = FALSE;
b00c06f0 1227
2405af19
OM
1228 DevPath = DevicePath;
1229- Start = DevPath;
1230 //
1231 // Check for end of device path type
1232 //
1233@@ -796,14 +794,12 @@ LibScanHandleDatabase (
1234 UINTN OpenInfoIndex;
1235 UINTN ChildIndex;
1236 BOOLEAN DriverBindingHandleIndexValid;
1237- BOOLEAN ControllerHandleIndexValid;
b00c06f0 1238
2405af19
OM
1239 DriverBindingHandleIndexValid = FALSE;
1240 if (DriverBindingHandleIndex != NULL) {
1241 *DriverBindingHandleIndex = 0xffffffff;
2bba8d5a 1242 }
c0004f9c 1243
2405af19
OM
1244- ControllerHandleIndexValid = FALSE;
1245 if (ControllerHandleIndex != NULL) {
1246 *ControllerHandleIndex = 0xffffffff;
2bba8d5a 1247 }
2405af19 1248@@ -847,7 +843,6 @@ LibScanHandleDatabase (
c0004f9c 1249
2405af19
OM
1250 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
1251 *ControllerHandleIndex = (UINT32) HandleIndex;
1252- ControllerHandleIndexValid = TRUE;
1253 }
c0004f9c 1254
2405af19
OM
1255 }
1256@@ -1305,7 +1300,7 @@ Returns:
1257 Status = BS->HandleProtocol (
1258 Handles[Index],
1259 ProtocolGuid,
1260- Interface
1261+ (VOID**)Interface
2bba8d5a 1262 );
c0004f9c 1263
2405af19
OM
1264 if (!EFI_ERROR (Status)) {
1265diff --git a/Library/Handle.h b/Library/Handle.h
1266index 40ad40b..010e2cf 100644
1267--- a/Library/Handle.h
1268+++ b/Library/Handle.h
1269@@ -161,3 +161,4 @@ ShellGetHandleNum (
1270 );
c0004f9c 1271
2405af19
OM
1272 #endif
1273+
1274diff --git a/Library/HiiSupport.c b/Library/HiiSupport.c
1275index bce645b..5f70712 100644
1276--- a/Library/HiiSupport.c
1277+++ b/Library/HiiSupport.c
1278@@ -21,7 +21,7 @@ Revision History
1279 \r
1280 --*/\r
1281 \r
1282-#include "EfiShelllib.h"\r
1283+#include "EfiShellLib.h"\r
1284 \r
1285 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
1286 \r
1287@@ -56,11 +56,11 @@ Returns:
1288 return EFI_SUCCESS;\r
1289 }\r
1290 \r
1291- Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);\r
1292+ Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);\r
1293 if (EFI_ERROR (Status)) {\r
1294 return Status;\r
1295 }\r
1296- Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);\r
1297+ Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);\r
1298 if (EFI_ERROR (Status)) {\r
1299 return Status;\r
1300 } \r
1301diff --git a/Library/HiiSupport.h b/Library/HiiSupport.h
1302index b04c443..bfeb077 100644
1303--- a/Library/HiiSupport.h
1304+++ b/Library/HiiSupport.h
1305@@ -142,3 +142,4 @@ LibGetString (
1306 ;\r
1307 \r
1308 #endif\r
1309+
1310diff --git a/Library/IA32/efilibplat.h b/Library/IA32/efilibplat.h
1311index 4e58f50..a6eb87f 100644
1312--- a/Library/IA32/efilibplat.h
1313+++ b/Library/IA32/efilibplat.h
1314@@ -34,4 +34,4 @@ InitializeLibPlatform (
c0004f9c 1315
2405af19 1316 #define MIN_ALIGNMENT_SIZE 4
c0004f9c 1317
2405af19
OM
1318-#endif
1319\ No newline at end of file
1320+#endif
1321diff --git a/Library/IO.c b/Library/IO.c
1322index 81f26fd..b976e32 100644
1323--- a/Library/IO.c
1324+++ b/Library/IO.c
1325@@ -21,7 +21,7 @@ Revision History
c0004f9c 1326
2405af19 1327 --*/
c0004f9c 1328
2405af19
OM
1329-#include "EfiShelllib.h"
1330+#include "EfiShellLib.h"
c0004f9c 1331
2405af19
OM
1332 #define PRINT_STRING_LEN 1024
1333 #define PRINT_ITEM_BUFFER_LEN 100
1334@@ -86,8 +86,8 @@ typedef struct _pstate {
1335 typedef struct {
1336 BOOLEAN PageBreak;
1337 BOOLEAN AutoWrap;
1338- INTN MaxRow;
1339- INTN MaxColumn;
1340+ UINTN MaxRow;
1341+ UINTN MaxColumn;
1342 INTN InitRow;
1343 INTN Row;
1344 INTN Column;
1345@@ -1575,7 +1575,7 @@ Returns:
1346 {
1347 BOOLEAN Done;
1348 UINTN Column;
1349- INTN Row;
1350+ UINTN Row;
1351 UINTN StartColumn;
1352 UINTN Update;
1353 UINTN Delete;
1354@@ -1769,7 +1769,7 @@ Returns:
1355 //
1356 // If we need to update the output do so now
1357 //
1358- if (Update != -1) {
1359+ if (Update != (UINTN) -1) {
1360 PrintAt (Column, Row, L"%s%.*s", InStr + Update, Delete, L"");
1361 Len = StrLen (InStr);
b00c06f0 1362
2405af19
OM
1363@@ -1928,8 +1928,8 @@ LibGetPageBreak (
1364 return mPrintMode.PageBreak;
1365 }
1366
1367+#if 0
1368 STATIC
1369-
1370 BOOLEAN
1371 GetOutputPause (
1372 VOID
1373@@ -1937,6 +1937,7 @@ GetOutputPause (
1374 {
1375 return mPrintMode.OutputPause;
1376 }
1377+#endif
1378
1379 INTN
1380 DbgPrint (
1381diff --git a/Library/IO.h b/Library/IO.h
1382index 7469c32..6dfc743 100644
1383--- a/Library/IO.h
1384+++ b/Library/IO.h
1385@@ -157,4 +157,6 @@ LibGetPageBreak (
1386 );
1387
1388
1389-#endif
1390\ No newline at end of file
1391+#endif
b00c06f0 1392+
b00c06f0 1393+
2405af19
OM
1394diff --git a/Library/IPF/efilibplat.h b/Library/IPF/efilibplat.h
1395index 90659b4..aad0dd0 100644
1396--- a/Library/IPF/efilibplat.h
1397+++ b/Library/IPF/efilibplat.h
1398@@ -35,3 +35,4 @@ InitializeLibPlatform (
1399 #define MIN_ALIGNMENT_SIZE 8
c0004f9c 1400
2405af19
OM
1401 #endif
1402+
1403diff --git a/Library/IPF/libsalpal.h b/Library/IPF/libsalpal.h
1404index fc25995..1461669 100644
1405--- a/Library/IPF/libsalpal.h
1406+++ b/Library/IPF/libsalpal.h
1407@@ -74,4 +74,4 @@ LibSalProc (
1408 IN UINT64 Arg8
1409 );
2bba8d5a 1410
2405af19
OM
1411-#endif
1412\ No newline at end of file
1413+#endif
1414diff --git a/Library/IPF/palproc.h b/Library/IPF/palproc.h
1415index 6d1edf8..ea426bf 100644
1416--- a/Library/IPF/palproc.h
1417+++ b/Library/IPF/palproc.h
1418@@ -58,3 +58,4 @@
1419 #define PAL_MC_REGISTER_MEM 0x001b
b00c06f0 1420
2405af19 1421 #endif // _PALPROC_H
b00c06f0 1422+
2405af19
OM
1423diff --git a/Library/Init.c b/Library/Init.c
1424index 3ef0c8e..e791ff1 100644
1425--- a/Library/Init.c
1426+++ b/Library/Init.c
1427@@ -20,7 +20,7 @@ Revision History
b00c06f0 1428
2405af19
OM
1429 --*/
1430
1431-#include "EfiShelllib.h"
1432+#include "EfiShellLib.h"
1433
1434 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
2bba8d5a 1435
2405af19
OM
1436diff --git a/Library/LinkedList.h b/Library/LinkedList.h
1437index d39e5a3..0c82b61 100644
1438--- a/Library/LinkedList.h
1439+++ b/Library/LinkedList.h
1440@@ -77,11 +77,10 @@ typedef struct _EFI_LIST_ENTRY {
2bba8d5a
OM
1441 }
1442
2405af19
OM
1443 #define SwapListEntries(Entry1, Entry2) { \
1444- EFI_LIST_ENTRY *Entry1Flink, *Entry1Blink; \
1445+ EFI_LIST_ENTRY *Entry1Blink; \
1446 EFI_LIST_ENTRY *Entry2Flink, *Entry2Blink; \
1447 Entry2Flink = (Entry2)->Flink; \
1448 Entry2Blink = (Entry2)->Blink; \
1449- Entry1Flink = (Entry1)->Flink; \
1450 Entry1Blink = (Entry1)->Blink; \
1451 Entry2Blink->Flink = Entry2Flink; \
1452 Entry2Flink->Blink = Entry2Blink; \
1453@@ -100,3 +99,4 @@ typedef struct _EFI_LIST_ENTRY {
1454 // A lock structure
1455 //
2bba8d5a
OM
1456 #endif
1457+
2405af19
OM
1458diff --git a/Library/Lock.c b/Library/Lock.c
1459index 8a40db5..b3f9bad 100644
1460--- a/Library/Lock.c
1461+++ b/Library/Lock.c
1462@@ -21,7 +21,7 @@ Revision History
2bba8d5a 1463
2405af19 1464 --*/
2bba8d5a 1465
2405af19
OM
1466-#include "EfiShelllib.h"
1467+#include "EfiShellLib.h"
2bba8d5a 1468
2405af19
OM
1469 VOID
1470 InitializeLock (
1471diff --git a/Library/Lock.h b/Library/Lock.h
1472index 9e35b92..bd5304e 100644
1473--- a/Library/Lock.h
1474+++ b/Library/Lock.h
1475@@ -45,4 +45,6 @@ ReleaseLock (
1476 IN FLOCK *Lock
1477 );
b00c06f0 1478
2405af19
OM
1479-#endif
1480\ No newline at end of file
1481+#endif
b00c06f0 1482+
2405af19
OM
1483+
1484diff --git a/Library/Mem.c b/Library/Mem.c
1485index f82cb52..9675b52 100644
1486--- a/Library/Mem.c
1487+++ b/Library/Mem.c
1488@@ -21,7 +21,7 @@ Revision History
b00c06f0 1489
2405af19 1490 --*/
c0004f9c 1491
2405af19
OM
1492-#include "EfiShelllib.h"
1493+#include "EfiShellLib.h"
1494
1495 VOID
1496 SetMem (
1497diff --git a/Library/Mem.h b/Library/Mem.h
1498index bca1e1d..1e0b331 100644
1499--- a/Library/Mem.h
1500+++ b/Library/Mem.h
1501@@ -73,4 +73,6 @@ ZeroMem (
1502 IN UINTN Size
1503 );
c0004f9c 1504
2bba8d5a
OM
1505-#endif
1506\ No newline at end of file
1507+#endif
c0004f9c 1508+
2405af19
OM
1509+
1510diff --git a/Library/Misc.c b/Library/Misc.c
1511index 1564c49..e3204ff 100644
1512--- a/Library/Misc.c
1513+++ b/Library/Misc.c
1514@@ -21,7 +21,7 @@ Revision History
c0004f9c 1515
2405af19
OM
1516 --*/
1517
1518-#include "EfiShelllib.h"
1519+#include "EfiShellLib.h"
1520
1521 #if (PLATFORM == NT32)
1522 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \
1523@@ -348,7 +348,7 @@ Returns:
1524 ASSERT (Buffer != NULL);
1525
1526 if (mShellEnv == NULL) {
1527- Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv);
1528+ Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv);
1529 if (EFI_ERROR (Status)) {
1530 mShellEnv = NULL;
1531 }
1532@@ -1171,7 +1171,7 @@ Returns:
1533 Status = BS->HandleProtocol (
1534 Image->DeviceHandle,
1535 &gEfiFirmwareVolumeProtocolGuid,
1536- &FV
1537+ (VOID**)&FV
1538 );
1539 if (!EFI_ERROR (Status)) {
1540 Status = FV->ReadSection (
1541@@ -1192,7 +1192,7 @@ Returns:
1542 Status = BS->HandleProtocol (
1543 Image->DeviceHandle,
1544 &gEfiFirmwareVolume2ProtocolGuid,
1545- &FV2
1546+ (VOID**)&FV2
1547 );
1548 if (!EFI_ERROR (Status)) {
1549 Status = FV2->ReadSection (
1550@@ -1339,7 +1339,7 @@ LibCmdGetStringByToken (
1551 {
1552 EFI_STATUS Status;
1553 CHAR16 *String;
1554- EFI_HII_HANDLE HiiHandle;
1555+ STATIC EFI_HII_HANDLE HiiHandle;
1556
1557 ASSERT (Str);
1558
1559@@ -1730,6 +1730,8 @@ Returns:
1560 return L"X64";
1561 case EFI_IMAGE_MACHINE_IA64:
1562 return L"IA64";
1563+ case EFI_IMAGE_MACHINE_AARCH64:
1564+ return L"AARCH64";
1565 default:
1566 return L"UNKNOWN";
1567 }
1568@@ -2544,4 +2546,5 @@ Returns:
1569 }
1570
1571 return Status;
1572-}
1573\ No newline at end of file
1574+}
1575+
1576diff --git a/Library/Misc.h b/Library/Misc.h
1577index 7a99186..a7a6825 100644
1578--- a/Library/Misc.h
1579+++ b/Library/Misc.h
1580@@ -258,3 +258,4 @@ LibGetExitCode (
1581 );
1582
1583 #endif
1584+
1585diff --git a/Library/Perf.c b/Library/Perf.c
1586index 43e09ea..87c4113 100644
1587--- a/Library/Perf.c
1588+++ b/Library/Perf.c
1589@@ -19,7 +19,7 @@ Abstract:
1590
1591 --*/
1592
1593-#include "EfiShelllib.h"
1594+#include "EfiShellLib.h"
1595
1596 #include EFI_PROTOCOL_DEFINITION (Performance)
1597
1598diff --git a/Library/RtData.c b/Library/RtData.c
1599index af55cb4..145e933 100644
1600--- a/Library/RtData.c
1601+++ b/Library/RtData.c
1602@@ -21,7 +21,7 @@ Revision History
1603
1604 --*/
1605
1606-#include "EfiShelllib.h"
1607+#include "EfiShellLib.h"
1608
1609 //
1610 // RT - pointer to the runtime table
1611diff --git a/Library/ShellDebug.c b/Library/ShellDebug.c
1612index b31ef06..c8b93d5 100644
1613--- a/Library/ShellDebug.c
1614+++ b/Library/ShellDebug.c
1615@@ -19,7 +19,7 @@ Abstract:
1616
1617 --*/
1618
1619-#include "EfiShelllib.h"
1620+#include "EfiShellLib.h"
1621 #include EFI_PROTOCOL_DEFINITION (DebugAssert)
1622
1623 EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL;
1624diff --git a/Library/ShellDebug.h b/Library/ShellDebug.h
1625index 039197e..aedb3fa 100644
1626--- a/Library/ShellDebug.h
1627+++ b/Library/ShellDebug.h
1628@@ -99,3 +99,4 @@ EFIDebugVariable (
1629 );
1630 #endif
1631
1632+
1633diff --git a/Library/ShellEnvInt.c b/Library/ShellEnvInt.c
1634index b99d973..53de481 100644
1635--- a/Library/ShellEnvInt.c
1636+++ b/Library/ShellEnvInt.c
1637@@ -21,7 +21,7 @@ Revision History
1638
1639 --*/
1640
1641-#include "EfiShelllib.h"
1642+#include "EfiShellLib.h"
1643
1644 EFI_STATUS
1645 ShellExecute (
1646diff --git a/Library/ShellEnvInt.h b/Library/ShellEnvInt.h
1647index 4182dff..653f997 100644
1648--- a/Library/ShellEnvInt.h
1649+++ b/Library/ShellEnvInt.h
1650@@ -196,4 +196,6 @@ ShellGetHandleNum (
1651 VOID
1652 );
1653
1654-#endif
1655\ No newline at end of file
1656+#endif
1657+
1658+
1659diff --git a/Library/Str.c b/Library/Str.c
1660index ca0c76b..d881dae 100644
1661--- a/Library/Str.c
1662+++ b/Library/Str.c
1663@@ -22,7 +22,7 @@ Revision History
1664
1665 --*/
1666
1667-#include "EfiShelllib.h"
1668+#include "EfiShellLib.h"
1669
1670 INTN
1671 StrCmp (
1672@@ -421,7 +421,7 @@ Returns:
1673 return (UINTN) -1;
1674 }
1675
1676- u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
1677+ u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
1678 } else {
1679 break;
1680 }
1681@@ -472,7 +472,7 @@ Returns:
1682 c = *(str++);
1683 while (c) {
1684 if (c >= '0' && c <= '9') {
1685- if (u > m || u == m && c - '0' > (INTN) n) {
1686+ if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) {
1687 return (UINTN) -1;
1688 }
1689
1690diff --git a/Library/Str.h b/Library/Str.h
1691index 3f73bc5..7b01848 100644
1692--- a/Library/Str.h
1693+++ b/Library/Str.h
1694@@ -248,3 +248,4 @@ LibStubStrUpr (
1695 );
1696
1697 #endif
1698+
1699diff --git a/Library/VarCheck.c b/Library/VarCheck.c
1700index 53597ff..1abec9d 100644
1701--- a/Library/VarCheck.c
1702+++ b/Library/VarCheck.c
1703@@ -21,7 +21,7 @@ Revision History
1704
1705 --*/
1706
1707-#include "EfiShelllib.h"
1708+#include "EfiShellLib.h"
1709
1710 VOID
1711 LibCheckVarFreeVarList (
1712diff --git a/Library/VarCheck.h b/Library/VarCheck.h
1713index bc1f412..d2bfa66 100644
1714--- a/Library/VarCheck.h
1715+++ b/Library/VarCheck.h
1716@@ -41,7 +41,7 @@ typedef enum {
1717 ARG_PARTIALLY_QUOTED = 0x2,
1718 ARG_FIRST_HALF_QUOTED = 0x4,
1719 ARG_FIRST_CHAR_IS_ESC = 0x8
1720-};
1721+} SHELL_ARG_EXPR;
1722
1723 typedef struct {
1724 CHAR16 *FlagStr;
1725@@ -116,3 +116,4 @@ LibGetErrRedirFilename (
1726 );
1727
1728 #endif
1729+
1730diff --git a/Library/X64/efilibplat.h b/Library/X64/efilibplat.h
1731index 90659b4..aad0dd0 100644
1732--- a/Library/X64/efilibplat.h
1733+++ b/Library/X64/efilibplat.h
1734@@ -35,3 +35,4 @@ InitializeLibPlatform (
1735 #define MIN_ALIGNMENT_SIZE 8
1736
1737 #endif
1738+
1739diff --git a/LoadPciRom/LoadPciRom.c b/LoadPciRom/LoadPciRom.c
1740index f8854b7..99fd99d 100644
1741--- a/LoadPciRom/LoadPciRom.c
1742+++ b/LoadPciRom/LoadPciRom.c
1743@@ -24,7 +24,7 @@ Revision History
1744
1745 #include "EfiShellLib.h"
1746 #include "LoadPciRom.h"
1747-#include "Pci22.h"
1748+#include "pci22.h"
1749
1750 extern UINT8 STRING_ARRAY_NAME[];
1751
1752@@ -56,7 +56,7 @@ LoadEfiDriversFromRomImage (
1753 );
1754
1755 EFI_HANDLE gMyImageHandle;
1756-EFI_HII_HANDLE HiiHandle;
1757+STATIC EFI_HII_HANDLE HiiHandle;
1758 EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID;
1759 SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
1760 {
1761@@ -81,7 +81,7 @@ SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
1762 NULL,
1763 0,
1764 0,
1765- 0
1766+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1767 }
1768 };
1769
1770@@ -377,7 +377,7 @@ Returns:
1771 }
1772
1773 if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {
1774- Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress);
1775+ Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);
1776 if (EFI_ERROR (Status)) {
1777 PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle);
1778 SkipImage = TRUE;
1779diff --git a/LoadPciRom/LoadPciRom.h b/LoadPciRom/LoadPciRom.h
1780index e9db96d..116bb89 100644
1781--- a/LoadPciRom/LoadPciRom.h
1782+++ b/LoadPciRom/LoadPciRom.h
1783@@ -30,3 +30,4 @@ Revision History
1784 }
1785
1786 #endif
1787+
1788diff --git a/LoadPciRom/LoadPciRom.inf b/LoadPciRom/LoadPciRom.inf
1789index 8e79af7..83744ef 100644
1790--- a/LoadPciRom/LoadPciRom.inf
1791+++ b/LoadPciRom/LoadPciRom.inf
1792@@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a 1793
2405af19
OM
1794 [sources.common]
1795 LoadPciRomStrings.uni
1796- ..\ShCommonStrings.uni
1797+ ../ShCommonStrings.uni
1798 LoadPciRom.c
1799 LoadPciRom.h
1800
2bba8d5a
OM
1801 [includes.common]
1802 .
1803- ..\Inc
1804- ..\Library
1805- $(EDK_SOURCE)\Foundation
1806- $(EDK_SOURCE)\Foundation\Include
1807- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1808- $(EDK_SOURCE)\Foundation\Efi
1809- $(EDK_SOURCE)\Foundation\Efi\Include
1810- $(EDK_SOURCE)\Foundation\FrameWork
1811- $(EDK_SOURCE)\Foundation\FrameWork\Include
1812- $(EDK_SOURCE)\Foundation\Core\Dxe
1813- $(DEST_DIR)\
1814+ ../Inc
1815+ ../Library
1816+ $(EDK_SOURCE)/Foundation
1817+ $(EDK_SOURCE)/Foundation/Include
1818+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1819+ $(EDK_SOURCE)/Foundation/Efi
1820+ $(EDK_SOURCE)/Foundation/Efi/Include
1821+ $(EDK_SOURCE)/Foundation/FrameWork
1822+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1823+ $(EDK_SOURCE)/Foundation/Core/Dxe
1824+ $(DEST_DIR./
1825
1826 [libraries.common]
1827 EfiShellLib
2405af19
OM
1828@@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
1829
b00c06f0 1830 [nmake.common]
2405af19 1831 IMAGE_ENTRY_POINT=InitializeLoadPciRom
b00c06f0
OM
1832+
1833+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
b00c06f0
OM
1834 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1835 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
1836 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1837
b00c06f0
OM
1838+[nmake.ARM, nmake.AARCH64]
1839+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
1840diff --git a/Ping/Ping.c b/Ping/Ping.c
1841index 7d92881..65e45b7 100644
1842--- a/Ping/Ping.c
1843+++ b/Ping/Ping.c
1844@@ -20,14 +20,14 @@ Abstract:
1845 --*/
1846
1847 #include "EfiShellLib.h"
1848-#include "CpuFuncs.h"
1849+//#include "CpuFuncs.h"
1850 #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu)
1851 #include EFI_PROTOCOL_DEFINITION (Ip4)
1852 #include "Ping.h"
1853 #include STRING_DEFINES_FILE
1854 extern UINT8 STRING_ARRAY_NAME[];
2bba8d5a 1855
2bba8d5a
OM
1856-EFI_HII_HANDLE HiiHandle;
1857+STATIC EFI_HII_HANDLE HiiHandle;
2405af19
OM
1858
1859 EFI_GUID EfiPingGuid = EFI_PING_GUID;
1860 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
1861@@ -59,7 +59,7 @@ SHELL_VAR_CHECK_ITEM PingCheckList[] = {
2bba8d5a
OM
1862 NULL,
1863 0,
1864 0,
1865- 0
1866+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
1867 }
1868 };
c0004f9c 1869
2405af19
OM
1870@@ -114,6 +114,8 @@ UINT32 RttSum;
1871 UINT32 RttMin;
1872 UINT32 RttMax;
2bba8d5a 1873
2405af19
OM
1874+EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
1875+
1876 STATIC
1877 UINT64
1878 GetTimerValue (
1879@@ -135,7 +137,22 @@ Returns:
2bba8d5a 1880
2405af19
OM
1881 --*/
1882 {
1883- return EfiReadTsc ();
1884+ static UINT64 CurrentTick = 0;
1885+ UINT64 TimerPeriod;
1886+ EFI_STATUS Status;
1887+
1888+ ASSERT (gCpu != NULL);
1889+
1890+ Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);
1891+ if (EFI_ERROR (Status)) {
1892+ //
1893+ // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the
1894+ // TimerPeriod by ourselves.
1895+ //
1896+ CurrentTick += 1000000;
1897+ }
1898+
1899+ return CurrentTick;
1900 }
2bba8d5a 1901
2405af19
OM
1902 STATIC
1903@@ -168,7 +185,7 @@ Returns:
1904 //
1905 // Locate the Cpu Arch Protocol.
1906 //
1907- Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
1908+ Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu);
1909 if (EFI_ERROR (Status)) {
1910 return Status;
c0004f9c 1911 }
2405af19
OM
1912diff --git a/Ping/Ping.h b/Ping/Ping.h
1913index 7867caf..6f59a0c 100644
1914--- a/Ping/Ping.h
1915+++ b/Ping/Ping.h
1916@@ -78,3 +78,4 @@ typedef struct _ICMP_TX_INFO {
1917 } ICMP_TX_INFO;
2bba8d5a 1918
2405af19
OM
1919 #endif
1920+
1921diff --git a/Ping/Ping.inf b/Ping/Ping.inf
1922index 64dec5c..a678489 100644
1923--- a/Ping/Ping.inf
1924+++ b/Ping/Ping.inf
1925@@ -25,24 +25,24 @@ FILE_GUID = FAAA94BA-7095-4c0f-8D69-8E00C8328863
c0004f9c 1926 COMPONENT_TYPE = APPLICATION
1927
1928 [sources.common]
2405af19
OM
1929- ..\ShCommonStrings.uni
1930+ ../ShCommonStrings.uni
1931 PingStrings.uni
1932 Ping.h
1933 Ping.c
c0004f9c 1934
1935 [includes.common]
1936- ..\Inc
1937- ..\Library
2405af19 1938- $(EDK_SOURCE)\Foundation\Efi
c0004f9c 1939- $(EDK_SOURCE)\Foundation
2405af19 1940- $(EDK_SOURCE)\Foundation\Efi\Include
c0004f9c 1941- $(EDK_SOURCE)\Foundation\Include
1942- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1943- $(EDK_SOURCE)\Foundation\FrameWork
1944- $(EDK_SOURCE)\Foundation\FrameWork\Include
1945- $(EDK_SOURCE)\Foundation\Core\Dxe
2405af19 1946- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
c0004f9c 1947- $(DEST_DIR)\
1948+ ../Inc
1949+ ../Library
2405af19 1950+ $(EDK_SOURCE)/Foundation/Efi
c0004f9c 1951+ $(EDK_SOURCE)/Foundation
2405af19 1952+ $(EDK_SOURCE)/Foundation/Efi/Include
c0004f9c 1953+ $(EDK_SOURCE)/Foundation/Include
1954+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1955+ $(EDK_SOURCE)/Foundation/FrameWork
1956+ $(EDK_SOURCE)/Foundation/FrameWork/Include
1957+ $(EDK_SOURCE)/Foundation/Core/Dxe
2405af19 1958+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
c0004f9c 1959+ $(DEST_DIR./
1960
1961 [libraries.common]
1962 EfiShellLib
2405af19
OM
1963@@ -52,7 +52,6 @@ COMPONENT_TYPE = APPLICATION
1964 ArchProtocolLib
1965 EdkGuidLib
1966 EdkFrameworkGuidLib
1967- EfiDriverLib
1968
1969 [libraries.Ia32]
1970 CpuIA32Lib
1971@@ -64,9 +63,12 @@ COMPONENT_TYPE = APPLICATION
1972 CpuIA32Lib
1973
b00c06f0 1974 [nmake.common]
2405af19
OM
1975- C_PROJ_FLAGS = $(C_PROJ_FLAGS)
1976 IMAGE_ENTRY_POINT=Ping
1977- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
b00c06f0
OM
1978+
1979+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
b00c06f0
OM
1980 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
1981 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2405af19 1982+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
b00c06f0 1983
b00c06f0
OM
1984+[nmake.ARM, nmake.AARCH64]
1985+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
1986diff --git a/Shell.inf b/Shell.inf
1987index fee3558..b1dc90e 100644
1988--- a/Shell.inf
1989+++ b/Shell.inf
1990@@ -25,179 +25,189 @@ FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
1991 COMPONENT_TYPE = APPLICATION
c0004f9c 1992
2405af19
OM
1993 [sources.common]
1994- Library\ShellDebug.c
1995- Library\DPath.c
1996- Library\Init.c
1997- Library\Lock.c
1998- Library\Str.c
1999- Library\IO.c
2000- Library\Mem.c
2001- Library\Misc.c
2002- Library\Data.c
2003- Library\RtData.c
2004- Library\ShellEnvInt.c
2005- Library\Handle.c
2006- Library\FileIO.c
2007- Library\ConsistMapping.c
2008- Library\CRC.c
2009- Library\Event.c
2010- Library\Perf.c
2011- Library\VarCheck.c
2012- Library\HiiSupport.c
2013-
2014- newshell\NshellStrings.uni
2015- newshell\init.c
2016- newshell\nshell.h
2017- newshell\fakehii.c
2018+ Library/ShellDebug.c
2019+ Library/DPath.c
2020+ Library/Init.c
2021+ Library/Lock.c
2022+ Library/Str.c
2023+ Library/IO.c
2024+ Library/Mem.c
2025+ Library/Misc.c
2026+ Library/Data.c
2027+ Library/RtData.c
2028+ Library/ShellEnvInt.c
2029+ Library/Handle.c
2030+ Library/FileIO.c
2031+ Library/ConsistMapping.c
2032+ Library/CRC.c
2033+ Library/Event.c
2034+ Library/Perf.c
2035+ Library/VarCheck.c
2036+ Library/HiiSupport.c
2037+
2038+ newshell/NshellStrings.uni
2039+ newshell/init.c
2040+ newshell/nshell.h
2041+ newshell/fakehii.c
c0004f9c 2042
2405af19
OM
2043 ShCommonStrings.uni
2044- shellenv\ShellenvHelpStrings.uni
2045- shellenv\ShellenvStrings.uni
2046- shellenv\ScriptCmdStrings.uni
2047- shellenv\ConnectStrings.uni
2048- shellenv\EchoStrings.uni
2049- shellenv\HelpStrings.uni
2050- shellenv\MapStrings.uni
2051- shellenv\CdStrings.uni
2052- shellenv\DhStrings.uni
2053+ shellenv/ShellenvHelpStrings.uni
2054+ shellenv/ShellenvStrings.uni
2055+ shellenv/ScriptCmdStrings.uni
2056+ shellenv/ConnectStrings.uni
2057+ shellenv/EchoStrings.uni
2058+ shellenv/HelpStrings.uni
2059+ shellenv/MapStrings.uni
2060+ shellenv/CdStrings.uni
2061+ shellenv/DhStrings.uni
2062
2063- shellenv\cmddisp.c
2064- shellenv\connect.c
2065- shellenv\data.c
2066- shellenv\exec.c
2067- shellenv\init.c
2068- shellenv\protid.c
2069- shellenv\var.c
2070- shellenv\conio.c
2071- shellenv\consoleproxy.c
2072- shellenv\handle.c
2073- shellenv\dprot.c
2074- shellenv\map.c
2075- shellenv\marg.c
2076- shellenv\batch.c
2077- shellenv\if.c
2078- shellenv\goto.c
2079- shellenv\echo.c
2080- shellenv\pause.c
2081- shellenv\for.c
2082- shellenv\wait.c
2083- shellenv\help.c
2084- shellenv\shelle.h
2085- shellenv\shellenvguid.h
2086- shellenv\parsecmd.c
2087- shellenv\shift.c
2088+ shellenv/cmddisp.c
2089+ shellenv/connect.c
2090+ shellenv/data.c
2091+ shellenv/exec.c
2092+ shellenv/init.c
2093+ shellenv/protid.c
2094+ shellenv/var.c
2095+ shellenv/conio.c
2096+ shellenv/consoleproxy.c
2097+ shellenv/handle.c
2098+ shellenv/dprot.c
2099+ shellenv/map.c
2100+ shellenv/marg.c
2101+ shellenv/batch.c
2102+ shellenv/if.c
2103+ shellenv/goto.c
2104+ shellenv/echo.c
2105+ shellenv/pause.c
2106+ shellenv/for.c
2107+ shellenv/wait.c
2108+ shellenv/help.c
2109+ shellenv/shelle.h
2110+ shellenv/shellenvguid.h
2111+ shellenv/parsecmd.c
2112+ shellenv/shift.c
2113
2114- unload\UnloadStrings.uni
2115- unload\unload.c
2116+ unload/UnloadStrings.uni
2117+ unload/unload.c
2118
2119- attrib\AttribStrings.uni
2120- attrib\attrib.c
2121- attrib\attrib.h
2122+ attrib/AttribStrings.uni
2123+ attrib/attrib.c
2124+ attrib/attrib.h
c0004f9c 2125
2405af19
OM
2126- cls\clsstrings.uni
2127- cls\cls.c
2128+ cls/clsstrings.uni
2129+ cls/cls.c
c0004f9c 2130
2405af19
OM
2131- cp\CpStrings.uni
2132- cp\cp.h
2133- cp\cp.c
2134+ cp/CpStrings.uni
2135+ cp/cp.h
2136+ cp/cp.c
2137
2138- date\DateStrings.uni
2139- date\date.c
2140- date\date.h
2141+ date/DateStrings.uni
2142+ date/date.c
2143+ date/date.h
c0004f9c 2144
2405af19
OM
2145- load\LoadStrings.uni
2146- load\load.c
2147- load\load.h
2148+ load/LoadStrings.uni
2149+ load/load.c
2150+ load/load.h
c0004f9c 2151
2405af19
OM
2152- ls\LsStrings.uni
2153- ls\ls.h
2154- ls\ls.c
2155+ ls/LsStrings.uni
2156+ ls/ls.h
2157+ ls/ls.c
2bba8d5a 2158
2405af19
OM
2159- mkdir\MkdirStrings.uni
2160- mkdir\mkdir.c
2161- mkdir\mkdir.h
2162+ mkdir/MkdirStrings.uni
2163+ mkdir/mkdir.c
2164+ mkdir/mkdir.h
c0004f9c 2165
2405af19
OM
2166- mv\MvStrings.uni
2167- mv\mv.c
2168- mv\mv.h
2169+ mv/MvStrings.uni
2170+ mv/mv.c
2171+ mv/mv.h
2172
2173- reset\ResetStrings.uni
2174- reset\reset.c
2175- reset\reset.h
2176+ reset/ResetStrings.uni
2177+ reset/reset.c
2178+ reset/reset.h
2179
2180- rm\RmStrings.uni
2181- rm\rm.h
2182- rm\rm.c
2183+ rm/RmStrings.uni
2184+ rm/rm.h
2185+ rm/rm.c
2186
2187- type\TypeStrings.uni
2188- type\type.c
2189- type\type.h
2190- time\TimeStrings.uni
2191- time\time.c
2192- time\time.h
2193-
2194- touch\TouchStrings.uni
2195- touch\touch.c
2196- touch\touch.h
2197-
2198- vol\VolStrings.uni
2199- vol\vol.c
2200- vol\vol.h
2201-
2202- ver\VerStrings.uni
2203- ver\ver.c
2204- ver\ver.h
2205+ type/TypeStrings.uni
2206+ type/type.c
2207+ type/type.h
2208+ time/TimeStrings.uni
2209+ time/time.c
2210+ time/time.h
2bba8d5a 2211+
2405af19
OM
2212+ touch/TouchStrings.uni
2213+ touch/touch.c
2214+ touch/touch.h
c0004f9c 2215+
2405af19
OM
2216+ vol/VolStrings.uni
2217+ vol/vol.c
2218+ vol/vol.h
c0004f9c 2219+
2405af19
OM
2220+ ver/VerStrings.uni
2221+ ver/ver.c
2222+ ver/ver.h
2223
2224- drivers\driversStrings.uni
2225- drivers\drivers.c
2226- drivers\drivers.h
2227+ drivers/driversStrings.uni
2228+ drivers/drivers.c
2229+ drivers/drivers.h
2230
2231- drvcfg\DrvcfgStrings.uni
2232- drvcfg\drvcfg.c
2233- drvcfg\drvcfg.h
2234+ drvcfg/DrvcfgStrings.uni
2235+ drvcfg/drvcfg.c
2236+ drvcfg/drvcfg.h
2237
2238- drvdiag\DrvdiagStrings.uni
2239- drvdiag\drvdiag.c
2240- drvdiag\drvdiag.h
2241+ drvdiag/DrvdiagStrings.uni
2242+ drvdiag/drvdiag.c
2243+ drvdiag/drvdiag.h
2244
2bba8d5a 2245
2bba8d5a 2246
2405af19
OM
2247 [sources.ia32]
2248- ver\ia32\ver32.c
2249- Library\ia32\math.c
2250- Library\ia32\initplat.c
2251+ ver/IA32/ver32.c
2252+ Library/IA32/math.c
2253+ Library/IA32/initplat.c
2bba8d5a 2254
2bba8d5a 2255
2405af19
OM
2256 [sources.ipf]
2257- ver\ipf\ver64.c
2258- Library\ipf\math.c
2259- Library\ipf\initplat.c
2260- Library\ipf\palproc.s
2261- Library\ipf\salpal.c
2262+ ver/IPF/ver64.c
2263+ Library/IPF/math.c
2264+ Library/IPF/initplat.c
2265+ Library/IPF/palproc.s
2266+ Library/IPF/salpal.c
2bba8d5a 2267
2405af19
OM
2268 [sources.EBC]
2269- ver\ebc\verEbc.c
2270- Library\EBC\math.c
2271- Library\EBC\initplat.c
2272+ ver/ebc/verEbc.c
2273+ Library/Ebc/math.c
2274+ Library/Ebc/initplat.c
2bba8d5a 2275
2405af19
OM
2276 [sources.x64]
2277- ver\ia32\ver32.c
2278- Library\ipf\math.c
2279- Library\ia32\initplat.c
2280+ ver/IA32/ver32.c
2281+ Library/IPF/math.c
2282+ Library/IA32/initplat.c
c0004f9c 2283+
2405af19
OM
2284+[sources.ARM]
2285+ ver/ia32/ver32.c
2286+ Library/IPF/math.c
2287+ Library/IA32/initplat.c
2bba8d5a 2288+
2405af19
OM
2289+[sources.AARCH64]
2290+ ver/ia32/ver32.c
2291+ Library/IPF/math.c
2292+ Library/IA32/initplat.c
c0004f9c 2293
2405af19
OM
2294 [includes.common]
2295 .
2296- .\Inc
2297- .\ver
2298- .\Library
2299- $(EDK_SOURCE)\Foundation
2300- $(EDK_SOURCE)\Foundation\Include
2301- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2302- $(EDK_SOURCE)\Foundation\Efi
2303- $(EDK_SOURCE)\Foundation\Efi\Include
2304- $(EDK_SOURCE)\Foundation\FrameWork
2305- $(EDK_SOURCE)\Foundation\FrameWork\Include
2306- $(EDK_SOURCE)\Foundation\Core\Dxe
2307+ ./Inc
2308+ ./ver
2309+ ./Library
2310+ $(EDK_SOURCE)/Foundation
2311+ $(EDK_SOURCE)/Foundation/Include
2312+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2313+ $(EDK_SOURCE)/Foundation/Efi
2314+ $(EDK_SOURCE)/Foundation/Efi/Include
2315+ $(EDK_SOURCE)/Foundation/FrameWork
2316+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2317+ $(EDK_SOURCE)/Foundation/Core/Dxe
2318 $(DEST_DIR)
c0004f9c 2319
2405af19
OM
2320 [libraries.common]
2321@@ -216,17 +226,18 @@ COMPONENT_TYPE = APPLICATION
2322 # we will specify some additional DEFINEs on the compile command line.
2323 #
2324 [nmake.common]
2325- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2326 IMAGE_ENTRY_POINT=InitializeShell
2327- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
2328+
2329+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2330+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2331 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2332 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2333+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL
2334+
2335+[nmake.ARM, nmake.AARCH64]
2336+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL
c0004f9c 2337
2405af19
OM
2338 [nmake.ebc]
2339 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL
2340 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2341 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2bba8d5a 2342-
2bba8d5a 2343-
c0004f9c 2344-
2405af19
OM
2345-
2346\ No newline at end of file
2347diff --git a/ShellFull.inf b/ShellFull.inf
2348index 832dc79..48fa7aa 100644
2349--- a/ShellFull.inf
2350+++ b/ShellFull.inf
2351@@ -20,300 +20,310 @@
2352 #--*/
c0004f9c 2353
2405af19
OM
2354 [defines]
2355-BASE_NAME = Shell
2356-FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
2357+BASE_NAME = ShellFull
2358+FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20
2359 COMPONENT_TYPE = APPLICATION
c0004f9c 2360
2405af19
OM
2361 [sources.common]
2362- Library\ShellDebug.c
2363- Library\DPath.c
2364- Library\Init.c
2365- Library\Lock.c
2366- Library\Str.c
2367- Library\IO.c
2368- Library\Mem.c
2369- Library\Misc.c
2370- Library\Data.c
2371- Library\RtData.c
2372- Library\ShellEnvInt.c
2373- Library\Handle.c
2374- Library\FileIO.c
2375- Library\ConsistMapping.c
2376- Library\CRC.c
2377- Library\Event.c
2378- Library\Perf.c
2379- Library\VarCheck.c
2380- Library\HiiSupport.c
2bba8d5a 2381-
2405af19
OM
2382- newshell\NshellStrings.uni
2383- newshell\init.c
2384- newshell\nshell.h
2385- newshell\fakehii.c
2386+ Library/ShellDebug.c
2387+ Library/DPath.c
2388+ Library/Init.c
2389+ Library/Lock.c
2390+ Library/Str.c
2391+ Library/IO.c
2392+ Library/Mem.c
2393+ Library/Misc.c
2394+ Library/Data.c
2395+ Library/RtData.c
2396+ Library/ShellEnvInt.c
2397+ Library/Handle.c
2398+ Library/FileIO.c
2399+ Library/ConsistMapping.c
2400+ Library/CRC.c
2401+ Library/Event.c
2402+ Library/Perf.c
2403+ Library/VarCheck.c
2404+ Library/HiiSupport.c
2bba8d5a 2405+
2405af19
OM
2406+ newshell/NshellStrings.uni
2407+ newshell/init.c
2408+ newshell/nshell.h
2409+ newshell/fakehii.c
2bba8d5a 2410
2405af19
OM
2411 ShCommonStrings.uni
2412- shellenv\ShellenvHelpStrings.uni
2413- shellenv\ShellenvStrings.uni
2414- shellenv\ScriptCmdStrings.uni
2415- shellenv\ConnectStrings.uni
2416- shellenv\EchoStrings.uni
2417- shellenv\HelpStrings.uni
2418- shellenv\MapStrings.uni
2419- shellenv\CdStrings.uni
2420- shellenv\DhStrings.uni
2421+ shellenv/ShellenvHelpStrings.uni
2422+ shellenv/ShellenvStrings.uni
2423+ shellenv/ScriptCmdStrings.uni
2424+ shellenv/ConnectStrings.uni
2425+ shellenv/EchoStrings.uni
2426+ shellenv/HelpStrings.uni
2427+ shellenv/MapStrings.uni
2428+ shellenv/CdStrings.uni
2429+ shellenv/DhStrings.uni
2430
2431- shellenv\cmddisp.c
2432- shellenv\connect.c
2433- shellenv\data.c
2434- shellenv\exec.c
2435- shellenv\init.c
2436- shellenv\protid.c
2437- shellenv\var.c
2438- shellenv\conio.c
2439- shellenv\consoleproxy.c
2440- shellenv\handle.c
2441- shellenv\dprot.c
2442- shellenv\map.c
2443- shellenv\marg.c
2444- shellenv\batch.c
2445- shellenv\if.c
2446- shellenv\goto.c
2447- shellenv\echo.c
2448- shellenv\pause.c
2449- shellenv\for.c
2450- shellenv\wait.c
2451- shellenv\help.c
2452- shellenv\shelle.h
2453- shellenv\shellenvguid.h
2454- shellenv\parsecmd.c
2455- shellenv\shift.c
2456+ shellenv/cmddisp.c
2457+ shellenv/connect.c
2458+ shellenv/data.c
2459+ shellenv/exec.c
2460+ shellenv/init.c
2461+ shellenv/protid.c
2462+ shellenv/var.c
2463+ shellenv/conio.c
2464+ shellenv/consoleproxy.c
2465+ shellenv/handle.c
2466+ shellenv/dprot.c
2467+ shellenv/map.c
2468+ shellenv/marg.c
2469+ shellenv/batch.c
2470+ shellenv/if.c
2471+ shellenv/goto.c
2472+ shellenv/echo.c
2473+ shellenv/pause.c
2474+ shellenv/for.c
2475+ shellenv/wait.c
2476+ shellenv/help.c
2477+ shellenv/shelle.h
2478+ shellenv/shellenvguid.h
2479+ shellenv/parsecmd.c
2480+ shellenv/shift.c
2481
2482- unload\UnloadStrings.uni
2483- unload\unload.c
2484+ unload/UnloadStrings.uni
2485+ unload/unload.c
2486
2487- attrib\AttribStrings.uni
2488- attrib\attrib.c
2489- attrib\attrib.h
2490+ attrib/AttribStrings.uni
2491+ attrib/attrib.c
2492+ attrib/attrib.h
2bba8d5a 2493
2405af19
OM
2494- cls\clsstrings.uni
2495- cls\cls.c
2496+ cls/clsstrings.uni
2497+ cls/cls.c
2bba8d5a 2498
2405af19
OM
2499- cp\CpStrings.uni
2500- cp\cp.h
2501- cp\cp.c
2502+ cp/CpStrings.uni
2503+ cp/cp.h
2504+ cp/cp.c
2505
2506- date\DateStrings.uni
2507- date\date.c
2508- date\date.h
2509+ date/DateStrings.uni
2510+ date/date.c
2511+ date/date.h
2bba8d5a 2512
2405af19
OM
2513- load\LoadStrings.uni
2514- load\load.c
2515- load\load.h
2516+ load/LoadStrings.uni
2517+ load/load.c
2518+ load/load.h
2bba8d5a 2519
2405af19
OM
2520- ls\LsStrings.uni
2521- ls\ls.h
2522- ls\ls.c
2523+ ls/LsStrings.uni
2524+ ls/ls.h
2525+ ls/ls.c
2bba8d5a 2526
2405af19
OM
2527- mkdir\MkdirStrings.uni
2528- mkdir\mkdir.c
2529- mkdir\mkdir.h
2530+ mkdir/MkdirStrings.uni
2531+ mkdir/mkdir.c
2532+ mkdir/mkdir.h
2bba8d5a 2533
2405af19
OM
2534- mv\MvStrings.uni
2535- mv\mv.c
2536- mv\mv.h
2537+ mv/MvStrings.uni
2538+ mv/mv.c
2539+ mv/mv.h
2540
2541- reset\ResetStrings.uni
2542- reset\reset.c
2543- reset\reset.h
2544+ reset/ResetStrings.uni
2545+ reset/reset.c
2546+ reset/reset.h
2547
2548- rm\RmStrings.uni
2549- rm\rm.h
2550- rm\rm.c
2551+ rm/RmStrings.uni
2552+ rm/rm.h
2553+ rm/rm.c
2554
2555- type\TypeStrings.uni
2556- type\type.c
2557- type\type.h
2558- time\TimeStrings.uni
2559- time\time.c
2560- time\time.h
c0004f9c 2561-
2405af19
OM
2562- touch\TouchStrings.uni
2563- touch\touch.c
2564- touch\touch.h
c0004f9c 2565-
2405af19
OM
2566- vol\VolStrings.uni
2567- vol\vol.c
2568- vol\vol.h
2569-
2570- ver\VerStrings.uni
2571- ver\ver.c
2572- ver\ver.h
2573+ type/TypeStrings.uni
2574+ type/type.c
2575+ type/type.h
2576+ time/TimeStrings.uni
2577+ time/time.c
2578+ time/time.h
c0004f9c 2579+
2405af19
OM
2580+ touch/TouchStrings.uni
2581+ touch/touch.c
2582+ touch/touch.h
c0004f9c 2583+
2405af19
OM
2584+ vol/VolStrings.uni
2585+ vol/vol.c
2586+ vol/vol.h
2bba8d5a 2587+
2405af19
OM
2588+ ver/VerStrings.uni
2589+ ver/ver.c
2590+ ver/ver.h
2591
2592- drivers\driversStrings.uni
2593- drivers\drivers.c
2594- drivers\drivers.h
2595+ drivers/driversStrings.uni
2596+ drivers/drivers.c
2597+ drivers/drivers.h
2598
2599- drvcfg\DrvcfgStrings.uni
2600- drvcfg\drvcfg.c
2601- drvcfg\drvcfg.h
2602+ drvcfg/DrvcfgStrings.uni
2603+ drvcfg/drvcfg.c
2604+ drvcfg/drvcfg.h
2605
2606- drvdiag\DrvdiagStrings.uni
2607- drvdiag\drvdiag.c
2608- drvdiag\drvdiag.h
2609+ drvdiag/DrvdiagStrings.uni
2610+ drvdiag/drvdiag.c
2611+ drvdiag/drvdiag.h
2612
2613- comp\CompStrings.uni
2614- comp\comp.c
2615+ comp/CompStrings.uni
2616+ comp/comp.c
2617
2618- dblk\dblkStrings.uni
2619- dblk\dblk.c
2620- dblk\efidump.c
2621+ dblk/dblkStrings.uni
2622+ dblk/dblk.c
2623+ dblk/efidump.c
b00c06f0 2624
2405af19
OM
2625- devices\DevicesStrings.uni
2626- devices\devices.c
2627+ devices/DevicesStrings.uni
2628+ devices/devices.c
2629
2630- devicetree\DevicetreeStrings.uni
2631- devicetree\devicetree.c
2632+ devicetree/DevicetreeStrings.uni
2633+ devicetree/devicetree.c
2634
2635- dmem\MemStrings.uni
2636- dmem\DebugStrings.uni
2637- dmem\mem.c
2638- dmem\MemCommonPart.c
2639- dmem\efidump.c
2640+ dmem/MemStrings.uni
2641+ dmem/DebugStrings.uni
2642+ dmem/mem.c
2643+ dmem/MemCommonPart.c
2644+ dmem/efidump.c
2645
2646- dmpstore\DmpstoreStrings.uni
2647- dmpstore\dmpstore.c
2648+ dmpstore/DmpstoreStrings.uni
2649+ dmpstore/dmpstore.c
2650
2651- edit\EditStrings.uni
2652- edit\main.c
2653- edit\libFileBuffer.c
2654- edit\libEditor.c
2655- edit\libTitleBar.c
2656- edit\libStatusBar.c
2657- edit\libInputBar.c
2658- edit\libMenuBar.c
2659- edit\libMisc.c
2660+ edit/EditStrings.uni
2661+ edit/main.c
2662+ edit/libFileBuffer.c
2663+ edit/libEditor.c
2664+ edit/libTitleBar.c
2665+ edit/libStatusBar.c
2666+ edit/libInputBar.c
2667+ edit/libMenuBar.c
2668+ edit/libMisc.c
2669
2670- eficompress\CompressStrings.uni
2671- eficompress\compressMain.c
2672- eficompress\compress.c
2673+ eficompress/CompressStrings.uni
2674+ eficompress/compressMain.c
2675+ eficompress/compress.c
2676
2677- efidecompress\DecompressStrings.uni
2678- efidecompress\decompress.c
2679+ efidecompress/DecompressStrings.uni
2680+ efidecompress/decompress.c
2681
2682- err\ErrStrings.uni
2683- err\err.c
2684+ err/ErrStrings.uni
2685+ err/err.c
2686
2687- guid\GuidStrings.uni
2688- guid\guid.c
2689+ guid/GuidStrings.uni
2690+ guid/guid.c
2691
2692- hexedit\HexeditStrings.uni
2693- hexedit\main.c
2694- hexedit\libBufferImage.c
2695- hexedit\libFileImage.c
2696- hexedit\libDiskImage.c
2697- hexedit\libMemImage.c
2698- hexedit\libEditor.c
2699- hexedit\libTitleBar.c
2700- hexedit\libStatusBar.c
2701- hexedit\libInputBar.c
2702- hexedit\libMenuBar.c
2703- hexedit\libClipBoard.c
2704- hexedit\libMisc.c
2bba8d5a 2705-
2405af19
OM
2706- IfConfig\IfConfigStrings.uni
2707- IfConfig\IfConfig.c
2708- IfConfig\IfConfig.h
2709- IfConfig\ShellNetHelper.c
2bba8d5a 2710-
2405af19
OM
2711- ipconfig\IpConfigStrings.uni
2712- ipconfig\IpConfig.c
2713+ hexedit/HexeditStrings.uni
2714+ hexedit/main.c
2715+ hexedit/libBufferImage.c
2716+ hexedit/libFileImage.c
2717+ hexedit/libDiskImage.c
2718+ hexedit/libMemImage.c
2719+ hexedit/libEditor.c
2720+ hexedit/libTitleBar.c
2721+ hexedit/libStatusBar.c
2722+ hexedit/libInputBar.c
2723+ hexedit/libMenuBar.c
2724+ hexedit/libClipBoard.c
2725+ hexedit/libMisc.c
2726+
2727+ IfConfig/IfConfigStrings.uni
2728+ IfConfig/IfConfig.c
2729+ IfConfig/IfConfig.h
2730+ IfConfig/ShellNetHelper.c
2731+
2732+ IpConfig/IpConfigStrings.uni
2733+ IpConfig/IpConfig.c
2734
2735- loadpcirom\LoadPciRomStrings.uni
2736- loadpcirom\LoadPciRom.c
2737+ loadpcirom/LoadPciRomStrings.uni
2738+ loadpcirom/LoadPciRom.c
2739
2740- mem\MemStrings.uni
2741- mem\DebugStrings.uni
2742- mem\mm.c
2743- mem\MemCommonPart.c
2744- mem\efidump.c
2745+ mem/MemStrings.uni
2746+ mem/DebugStrings.uni
2747+ mem/mm.c
2748+ mem/MemCommonPart.c
2749+ mem/efidump.c
2750
2751- memmap\memmapStrings.uni
2752- memmap\memmap.c
2753+ memmap/memmapStrings.uni
2754+ memmap/memmap.c
2755
2756- mm\MmStrings.uni
2757- mm\mm.c
2758+ mm/MmStrings.uni
2759+ mm/mm.c
2760
2761- mode\ModeStrings.uni
2762- mode\mode.c
2763+ mode/ModeStrings.uni
2764+ mode/mode.c
2765
2766- mount\MountStrings.uni
2767- mount\mount.c
2768+ mount/MountStrings.uni
2769+ mount/mount.c
2770
2771- openinfo\OPeninfoStrings.uni
2772- openinfo\openinfo.c
2773+ openinfo/OPeninfoStrings.uni
2774+ openinfo/openinfo.c
2bba8d5a 2775
2405af19
OM
2776- Ping\PingStrings.uni
2777- Ping\Ping.c
2778+ Ping/PingStrings.uni
2779+ Ping/Ping.c
2bba8d5a 2780
2405af19
OM
2781- pci\PciStrings.uni
2782- pci\pci.c
2783- pci\pci_class.c
2784+ pci/PciStrings.uni
2785+ pci/pci.c
2786+ pci/pci_class.c
2787
2788- sermode\SermodeStrings.uni
2789- sermode\sermode.c
2790+ sermode/SermodeStrings.uni
2791+ sermode/sermode.c
2792
2793- smbiosview\SmBiosViewStrings.uni
2794- smbiosview\QueryTable.c
2795- smbiosview\EventLogInfo.c
2796- smbiosview\PrintInfo.c
2797- smbiosview\LibSmbiosView.c
2798- smbiosview\smbiosview.c
2799- smbiosview\smbios.c
2800+ smbiosview/SmBiosViewStrings.uni
2801+ smbiosview/QueryTable.c
2802+ smbiosview/EventLogInfo.c
2803+ smbiosview/PrintInfo.c
2804+ smbiosview/LibSmbiosView.c
2805+ smbiosview/smbiosview.c
2806+ smbiosview/smbios.c
2807
2808- stall\stallStrings.uni
2809- stall\stall.c
2810+ stall/stallStrings.uni
2811+ stall/stall.c
2812
2813- telnetmgmt\TelnetMgmtStrings.uni
2814- telnetmgmt\TelnetMgmt.c
2815+ telnetmgmt/TelnetMgmtStrings.uni
2816+ telnetmgmt/TelnetMgmt.c
2817
2818- tzone\TZoneStrings.uni
2819- tzone\tzone.c
2820+ tzone/TZoneStrings.uni
2821+ tzone/tzone.c
2bba8d5a 2822
2405af19
OM
2823 [sources.ia32]
2824- ver\ia32\ver32.c
2825- Library\ia32\math.c
2826- Library\ia32\initplat.c
2827+ ver/IA32/ver32.c
2828+ Library/IA32/math.c
2829+ Library/IA32/initplat.c
2bba8d5a 2830
2405af19
OM
2831 [sources.ipf]
2832- ver\ipf\ver64.c
2833- Library\ipf\math.c
2834- Library\ipf\initplat.c
2835- Library\ipf\palproc.s
2836- Library\ipf\salpal.c
2837+ ver/IPF/ver64.c
2838+ Library/IPF/math.c
2839+ Library/IPF/initplat.c
2840+ Library/IPF/palproc.s
2841+ Library/IPF/salpal.c
2bba8d5a 2842
2405af19
OM
2843 [sources.EBC]
2844- ver\ebc\verEbc.c
2845- Library\EBC\math.c
2846- Library\EBC\initplat.c
2847+ ver/ebc/verEbc.c
2848+ Library/Ebc/math.c
2849+ Library/Ebc/initplat.c
2bba8d5a 2850
2405af19
OM
2851 [sources.x64]
2852- ver\ia32\ver32.c
2853- Library\ipf\math.c
2854- Library\ia32\initplat.c
2855+ ver/IA32/ver32.c
2856+ Library/IPF/math.c
2857+ Library/IA32/initplat.c
2858+
2859+[sources.ARM]
2860+ ver/ia32/ver32.c
2861+ Library/IPF/math.c
2862+ Library/IA32/initplat.c
2863+
2864+[sources.AARCH64]
2865+ ver/ia32/ver32.c
2866+ Library/IPF/math.c
2867+ Library/IA32/initplat.c
2bba8d5a 2868
2405af19
OM
2869 [includes.common]
2870 .
2871- .\Inc
2872- .\ver
2873- .\Library
2874- $(EDK_SOURCE)\Foundation
2875- $(EDK_SOURCE)\Foundation\Include
2876- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2877- $(EDK_SOURCE)\Foundation\Efi
2878- $(EDK_SOURCE)\Foundation\Efi\Include
2879- $(EDK_SOURCE)\Foundation\FrameWork
2880- $(EDK_SOURCE)\Foundation\FrameWork\Include
2881- $(EDK_SOURCE)\Foundation\Core\Dxe
2882- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2883+ ./Inc
2884+ ./ver
2885+ ./Library
2886+ $(EDK_SOURCE)/Foundation
2887+ $(EDK_SOURCE)/Foundation/Include
2888+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2889+ $(EDK_SOURCE)/Foundation/Efi
2890+ $(EDK_SOURCE)/Foundation/Efi/Include
2891+ $(EDK_SOURCE)/Foundation/FrameWork
2892+ $(EDK_SOURCE)/Foundation/FrameWork/Include
2893+ $(EDK_SOURCE)/Foundation/Core/Dxe
2894+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2895 $(DEST_DIR)
2bba8d5a 2896
2405af19
OM
2897 [libraries.common]
2898@@ -341,16 +351,18 @@ COMPONENT_TYPE = APPLICATION
2899 # we will specify some additional DEFINEs on the compile command line.
2900 #
2901 [nmake.common]
2902- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2903 IMAGE_ENTRY_POINT=InitializeShell
2904- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
2905+
2906+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2907+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
2908 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2909 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2910+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
2911+
2912+[nmake.ARM, nmake.AARCH64]
2913+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_MONOSHELL -DEFI_FULLSHELL
2bba8d5a 2914
2405af19
OM
2915 [nmake.ebc]
2916 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DEFI_MONOSHELL /DEFI_FULLSHELL
2917 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
2918 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2919-
2920-
2921-
2922\ No newline at end of file
2923diff --git a/SmbiosView/EventLogInfo.c b/SmbiosView/EventLogInfo.c
2924index 7f9b726..33e3549 100644
2925--- a/SmbiosView/EventLogInfo.c
2926+++ b/SmbiosView/EventLogInfo.c
2927@@ -25,7 +25,7 @@ Revision History
2928 #include "PrintInfo.h"
2929 #include "QueryTable.h"
2930 #include "EventLogInfo.h"
2931-#include "smbios.h"
2932+#include "Smbios.h"
2933 #include STRING_DEFINES_FILE
2bba8d5a 2934
2405af19
OM
2935 VOID
2936diff --git a/SmbiosView/EventLogInfo.h b/SmbiosView/EventLogInfo.h
2937index d1591c0..ca58380 100644
2938--- a/SmbiosView/EventLogInfo.h
2939+++ b/SmbiosView/EventLogInfo.h
2940@@ -85,3 +85,4 @@ DisplaySysEventLogData (
2941 );
2bba8d5a 2942
2405af19
OM
2943 #endif
2944+
2945diff --git a/SmbiosView/LibSmbios.h b/SmbiosView/LibSmbios.h
2946index b13fd6b..c2e6b5e 100644
2947--- a/SmbiosView/LibSmbios.h
2948+++ b/SmbiosView/LibSmbios.h
2949@@ -642,3 +642,4 @@ LibGetSmbiosSystemGuidAndSerialNumber (
2bba8d5a 2950
2bba8d5a 2951
2405af19
OM
2952 #endif
2953+
2954diff --git a/SmbiosView/LibSmbiosView.c b/SmbiosView/LibSmbiosView.c
2955index d31ed01..f1438bc 100644
2956--- a/SmbiosView/LibSmbiosView.c
2957+++ b/SmbiosView/LibSmbiosView.c
2958@@ -22,10 +22,10 @@ Revision History
2959 --*/
2bba8d5a 2960
2405af19
OM
2961 #include "EfiShellLib.h"
2962-#include "LIbSmbios.h"
2963+#include "LibSmbios.h"
2964 #include "LibSmbiosView.h"
2965 #include "smbiosview.h"
2966-#include "smbios.h"
2967+#include "Smbios.h"
2968 #include STRING_DEFINES_FILE
2bba8d5a 2969
2405af19
OM
2970 STATIC UINT8 mInit = 0;
2971@@ -62,7 +62,7 @@ Returns:
2bba8d5a 2972 //
2405af19
OM
2973 // Get SMBIOS table from System Configure table
2974 //
2975- Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
2976+ Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
2bba8d5a 2977
2405af19
OM
2978 if (mSmbiosTable == NULL) {
2979 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
2980@@ -110,13 +110,13 @@ LibSmbiosGetEPS (
2bba8d5a 2981
2405af19
OM
2982 VOID
2983 LibSmbiosGetStructHead (
2984- SMBIOS_STRUCTURE_POINTER *pHead
2985+ SMBIOS_STRUCTURE_POINTER **pHead
2986 )
2987 {
2988 //
2989 // return SMBIOS structure table address
2990 //
2991- pHead = mSmbiosStruct;
2992+ *pHead = mSmbiosStruct;
2993 }
2bba8d5a
OM
2994
2995 EFI_STATUS
2405af19
OM
2996diff --git a/SmbiosView/LibSmbiosView.h b/SmbiosView/LibSmbiosView.h
2997index d763937..b7f7989 100644
2998--- a/SmbiosView/LibSmbiosView.h
2999+++ b/SmbiosView/LibSmbiosView.h
3000@@ -66,7 +66,7 @@ LibSmbiosGetEPS (
3001
3002 VOID
3003 LibSmbiosGetStructHead (
3004- SMBIOS_STRUCTURE_POINTER *pHead
3005+ SMBIOS_STRUCTURE_POINTER **pHead
3006 );
3007
3008 EFI_STATUS
3009@@ -128,3 +128,4 @@ SmbiosCheckStructure (
2bba8d5a
OM
3010 );
3011
3012 #endif
3013+
2405af19
OM
3014diff --git a/SmbiosView/PrintInfo.c b/SmbiosView/PrintInfo.c
3015index ff1f63c..1789ef6 100644
3016--- a/SmbiosView/PrintInfo.c
3017+++ b/SmbiosView/PrintInfo.c
3018@@ -26,7 +26,7 @@ Revision History
3019 #include "LibSmbiosView.h"
3020 #include "QueryTable.h"
3021 #include "EventLogInfo.h"
3022-#include "smbios.h"
3023+#include "Smbios.h"
3024 #include STRING_DEFINES_FILE
2bba8d5a 3025
2405af19
OM
3026 //
3027diff --git a/SmbiosView/PrintInfo.h b/SmbiosView/PrintInfo.h
3028index 608dfb1..10faf21 100644
3029--- a/SmbiosView/PrintInfo.h
3030+++ b/SmbiosView/PrintInfo.h
3031@@ -199,3 +199,4 @@ DisplaySPSCharacteristics (
2bba8d5a
OM
3032 );
3033
3034 #endif
3035+
2405af19
OM
3036diff --git a/SmbiosView/QueryTable.c b/SmbiosView/QueryTable.c
3037index 4570938..1d9d60f 100644
3038--- a/SmbiosView/QueryTable.c
3039+++ b/SmbiosView/QueryTable.c
3040@@ -23,7 +23,7 @@ Revision History
3041 #include "EfiShellLib.h"
3042 #include "QueryTable.h"
3043 #include "PrintInfo.h"
3044-#include "smbios.h"
3045+#include "Smbios.h"
3046
3047 #include STRING_DEFINES_FILE
3048
3049diff --git a/SmbiosView/QueryTable.h b/SmbiosView/QueryTable.h
3050index 727a053..ceb02fe 100644
3051--- a/SmbiosView/QueryTable.h
3052+++ b/SmbiosView/QueryTable.h
3053@@ -437,3 +437,4 @@ DisplayIPMIDIBMCInterfaceType (
2bba8d5a
OM
3054 );
3055
3056 #endif
3057+
2405af19
OM
3058diff --git a/SmbiosView/Smbios.h b/SmbiosView/Smbios.h
3059index 8a91b9e..15eb89c 100644
3060--- a/SmbiosView/Smbios.h
3061+++ b/SmbiosView/Smbios.h
3062@@ -37,3 +37,4 @@ extern EFI_HII_HANDLE HiiHandle;
3063
2bba8d5a
OM
3064
3065 #endif
3066+
2405af19
OM
3067diff --git a/SmbiosView/Smbiosview.inf b/SmbiosView/Smbiosview.inf
3068index f9e8c0b..d35b669 100644
3069--- a/SmbiosView/Smbiosview.inf
3070+++ b/SmbiosView/Smbiosview.inf
3071@@ -25,7 +25,7 @@ FILE_GUID = 0F4C0280-B581-4940-AF19-D0CB5559CC95
3072 COMPONENT_TYPE = APPLICATION
2bba8d5a 3073
2405af19
OM
3074 [sources.common]
3075- ..\ShCommonStrings.uni
3076+ ../ShCommonStrings.uni
3077 SmBiosViewStrings.uni
3078 QueryTable.c
3079 QueryTable.h
3080@@ -43,19 +43,19 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a 3081
2405af19
OM
3082 [includes.common]
3083 .
3084- ..\Inc
3085- ..\Library
3086- $(EDK_SOURCE)\Foundation
3087- $(EDK_SOURCE)\Foundation\Include
3088- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3089- $(EDK_SOURCE)\Foundation\Efi
3090- $(EDK_SOURCE)\Foundation\Efi\Include
3091- $(EDK_SOURCE)\Foundation\FrameWork
3092- $(EDK_SOURCE)\Foundation\FrameWork\Include
3093- $(EDK_SOURCE)\Foundation\Core\Dxe
3094- $(DEST_DIR)\
3095- $(EFI_SOURCE)\Application\Shell\Inc
3096- $(EFI_SOURCE)\Application\Shell\Library
3097+ ../Inc
3098+ ../Library
3099+ $(EDK_SOURCE)/Foundation
3100+ $(EDK_SOURCE)/Foundation/Include
3101+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3102+ $(EDK_SOURCE)/Foundation/Efi
3103+ $(EDK_SOURCE)/Foundation/Efi/Include
3104+ $(EDK_SOURCE)/Foundation/FrameWork
3105+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3106+ $(EDK_SOURCE)/Foundation/Core/Dxe
3107+ $(DEST_DIR./
3108+ $(EFI_SOURCE)/Applicatio./Shels/Inc
3109+ $(EFI_SOURCE)/Applicatio./Shels/Library
2bba8d5a 3110
2405af19
OM
3111 [libraries.common]
3112 EfiShellLib
3113@@ -70,7 +70,12 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a 3114
2405af19
OM
3115 [nmake.common]
3116 IMAGE_ENTRY_POINT=InitializeSmbiosViewApplication
3117+
3118+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3119 L_PROJ_FLAGS=/align:4096
3120 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3121 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3122 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3123+
3124+[nmake.ARM, nmake.AARCH64]
3125+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3126diff --git a/SmbiosView/smbiosview.c b/SmbiosView/smbiosview.c
3127index 13b4fb7..79716d3 100644
3128--- a/SmbiosView/smbiosview.c
3129+++ b/SmbiosView/smbiosview.c
3130@@ -26,7 +26,7 @@ Revision History
3131 #include "smbiosview.h"
3132 #include "PrintInfo.h"
3133 #include "QueryTable.h"
3134-#include "smbios.h"
3135+#include "Smbios.h"
2bba8d5a 3136
2405af19 3137 extern UINT8 STRING_ARRAY_NAME[];
2bba8d5a 3138
2405af19
OM
3139@@ -88,7 +88,7 @@ SHELL_VAR_CHECK_ITEM SmbiosviewCheckList[] = {
3140 NULL,
3141 0,
3142 0,
3143- 0
3144+ (SHELL_VAR_CHECK_FLAG_TYPE)0
2bba8d5a 3145 }
2405af19 3146 };
2bba8d5a 3147
2405af19
OM
3148diff --git a/SmbiosView/smbiosview.h b/SmbiosView/smbiosview.h
3149index dd65bc1..2101551 100644
3150--- a/SmbiosView/smbiosview.h
3151+++ b/SmbiosView/smbiosview.h
3152@@ -84,3 +84,4 @@ GetShowTypeString (
3153 extern UINT8 gShowType;
3154
3155 #endif
3156+
3157diff --git a/TelnetMgmt/TelnetMgmt.c b/TelnetMgmt/TelnetMgmt.c
3158index 9d779df..04088d1 100644
3159--- a/TelnetMgmt/TelnetMgmt.c
3160+++ b/TelnetMgmt/TelnetMgmt.c
3161@@ -32,7 +32,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3162 //
3163 #include STRING_DEFINES_FILE
3164
3165-EFI_HII_HANDLE HiiHandle;
3166+STATIC EFI_HII_HANDLE HiiHandle;
3167 EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID;
3168 EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID;
3169 SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
3170@@ -58,7 +58,7 @@ SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
3171 NULL,
3172 0,
3173 0,
3174- 0
3175+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3176 }
3177 };
2bba8d5a 3178
2405af19
OM
3179diff --git a/TelnetMgmt/TelnetMgmt.h b/TelnetMgmt/TelnetMgmt.h
3180index 224fc3b..ed3c2f2 100644
3181--- a/TelnetMgmt/TelnetMgmt.h
3182+++ b/TelnetMgmt/TelnetMgmt.h
3183@@ -29,4 +29,4 @@ Revision History
3184 0x55d41b9a, 0x954d, 0x4fbb, 0x8d, 0x6d, 0x24, 0x75, 0xf5, 0x30, 0x9d, 0x37 \
2bba8d5a 3185 }
2bba8d5a 3186
2405af19
OM
3187-#endif
3188\ No newline at end of file
3189+#endif
3190diff --git a/TelnetMgmt/TelnetMgmt.inf b/TelnetMgmt/TelnetMgmt.inf
3191index ad8b8bd..d2d9edb 100644
3192--- a/TelnetMgmt/TelnetMgmt.inf
3193+++ b/TelnetMgmt/TelnetMgmt.inf
3194@@ -25,23 +25,23 @@ FILE_GUID = 0C6282F4-F575-469d-BD55-7693AAC9D812
2bba8d5a
OM
3195 COMPONENT_TYPE = APPLICATION
3196
3197 [sources.common]
3198- ..\ShCommonStrings.uni
3199+ ../ShCommonStrings.uni
2405af19
OM
3200 TelnetMgmtStrings.uni
3201 TelnetMgmt.c
2bba8d5a
OM
3202
3203 [includes.common]
2405af19 3204 .
2bba8d5a
OM
3205- ..\Inc
3206- ..\Library
2bba8d5a 3207- $(EDK_SOURCE)\Foundation
2bba8d5a
OM
3208- $(EDK_SOURCE)\Foundation\Include
3209- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2405af19
OM
3210- $(EDK_SOURCE)\Foundation\Efi
3211- $(EDK_SOURCE)\Foundation\Efi\Include
2bba8d5a
OM
3212- $(EDK_SOURCE)\Foundation\FrameWork
3213- $(EDK_SOURCE)\Foundation\FrameWork\Include
3214- $(EDK_SOURCE)\Foundation\Core\Dxe
2bba8d5a
OM
3215- $(DEST_DIR)\
3216+ ../Inc
3217+ ../Library
2bba8d5a 3218+ $(EDK_SOURCE)/Foundation
2bba8d5a
OM
3219+ $(EDK_SOURCE)/Foundation/Include
3220+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2405af19
OM
3221+ $(EDK_SOURCE)/Foundation/Efi
3222+ $(EDK_SOURCE)/Foundation/Efi/Include
2bba8d5a
OM
3223+ $(EDK_SOURCE)/Foundation/FrameWork
3224+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3225+ $(EDK_SOURCE)/Foundation/Core/Dxe
2bba8d5a
OM
3226+ $(DEST_DIR./
3227
3228 [libraries.common]
3229 EfiShellLib
2405af19 3230@@ -55,6 +55,11 @@ COMPONENT_TYPE = APPLICATION
b00c06f0
OM
3231
3232 [nmake.common]
2405af19 3233 IMAGE_ENTRY_POINT=InitializeTelnetMgmt
b00c06f0
OM
3234+
3235+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3236 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3237 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2405af19
OM
3238 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3239+
b00c06f0
OM
3240+[nmake.ARM, nmake.AARCH64]
3241+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3242diff --git a/TelnetMgmt/TelnetServer.h b/TelnetMgmt/TelnetServer.h
3243index 5eca179..8e0610f 100644
3244--- a/TelnetMgmt/TelnetServer.h
3245+++ b/TelnetMgmt/TelnetServer.h
3246@@ -81,3 +81,4 @@ typedef struct _EFI_TELNET_SERVER_PROTOCOL {
3247 extern EFI_GUID gEfiTelnetServerGuid;
2bba8d5a 3248
2405af19
OM
3249 #endif
3250+
3251diff --git a/attrib/attrib.c b/attrib/attrib.c
3252index 3599d6d..6d1e677 100644
3253--- a/attrib/attrib.c
3254+++ b/attrib/attrib.c
3255@@ -57,7 +57,7 @@ AttribFile (
3256 //
3257 // Global Variables
3258 //
2bba8d5a
OM
3259-EFI_HII_HANDLE HiiHandle;
3260+STATIC EFI_HII_HANDLE HiiHandle;
2405af19
OM
3261 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
3262 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
3263 {
3264@@ -124,7 +124,7 @@ SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
2bba8d5a
OM
3265 NULL,
3266 0,
3267 0,
3268- 0
3269+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3270 }
3271 };
3272
2405af19
OM
3273@@ -438,7 +438,7 @@ Returns:
3274 //
3275 Info = Arg->Info;
3276 if (Add || Remove) {
3277- Info->Attribute = Info->Attribute & (~Remove) | Add;
3278+ Info->Attribute = (Info->Attribute & (~Remove)) | Add;
3279 Status = Arg->Handle->SetInfo (
3280 Arg->Handle,
3281 &gEfiFileInfoGuid,
3282diff --git a/attrib/attrib.h b/attrib/attrib.h
3283index 69ebd2f..c40c2df 100644
3284--- a/attrib/attrib.h
3285+++ b/attrib/attrib.h
3286@@ -29,4 +29,5 @@ Revision History
3287 0xcd691c77, 0xfc45, 0x4d7b, 0xb8, 0x92, 0x92, 0xa, 0x86, 0x2d, 0x67, 0xdc \
2bba8d5a
OM
3288 }
3289
2405af19
OM
3290-#endif
3291\ No newline at end of file
3292+#endif
2bba8d5a 3293+
2405af19
OM
3294diff --git a/attrib/attrib.inf b/attrib/attrib.inf
3295index 38cc094..a35f1a7 100644
3296--- a/attrib/attrib.inf
3297+++ b/attrib/attrib.inf
3298@@ -41,24 +41,24 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a
OM
3299
3300 [sources.common]
2405af19 3301 AttribStrings.uni
2bba8d5a
OM
3302- ..\ShCommonStrings.uni
3303+ ../ShCommonStrings.uni
2405af19
OM
3304 attrib.c
3305 attrib.h
3306
3307
2bba8d5a
OM
3308 [includes.common]
3309 .
3310- ..\Inc
3311- ..\Library
3312- $(EDK_SOURCE)\Foundation
3313- $(EDK_SOURCE)\Foundation\Include
3314- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3315- $(EDK_SOURCE)\Foundation\Efi
3316- $(EDK_SOURCE)\Foundation\Efi\Include
3317- $(EDK_SOURCE)\Foundation\FrameWork
3318- $(EDK_SOURCE)\Foundation\FrameWork\Include
3319- $(EDK_SOURCE)\Foundation\Core\Dxe
3320- $(DEST_DIR)\
3321+ ../Inc
3322+ ../Library
3323+ $(EDK_SOURCE)/Foundation
3324+ $(EDK_SOURCE)/Foundation/Include
3325+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3326+ $(EDK_SOURCE)/Foundation/Efi
3327+ $(EDK_SOURCE)/Foundation/Efi/Include
3328+ $(EDK_SOURCE)/Foundation/FrameWork
3329+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3330+ $(EDK_SOURCE)/Foundation/Core/Dxe
3331+ $(DEST_DIR./
3332
3333 [libraries.common]
3334 EfiShellLib
2405af19 3335@@ -73,7 +73,11 @@ COMPONENT_TYPE = APPLICATION
b00c06f0
OM
3336
3337 [nmake.common]
2405af19 3338 IMAGE_ENTRY_POINT=InitializeAttrib
b00c06f0
OM
3339+
3340+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3341 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3342 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3343 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3344
3345+[nmake.ARM, nmake.AARCH64]
3346+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3347diff --git a/cls/cls.c b/cls/cls.c
3348index 572cc82..bd9826a 100644
3349--- a/cls/cls.c
3350+++ b/cls/cls.c
3351@@ -30,7 +30,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2bba8d5a 3352 //
2405af19
OM
3353 #include STRING_DEFINES_FILE
3354
2bba8d5a
OM
3355-EFI_HII_HANDLE HiiHandle;
3356+STATIC EFI_HII_HANDLE HiiHandle;
2405af19
OM
3357 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
3358 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
2bba8d5a 3359 {
2405af19 3360@@ -49,7 +49,7 @@ SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
2bba8d5a
OM
3361 NULL,
3362 0,
3363 0,
3364- 0
3365+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3366 }
3367 };
3368
2405af19
OM
3369diff --git a/cls/cls.h b/cls/cls.h
3370index eab21eb..31361c7 100644
3371--- a/cls/cls.h
3372+++ b/cls/cls.h
3373@@ -36,3 +36,4 @@ Revision History
2bba8d5a
OM
3374 }
3375
3376 #endif
3377+
2405af19
OM
3378diff --git a/cls/cls.inf b/cls/cls.inf
3379index 1e5ef66..70e676a 100644
3380--- a/cls/cls.inf
3381+++ b/cls/cls.inf
3382@@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a
OM
3383
3384
3385 [sources.common]
2405af19
OM
3386- ..\ShCommonStrings.uni
3387+ ../ShCommonStrings.uni
3388 ClsStrings.uni
3389 Cls.c
3390 Cls.h
3391
2bba8d5a
OM
3392 [includes.common]
3393 .
3394- ..\Inc
3395- ..\Library
3396- $(EDK_SOURCE)\Foundation
3397- $(EDK_SOURCE)\Foundation\Include
3398- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3399- $(EDK_SOURCE)\Foundation\Efi
3400- $(EDK_SOURCE)\Foundation\Efi\Include
3401- $(EDK_SOURCE)\Foundation\FrameWork
3402- $(EDK_SOURCE)\Foundation\FrameWork\Include
3403- $(EDK_SOURCE)\Foundation\Core\Dxe
3404- $(DEST_DIR)\
3405+ ../Inc
3406+ ../Library
3407+ $(EDK_SOURCE)/Foundation
3408+ $(EDK_SOURCE)/Foundation/Include
3409+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3410+ $(EDK_SOURCE)/Foundation/Efi
3411+ $(EDK_SOURCE)/Foundation/Efi/Include
3412+ $(EDK_SOURCE)/Foundation/FrameWork
3413+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3414+ $(EDK_SOURCE)/Foundation/Core/Dxe
3415+ $(DEST_DIR./
3416
3417 [libraries.common]
3418 EfiShellLib
2405af19 3419@@ -72,7 +72,12 @@ COMPONENT_TYPE = APPLICATION
b00c06f0
OM
3420
3421 [nmake.common]
2405af19 3422 IMAGE_ENTRY_POINT=InitializeCls
b00c06f0
OM
3423+
3424+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3425 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3426 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3427 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3428
3429+[nmake.ARM, nmake.AARCH64]
3430+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3431+
3432diff --git a/comp/comp.c b/comp/comp.c
3433index 734bbe7..888f53f 100644
3434--- a/comp/comp.c
3435+++ b/comp/comp.c
3436@@ -50,7 +50,7 @@ SHELL_VAR_CHECK_ITEM CompCheckList[] = {
3437 NULL,
3438 0,
3439 0,
3440- 0
3441+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3442 }
3443 };
2bba8d5a 3444
2405af19
OM
3445diff --git a/comp/comp.h b/comp/comp.h
3446index 4dd667c..4d6c647 100644
3447--- a/comp/comp.h
3448+++ b/comp/comp.h
3449@@ -29,4 +29,4 @@ Revision History
3450 0x7761e2c2, 0x7297, 0x434d, 0xb6, 0x52, 0xa9, 0x76, 0x91, 0xb8, 0x66, 0xf3 \
3451 }
3452
3453-#endif
3454\ No newline at end of file
3455+#endif
3456diff --git a/comp/comp.inf b/comp/comp.inf
3457index 7a525e4..86c464d 100644
3458--- a/comp/comp.inf
3459+++ b/comp/comp.inf
3460@@ -28,21 +28,21 @@ COMPONENT_TYPE = APPLICATION
3461 CompStrings.uni
3462 comp.c
3463 comp.h
3464-..\ShCommonStrings.uni
3465+../ShCommonStrings.uni
3466
2bba8d5a
OM
3467 [includes.common]
3468 .
3469- ..\Inc
3470- ..\Library
3471- $(EDK_SOURCE)\Foundation
3472- $(EDK_SOURCE)\Foundation\Include
3473- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3474- $(EDK_SOURCE)\Foundation\Efi
3475- $(EDK_SOURCE)\Foundation\Efi\Include
3476- $(EDK_SOURCE)\Foundation\FrameWork
3477- $(EDK_SOURCE)\Foundation\FrameWork\Include
3478- $(EDK_SOURCE)\Foundation\Core\Dxe
3479- $(DEST_DIR)\
3480+ ../Inc
3481+ ../Library
3482+ $(EDK_SOURCE)/Foundation
3483+ $(EDK_SOURCE)/Foundation/Include
3484+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3485+ $(EDK_SOURCE)/Foundation/Efi
3486+ $(EDK_SOURCE)/Foundation/Efi/Include
3487+ $(EDK_SOURCE)/Foundation/FrameWork
3488+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3489+ $(EDK_SOURCE)/Foundation/Core/Dxe
3490+ $(DEST_DIR./
3491
3492 [libraries.common]
3493 EfiShellLib
2405af19
OM
3494@@ -61,11 +61,16 @@ comp.h
3495 # we will specify some additional DEFINEs on the compile command line.
3496 #
b00c06f0 3497 [nmake.common]
2405af19
OM
3498- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3499 IMAGE_ENTRY_POINT=InitializeComp
b00c06f0
OM
3500+
3501+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
2405af19 3502+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
b00c06f0
OM
3503 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3504 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3505 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3506
3507+[nmake.ARM, nmake.AARCH64]
3508+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3509+
3510
3511
3512\ No newline at end of file
3513diff --git a/cp/cp.c b/cp/cp.c
3514index 25ac3cf..9299af4 100644
3515--- a/cp/cp.c
3516+++ b/cp/cp.c
3517@@ -66,7 +66,7 @@ SHELL_VAR_CHECK_ITEM CpCheckList[] = {
2bba8d5a
OM
3518 NULL,
3519 0,
3520 0,
3521- 0
3522+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3523 }
3524 };
3525
2405af19
OM
3526@@ -578,7 +578,7 @@ Returns:
3527 //
3528 if (SrcArg->Status == EFI_SUCCESS &&
3529 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
3530- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
3531+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))
3532 ) {
3533 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
3534 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
3535@@ -592,7 +592,7 @@ Returns:
3536 // we need to compose a full name of dir\file for the source
3537 //
3538 if (SrcArg->Status == EFI_SUCCESS &&
3539- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
3540+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) {
3541 if (DstFullName) {
3542 FreePool (DstFullName);
3543 }
3544@@ -869,7 +869,6 @@ Returns:
3545 EFI_STATUS Status;
3546 EFI_FILE_INFO *SrcInfo;
3547 EFI_FILE_INFO *DstInfo;
3548- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *DstVol;
3549 EFI_FILE_SYSTEM_INFO *DstFsInfo;
3550 CHAR16 InputString[10];
3551 UINTN BufSize;
3552@@ -894,7 +893,6 @@ Returns:
3553 SrcInfo = NULL;
3554 DstInfo = NULL;
3555 FileInfo = NULL;
3556- DstVol = NULL;
3557 DstFsInfo = NULL;
3558 InputString[0] = 0;
3559 BufSize = 0;
3560@@ -1789,7 +1787,7 @@ Returns:
3561 //
3562 if (SrcArg->Status == EFI_SUCCESS &&
3563 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
3564- (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
3565+ (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle)))
3566 ) {
3567 if (DstFullName) {
3568 FreePool (DstFullName);
3569diff --git a/cp/cp.h b/cp/cp.h
3570index 338cdaa..89d22dd 100644
3571--- a/cp/cp.h
3572+++ b/cp/cp.h
3573@@ -67,4 +67,5 @@ CPMainProcOld (
3574 IN EFI_SYSTEM_TABLE *SystemTable
3575 );
2bba8d5a
OM
3576
3577-#endif
3578\ No newline at end of file
3579+#endif
3580+
2405af19
OM
3581diff --git a/cp/cp.inf b/cp/cp.inf
3582index 714c7bb..160434c 100644
3583--- a/cp/cp.inf
3584+++ b/cp/cp.inf
3585@@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a
OM
3586
3587 [sources.common]
2405af19 3588 CpStrings.uni
2bba8d5a
OM
3589- ..\ShCommonStrings.uni
3590+ ../ShCommonStrings.uni
2405af19
OM
3591 cp.h
3592 cp.c
3593
2bba8d5a
OM
3594 [includes.common]
3595 .
3596- ..\Inc
3597- ..\Library
3598- $(EDK_SOURCE)\Foundation
3599- $(EDK_SOURCE)\Foundation\Include
3600- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3601- $(EDK_SOURCE)\Foundation\Efi
3602- $(EDK_SOURCE)\Foundation\Efi\Include
3603- $(EDK_SOURCE)\Foundation\FrameWork
3604- $(EDK_SOURCE)\Foundation\FrameWork\Include
3605- $(EDK_SOURCE)\Foundation\Core\Dxe
3606- $(DEST_DIR)\
3607+ ../Inc
3608+ ../Library
3609+ $(EDK_SOURCE)/Foundation
3610+ $(EDK_SOURCE)/Foundation/Include
3611+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3612+ $(EDK_SOURCE)/Foundation/Efi
3613+ $(EDK_SOURCE)/Foundation/Efi/Include
3614+ $(EDK_SOURCE)/Foundation/FrameWork
3615+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3616+ $(EDK_SOURCE)/Foundation/Core/Dxe
3617+ $(DEST_DIR./
3618
3619 [libraries.common]
3620 EfiShellLib
2405af19 3621@@ -72,7 +72,12 @@ COMPONENT_TYPE = APPLICATION
b00c06f0
OM
3622
3623 [nmake.common]
2405af19 3624 IMAGE_ENTRY_POINT=InitializeCP
b00c06f0
OM
3625+
3626+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3627 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3628 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3629 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3630
3631+[nmake.ARM, nmake.AARCH64]
3632+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3633+
3634diff --git a/date/date.c b/date/date.c
3635index fb2f765..0416abe 100644
3636--- a/date/date.c
3637+++ b/date/date.c
3638@@ -53,8 +53,8 @@ STATIC
3639 BOOLEAN
3640 GetNumber (
3641 IN CHAR16 *Str,
3642- IN OUT INTN *Position,
3643- IN OUT INTN *Number,
3644+ IN OUT UINTN *Position,
3645+ IN OUT UINTN *Number,
3646 IN BOOLEAN EndNum
2bba8d5a
OM
3647 );
3648
2405af19 3649@@ -92,7 +92,7 @@ SHELL_VAR_CHECK_ITEM DateCheckList[] = {
2bba8d5a
OM
3650 NULL,
3651 0,
3652 0,
3653- 0
3654+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3655 }
3656 };
3657
2405af19
OM
3658@@ -330,8 +330,8 @@ STATIC
3659 BOOLEAN
3660 GetNumber (
3661 IN CHAR16 *Str,
3662- IN OUT INTN *Position,
3663- IN OUT INTN *Number,
3664+ IN OUT UINTN *Position,
3665+ IN OUT UINTN *Number,
3666 IN BOOLEAN EndNum
3667 )
3668 {
3669diff --git a/date/date.h b/date/date.h
3670index c95ac4d..d327c33 100644
3671--- a/date/date.h
3672+++ b/date/date.h
3673@@ -32,3 +32,4 @@ Revision History
2bba8d5a
OM
3674 }
3675
3676 #endif
3677+
2405af19
OM
3678diff --git a/date/date.inf b/date/date.inf
3679index 2c40f72..affbb73 100644
3680--- a/date/date.inf
3681+++ b/date/date.inf
3682@@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
2bba8d5a
OM
3683
3684
3685 [sources.common]
2405af19
OM
3686- ..\ShCommonStrings.uni
3687+ ../ShCommonStrings.uni
3688 DateStrings.uni
3689 Date.c
3690 Date.h
3691
2bba8d5a
OM
3692 [includes.common]
3693 .
3694- ..\Inc
3695- ..\Library
3696- $(EDK_SOURCE)\Foundation
3697- $(EDK_SOURCE)\Foundation\Include
3698- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3699- $(EDK_SOURCE)\Foundation\Efi
3700- $(EDK_SOURCE)\Foundation\Efi\Include
3701- $(EDK_SOURCE)\Foundation\FrameWork
3702- $(EDK_SOURCE)\Foundation\FrameWork\Include
3703- $(EDK_SOURCE)\Foundation\Core\Dxe
3704- $(DEST_DIR)\
3705+ ../Inc
3706+ ../Library
3707+ $(EDK_SOURCE)/Foundation
3708+ $(EDK_SOURCE)/Foundation/Include
3709+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3710+ $(EDK_SOURCE)/Foundation/Efi
3711+ $(EDK_SOURCE)/Foundation/Efi/Include
3712+ $(EDK_SOURCE)/Foundation/FrameWork
3713+ $(EDK_SOURCE)/Foundation/FrameWork/Include
3714+ $(EDK_SOURCE)/Foundation/Core/Dxe
3715+ $(DEST_DIR./
3716
3717 [libraries.common]
3718 EfiShellLib
2405af19 3719@@ -71,7 +71,12 @@ COMPONENT_TYPE = APPLICATION
b00c06f0
OM
3720
3721 [nmake.common]
2405af19 3722 IMAGE_ENTRY_POINT=InitializeDate
b00c06f0
OM
3723+
3724+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3725 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3726 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3727 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3728
3729+[nmake.ARM, nmake.AARCH64]
3730+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
2405af19
OM
3731+
3732diff --git a/dblk/dblk.c b/dblk/dblk.c
3733index 3019627..21c841e 100644
3734--- a/dblk/dblk.c
3735+++ b/dblk/dblk.c
3736@@ -52,7 +52,7 @@ SHELL_VAR_CHECK_ITEM DblkCheckList[] = {
2bba8d5a
OM
3737 NULL,
3738 0,
3739 0,
3740- 0
3741+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
3742 }
3743 };
3744
2405af19
OM
3745diff --git a/dblk/dblk.h b/dblk/dblk.h
3746index 0341aeb..d7ec371 100644
3747--- a/