SecurityPkg: Add TPM PTP support in TPM2 device lib.
[mirror_edk2.git] / EdkShellPkg / ShellR64.patch
1 From 6451e0daf7f733a27e1afb3c7ac662a620d8b93b Mon Sep 17 00:00:00 2001
2 From: Olivier Martin <olivier.martin@arm.com>
3 Date: Tue, 14 Jan 2014 14:43:50 +0000
4 Subject: [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
281 diff --git a/DeviceTree/devicetree.c b/DeviceTree/devicetree.c
282 index 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[] = {
295 NULL,
296 0,
297 0,
298 - 0
299 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
300 }
301 };
302
303 diff --git a/DeviceTree/devicetree.h b/DeviceTree/devicetree.h
304 index 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 +
312 diff --git a/DeviceTree/devicetree.inf b/DeviceTree/devicetree.inf
313 index a86a1a0..7adc097 100644
314 --- a/DeviceTree/devicetree.inf
315 +++ b/DeviceTree/devicetree.inf
316 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
317
318
319 [sources.common]
320 - ..\ShCommonStrings.uni
321 + ../ShCommonStrings.uni
322 DevicetreeStrings.uni
323 devicetree.c
324 devicetree.h
325
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
353 @@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
354
355 [nmake.common]
356 IMAGE_ENTRY_POINT=DevicetreeMain
357 +
358 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
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
363 +[nmake.ARM, nmake.AARCH64]
364 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
365 diff --git a/EfiCompress/Compress.h b/EfiCompress/Compress.h
366 index 6ce2bfc..4e8313f 100644
367 --- a/EfiCompress/Compress.h
368 +++ b/EfiCompress/Compress.h
369 @@ -57,4 +57,4 @@ Returns:
370
371 --*/
372
373 -#endif
374 \ No newline at end of file
375 +#endif
376 diff --git a/EfiCompress/CompressMain.c b/EfiCompress/CompressMain.c
377 index 3edb17e..082046e 100644
378 --- a/EfiCompress/CompressMain.c
379 +++ b/EfiCompress/CompressMain.c
380 @@ -50,7 +50,7 @@ SHELL_VAR_CHECK_ITEM CompressCheckList[] = {
381 NULL,
382 0,
383 0,
384 - 0
385 + (SHELL_VAR_CHECK_FLAG_TYPE)0
386 }
387 };
388
389 diff --git a/EfiCompress/compress.c b/EfiCompress/compress.c
390 index 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;
395
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;
402 diff --git a/EfiCompress/compress.inf b/EfiCompress/compress.inf
403 index 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
407 COMPONENT_TYPE = APPLICATION
408
409 [sources.common]
410 -..\ShCommonStrings.uni
411 +../ShCommonStrings.uni
412 CompressStrings.uni
413 compressMain.c
414 compress.c
415 @@ -34,17 +34,17 @@ compress.h
416
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
444 @@ -64,11 +64,13 @@ compress.h
445 # we will specify some additional DEFINEs on the compile command line.
446 #
447 [nmake.common]
448 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
449 IMAGE_ENTRY_POINT=InitializeCompress
450 +
451 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
452 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
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
456
457 -
458 -
459 \ No newline at end of file
460 +[nmake.ARM, nmake.AARCH64]
461 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
462 diff --git a/EfiDecompress/Decompress.c b/EfiDecompress/Decompress.c
463 index 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[];
476 //
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[] = {
485 NULL,
486 0,
487 0,
488 - 0
489 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
490 }
491 };
492
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;
502 diff --git a/EfiDecompress/Decompress.h b/EfiDecompress/Decompress.h
503 index 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 \
508 }
509
510 -#endif
511 \ No newline at end of file
512 +#endif
513 diff --git a/EfiDecompress/Decompress.inf b/EfiDecompress/Decompress.inf
514 index 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
519
520 [sources.common]
521 -..\ShCommonStrings.uni
522 +../ShCommonStrings.uni
523 DecompressStrings.uni
524 decompress.c
525 decompress.h
526 @@ -33,17 +33,17 @@ decompress.h
527
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
555 @@ -63,11 +63,14 @@ decompress.h
556 # we will specify some additional DEFINEs on the compile command line.
557 #
558 [nmake.common]
559 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
560 IMAGE_ENTRY_POINT=InitializeDecompress
561 +
562 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
563 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
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
568 -
569 -
570 +[nmake.ARM, nmake.AARCH64]
571 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
572 +
573 \ No newline at end of file
574 diff --git a/IfConfig/IfConfig.c b/IfConfig/IfConfig.c
575 index 07cedc2..52e1add 100644
576 --- a/IfConfig/IfConfig.c
577 +++ b/IfConfig/IfConfig.c
578 @@ -29,7 +29,7 @@ extern UINT8 STRING_ARRAY_NAME[];
579 //
580 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
581
582 -EFI_HII_HANDLE HiiHandle;
583 +STATIC EFI_HII_HANDLE HiiHandle;
584
585 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
586
587 @@ -75,7 +75,7 @@ SHELL_VAR_CHECK_ITEM IfConfigCheckList[] = {
588 NULL,
589 0,
590 0,
591 - 0
592 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
593 }
594 };
595
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;
605 diff --git a/IfConfig/IfConfig.h b/IfConfig/IfConfig.h
606 index 4a9d3c5..b8f044e 100644
607 --- a/IfConfig/IfConfig.h
608 +++ b/IfConfig/IfConfig.h
609 @@ -60,3 +60,4 @@ typedef struct {
610 } ARP_REQUEST;
611
612 #endif
613 +
614 diff --git a/IfConfig/IfConfig.inf b/IfConfig/IfConfig.inf
615 index 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
620
621 [sources.common]
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
630 [includes.common]
631 - ..\Inc
632 - ..\Library
633 - $(EDK_SOURCE)\Foundation\Efi
634 - $(EDK_SOURCE)\Foundation
635 - $(EDK_SOURCE)\Foundation\Efi\Include
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
641 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
642 - $(DEST_DIR)\
643 + ../Inc
644 + ../Library
645 + $(EDK_SOURCE)/Foundation/Efi
646 + $(EDK_SOURCE)/Foundation
647 + $(EDK_SOURCE)/Foundation/Efi/Include
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
653 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
654 + $(DEST_DIR./
655
656 [libraries.common]
657 EfiShellLib
658 EdkProtocolLib
659 EfiProtocolLib
660 EdkGuidLib
661 - EfiDriverLib
662
663 [nmake.common]
664 - C_PROJ_FLAGS = $(C_PROJ_FLAGS)
665 IMAGE_ENTRY_POINT=IfConfig
666 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
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\"
671 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
672
673 +[nmake.ARM, nmake.AARCH64]
674 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
675 diff --git a/IfConfig/ShellNetHelper.h b/IfConfig/ShellNetHelper.h
676 index 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
683 +
684 diff --git a/IpConfig/IpConfig.c b/IpConfig/IpConfig.c
685 index 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
706 diff --git a/IpConfig/IpConfig.h b/IpConfig/IpConfig.h
707 index 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
717 diff --git a/IpConfig/IpConfig.inf b/IpConfig/IpConfig.inf
718 index 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
723
724 [sources.common]
725 - ..\ShCommonStrings.uni
726 + ../ShCommonStrings.uni
727 IpConfigStrings.uni
728 IpConfig.c
729 IpConfig.h
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
758 @@ -56,9 +56,12 @@ COMPONENT_TYPE = APPLICATION
759
760
761 [nmake.common]
762 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
763 IMAGE_ENTRY_POINT=InitializeIpConfig
764 +
765 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
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\"
768 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
769
770 +[nmake.ARM, nmake.AARCH64]
771 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
772 diff --git a/Library/Aarch64/efilibplat.h b/Library/Aarch64/efilibplat.h
773 new file mode 100644
774 index 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 +
816 diff --git a/Library/Arm/efilibplat.h b/Library/Arm/efilibplat.h
817 new file mode 100644
818 index 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 +
861 diff --git a/Library/CRC.c b/Library/CRC.c
862 index ce5387b..ebbdf70 100644
863 --- a/Library/CRC.c
864 +++ b/Library/CRC.c
865 @@ -21,7 +21,7 @@ Revision History
866
867 --*/
868
869 -#include "EfiShelllib.h"
870 +#include "EfiShellLib.h"
871
872 UINT32 CRCTable[256] = {
873 0x00000000,
874 diff --git a/Library/CRC.h b/Library/CRC.h
875 index 326a5e1..db1f765 100644
876 --- a/Library/CRC.h
877 +++ b/Library/CRC.h
878 @@ -53,4 +53,6 @@ CalculateCrc (
879 UINTN Size
880 );
881
882 -#endif
883 \ No newline at end of file
884 +#endif
885 +
886 +
887 diff --git a/Library/ConsistMapping.c b/Library/ConsistMapping.c
888 index b70fa06..61eda8b 100644
889 --- a/Library/ConsistMapping.c
890 +++ b/Library/ConsistMapping.c
891 @@ -21,7 +21,7 @@ Revision History
892
893 --*/
894
895 -#include "EfiShelllib.h"
896 +#include "EfiShellLib.h"
897
898 MTD_NAME mMTDName[] = {
899 {
900 diff --git a/Library/ConsistMapping.h b/Library/ConsistMapping.h
901 index bc8d6f0..d520f31 100644
902 --- a/Library/ConsistMapping.h
903 +++ b/Library/ConsistMapping.h
904 @@ -79,4 +79,6 @@ DevicePathConsistMappingCompare (
905 IN VOID *Buffer2
906 );
907
908 -#endif
909 \ No newline at end of file
910 +#endif
911 +
912 +
913 diff --git a/Library/DPath.c b/Library/DPath.c
914 index f0974ac..73086d7 100644
915 --- a/Library/DPath.c
916 +++ b/Library/DPath.c
917 @@ -20,7 +20,7 @@ Revision History
918
919 --*/
920
921 -#include "EfiShelllib.h"
922 +#include "EfiShellLib.h"
923
924 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
925
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 }
943 }
944 diff --git a/Library/DPath.h b/Library/DPath.h
945 index 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 );
959
960 #endif
961 +
962 diff --git a/Library/Data.c b/Library/Data.c
963 index d2ffe4a..979b3dd 100644
964 --- a/Library/Data.c
965 +++ b/Library/Data.c
966 @@ -21,7 +21,7 @@ Revision History
967
968 --*/
969
970 -#include "EfiShelllib.h"
971 +#include "EfiShellLib.h"
972
973 //
974 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
975 diff --git a/Library/Ebc/EfiLibPlat.h b/Library/Ebc/EfiLibPlat.h
976 index 922c881..e4a8771 100644
977 --- a/Library/Ebc/EfiLibPlat.h
978 +++ b/Library/Ebc/EfiLibPlat.h
979 @@ -44,3 +44,4 @@ Returns:
980 ;
981
982 #define MIN_ALIGNMENT_SIZE 8
983 +
984 diff --git a/Library/EfiPart.h b/Library/EfiPart.h
985 index a62cd15..e59ae77 100644
986 --- a/Library/EfiPart.h
987 +++ b/Library/EfiPart.h
988 @@ -56,3 +56,4 @@ typedef struct {
989 #pragma pack()
990
991 #endif
992 +
993 diff --git a/Library/EfiShellLib.h b/Library/EfiShellLib.h
994 index 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_
999
1000 #include "Tiano.h"
1001 -#include "ShellEnv.h"
1002 +#include "shellenv.h"
1003 #include "pci22.h"
1004
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)
1035
1036 #include "efilibplat.h"
1037 -#include "efipart.h"
1038 +#include "EfiPart.h"
1039 #include "ShellDebug.h"
1040 #include "CRC.h"
1041 #include "DPath.h"
1042 @@ -358,3 +358,4 @@ LibGetControllerName (
1043 );
1044
1045 #endif
1046 +
1047 diff --git a/Library/EfiShellLib.inf b/Library/EfiShellLib.inf
1048 index d450f9d..a63406c 100644
1049 --- a/Library/EfiShellLib.inf
1050 +++ b/Library/EfiShellLib.inf
1051 @@ -45,34 +45,42 @@ COMPONENT_TYPE = LIBRARY
1052 HiiSupport.c
1053
1054 [sources.ia32]
1055 - ia32\math.c
1056 - ia32\initplat.c
1057 + IA32/math.c
1058 + IA32/initplat.c
1059
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
1069
1070 [sources.EBC]
1071 - EBC\math.c
1072 - EBC\initplat.c
1073 -
1074 + Ebc/math.c
1075 + Ebc/initplat.c
1076 +
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
1090
1091 [includes.common]
1092 .
1093 - ..\Inc
1094 - $(EDK_SOURCE)\Foundation
1095 - $(EDK_SOURCE)\Foundation\Include
1096 - $(EDK_SOURCE)\Foundation\Efi
1097 - $(EDK_SOURCE)\Foundation\Efi\Include
1098 - $(EDK_SOURCE)\Foundation\FrameWork
1099 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1100 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1101 - $(EDK_SOURCE)\Foundation\Core\Dxe
1102 + ../Inc
1103 + $(EDK_SOURCE)/Foundation
1104 + $(EDK_SOURCE)/Foundation/Include
1105 + $(EDK_SOURCE)/Foundation/Efi
1106 + $(EDK_SOURCE)/Foundation/Efi/Include
1107 + $(EDK_SOURCE)/Foundation/FrameWork
1108 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1109 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1110 + $(EDK_SOURCE)/Foundation/Core/Dxe
1111
1112 [libraries.common]
1113 EdkFrameworkProtocolLib
1114 @@ -81,4 +89,7 @@ COMPONENT_TYPE = LIBRARY
1115 EfiGuidLib
1116 EdkGuidLib
1117
1118 +[libraries.ARM]
1119 + CompilerIntrinsicsLib, CompilerIntrinsicsLib
1120 +
1121 [nmake.common]
1122 diff --git a/Library/Event.c b/Library/Event.c
1123 index 4929e4b..a0cbdc2 100644
1124 --- a/Library/Event.c
1125 +++ b/Library/Event.c
1126 @@ -21,7 +21,7 @@ Revision History
1127
1128 --*/
1129
1130 -#include "EfiShelllib.h"
1131 +#include "EfiShellLib.h"
1132
1133 EFI_EVENT
1134 LibCreateProtocolNotifyEvent (
1135 diff --git a/Library/Event.h b/Library/Event.h
1136 index 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
1146 +
1147 +
1148 diff --git a/Library/FileIO.c b/Library/FileIO.c
1149 index 40c67d1..8820c52 100644
1150 --- a/Library/FileIO.c
1151 +++ b/Library/FileIO.c
1152 @@ -21,7 +21,7 @@ Revision History
1153
1154 --*/
1155
1156 -#include "EfiShelllib.h"
1157 +#include "EfiShellLib.h"
1158
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;
1168
1169 @@ -728,7 +727,6 @@ LibSplitFsAndPath (
1170
1171 *Fs = NULL;
1172 *Path = NULL;
1173 - Status = EFI_SUCCESS;
1174
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);
1186
1187 - Link = NULL;
1188 SrcArg = NULL;
1189 DstArg = NULL;
1190 InitializeListHead (&SrcList);
1191 diff --git a/Library/FileIO.h b/Library/FileIO.h
1192 index 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 );
1198
1199 -#endif
1200 \ No newline at end of file
1201 +#endif
1202 +
1203 +
1204 diff --git a/Library/Handle.c b/Library/Handle.c
1205 index 25da2a1..45e623c 100644
1206 --- a/Library/Handle.c
1207 +++ b/Library/Handle.c
1208 @@ -21,7 +21,7 @@ Revision History
1209
1210 --*/
1211
1212 -#include "EfiShelllib.h"
1213 +#include "EfiShellLib.h"
1214
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;
1227
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;
1238
1239 DriverBindingHandleIndexValid = FALSE;
1240 if (DriverBindingHandleIndex != NULL) {
1241 *DriverBindingHandleIndex = 0xffffffff;
1242 }
1243
1244 - ControllerHandleIndexValid = FALSE;
1245 if (ControllerHandleIndex != NULL) {
1246 *ControllerHandleIndex = 0xffffffff;
1247 }
1248 @@ -847,7 +843,6 @@ LibScanHandleDatabase (
1249
1250 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
1251 *ControllerHandleIndex = (UINT32) HandleIndex;
1252 - ControllerHandleIndexValid = TRUE;
1253 }
1254
1255 }
1256 @@ -1305,7 +1300,7 @@ Returns:
1257 Status = BS->HandleProtocol (
1258 Handles[Index],
1259 ProtocolGuid,
1260 - Interface
1261 + (VOID**)Interface
1262 );
1263
1264 if (!EFI_ERROR (Status)) {
1265 diff --git a/Library/Handle.h b/Library/Handle.h
1266 index 40ad40b..010e2cf 100644
1267 --- a/Library/Handle.h
1268 +++ b/Library/Handle.h
1269 @@ -161,3 +161,4 @@ ShellGetHandleNum (
1270 );
1271
1272 #endif
1273 +
1274 diff --git a/Library/HiiSupport.c b/Library/HiiSupport.c
1275 index bce645b..5f70712 100644
1276 --- a/Library/HiiSupport.c
1277 +++ b/Library/HiiSupport.c
1278 @@ -21,7 +21,7 @@ Revision History
1279
1280 --*/
1281
1282 -#include "EfiShelllib.h"
1283 +#include "EfiShellLib.h"
1284
1285 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
1286
1287 @@ -56,11 +56,11 @@ Returns:
1288 return EFI_SUCCESS;
1289 }
1290
1291 - Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);
1292 + Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);
1293 if (EFI_ERROR (Status)) {
1294 return Status;
1295 }
1296 - Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);
1297 + Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);
1298 if (EFI_ERROR (Status)) {
1299 return Status;
1300 }
1301 diff --git a/Library/HiiSupport.h b/Library/HiiSupport.h
1302 index b04c443..bfeb077 100644
1303 --- a/Library/HiiSupport.h
1304 +++ b/Library/HiiSupport.h
1305 @@ -142,3 +142,4 @@ LibGetString (
1306 ;
1307
1308 #endif
1309 +
1310 diff --git a/Library/IA32/efilibplat.h b/Library/IA32/efilibplat.h
1311 index 4e58f50..a6eb87f 100644
1312 --- a/Library/IA32/efilibplat.h
1313 +++ b/Library/IA32/efilibplat.h
1314 @@ -34,4 +34,4 @@ InitializeLibPlatform (
1315
1316 #define MIN_ALIGNMENT_SIZE 4
1317
1318 -#endif
1319 \ No newline at end of file
1320 +#endif
1321 diff --git a/Library/IO.c b/Library/IO.c
1322 index 81f26fd..b976e32 100644
1323 --- a/Library/IO.c
1324 +++ b/Library/IO.c
1325 @@ -21,7 +21,7 @@ Revision History
1326
1327 --*/
1328
1329 -#include "EfiShelllib.h"
1330 +#include "EfiShellLib.h"
1331
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);
1362
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 (
1381 diff --git a/Library/IO.h b/Library/IO.h
1382 index 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
1392 +
1393 +
1394 diff --git a/Library/IPF/efilibplat.h b/Library/IPF/efilibplat.h
1395 index 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
1400
1401 #endif
1402 +
1403 diff --git a/Library/IPF/libsalpal.h b/Library/IPF/libsalpal.h
1404 index 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 );
1410
1411 -#endif
1412 \ No newline at end of file
1413 +#endif
1414 diff --git a/Library/IPF/palproc.h b/Library/IPF/palproc.h
1415 index 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
1420
1421 #endif // _PALPROC_H
1422 +
1423 diff --git a/Library/Init.c b/Library/Init.c
1424 index 3ef0c8e..e791ff1 100644
1425 --- a/Library/Init.c
1426 +++ b/Library/Init.c
1427 @@ -20,7 +20,7 @@ Revision History
1428
1429 --*/
1430
1431 -#include "EfiShelllib.h"
1432 +#include "EfiShellLib.h"
1433
1434 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
1435
1436 diff --git a/Library/LinkedList.h b/Library/LinkedList.h
1437 index d39e5a3..0c82b61 100644
1438 --- a/Library/LinkedList.h
1439 +++ b/Library/LinkedList.h
1440 @@ -77,11 +77,10 @@ typedef struct _EFI_LIST_ENTRY {
1441 }
1442
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 //
1456 #endif
1457 +
1458 diff --git a/Library/Lock.c b/Library/Lock.c
1459 index 8a40db5..b3f9bad 100644
1460 --- a/Library/Lock.c
1461 +++ b/Library/Lock.c
1462 @@ -21,7 +21,7 @@ Revision History
1463
1464 --*/
1465
1466 -#include "EfiShelllib.h"
1467 +#include "EfiShellLib.h"
1468
1469 VOID
1470 InitializeLock (
1471 diff --git a/Library/Lock.h b/Library/Lock.h
1472 index 9e35b92..bd5304e 100644
1473 --- a/Library/Lock.h
1474 +++ b/Library/Lock.h
1475 @@ -45,4 +45,6 @@ ReleaseLock (
1476 IN FLOCK *Lock
1477 );
1478
1479 -#endif
1480 \ No newline at end of file
1481 +#endif
1482 +
1483 +
1484 diff --git a/Library/Mem.c b/Library/Mem.c
1485 index f82cb52..9675b52 100644
1486 --- a/Library/Mem.c
1487 +++ b/Library/Mem.c
1488 @@ -21,7 +21,7 @@ Revision History
1489
1490 --*/
1491
1492 -#include "EfiShelllib.h"
1493 +#include "EfiShellLib.h"
1494
1495 VOID
1496 SetMem (
1497 diff --git a/Library/Mem.h b/Library/Mem.h
1498 index bca1e1d..1e0b331 100644
1499 --- a/Library/Mem.h
1500 +++ b/Library/Mem.h
1501 @@ -73,4 +73,6 @@ ZeroMem (
1502 IN UINTN Size
1503 );
1504
1505 -#endif
1506 \ No newline at end of file
1507 +#endif
1508 +
1509 +
1510 diff --git a/Library/Misc.c b/Library/Misc.c
1511 index 1564c49..e3204ff 100644
1512 --- a/Library/Misc.c
1513 +++ b/Library/Misc.c
1514 @@ -21,7 +21,7 @@ Revision History
1515
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 +
1576 diff --git a/Library/Misc.h b/Library/Misc.h
1577 index 7a99186..a7a6825 100644
1578 --- a/Library/Misc.h
1579 +++ b/Library/Misc.h
1580 @@ -258,3 +258,4 @@ LibGetExitCode (
1581 );
1582
1583 #endif
1584 +
1585 diff --git a/Library/Perf.c b/Library/Perf.c
1586 index 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
1598 diff --git a/Library/RtData.c b/Library/RtData.c
1599 index 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
1611 diff --git a/Library/ShellDebug.c b/Library/ShellDebug.c
1612 index 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;
1624 diff --git a/Library/ShellDebug.h b/Library/ShellDebug.h
1625 index 039197e..aedb3fa 100644
1626 --- a/Library/ShellDebug.h
1627 +++ b/Library/ShellDebug.h
1628 @@ -99,3 +99,4 @@ EFIDebugVariable (
1629 );
1630 #endif
1631
1632 +
1633 diff --git a/Library/ShellEnvInt.c b/Library/ShellEnvInt.c
1634 index 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 (
1646 diff --git a/Library/ShellEnvInt.h b/Library/ShellEnvInt.h
1647 index 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 +
1659 diff --git a/Library/Str.c b/Library/Str.c
1660 index 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
1690 diff --git a/Library/Str.h b/Library/Str.h
1691 index 3f73bc5..7b01848 100644
1692 --- a/Library/Str.h
1693 +++ b/Library/Str.h
1694 @@ -248,3 +248,4 @@ LibStubStrUpr (
1695 );
1696
1697 #endif
1698 +
1699 diff --git a/Library/VarCheck.c b/Library/VarCheck.c
1700 index 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 (
1712 diff --git a/Library/VarCheck.h b/Library/VarCheck.h
1713 index 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 +
1730 diff --git a/Library/X64/efilibplat.h b/Library/X64/efilibplat.h
1731 index 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 +
1739 diff --git a/LoadPciRom/LoadPciRom.c b/LoadPciRom/LoadPciRom.c
1740 index 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;
1779 diff --git a/LoadPciRom/LoadPciRom.h b/LoadPciRom/LoadPciRom.h
1780 index 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 +
1788 diff --git a/LoadPciRom/LoadPciRom.inf b/LoadPciRom/LoadPciRom.inf
1789 index 8e79af7..83744ef 100644
1790 --- a/LoadPciRom/LoadPciRom.inf
1791 +++ b/LoadPciRom/LoadPciRom.inf
1792 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
1793
1794 [sources.common]
1795 LoadPciRomStrings.uni
1796 - ..\ShCommonStrings.uni
1797 + ../ShCommonStrings.uni
1798 LoadPciRom.c
1799 LoadPciRom.h
1800
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
1828 @@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
1829
1830 [nmake.common]
1831 IMAGE_ENTRY_POINT=InitializeLoadPciRom
1832 +
1833 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
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
1838 +[nmake.ARM, nmake.AARCH64]
1839 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1840 diff --git a/Ping/Ping.c b/Ping/Ping.c
1841 index 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[];
1855
1856 -EFI_HII_HANDLE HiiHandle;
1857 +STATIC EFI_HII_HANDLE HiiHandle;
1858
1859 EFI_GUID EfiPingGuid = EFI_PING_GUID;
1860 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
1861 @@ -59,7 +59,7 @@ SHELL_VAR_CHECK_ITEM PingCheckList[] = {
1862 NULL,
1863 0,
1864 0,
1865 - 0
1866 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
1867 }
1868 };
1869
1870 @@ -114,6 +114,8 @@ UINT32 RttSum;
1871 UINT32 RttMin;
1872 UINT32 RttMax;
1873
1874 +EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
1875 +
1876 STATIC
1877 UINT64
1878 GetTimerValue (
1879 @@ -135,7 +137,22 @@ Returns:
1880
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 }
1901
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;
1911 }
1912 diff --git a/Ping/Ping.h b/Ping/Ping.h
1913 index 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;
1918
1919 #endif
1920 +
1921 diff --git a/Ping/Ping.inf b/Ping/Ping.inf
1922 index 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
1926 COMPONENT_TYPE = APPLICATION
1927
1928 [sources.common]
1929 - ..\ShCommonStrings.uni
1930 + ../ShCommonStrings.uni
1931 PingStrings.uni
1932 Ping.h
1933 Ping.c
1934
1935 [includes.common]
1936 - ..\Inc
1937 - ..\Library
1938 - $(EDK_SOURCE)\Foundation\Efi
1939 - $(EDK_SOURCE)\Foundation
1940 - $(EDK_SOURCE)\Foundation\Efi\Include
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
1946 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
1947 - $(DEST_DIR)\
1948 + ../Inc
1949 + ../Library
1950 + $(EDK_SOURCE)/Foundation/Efi
1951 + $(EDK_SOURCE)/Foundation
1952 + $(EDK_SOURCE)/Foundation/Efi/Include
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
1958 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
1959 + $(DEST_DIR./
1960
1961 [libraries.common]
1962 EfiShellLib
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
1974 [nmake.common]
1975 - C_PROJ_FLAGS = $(C_PROJ_FLAGS)
1976 IMAGE_ENTRY_POINT=Ping
1977 - C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1978 +
1979 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
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\"
1982 + C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
1983
1984 +[nmake.ARM, nmake.AARCH64]
1985 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
1986 diff --git a/Shell.inf b/Shell.inf
1987 index 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
1992
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
2042
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
2125
2126 - cls\clsstrings.uni
2127 - cls\cls.c
2128 + cls/clsstrings.uni
2129 + cls/cls.c
2130
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
2144
2145 - load\LoadStrings.uni
2146 - load\load.c
2147 - load\load.h
2148 + load/LoadStrings.uni
2149 + load/load.c
2150 + load/load.h
2151
2152 - ls\LsStrings.uni
2153 - ls\ls.h
2154 - ls\ls.c
2155 + ls/LsStrings.uni
2156 + ls/ls.h
2157 + ls/ls.c
2158
2159 - mkdir\MkdirStrings.uni
2160 - mkdir\mkdir.c
2161 - mkdir\mkdir.h
2162 + mkdir/MkdirStrings.uni
2163 + mkdir/mkdir.c
2164 + mkdir/mkdir.h
2165
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
2211 +
2212 + touch/TouchStrings.uni
2213 + touch/touch.c
2214 + touch/touch.h
2215 +
2216 + vol/VolStrings.uni
2217 + vol/vol.c
2218 + vol/vol.h
2219 +
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
2245
2246
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
2254
2255
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
2267
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
2275
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
2283 +
2284 +[sources.ARM]
2285 + ver/ia32/ver32.c
2286 + Library/IPF/math.c
2287 + Library/IA32/initplat.c
2288 +
2289 +[sources.AARCH64]
2290 + ver/ia32/ver32.c
2291 + Library/IPF/math.c
2292 + Library/IA32/initplat.c
2293
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)
2319
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
2337
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\"
2342 -
2343 -
2344 -
2345 -
2346 \ No newline at end of file
2347 diff --git a/ShellFull.inf b/ShellFull.inf
2348 index 832dc79..48fa7aa 100644
2349 --- a/ShellFull.inf
2350 +++ b/ShellFull.inf
2351 @@ -20,300 +20,310 @@
2352 #--*/
2353
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
2360
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
2381 -
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
2405 +
2406 + newshell/NshellStrings.uni
2407 + newshell/init.c
2408 + newshell/nshell.h
2409 + newshell/fakehii.c
2410
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
2493
2494 - cls\clsstrings.uni
2495 - cls\cls.c
2496 + cls/clsstrings.uni
2497 + cls/cls.c
2498
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
2512
2513 - load\LoadStrings.uni
2514 - load\load.c
2515 - load\load.h
2516 + load/LoadStrings.uni
2517 + load/load.c
2518 + load/load.h
2519
2520 - ls\LsStrings.uni
2521 - ls\ls.h
2522 - ls\ls.c
2523 + ls/LsStrings.uni
2524 + ls/ls.h
2525 + ls/ls.c
2526
2527 - mkdir\MkdirStrings.uni
2528 - mkdir\mkdir.c
2529 - mkdir\mkdir.h
2530 + mkdir/MkdirStrings.uni
2531 + mkdir/mkdir.c
2532 + mkdir/mkdir.h
2533
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
2561 -
2562 - touch\TouchStrings.uni
2563 - touch\touch.c
2564 - touch\touch.h
2565 -
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
2579 +
2580 + touch/TouchStrings.uni
2581 + touch/touch.c
2582 + touch/touch.h
2583 +
2584 + vol/VolStrings.uni
2585 + vol/vol.c
2586 + vol/vol.h
2587 +
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
2624
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
2705 -
2706 - IfConfig\IfConfigStrings.uni
2707 - IfConfig\IfConfig.c
2708 - IfConfig\IfConfig.h
2709 - IfConfig\ShellNetHelper.c
2710 -
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
2775
2776 - Ping\PingStrings.uni
2777 - Ping\Ping.c
2778 + Ping/PingStrings.uni
2779 + Ping/Ping.c
2780
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
2822
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
2830
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
2842
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
2850
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
2868
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)
2896
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
2914
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
2923 diff --git a/SmbiosView/EventLogInfo.c b/SmbiosView/EventLogInfo.c
2924 index 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
2934
2935 VOID
2936 diff --git a/SmbiosView/EventLogInfo.h b/SmbiosView/EventLogInfo.h
2937 index d1591c0..ca58380 100644
2938 --- a/SmbiosView/EventLogInfo.h
2939 +++ b/SmbiosView/EventLogInfo.h
2940 @@ -85,3 +85,4 @@ DisplaySysEventLogData (
2941 );
2942
2943 #endif
2944 +
2945 diff --git a/SmbiosView/LibSmbios.h b/SmbiosView/LibSmbios.h
2946 index b13fd6b..c2e6b5e 100644
2947 --- a/SmbiosView/LibSmbios.h
2948 +++ b/SmbiosView/LibSmbios.h
2949 @@ -642,3 +642,4 @@ LibGetSmbiosSystemGuidAndSerialNumber (
2950
2951
2952 #endif
2953 +
2954 diff --git a/SmbiosView/LibSmbiosView.c b/SmbiosView/LibSmbiosView.c
2955 index d31ed01..f1438bc 100644
2956 --- a/SmbiosView/LibSmbiosView.c
2957 +++ b/SmbiosView/LibSmbiosView.c
2958 @@ -22,10 +22,10 @@ Revision History
2959 --*/
2960
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
2969
2970 STATIC UINT8 mInit = 0;
2971 @@ -62,7 +62,7 @@ Returns:
2972 //
2973 // Get SMBIOS table from System Configure table
2974 //
2975 - Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
2976 + Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
2977
2978 if (mSmbiosTable == NULL) {
2979 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
2980 @@ -110,13 +110,13 @@ LibSmbiosGetEPS (
2981
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 }
2994
2995 EFI_STATUS
2996 diff --git a/SmbiosView/LibSmbiosView.h b/SmbiosView/LibSmbiosView.h
2997 index 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 (
3010 );
3011
3012 #endif
3013 +
3014 diff --git a/SmbiosView/PrintInfo.c b/SmbiosView/PrintInfo.c
3015 index 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
3025
3026 //
3027 diff --git a/SmbiosView/PrintInfo.h b/SmbiosView/PrintInfo.h
3028 index 608dfb1..10faf21 100644
3029 --- a/SmbiosView/PrintInfo.h
3030 +++ b/SmbiosView/PrintInfo.h
3031 @@ -199,3 +199,4 @@ DisplaySPSCharacteristics (
3032 );
3033
3034 #endif
3035 +
3036 diff --git a/SmbiosView/QueryTable.c b/SmbiosView/QueryTable.c
3037 index 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
3049 diff --git a/SmbiosView/QueryTable.h b/SmbiosView/QueryTable.h
3050 index 727a053..ceb02fe 100644
3051 --- a/SmbiosView/QueryTable.h
3052 +++ b/SmbiosView/QueryTable.h
3053 @@ -437,3 +437,4 @@ DisplayIPMIDIBMCInterfaceType (
3054 );
3055
3056 #endif
3057 +
3058 diff --git a/SmbiosView/Smbios.h b/SmbiosView/Smbios.h
3059 index 8a91b9e..15eb89c 100644
3060 --- a/SmbiosView/Smbios.h
3061 +++ b/SmbiosView/Smbios.h
3062 @@ -37,3 +37,4 @@ extern EFI_HII_HANDLE HiiHandle;
3063
3064
3065 #endif
3066 +
3067 diff --git a/SmbiosView/Smbiosview.inf b/SmbiosView/Smbiosview.inf
3068 index 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
3073
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
3081
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
3110
3111 [libraries.common]
3112 EfiShellLib
3113 @@ -70,7 +70,12 @@ COMPONENT_TYPE = APPLICATION
3114
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
3126 diff --git a/SmbiosView/smbiosview.c b/SmbiosView/smbiosview.c
3127 index 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"
3136
3137 extern UINT8 STRING_ARRAY_NAME[];
3138
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
3145 }
3146 };
3147
3148 diff --git a/SmbiosView/smbiosview.h b/SmbiosView/smbiosview.h
3149 index 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 +
3157 diff --git a/TelnetMgmt/TelnetMgmt.c b/TelnetMgmt/TelnetMgmt.c
3158 index 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 };
3178
3179 diff --git a/TelnetMgmt/TelnetMgmt.h b/TelnetMgmt/TelnetMgmt.h
3180 index 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 \
3185 }
3186
3187 -#endif
3188 \ No newline at end of file
3189 +#endif
3190 diff --git a/TelnetMgmt/TelnetMgmt.inf b/TelnetMgmt/TelnetMgmt.inf
3191 index 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
3195 COMPONENT_TYPE = APPLICATION
3196
3197 [sources.common]
3198 - ..\ShCommonStrings.uni
3199 + ../ShCommonStrings.uni
3200 TelnetMgmtStrings.uni
3201 TelnetMgmt.c
3202
3203 [includes.common]
3204 .
3205 - ..\Inc
3206 - ..\Library
3207 - $(EDK_SOURCE)\Foundation
3208 - $(EDK_SOURCE)\Foundation\Include
3209 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3210 - $(EDK_SOURCE)\Foundation\Efi
3211 - $(EDK_SOURCE)\Foundation\Efi\Include
3212 - $(EDK_SOURCE)\Foundation\FrameWork
3213 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3214 - $(EDK_SOURCE)\Foundation\Core\Dxe
3215 - $(DEST_DIR)\
3216 + ../Inc
3217 + ../Library
3218 + $(EDK_SOURCE)/Foundation
3219 + $(EDK_SOURCE)/Foundation/Include
3220 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3221 + $(EDK_SOURCE)/Foundation/Efi
3222 + $(EDK_SOURCE)/Foundation/Efi/Include
3223 + $(EDK_SOURCE)/Foundation/FrameWork
3224 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3225 + $(EDK_SOURCE)/Foundation/Core/Dxe
3226 + $(DEST_DIR./
3227
3228 [libraries.common]
3229 EfiShellLib
3230 @@ -55,6 +55,11 @@ COMPONENT_TYPE = APPLICATION
3231
3232 [nmake.common]
3233 IMAGE_ENTRY_POINT=InitializeTelnetMgmt
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\"
3238 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3239 +
3240 +[nmake.ARM, nmake.AARCH64]
3241 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3242 diff --git a/TelnetMgmt/TelnetServer.h b/TelnetMgmt/TelnetServer.h
3243 index 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;
3248
3249 #endif
3250 +
3251 diff --git a/attrib/attrib.c b/attrib/attrib.c
3252 index 3599d6d..6d1e677 100644
3253 --- a/attrib/attrib.c
3254 +++ b/attrib/attrib.c
3255 @@ -57,7 +57,7 @@ AttribFile (
3256 //
3257 // Global Variables
3258 //
3259 -EFI_HII_HANDLE HiiHandle;
3260 +STATIC EFI_HII_HANDLE HiiHandle;
3261 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
3262 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
3263 {
3264 @@ -124,7 +124,7 @@ SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
3265 NULL,
3266 0,
3267 0,
3268 - 0
3269 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3270 }
3271 };
3272
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,
3282 diff --git a/attrib/attrib.h b/attrib/attrib.h
3283 index 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 \
3288 }
3289
3290 -#endif
3291 \ No newline at end of file
3292 +#endif
3293 +
3294 diff --git a/attrib/attrib.inf b/attrib/attrib.inf
3295 index 38cc094..a35f1a7 100644
3296 --- a/attrib/attrib.inf
3297 +++ b/attrib/attrib.inf
3298 @@ -41,24 +41,24 @@ COMPONENT_TYPE = APPLICATION
3299
3300 [sources.common]
3301 AttribStrings.uni
3302 - ..\ShCommonStrings.uni
3303 + ../ShCommonStrings.uni
3304 attrib.c
3305 attrib.h
3306
3307
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
3335 @@ -73,7 +73,11 @@ COMPONENT_TYPE = APPLICATION
3336
3337 [nmake.common]
3338 IMAGE_ENTRY_POINT=InitializeAttrib
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
3347 diff --git a/cls/cls.c b/cls/cls.c
3348 index 572cc82..bd9826a 100644
3349 --- a/cls/cls.c
3350 +++ b/cls/cls.c
3351 @@ -30,7 +30,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3352 //
3353 #include STRING_DEFINES_FILE
3354
3355 -EFI_HII_HANDLE HiiHandle;
3356 +STATIC EFI_HII_HANDLE HiiHandle;
3357 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
3358 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
3359 {
3360 @@ -49,7 +49,7 @@ SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
3361 NULL,
3362 0,
3363 0,
3364 - 0
3365 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3366 }
3367 };
3368
3369 diff --git a/cls/cls.h b/cls/cls.h
3370 index eab21eb..31361c7 100644
3371 --- a/cls/cls.h
3372 +++ b/cls/cls.h
3373 @@ -36,3 +36,4 @@ Revision History
3374 }
3375
3376 #endif
3377 +
3378 diff --git a/cls/cls.inf b/cls/cls.inf
3379 index 1e5ef66..70e676a 100644
3380 --- a/cls/cls.inf
3381 +++ b/cls/cls.inf
3382 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
3383
3384
3385 [sources.common]
3386 - ..\ShCommonStrings.uni
3387 + ../ShCommonStrings.uni
3388 ClsStrings.uni
3389 Cls.c
3390 Cls.h
3391
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
3419 @@ -72,7 +72,12 @@ COMPONENT_TYPE = APPLICATION
3420
3421 [nmake.common]
3422 IMAGE_ENTRY_POINT=InitializeCls
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
3431 +
3432 diff --git a/comp/comp.c b/comp/comp.c
3433 index 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 };
3444
3445 diff --git a/comp/comp.h b/comp/comp.h
3446 index 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
3456 diff --git a/comp/comp.inf b/comp/comp.inf
3457 index 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
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
3494 @@ -61,11 +61,16 @@ comp.h
3495 # we will specify some additional DEFINEs on the compile command line.
3496 #
3497 [nmake.common]
3498 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3499 IMAGE_ENTRY_POINT=InitializeComp
3500 +
3501 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3502 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
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
3509 +
3510
3511
3512 \ No newline at end of file
3513 diff --git a/cp/cp.c b/cp/cp.c
3514 index 25ac3cf..9299af4 100644
3515 --- a/cp/cp.c
3516 +++ b/cp/cp.c
3517 @@ -66,7 +66,7 @@ SHELL_VAR_CHECK_ITEM CpCheckList[] = {
3518 NULL,
3519 0,
3520 0,
3521 - 0
3522 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3523 }
3524 };
3525
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);
3569 diff --git a/cp/cp.h b/cp/cp.h
3570 index 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 );
3576
3577 -#endif
3578 \ No newline at end of file
3579 +#endif
3580 +
3581 diff --git a/cp/cp.inf b/cp/cp.inf
3582 index 714c7bb..160434c 100644
3583 --- a/cp/cp.inf
3584 +++ b/cp/cp.inf
3585 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
3586
3587 [sources.common]
3588 CpStrings.uni
3589 - ..\ShCommonStrings.uni
3590 + ../ShCommonStrings.uni
3591 cp.h
3592 cp.c
3593
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
3621 @@ -72,7 +72,12 @@ COMPONENT_TYPE = APPLICATION
3622
3623 [nmake.common]
3624 IMAGE_ENTRY_POINT=InitializeCP
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
3633 +
3634 diff --git a/date/date.c b/date/date.c
3635 index 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
3647 );
3648
3649 @@ -92,7 +92,7 @@ SHELL_VAR_CHECK_ITEM DateCheckList[] = {
3650 NULL,
3651 0,
3652 0,
3653 - 0
3654 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3655 }
3656 };
3657
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 {
3669 diff --git a/date/date.h b/date/date.h
3670 index c95ac4d..d327c33 100644
3671 --- a/date/date.h
3672 +++ b/date/date.h
3673 @@ -32,3 +32,4 @@ Revision History
3674 }
3675
3676 #endif
3677 +
3678 diff --git a/date/date.inf b/date/date.inf
3679 index 2c40f72..affbb73 100644
3680 --- a/date/date.inf
3681 +++ b/date/date.inf
3682 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
3683
3684
3685 [sources.common]
3686 - ..\ShCommonStrings.uni
3687 + ../ShCommonStrings.uni
3688 DateStrings.uni
3689 Date.c
3690 Date.h
3691
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
3719 @@ -71,7 +71,12 @@ COMPONENT_TYPE = APPLICATION
3720
3721 [nmake.common]
3722 IMAGE_ENTRY_POINT=InitializeDate
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
3731 +
3732 diff --git a/dblk/dblk.c b/dblk/dblk.c
3733 index 3019627..21c841e 100644
3734 --- a/dblk/dblk.c
3735 +++ b/dblk/dblk.c
3736 @@ -52,7 +52,7 @@ SHELL_VAR_CHECK_ITEM DblkCheckList[] = {
3737 NULL,
3738 0,
3739 0,
3740 - 0
3741 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3742 }
3743 };
3744
3745 diff --git a/dblk/dblk.h b/dblk/dblk.h
3746 index 0341aeb..d7ec371 100644
3747 --- a/dblk/dblk.h
3748 +++ b/dblk/dblk.h
3749 @@ -168,3 +168,4 @@ DblkStructsPrint (
3750 extern EFI_HII_HANDLE HiiDblkHandle;
3751
3752 #endif
3753 +
3754 diff --git a/dblk/dblk.inf b/dblk/dblk.inf
3755 index f15392c..3c5dd45 100644
3756 --- a/dblk/dblk.inf
3757 +++ b/dblk/dblk.inf
3758 @@ -26,23 +26,23 @@ COMPONENT_TYPE = APPLICATION
3759
3760 [sources.common]
3761 DblkStrings.uni
3762 - ..\ShCommonStrings.uni
3763 + ../ShCommonStrings.uni
3764 dblk.c
3765 efidump.c
3766
3767 [includes.common]
3768 .
3769 - ..\Inc
3770 - ..\Library
3771 - $(EDK_SOURCE)\Foundation
3772 - $(EDK_SOURCE)\Foundation\Include
3773 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3774 - $(EDK_SOURCE)\Foundation\Efi
3775 - $(EDK_SOURCE)\Foundation\Efi\Include
3776 - $(EDK_SOURCE)\Foundation\FrameWork
3777 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3778 - $(EDK_SOURCE)\Foundation\Core\Dxe
3779 - $(DEST_DIR)\
3780 + ../Inc
3781 + ../Library
3782 + $(EDK_SOURCE)/Foundation
3783 + $(EDK_SOURCE)/Foundation/Include
3784 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3785 + $(EDK_SOURCE)/Foundation/Efi
3786 + $(EDK_SOURCE)/Foundation/Efi/Include
3787 + $(EDK_SOURCE)/Foundation/FrameWork
3788 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3789 + $(EDK_SOURCE)/Foundation/Core/Dxe
3790 + $(DEST_DIR./
3791
3792 [libraries.common]
3793 EfiShellLib
3794 @@ -61,11 +61,16 @@ COMPONENT_TYPE = APPLICATION
3795 # we will specify some additional DEFINEs on the compile command line.
3796 #
3797 [nmake.common]
3798 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3799 IMAGE_ENTRY_POINT=DumpBlockDev
3800 +
3801 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3802 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
3803 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3804 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3805 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3806
3807 +[nmake.ARM, nmake.AARCH64]
3808 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3809 +
3810
3811
3812 \ No newline at end of file
3813 diff --git a/dblk/efidump.c b/dblk/efidump.c
3814 index 7fc0337..c18b826 100644
3815 --- a/dblk/efidump.c
3816 +++ b/dblk/efidump.c
3817 @@ -24,7 +24,7 @@ Revision History
3818 --*/
3819
3820 #include "dblk.h"
3821 -#include "Efipart.h"
3822 +#include "EfiPart.h"
3823 #include "EfiShellLib.h"
3824
3825 #include STRING_DEFINES_FILE
3826 @@ -320,13 +320,11 @@ DblkDumpSystemTable (
3827 VOID *AcpiTable;
3828 VOID *Acpi20Table;
3829 VOID *SMBIOSTable;
3830 - VOID *SalSystemTable;
3831 VOID *MpsTable;
3832
3833 AcpiTable = NULL;
3834 Acpi20Table = NULL;
3835 SMBIOSTable = NULL;
3836 - SalSystemTable = NULL;
3837 MpsTable = NULL;
3838
3839 PrintToken (
3840 @@ -352,10 +350,12 @@ DblkDumpSystemTable (
3841 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
3842 }
3843
3844 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
3845 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
3846 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
3847 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
3848
3849 EFI64_CODE (
3850 + VOID *SalSystemTable;
3851 +
3852 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
3853 if (!EFI_ERROR(Status)) {
3854 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDblkHandle, (UINT64)SalSystemTable);
3855 @@ -364,22 +364,22 @@ DblkDumpSystemTable (
3856
3857 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
3858 if (!EFI_ERROR (Status)) {
3859 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
3860 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable);
3861 }
3862
3863 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
3864 if (!EFI_ERROR (Status)) {
3865 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
3866 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table);
3867 }
3868
3869 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
3870 if (!EFI_ERROR (Status)) {
3871 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
3872 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable);
3873 }
3874
3875 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
3876 if (!EFI_ERROR (Status)) {
3877 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
3878 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable);
3879 }
3880 }
3881
3882 diff --git a/devices/devices.c b/devices/devices.c
3883 index bcc8beb..1934ef5 100644
3884 --- a/devices/devices.c
3885 +++ b/devices/devices.c
3886 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3887 //
3888 // Global Variables
3889 //
3890 -EFI_HII_HANDLE HiiHandle;
3891 +STATIC EFI_HII_HANDLE HiiHandle;
3892 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
3893 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
3894 {
3895 @@ -61,7 +61,7 @@ SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
3896 NULL,
3897 0,
3898 0,
3899 - 0
3900 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3901 }
3902 };
3903
3904 diff --git a/devices/devices.h b/devices/devices.h
3905 index 19e0983..6aff8bf 100644
3906 --- a/devices/devices.h
3907 +++ b/devices/devices.h
3908 @@ -32,3 +32,4 @@ Revision History
3909 0x6fabed98, 0x2a7, 0x46a4, 0x84, 0xd1, 0x76, 0xcd, 0x5c, 0x49, 0x78, 0x74 \
3910 }
3911 #endif
3912 +
3913 diff --git a/devices/devices.inf b/devices/devices.inf
3914 index c380f7d..f9356da 100644
3915 --- a/devices/devices.inf
3916 +++ b/devices/devices.inf
3917 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
3918
3919 [sources.common]
3920 DevicesStrings.uni
3921 - ..\ShCommonStrings.uni
3922 + ../ShCommonStrings.uni
3923 devices.c
3924 devices.h
3925
3926 [includes.common]
3927 .
3928 - ..\Inc
3929 - ..\Library
3930 - $(EDK_SOURCE)\Foundation
3931 - $(EDK_SOURCE)\Foundation\Include
3932 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3933 - $(EDK_SOURCE)\Foundation\Efi
3934 - $(EDK_SOURCE)\Foundation\Efi\Include
3935 - $(EDK_SOURCE)\Foundation\FrameWork
3936 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3937 - $(EDK_SOURCE)\Foundation\Core\Dxe
3938 - $(DEST_DIR)\
3939 + ../Inc
3940 + ../Library
3941 + $(EDK_SOURCE)/Foundation
3942 + $(EDK_SOURCE)/Foundation/Include
3943 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3944 + $(EDK_SOURCE)/Foundation/Efi
3945 + $(EDK_SOURCE)/Foundation/Efi/Include
3946 + $(EDK_SOURCE)/Foundation/FrameWork
3947 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3948 + $(EDK_SOURCE)/Foundation/Core/Dxe
3949 + $(DEST_DIR./
3950
3951 [libraries.common]
3952 EfiShellLib
3953 @@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
3954
3955 [nmake.common]
3956 IMAGE_ENTRY_POINT=DevicesMain
3957 +
3958 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
3959 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
3960 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
3961 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
3962
3963 +[nmake.ARM, nmake.AARCH64]
3964 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
3965 diff --git a/dmem/MemCommonPart.c b/dmem/MemCommonPart.c
3966 index 377da17..c4807a3 100644
3967 --- a/dmem/MemCommonPart.c
3968 +++ b/dmem/MemCommonPart.c
3969 @@ -58,7 +58,7 @@ SHELL_VAR_CHECK_ITEM DmemCheckList[] = {
3970 NULL,
3971 0,
3972 0,
3973 - 0
3974 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
3975 }
3976 };
3977
3978 @@ -148,7 +148,7 @@ Return:
3979 return EFI_SUCCESS;
3980 }
3981
3982 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
3983 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
3984 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
3985
3986 //
3987 @@ -156,7 +156,7 @@ Return:
3988 //
3989 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
3990 if (MMIo) {
3991 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
3992 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
3993 if (EFI_ERROR (Status)) {
3994 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
3995 return Status;
3996 @@ -171,7 +171,7 @@ Return:
3997 return Status;
3998 }
3999
4000 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
4001 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
4002 } else {
4003 Buffer = (UINT8 *) (UINTN) Address;
4004 }
4005 @@ -233,7 +233,7 @@ Return:
4006 //
4007 MMIo = FALSE;
4008 AddressStr = SizeStr = NULL;
4009 - Address = (UINT64) SystemTable;
4010 + Address = (UINT64)(UINTN) SystemTable;
4011 Size = 512;
4012 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
4013 if (VarCheckOk != RetCode) {
4014 @@ -316,7 +316,7 @@ Return:
4015 //
4016 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
4017 if (MMIo) {
4018 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
4019 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
4020 if (EFI_ERROR (Status)) {
4021 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
4022 return Status;
4023 @@ -331,7 +331,7 @@ Return:
4024 return Status;
4025 }
4026
4027 - PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciIoWidthUint8, Address, Size, Buffer);
4028 + PciRootBridgeIo->Mem.Read (PciRootBridgeIo, EfiPciWidthUint8, Address, Size, Buffer);
4029 } else {
4030 Buffer = (UINT8 *) (UINTN) Address;
4031 }
4032 diff --git a/dmem/MemCommonPart.h b/dmem/MemCommonPart.h
4033 index f57e32a..f094fbb 100644
4034 --- a/dmem/MemCommonPart.h
4035 +++ b/dmem/MemCommonPart.h
4036 @@ -61,4 +61,4 @@ EFIStructsPrint (
4037 IN EFI_BLOCK_IO_PROTOCOL *BlkIo
4038 );
4039
4040 -#endif
4041 \ No newline at end of file
4042 +#endif
4043 diff --git a/dmem/debug.h b/dmem/debug.h
4044 index 50df0ed..8d5cd4e 100644
4045 --- a/dmem/debug.h
4046 +++ b/dmem/debug.h
4047 @@ -156,3 +156,4 @@ EFIStructsPrint (
4048 extern EFI_HII_HANDLE HiiDmemHandle;
4049
4050 #endif
4051 +
4052 diff --git a/dmem/dmem.inf b/dmem/dmem.inf
4053 index ca0dcaf..acdf279 100644
4054 --- a/dmem/dmem.inf
4055 +++ b/dmem/dmem.inf
4056 @@ -25,7 +25,7 @@ FILE_GUID = 644E259E-FF88-4d31-8092-B99D8777F1C4
4057 COMPONENT_TYPE = APPLICATION
4058
4059 [sources.common]
4060 - ..\ShCommonStrings.uni
4061 + ../ShCommonStrings.uni
4062 MemStrings.uni
4063 DebugStrings.uni
4064 mem.c
4065 @@ -34,17 +34,17 @@ COMPONENT_TYPE = APPLICATION
4066
4067 [includes.common]
4068 .
4069 - ..\Inc
4070 - ..\Library
4071 - $(EDK_SOURCE)\Foundation
4072 - $(EDK_SOURCE)\Foundation\Include
4073 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4074 - $(EDK_SOURCE)\Foundation\Efi
4075 - $(EDK_SOURCE)\Foundation\Efi\Include
4076 - $(EDK_SOURCE)\Foundation\FrameWork
4077 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4078 - $(EDK_SOURCE)\Foundation\Core\Dxe
4079 - $(DEST_DIR)\
4080 + ../Inc
4081 + ../Library
4082 + $(EDK_SOURCE)/Foundation
4083 + $(EDK_SOURCE)/Foundation/Include
4084 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4085 + $(EDK_SOURCE)/Foundation/Efi
4086 + $(EDK_SOURCE)/Foundation/Efi/Include
4087 + $(EDK_SOURCE)/Foundation/FrameWork
4088 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4089 + $(EDK_SOURCE)/Foundation/Core/Dxe
4090 + $(DEST_DIR./
4091
4092 [libraries.common]
4093 EfiShellLib
4094 @@ -64,9 +64,13 @@ COMPONENT_TYPE = APPLICATION
4095 # we will specify some additional DEFINEs on the compile command line.
4096 #
4097 [nmake.common]
4098 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
4099 IMAGE_ENTRY_POINT=DumpMem
4100 +
4101 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4102 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
4103 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4104 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4105 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4106
4107 +[nmake.ARM, nmake.AARCH64]
4108 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
4109 diff --git a/dmem/efidump.c b/dmem/efidump.c
4110 index 051f6a0..11526f2 100644
4111 --- a/dmem/efidump.c
4112 +++ b/dmem/efidump.c
4113 @@ -24,7 +24,7 @@ Revision History
4114 --*/
4115
4116 #include "debug.h"
4117 -#include "Efipart.h"
4118 +#include "EfiPart.h"
4119 #include "EfiShellLib.h"
4120
4121 #include STRING_DEFINES_FILE
4122 @@ -320,13 +320,11 @@ DumpSystemTable (
4123 VOID *AcpiTable;
4124 VOID *Acpi20Table;
4125 VOID *SMBIOSTable;
4126 - VOID *SalSystemTable;
4127 VOID *MpsTable;
4128
4129 AcpiTable = NULL;
4130 Acpi20Table = NULL;
4131 SMBIOSTable = NULL;
4132 - SalSystemTable = NULL;
4133 MpsTable = NULL;
4134
4135 PrintToken (
4136 @@ -352,11 +350,13 @@ DumpSystemTable (
4137 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
4138 }
4139
4140 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
4141 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
4142 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
4143 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
4144
4145 EFI64_CODE (
4146 - Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
4147 + VOID *SalSystemTable;
4148 +
4149 + Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
4150 if (!EFI_ERROR(Status)) {
4151 PrintToken (STRING_TOKEN(STR_DEBUG_SAL_SYSTEM_TABLE), HiiDmemHandle, (UINT64)SalSystemTable);
4152 }
4153 @@ -364,22 +364,22 @@ DumpSystemTable (
4154
4155 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
4156 if (!EFI_ERROR (Status)) {
4157 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
4158 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable);
4159 }
4160
4161 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
4162 if (!EFI_ERROR (Status)) {
4163 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
4164 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table);
4165 }
4166
4167 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
4168 if (!EFI_ERROR (Status)) {
4169 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
4170 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable);
4171 }
4172
4173 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
4174 if (!EFI_ERROR (Status)) {
4175 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
4176 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable);
4177 }
4178 }
4179
4180 diff --git a/dmpstore/dmpstore.c b/dmpstore/dmpstore.c
4181 index 747762e..3473d19 100644
4182 --- a/dmpstore/dmpstore.c
4183 +++ b/dmpstore/dmpstore.c
4184 @@ -95,7 +95,7 @@ SetFileVariable (
4185 //
4186 // Global Variables
4187 //
4188 -EFI_HII_HANDLE HiiHandle;
4189 +STATIC EFI_HII_HANDLE HiiHandle;
4190 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
4191 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
4192 {
4193 @@ -132,7 +132,7 @@ SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
4194 NULL,
4195 0,
4196 0,
4197 - 0
4198 + (SHELL_VAR_CHECK_FLAG_TYPE) 0
4199 }
4200 };
4201
4202 diff --git a/dmpstore/dmpstore.h b/dmpstore/dmpstore.h
4203 index 32d72ec..278fb59 100644
4204 --- a/dmpstore/dmpstore.h
4205 +++ b/dmpstore/dmpstore.h
4206 @@ -40,3 +40,4 @@ typedef struct {
4207 } DMPSTORE_VARIABLE;
4208
4209 #endif
4210 +
4211 diff --git a/dmpstore/dmpstore.inf b/dmpstore/dmpstore.inf
4212 index f380759..4a5563d 100644
4213 --- a/dmpstore/dmpstore.inf
4214 +++ b/dmpstore/dmpstore.inf
4215 @@ -25,24 +25,24 @@ FILE_GUID = 7185D15A-A0AE-4dd1-A58F-C6EAD28EC9A8
4216 COMPONENT_TYPE = APPLICATION
4217
4218 [sources.common]
4219 - ..\ShCommonStrings.uni
4220 + ../ShCommonStrings.uni
4221 DmpstoreStrings.uni
4222 dmpstore.c
4223 dmpstore.h
4224
4225 [includes.common]
4226 .
4227 - ..\Inc
4228 - ..\Library
4229 - $(EDK_SOURCE)\Foundation
4230 - $(EDK_SOURCE)\Foundation\Include
4231 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4232 - $(EDK_SOURCE)\Foundation\Efi
4233 - $(EDK_SOURCE)\Foundation\Efi\Include
4234 - $(EDK_SOURCE)\Foundation\FrameWork
4235 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4236 - $(EDK_SOURCE)\Foundation\Core\Dxe
4237 - $(DEST_DIR)\
4238 + ../Inc
4239 + ../Library
4240 + $(EDK_SOURCE)/Foundation
4241 + $(EDK_SOURCE)/Foundation/Include
4242 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4243 + $(EDK_SOURCE)/Foundation/Efi
4244 + $(EDK_SOURCE)/Foundation/Efi/Include
4245 + $(EDK_SOURCE)/Foundation/FrameWork
4246 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4247 + $(EDK_SOURCE)/Foundation/Core/Dxe
4248 + $(DEST_DIR./
4249
4250 [libraries.common]
4251 EfiShellLib
4252 @@ -61,11 +61,14 @@ COMPONENT_TYPE = APPLICATION
4253 # we will specify some additional DEFINEs on the compile command line.
4254 #
4255 [nmake.common]
4256 - C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
4257 IMAGE_ENTRY_POINT=InitializeDumpStore
4258 +
4259 +[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
4260 + C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
4261 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
4262 C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
4263 C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
4264
4265 -
4266 +[nmake.ARM, nmake.AARCH64]
4267 + C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL