This repository has been archived by the owner on Jan 19, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathShellR64.patch
9765 lines (8846 loc) · 268 KB
/
ShellR64.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 6451e0daf7f733a27e1afb3c7ac662a620d8b93b Mon Sep 17 00:00:00 2001
From: Olivier Martin <[email protected]>
Date: Tue, 14 Jan 2014 14:43:50 +0000
Subject: [PATCH] EDK Shell patch to support GCC
---
DeviceTree/devicetree.c | 4 +-
DeviceTree/devicetree.h | 1 +
DeviceTree/devicetree.inf | 28 +--
EfiCompress/Compress.h | 2 +-
EfiCompress/CompressMain.c | 2 +-
EfiCompress/compress.c | 2 +-
EfiCompress/compress.inf | 32 +--
EfiDecompress/Decompress.c | 8 +-
EfiDecompress/Decompress.h | 2 +-
EfiDecompress/Decompress.inf | 33 +--
IfConfig/IfConfig.c | 6 +-
IfConfig/IfConfig.h | 1 +
IfConfig/IfConfig.inf | 34 +--
IfConfig/ShellNetHelper.h | 1 +
IpConfig/IpConfig.c | 4 +-
IpConfig/IpConfig.h | 2 +-
IpConfig/IpConfig.inf | 29 +--
Library/Aarch64/efilibplat.h | 38 ++++
Library/Arm/efilibplat.h | 39 ++++
Library/CRC.c | 2 +-
Library/CRC.h | 4 +-
Library/ConsistMapping.c | 2 +-
Library/ConsistMapping.h | 4 +-
Library/DPath.c | 6 +-
Library/DPath.h | 3 +-
Library/Data.c | 2 +-
Library/Ebc/EfiLibPlat.h | 1 +
Library/EfiPart.h | 1 +
Library/EfiShellLib.h | 11 +-
Library/EfiShellLib.inf | 51 +++--
Library/Event.c | 2 +-
Library/Event.h | 4 +-
Library/FileIO.c | 6 +-
Library/FileIO.h | 4 +-
Library/Handle.c | 9 +-
Library/Handle.h | 1 +
Library/HiiSupport.c | 6 +-
Library/HiiSupport.h | 1 +
Library/IA32/efilibplat.h | 2 +-
Library/IO.c | 13 +-
Library/IO.h | 4 +-
Library/IPF/efilibplat.h | 1 +
Library/IPF/libsalpal.h | 2 +-
Library/IPF/palproc.h | 1 +
Library/Init.c | 2 +-
Library/LinkedList.h | 4 +-
Library/Lock.c | 2 +-
Library/Lock.h | 4 +-
Library/Mem.c | 2 +-
Library/Mem.h | 4 +-
Library/Misc.c | 15 +-
Library/Misc.h | 1 +
Library/Perf.c | 2 +-
Library/RtData.c | 2 +-
Library/ShellDebug.c | 2 +-
Library/ShellDebug.h | 1 +
Library/ShellEnvInt.c | 2 +-
Library/ShellEnvInt.h | 4 +-
Library/Str.c | 6 +-
Library/Str.h | 1 +
Library/VarCheck.c | 2 +-
Library/VarCheck.h | 3 +-
Library/X64/efilibplat.h | 1 +
LoadPciRom/LoadPciRom.c | 8 +-
LoadPciRom/LoadPciRom.h | 1 +
LoadPciRom/LoadPciRom.inf | 28 +--
Ping/Ping.c | 27 ++-
Ping/Ping.h | 1 +
Ping/Ping.inf | 34 +--
Shell.inf | 305 +++++++++++++-------------
ShellFull.inf | 494 ++++++++++++++++++++++---------------------
SmbiosView/EventLogInfo.c | 2 +-
SmbiosView/EventLogInfo.h | 1 +
SmbiosView/LibSmbios.h | 1 +
SmbiosView/LibSmbiosView.c | 10 +-
SmbiosView/LibSmbiosView.h | 3 +-
SmbiosView/PrintInfo.c | 2 +-
SmbiosView/PrintInfo.h | 1 +
SmbiosView/QueryTable.c | 2 +-
SmbiosView/QueryTable.h | 1 +
SmbiosView/Smbios.h | 1 +
SmbiosView/Smbiosview.inf | 33 +--
SmbiosView/smbiosview.c | 4 +-
SmbiosView/smbiosview.h | 1 +
TelnetMgmt/TelnetMgmt.c | 4 +-
TelnetMgmt/TelnetMgmt.h | 2 +-
TelnetMgmt/TelnetMgmt.inf | 29 +--
TelnetMgmt/TelnetServer.h | 1 +
attrib/attrib.c | 6 +-
attrib/attrib.h | 3 +-
attrib/attrib.inf | 28 +--
cls/cls.c | 4 +-
cls/cls.h | 1 +
cls/cls.inf | 29 +--
comp/comp.c | 2 +-
comp/comp.h | 2 +-
comp/comp.inf | 31 +--
cp/cp.c | 10 +-
cp/cp.h | 3 +-
cp/cp.inf | 29 +--
date/date.c | 10 +-
date/date.h | 1 +
date/date.inf | 29 +--
dblk/dblk.c | 2 +-
dblk/dblk.h | 1 +
dblk/dblk.inf | 31 +--
dblk/efidump.c | 18 +-
devices/devices.c | 4 +-
devices/devices.h | 1 +
devices/devices.inf | 28 +--
dmem/MemCommonPart.c | 14 +-
dmem/MemCommonPart.h | 2 +-
dmem/debug.h | 1 +
dmem/dmem.inf | 30 +--
dmem/efidump.c | 20 +-
dmpstore/dmpstore.c | 4 +-
dmpstore/dmpstore.h | 1 +
dmpstore/dmpstore.inf | 31 +--
drivers/drivers.c | 6 +-
drivers/drivers.h | 1 +
drivers/drivers.inf | 28 +--
drvcfg/drvcfg.c | 4 +-
drvcfg/drvcfg.h | 1 +
drvcfg/drvcfg.inf | 28 +--
drvdiag/drvdiag.c | 4 +-
drvdiag/drvdiag.h | 1 +
drvdiag/drvdiag.inf | 28 +--
edit/edit.inf | 32 +--
edit/editor.h | 5 +-
edit/editortype.h | 7 +-
edit/libEditor.c | 24 +--
edit/libFileBuffer.c | 24 ++-
edit/libInputBar.c | 26 +--
edit/libMenuBar.c | 9 +-
edit/libMisc.h | 1 +
edit/libStatusBar.c | 11 +-
edit/libTitleBar.c | 17 +-
edit/libeditor.h | 1 +
edit/libfilebuffer.h | 1 +
edit/libinputbar.h | 1 +
edit/libmenubar.h | 1 +
edit/libstatusbar.h | 1 +
edit/libtitlebar.h | 1 +
edit/main.c | 30 +--
err/DebugMask.h | 1 +
err/err.c | 12 +-
err/err.h | 2 +-
err/err.inf | 31 +--
guid/guid.c | 4 +-
guid/guid.h | 2 +-
guid/guid.inf | 33 +--
hexedit/heditor.h | 5 +-
hexedit/heditortype.h | 7 +-
hexedit/hexedit.inf | 31 +--
hexedit/libBufferImage.c | 37 ++--
hexedit/libEditor.c | 33 +--
hexedit/libInputBar.c | 11 +-
hexedit/libMemImage.c | 8 +-
hexedit/libMenuBar.c | 13 +-
hexedit/libMisc.h | 3 +-
hexedit/libStatusBar.c | 1 +
hexedit/libTitleBar.c | 24 ++-
hexedit/libbufferimage.h | 1 +
hexedit/libclipboard.h | 1 +
hexedit/libdiskimage.c | 17 +-
hexedit/libdiskimage.h | 1 +
hexedit/libeditor.h | 1 +
hexedit/libfileimage.h | 1 +
hexedit/libinputbar.h | 1 +
hexedit/libmemimage.h | 1 +
hexedit/libmenubar.h | 3 +-
hexedit/libstatusbar.h | 1 +
hexedit/libtitlebar.h | 1 +
hexedit/main.c | 78 +++----
inc/shellenv.h | 1 +
inc/shelltypes.h | 3 +-
load/load.c | 2 +-
load/load.h | 1 +
load/load.inf | 29 +--
ls/ls.c | 11 +-
ls/ls.h | 3 +-
ls/ls.inf | 28 +--
mem/MemCommonPart.c | 14 +-
mem/MemCommonPart.h | 2 +-
mem/debug.h | 1 +
mem/efidump.c | 20 +-
mem/mem.inf | 30 +--
memmap/memmap.c | 6 +-
memmap/memmap.h | 1 +
memmap/memmap.inf | 28 +--
mkdir/mkdir.c | 4 +-
mkdir/mkdir.h | 3 +-
mkdir/mkdir.inf | 28 +--
mm/mm.c | 72 +++----
mm/mm.h | 1 +
mm/mm.inf | 28 +--
mode/mode.c | 2 +-
mode/mode.h | 1 +
mode/mode.inf | 28 +--
mount/mount.c | 4 +-
mount/mount.h | 1 +
mount/mount.inf | 28 +--
mv/mv.c | 4 +-
mv/mv.h | 2 +-
mv/mv.inf | 28 +--
newshell/FakeHii.c | 6 +-
newshell/FakeHii.h | 1 +
newshell/init.c | 18 +-
newshell/nshell.h | 3 +-
newshell/nshell.inf | 34 +--
openinfo/openinfo.c | 4 +-
openinfo/openinfo.h | 1 +
openinfo/openinfo.inf | 28 +--
pci/pci.c | 19 +-
pci/pci.h | 3 +-
pci/pci.inf | 28 +--
pci/pci_class.c | 2 +-
pci/pci_class.h | 3 +-
reset/reset.c | 2 +-
reset/reset.h | 1 +
reset/reset.inf | 28 +--
rm/rm.c | 2 +-
rm/rm.h | 1 +
rm/rm.inf | 28 +--
sermode/sermode.c | 8 +-
sermode/sermode.h | 1 +
sermode/sermode.inf | 28 +--
shellenv/Connect.c | 20 +-
shellenv/ConsoleProxy.c | 6 +-
shellenv/batch.c | 15 +-
shellenv/conio.c | 2 +-
shellenv/dprot.c | 8 +-
shellenv/echo.c | 2 +-
shellenv/exec.c | 18 +-
shellenv/for.c | 7 +-
shellenv/help.c | 2 +-
shellenv/if.c | 3 -
shellenv/init.c | 2 +-
shellenv/map.c | 16 +-
shellenv/parsecmd.h | 3 +-
shellenv/pause.c | 2 +-
shellenv/protid.c | 22 +-
shellenv/shelle.h | 1 +
shellenv/shellenvguid.h | 1 +
shellenv/var.c | 6 +-
stall/stall.c | 2 +-
stall/stall.h | 1 +
stall/stall.inf | 28 +--
time/time.c | 10 +-
time/time.h | 1 +
time/time.inf | 28 +--
touch/touch.c | 2 +-
touch/touch.h | 2 +-
touch/touch.inf | 29 +--
type/type.c | 4 +-
type/type.h | 1 +
type/type.inf | 28 +--
tzone/timezone.inf | 32 +--
tzone/tzone.c | 4 +-
tzone/tzone.h | 1 +
unload/unload.c | 18 +-
unload/unload.h | 1 +
unload/unload.inf | 29 +--
ver/Ebc/verEbc.c | 2 +-
ver/Ver.inf | 36 ++--
ver/ver.c | 2 +-
ver/ver.h | 1 +
vol/Vol.inf | 28 +--
vol/vol.c | 4 +-
vol/vol.h | 1 +
270 files changed, 1985 insertions(+), 1610 deletions(-)
create mode 100644 Library/Aarch64/efilibplat.h
create mode 100644 Library/Arm/efilibplat.h
diff --git a/DeviceTree/devicetree.c b/DeviceTree/devicetree.c
index 147e2cb..77e3cf4 100644
--- a/DeviceTree/devicetree.c
+++ b/DeviceTree/devicetree.c
@@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
//
// Global Variables
//
-EFI_HII_HANDLE HiiHandle;
+STATIC EFI_HII_HANDLE HiiHandle;
EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
{
@@ -67,7 +67,7 @@ SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
NULL,
0,
0,
- 0
+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
}
};
diff --git a/DeviceTree/devicetree.h b/DeviceTree/devicetree.h
index c452fc7..07bb939 100644
--- a/DeviceTree/devicetree.h
+++ b/DeviceTree/devicetree.h
@@ -32,3 +32,4 @@ Revision History
0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
}
#endif
+
diff --git a/DeviceTree/devicetree.inf b/DeviceTree/devicetree.inf
index a86a1a0..7adc097 100644
--- a/DeviceTree/devicetree.inf
+++ b/DeviceTree/devicetree.inf
@@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
[sources.common]
- ..\ShCommonStrings.uni
+ ../ShCommonStrings.uni
DevicetreeStrings.uni
devicetree.c
devicetree.h
[includes.common]
.
- ..\Inc
- ..\Library
- $(EDK_SOURCE)\Foundation
- $(EDK_SOURCE)\Foundation\Include
- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
- $(EDK_SOURCE)\Foundation\Efi
- $(EDK_SOURCE)\Foundation\Efi\Include
- $(EDK_SOURCE)\Foundation\FrameWork
- $(EDK_SOURCE)\Foundation\FrameWork\Include
- $(EDK_SOURCE)\Foundation\Core\Dxe
- $(DEST_DIR)\
+ ../Inc
+ ../Library
+ $(EDK_SOURCE)/Foundation
+ $(EDK_SOURCE)/Foundation/Include
+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+ $(EDK_SOURCE)/Foundation/Efi
+ $(EDK_SOURCE)/Foundation/Efi/Include
+ $(EDK_SOURCE)/Foundation/FrameWork
+ $(EDK_SOURCE)/Foundation/FrameWork/Include
+ $(EDK_SOURCE)/Foundation/Core/Dxe
+ $(DEST_DIR./
[libraries.common]
EfiShellLib
@@ -72,7 +72,11 @@ COMPONENT_TYPE = APPLICATION
[nmake.common]
IMAGE_ENTRY_POINT=DevicetreeMain
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+[nmake.ARM, nmake.AARCH64]
+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
diff --git a/EfiCompress/Compress.h b/EfiCompress/Compress.h
index 6ce2bfc..4e8313f 100644
--- a/EfiCompress/Compress.h
+++ b/EfiCompress/Compress.h
@@ -57,4 +57,4 @@ Returns:
--*/
-#endif
\ No newline at end of file
+#endif
diff --git a/EfiCompress/CompressMain.c b/EfiCompress/CompressMain.c
index 3edb17e..082046e 100644
--- a/EfiCompress/CompressMain.c
+++ b/EfiCompress/CompressMain.c
@@ -50,7 +50,7 @@ SHELL_VAR_CHECK_ITEM CompressCheckList[] = {
NULL,
0,
0,
- 0
+ (SHELL_VAR_CHECK_FLAG_TYPE)0
}
};
diff --git a/EfiCompress/compress.c b/EfiCompress/compress.c
index e21c1f6..012bbef 100644
--- a/EfiCompress/compress.c
+++ b/EfiCompress/compress.c
@@ -262,7 +262,7 @@ STATIC UINT32 mBufSiz = 0, mOutputPos, mOutputMask, mSubBitBuf, mCrc;
STATIC UINT32 mCompSize, mOrigSize;
STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
- mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
+ mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
diff --git a/EfiCompress/compress.inf b/EfiCompress/compress.inf
index 2e62fbf..f3194b5 100644
--- a/EfiCompress/compress.inf
+++ b/EfiCompress/compress.inf
@@ -25,7 +25,7 @@ FILE_GUID = A6A236DB-F3FB-4f7f-93BC-0AF7DAA583B9
COMPONENT_TYPE = APPLICATION
[sources.common]
-..\ShCommonStrings.uni
+../ShCommonStrings.uni
CompressStrings.uni
compressMain.c
compress.c
@@ -34,17 +34,17 @@ compress.h
[includes.common]
.
- ..\Inc
- ..\Library
- $(EDK_SOURCE)\Foundation
- $(EDK_SOURCE)\Foundation\Include
- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
- $(EDK_SOURCE)\Foundation\Efi
- $(EDK_SOURCE)\Foundation\Efi\Include
- $(EDK_SOURCE)\Foundation\FrameWork
- $(EDK_SOURCE)\Foundation\FrameWork\Include
- $(EDK_SOURCE)\Foundation\Core\Dxe
- $(DEST_DIR)\
+ ../Inc
+ ../Library
+ $(EDK_SOURCE)/Foundation
+ $(EDK_SOURCE)/Foundation/Include
+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+ $(EDK_SOURCE)/Foundation/Efi
+ $(EDK_SOURCE)/Foundation/Efi/Include
+ $(EDK_SOURCE)/Foundation/FrameWork
+ $(EDK_SOURCE)/Foundation/FrameWork/Include
+ $(EDK_SOURCE)/Foundation/Core/Dxe
+ $(DEST_DIR./
[libraries.common]
EfiShellLib
@@ -64,11 +64,13 @@ compress.h
# we will specify some additional DEFINEs on the compile command line.
#
[nmake.common]
- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
IMAGE_ENTRY_POINT=InitializeCompress
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
-
-
\ No newline at end of file
+[nmake.ARM, nmake.AARCH64]
+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
diff --git a/EfiDecompress/Decompress.c b/EfiDecompress/Decompress.c
index 918f673..2ee0404 100644
--- a/EfiDecompress/Decompress.c
+++ b/EfiDecompress/Decompress.c
@@ -22,7 +22,7 @@ Revision History
--*/
#include "EfiShellLib.h"
-#include "decompress.h"
+#include "Decompress.h"
extern UINT8 STRING_ARRAY_NAME[];
@@ -31,7 +31,7 @@ extern UINT8 STRING_ARRAY_NAME[];
//
#include STRING_DEFINES_FILE
-#include EFI_PROTOCOL_DEFINITION (decompress)
+#include EFI_PROTOCOL_DEFINITION (Decompress)
EFI_HII_HANDLE HiiDecompressHandle;
EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
@@ -52,7 +52,7 @@ SHELL_VAR_CHECK_ITEM DecompressCheckList[] = {
NULL,
0,
0,
- 0
+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
}
};
@@ -192,7 +192,7 @@ Returns:
//
//
//
- Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
+ Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
if (EFI_ERROR (Status)) {
PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
Status = EFI_UNSUPPORTED;
diff --git a/EfiDecompress/Decompress.h b/EfiDecompress/Decompress.h
index abfae65..3d4520c 100644
--- a/EfiDecompress/Decompress.h
+++ b/EfiDecompress/Decompress.h
@@ -29,4 +29,4 @@ Revision History
0xe15963a9, 0xa05a, 0x480e, 0x91, 0x49, 0x32, 0xe9, 0x24, 0x5d, 0x98, 0xcb \
}
-#endif
\ No newline at end of file
+#endif
diff --git a/EfiDecompress/Decompress.inf b/EfiDecompress/Decompress.inf
index f955220..7b2ff3d 100644
--- a/EfiDecompress/Decompress.inf
+++ b/EfiDecompress/Decompress.inf
@@ -25,7 +25,7 @@ FILE_GUID = D9D42564-071C-4d73-8DB0-43C55C62DC4C
COMPONENT_TYPE = APPLICATION
[sources.common]
-..\ShCommonStrings.uni
+../ShCommonStrings.uni
DecompressStrings.uni
decompress.c
decompress.h
@@ -33,17 +33,17 @@ decompress.h
[includes.common]
.
- ..\Inc
- ..\Library
- $(EDK_SOURCE)\Foundation
- $(EDK_SOURCE)\Foundation\Include
- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
- $(EDK_SOURCE)\Foundation\Efi
- $(EDK_SOURCE)\Foundation\Efi\Include
- $(EDK_SOURCE)\Foundation\FrameWork
- $(EDK_SOURCE)\Foundation\FrameWork\Include
- $(EDK_SOURCE)\Foundation\Core\Dxe
- $(DEST_DIR)\
+ ../Inc
+ ../Library
+ $(EDK_SOURCE)/Foundation
+ $(EDK_SOURCE)/Foundation/Include
+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+ $(EDK_SOURCE)/Foundation/Efi
+ $(EDK_SOURCE)/Foundation/Efi/Include
+ $(EDK_SOURCE)/Foundation/FrameWork
+ $(EDK_SOURCE)/Foundation/FrameWork/Include
+ $(EDK_SOURCE)/Foundation/Core/Dxe
+ $(DEST_DIR./
[libraries.common]
EfiShellLib
@@ -63,11 +63,14 @@ decompress.h
# we will specify some additional DEFINEs on the compile command line.
#
[nmake.common]
- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
IMAGE_ENTRY_POINT=InitializeDecompress
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
+ C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
-
-
+[nmake.ARM, nmake.AARCH64]
+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
+
\ No newline at end of file
diff --git a/IfConfig/IfConfig.c b/IfConfig/IfConfig.c
index 07cedc2..52e1add 100644
--- a/IfConfig/IfConfig.c
+++ b/IfConfig/IfConfig.c
@@ -29,7 +29,7 @@ extern UINT8 STRING_ARRAY_NAME[];
//
#define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
-EFI_HII_HANDLE HiiHandle;
+STATIC EFI_HII_HANDLE HiiHandle;
EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
@@ -75,7 +75,7 @@ SHELL_VAR_CHECK_ITEM IfConfigCheckList[] = {
NULL,
0,
0,
- 0
+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
}
};
@@ -669,7 +669,7 @@ Returns:
Status = BS->LocateProtocol (
&gEfiHiiConfigRoutingProtocolGuid,
NULL,
- &mHiiConfigRouting
+ (VOID**)&mHiiConfigRouting
);
if (EFI_ERROR (Status)) {
return EFI_NOT_FOUND;
diff --git a/IfConfig/IfConfig.h b/IfConfig/IfConfig.h
index 4a9d3c5..b8f044e 100644
--- a/IfConfig/IfConfig.h
+++ b/IfConfig/IfConfig.h
@@ -60,3 +60,4 @@ typedef struct {
} ARP_REQUEST;
#endif
+
diff --git a/IfConfig/IfConfig.inf b/IfConfig/IfConfig.inf
index b2e4964..d8c5c23 100644
--- a/IfConfig/IfConfig.inf
+++ b/IfConfig/IfConfig.inf
@@ -25,7 +25,7 @@ FILE_GUID = 6394CF3D-D3DC-4f69-926D-AF9FFE59F922
COMPONENT_TYPE = APPLICATION
[sources.common]
- ..\ShCommonStrings.uni
+ ../ShCommonStrings.uni
IfConfigStrings.uni
IfConfig.c
IfConfig.h
@@ -33,30 +33,32 @@ COMPONENT_TYPE = APPLICATION
ShellNetHelper.h
[includes.common]
- ..\Inc
- ..\Library
- $(EDK_SOURCE)\Foundation\Efi
- $(EDK_SOURCE)\Foundation
- $(EDK_SOURCE)\Foundation\Efi\Include
- $(EDK_SOURCE)\Foundation\Include
- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
- $(EDK_SOURCE)\Foundation\FrameWork
- $(EDK_SOURCE)\Foundation\FrameWork\Include
- $(EDK_SOURCE)\Foundation\Core\Dxe
- $(EDK_SOURCE)\Foundation\Library\Dxe\Include
- $(DEST_DIR)\
+ ../Inc
+ ../Library
+ $(EDK_SOURCE)/Foundation/Efi
+ $(EDK_SOURCE)/Foundation
+ $(EDK_SOURCE)/Foundation/Efi/Include
+ $(EDK_SOURCE)/Foundation/Include
+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+ $(EDK_SOURCE)/Foundation/FrameWork
+ $(EDK_SOURCE)/Foundation/FrameWork/Include
+ $(EDK_SOURCE)/Foundation/Core/Dxe
+ $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+ $(DEST_DIR./
[libraries.common]
EfiShellLib
EdkProtocolLib
EfiProtocolLib
EdkGuidLib
- EfiDriverLib
[nmake.common]
- C_PROJ_FLAGS = $(C_PROJ_FLAGS)
IMAGE_ENTRY_POINT=IfConfig
- C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
+ C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+[nmake.ARM, nmake.AARCH64]
+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
diff --git a/IfConfig/ShellNetHelper.h b/IfConfig/ShellNetHelper.h
index 9a33d3f..87e6886 100644
--- a/IfConfig/ShellNetHelper.h
+++ b/IfConfig/ShellNetHelper.h
@@ -87,3 +87,4 @@ ShellDestroyServiceChild (
IN EFI_HANDLE ChildHandle
);
#endif
+
diff --git a/IpConfig/IpConfig.c b/IpConfig/IpConfig.c
index 0c3e4c3..474e5f1 100644
--- a/IpConfig/IpConfig.c
+++ b/IpConfig/IpConfig.c
@@ -39,7 +39,7 @@ extern UINT8 STRING_ARRAY_NAME[];
//
// Global Variables
//
-EFI_HII_HANDLE HiiHandle;
+STATIC EFI_HII_HANDLE HiiHandle;
EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
{
@@ -76,7 +76,7 @@ SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
NULL,
0,
0,
- 0
+ (SHELL_VAR_CHECK_FLAG_TYPE) 0
}
};
diff --git a/IpConfig/IpConfig.h b/IpConfig/IpConfig.h
index 1806435..5c975a9 100644
--- a/IpConfig/IpConfig.h
+++ b/IpConfig/IpConfig.h
@@ -29,4 +29,4 @@ Revision History
0x8252915c, 0xf1e9, 0x435c, 0x81, 0x91, 0xad, 0x2f, 0x82, 0x62, 0x23, 0x73 \
}
-#endif
\ No newline at end of file
+#endif
diff --git a/IpConfig/IpConfig.inf b/IpConfig/IpConfig.inf
index bc8271c..8cb1e0f 100644
--- a/IpConfig/IpConfig.inf
+++ b/IpConfig/IpConfig.inf
@@ -25,24 +25,24 @@ FILE_GUID = 1D73AC03-AF05-44b3-B21E-93A174893FA6
COMPONENT_TYPE = APPLICATION
[sources.common]
- ..\ShCommonStrings.uni
+ ../ShCommonStrings.uni
IpConfigStrings.uni
IpConfig.c
IpConfig.h
[includes.common]
.
- ..\Inc
- ..\Library
- $(EDK_SOURCE)\Foundation
- $(EDK_SOURCE)\Foundation\Include
- $(EDK_SOURCE)\Foundation\Include\IndustryStandard
- $(EDK_SOURCE)\Foundation\Efi
- $(EDK_SOURCE)\Foundation\Efi\Include
- $(EDK_SOURCE)\Foundation\FrameWork
- $(EDK_SOURCE)\Foundation\FrameWork\Include
- $(EDK_SOURCE)\Foundation\Core\Dxe
- $(DEST_DIR)\
+ ../Inc
+ ../Library
+ $(EDK_SOURCE)/Foundation
+ $(EDK_SOURCE)/Foundation/Include
+ $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+ $(EDK_SOURCE)/Foundation/Efi
+ $(EDK_SOURCE)/Foundation/Efi/Include
+ $(EDK_SOURCE)/Foundation/FrameWork
+ $(EDK_SOURCE)/Foundation/FrameWork/Include
+ $(EDK_SOURCE)/Foundation/Core/Dxe
+ $(DEST_DIR./
[libraries.common]
EfiShellLib
@@ -56,9 +56,12 @@ COMPONENT_TYPE = APPLICATION
[nmake.common]
- C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
IMAGE_ENTRY_POINT=InitializeIpConfig
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+[nmake.ARM, nmake.AARCH64]
+ C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
diff --git a/Library/Aarch64/efilibplat.h b/Library/Aarch64/efilibplat.h
new file mode 100644
index 0000000..185c8b7
--- /dev/null
+++ b/Library/Aarch64/efilibplat.h
@@ -0,0 +1,38 @@
+/*++
+
+Copyright (c) 2005, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Module Name:
+
+ efilibplat.h
+
+Abstract:
+
+ EFI to compile bindings
+
+
+
+Revision History
+
+--*/
+
+#ifndef _EFI_LIB_PLAT_H
+#define _EFI_LIB_PLAT_H
+
+VOID
+InitializeLibPlatform (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ );
+
+#define MIN_ALIGNMENT_SIZE 8
+
+#endif
+
diff --git a/Library/Arm/efilibplat.h b/Library/Arm/efilibplat.h
new file mode 100644
index 0000000..791018d
--- /dev/null
+++ b/Library/Arm/efilibplat.h
@@ -0,0 +1,39 @@
+/*++
+
+Copyright (c) 2005, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Module Name:
+
+ efilibplat.h
+
+Abstract:
+
+ EFI to compile bindings
+
+
+
+
+Revision History
+
+--*/
+#ifndef _EFI_LIB_PLAT_H_
+#define _EFI_LIB_PLAT_H_
+
+VOID
+InitializeLibPlatform (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ );
+
+#define MIN_ALIGNMENT_SIZE 4
+
+#endif
+
+
diff --git a/Library/CRC.c b/Library/CRC.c
index ce5387b..ebbdf70 100644
--- a/Library/CRC.c
+++ b/Library/CRC.c
@@ -21,7 +21,7 @@ Revision History
--*/
-#include "EfiShelllib.h"
+#include "EfiShellLib.h"
UINT32 CRCTable[256] = {
0x00000000,
diff --git a/Library/CRC.h b/Library/CRC.h
index 326a5e1..db1f765 100644
--- a/Library/CRC.h
+++ b/Library/CRC.h
@@ -53,4 +53,6 @@ CalculateCrc (
UINTN Size
);
-#endif
\ No newline at end of file
+#endif
+
+
diff --git a/Library/ConsistMapping.c b/Library/ConsistMapping.c
index b70fa06..61eda8b 100644
--- a/Library/ConsistMapping.c
+++ b/Library/ConsistMapping.c
@@ -21,7 +21,7 @@ Revision History
--*/
-#include "EfiShelllib.h"
+#include "EfiShellLib.h"
MTD_NAME mMTDName[] = {
{
diff --git a/Library/ConsistMapping.h b/Library/ConsistMapping.h
index bc8d6f0..d520f31 100644
--- a/Library/ConsistMapping.h
+++ b/Library/ConsistMapping.h
@@ -79,4 +79,6 @@ DevicePathConsistMappingCompare (
IN VOID *Buffer2
);
-#endif
\ No newline at end of file
+#endif
+
+
diff --git a/Library/DPath.c b/Library/DPath.c
index f0974ac..73086d7 100644
--- a/Library/DPath.c
+++ b/Library/DPath.c
@@ -20,7 +20,7 @@ Revision History
--*/
-#include "EfiShelllib.h"
+#include "EfiShellLib.h"
EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
@@ -1468,7 +1468,7 @@ Returns:
Status = LibLocateProtocol (
&gEfiDevicePathToTextProtocolGuid,
- &DevPathToText
+ (VOID**)&DevPathToText
);
if (!EFI_ERROR (Status)) {
ToText = DevPathToText->ConvertDevicePathToText (
@@ -1766,7 +1766,7 @@ Returns:
Status = BS->HandleProtocol (
Device,
Protocol,
- Interface
+ (VOID**)Interface
);
}
}
diff --git a/Library/DPath.h b/Library/DPath.h
index 68da82b..0f2a33f 100644
--- a/Library/DPath.h
+++ b/Library/DPath.h
@@ -24,7 +24,7 @@ Revision History
#ifndef _D_PATH_H
#define _D_PATH_H
-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
+#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
#include EFI_GUID_DEFINITION (PcAnsi)
@@ -153,3 +153,4 @@ GetNameGuidFromFwVolDevicePathNode (
);
#endif
+
diff --git a/Library/Data.c b/Library/Data.c
index d2ffe4a..979b3dd 100644
--- a/Library/Data.c
+++ b/Library/Data.c
@@ -21,7 +21,7 @@ Revision History
--*/
-#include "EfiShelllib.h"
+#include "EfiShellLib.h"
//
// ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
diff --git a/Library/Ebc/EfiLibPlat.h b/Library/Ebc/EfiLibPlat.h
index 922c881..e4a8771 100644
--- a/Library/Ebc/EfiLibPlat.h
+++ b/Library/Ebc/EfiLibPlat.h
@@ -44,3 +44,4 @@ Returns:
;
#define MIN_ALIGNMENT_SIZE 8
+
diff --git a/Library/EfiPart.h b/Library/EfiPart.h
index a62cd15..e59ae77 100644
--- a/Library/EfiPart.h
+++ b/Library/EfiPart.h
@@ -56,3 +56,4 @@ typedef struct {
#pragma pack()
#endif
+
diff --git a/Library/EfiShellLib.h b/Library/EfiShellLib.h
index 6243d1d..e0ffe43 100644
--- a/Library/EfiShellLib.h
+++ b/Library/EfiShellLib.h
@@ -25,7 +25,7 @@ Revision History
#define _EFI_SHELL_LIB_INCLUDE_
#include "Tiano.h"